From e71dbdb290d045db86c646a3398d5140bd1d4b75 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:23:19 +0200
Subject: [PATCH 001/323] Define gradle wrapper checksum

---
 gradle/wrapper/gradle-wrapper.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3c4101c..a257bc7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,3 +3,4 @@ distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionSha256Sum=81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd

From dd01b057d5b8e22b919d2cbd50ff9e8807b94b99 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:28:34 +0200
Subject: [PATCH 002/323] Create custom class loader class

---
 .../io/pzstorm/storm/StormClassLoader.java    | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/StormClassLoader.java

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
new file mode 100644
index 0000000..b0920b8
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -0,0 +1,23 @@
+import java.net.URLClassLoader;
+/**
+ * This is a custom {@code ClassLoader} used to define, transform and load Project Zomboid classes.
+ * It is initially invoked by {@link StormLauncher} when launching the game.
+ */
+@SuppressWarnings("WeakerAccess")
+public class StormClassLoader extends ClassLoader {
+	/**
+	 * {@code ClassLoader} that is the parent of this {@code ClassLoader}.
+	 * When loading classes, those classes not matching the whitelist pattern will have
+	 * their loading process delegated to this {@code ClassLoader}.
+	 */
+	private final ClassLoader parentClassLoader;
+	private final URLClassLoader urlClassLoader;
+
+	StormClassLoader() {
+		parentClassLoader = getClass().getClassLoader();
+		urlClassLoader = (URLClassLoader) getParent();
+	}
+	@Override
+	public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+	}
+}

From 15e6100ce90466dd9e9c8a37501028acd8f29487 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:30:21 +0200
Subject: [PATCH 003/323] Create whitelist of classes to load

---
 .../io/pzstorm/storm/StormClassLoader.java    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index b0920b8..6779b1a 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -1,10 +1,32 @@
 import java.net.URLClassLoader;
+import org.jetbrains.annotations.Contract;
 /**
  * This is a custom {@code ClassLoader} used to define, transform and load Project Zomboid classes.
  * It is initially invoked by {@link StormLauncher} when launching the game.
  */
 @SuppressWarnings("WeakerAccess")
 public class StormClassLoader extends ClassLoader {
+
+	/**
+	 * <p>{@code Set} of class prefixes that mark classes to be loaded with this class loader.
+	 * If a class does not match this patter it's loading will be delegated to the parent loader.
+	 * </p>
+	 * This {@code Set} includes both Java libraries and main classes. Java Libraries have to be
+	 * loaded by the same class loader loading the game so that native libraries loaded from
+	 * those Java libraries become associated with the class loader loading the game.
+	 * If the native libraries are loaded using a different class loader they
+	 * will not be accessible to game classes.
+	 */
+	private static final Set<String> CLASS_WHITELIST = ImmutableSet.of(
+			// zomboid library classes
+			"org.lwjgl.", "net.java.games.", "jassimp.",
+			// zomboid main classes
+			"astar.", "com.evildevil.engines.bubble.texture.",
+			"com.jcraft.", "com.sixlegs.png.", "de.jarnbjo.", "fmod.",
+			"javax.vecmath.", "org.joml.", "org.luaj.kahluafork.compiler.",
+			"org.mindrot.jbcrypt.", "se.krka.kahlua.", "zombie."
+	);
+
 	/**
 	 * {@code ClassLoader} that is the parent of this {@code ClassLoader}.
 	 * When loading classes, those classes not matching the whitelist pattern will have
@@ -17,6 +39,16 @@ public class StormClassLoader extends ClassLoader {
 		parentClassLoader = getClass().getClassLoader();
 		urlClassLoader = (URLClassLoader) getParent();
 	}
+
+	/**
+	 * Returns {@code true} if at least one prefix pattern in whitelist matches the given name.
+	 * When a class name is considered whitelisted it will be loaded by this {@code ClassLoader}.
+	 */
+	@Contract("null -> fail")
+	protected static boolean isWhitelistedClass(String name) {
+		return CLASS_WHITELIST.stream().anyMatch(name::startsWith);
+	}
+
 	@Override
 	public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
 	}

From 71fcfb9baa091bacb64f4bf3d90ff92e6f91188e Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:33:24 +0200
Subject: [PATCH 004/323] Create method to read class to byte array

---
 .../io/pzstorm/storm/StormClassLoader.java    | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 6779b1a..634844c 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -1,3 +1,6 @@
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.net.URLClassLoader;
 import org.jetbrains.annotations.Contract;
 /**
@@ -51,5 +54,44 @@ protected static boolean isWhitelistedClass(String name) {
 
 	@Override
 	public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+
+	/**
+	 * Converts the given class name to a file name.
+	 */
+	@Contract(pure = true, value = "null -> fail")
+	private String getClassFileName(String name) {
+		return name.replace('.', '/') + ".class";
+	}
+
+	/**
+	 * Reads the {@code Class} with given name into a {@code byte} array and return the result.
+	 *
+	 * @param name name of the {@code Class} to read.
+	 * @return {@code byte} array read from {@code Class} or an empty array
+	 * 		if the {@code Class} with the given name could not be found.
+	 *
+	 * @throws IOException if an I/O error occurred while reading or writing to stream.
+	 */
+	@Contract("null -> fail")
+	protected byte[] getRawClassByteArray(String name) throws IOException {
+
+		// opens an input stream to read the class for given name
+		InputStream inputStream = getResourceAsStream(getClassFileName(name));
+		if (inputStream == null) {
+			return new byte[0];
+		}
+		int a = inputStream.available();
+		ByteArrayOutputStream outputStream = new ByteArrayOutputStream(a < 32 ? 32768 : a);
+		/*
+		 * read from input stream and write to output stream
+		 * a maximum of 8192 bytes per write operation
+		 */
+		int len;
+		byte[] buffer = new byte[8192];
+		while ((len = inputStream.read(buffer)) > 0) {
+			outputStream.write(buffer, 0, len);
+		}
+		inputStream.close();
+		return outputStream.toByteArray();
 	}
 }

From 607b8c4286683dcd81d02296681edaaf13ea188e Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:35:10 +0200
Subject: [PATCH 005/323] Create miscellaneous loader methods

---
 .../io/pzstorm/storm/StormClassLoader.java    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 634844c..7c17975 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -1,8 +1,12 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Objects;
+import java.util.Set;
 import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
 /**
  * This is a custom {@code ClassLoader} used to define, transform and load Project Zomboid classes.
  * It is initially invoked by {@link StormLauncher} when launching the game.
@@ -52,9 +56,36 @@ protected static boolean isWhitelistedClass(String name) {
 		return CLASS_WHITELIST.stream().anyMatch(name::startsWith);
 	}
 
+	@Override
+	@Contract("null -> fail")
+	public @Nullable URL getResource(String name) {
+		Objects.requireNonNull(name);
+
+		URL url = urlClassLoader.getResource(name);
+		if (url == null) {
+			url = parentClassLoader.getResource(name);
+		}
+		return url;
+	}
+
+	@Override
+	protected @Nullable URL findResource(String name) {
+		return urlClassLoader.findResource(name);
+	}
 	@Override
 	public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
 
+
+	@Override
+	public @Nullable InputStream getResourceAsStream(String name) {
+
+		InputStream inputStream = urlClassLoader.getResourceAsStream(name);
+		if (inputStream == null) {
+			inputStream = parentClassLoader.getResourceAsStream(name);
+		}
+		return inputStream;
+	}
+
 	/**
 	 * Converts the given class name to a file name.
 	 */

From 8fafb55b70a6964bc08e227b7831d88459826e14 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:37:12 +0200
Subject: [PATCH 006/323] Implement custom game class loading

Game classes and native libraries will be loaded by StormClassLoader.
---
 .../io/pzstorm/storm/StormClassLoader.java    | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 7c17975..1fac380 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -7,6 +7,10 @@
 import java.util.Set;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
+import com.google.common.collect.ImmutableSet;
+
+import zombie.debug.DebugLog;
+
 /**
  * This is a custom {@code ClassLoader} used to define, transform and load Project Zomboid classes.
  * It is initially invoked by {@link StormLauncher} when launching the game.
@@ -72,9 +76,90 @@ protected static boolean isWhitelistedClass(String name) {
 	protected @Nullable URL findResource(String name) {
 		return urlClassLoader.findResource(name);
 	}
+
+	/**
+	 * Defines and returns a package by name in this {@code ClassLoader}.
+	 *
+	 * @param name name of the package to define.
+	 * @return instance of {@link Package} defined or {@code null} if no package defined.
+	 *
+	 * @throws IllegalArgumentException if package name duplicates an existing
+	 * 		package either in this class loader or one of its ancestors
+	 */
+	@Contract("null -> fail")
+	protected @Nullable Package definePackageForName(String name) {
+
+		int pkgDelimiterPos = name.lastIndexOf('.');
+		if (pkgDelimiterPos > 0)
+		{
+			String pkgString = name.substring(0, pkgDelimiterPos);
+			if (getPackage(pkgString) == null) {
+				return definePackage(pkgString, null, null,
+						null, null, null, null, null);
+			}
+		}
+		return null;
+	}
+
 	@Override
 	public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
 
+		// make sure our loading is not interrupted by other operations
+		synchronized (getClassLoadingLock(name)) {
+			return loadClassInternal(name, resolve);
+		}
+	}
+
+	/**
+	 * Loads the class with the specified binary name. This method will get called every time
+	 * a class is about to be loaded by this {@code ClassLoader}. It is called before the class
+	 * is defined or loaded into JVM, which allows us to manipulate the class to our desire.
+	 *
+	 * @param name the binary name of the class.
+	 * @param resolve if {@code true} then resolve the class.
+	 * @return the resulting {@code Class} object.
+	 *
+	 * @throws ClassNotFoundException if the class could not be found.
+	 */
+	private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNotFoundException {
+
+		Class<?> clazz = findLoadedClass(name);
+		if (clazz == null)
+		{
+			DebugLog.General.debugln("STORM: Preparing to load class " + name);
+			if (isWhitelistedClass(name))
+			{
+				DebugLog.General.debugln("STORM: Loading with StormClassLoader");
+				try {
+					byte[] input = getRawClassByteArray(name);
+					if (input != null)
+					{
+						// package has to be created before we define the class
+						definePackageForName(name);
+
+						clazz = defineClass(name, input, 0, input.length);
+						if (clazz.getClassLoader() == this) {
+							DebugLog.General.debugln("STORM: Successfully loaded class with StormClassLoader");
+						}
+						else throw new RuntimeException("Unable to load class with StormClassLoader");
+					}
+				}
+				catch (IOException e) {
+					throw new RuntimeException("I/O exception occurred while transforming class to byte array");
+				}
+			}
+		}
+		// if the class is not whitelisted delegate loading to parent class loader
+		if (clazz == null)
+		{
+			DebugLog.General.debugln("STORM: Loading with application class loader");
+			clazz = parentClassLoader.loadClass(name);
+		}
+		if (resolve) {
+			resolveClass(clazz);
+		}
+		return clazz;
+	}
 
 	@Override
 	public @Nullable InputStream getResourceAsStream(String name) {

From e0f9d30855c5934c16cde9f03b11b0d3faa972dc Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:42:34 +0200
Subject: [PATCH 007/323] Declare missing class package

---
 src/main/java/io/pzstorm/storm/StormClassLoader.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 1fac380..7356540 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -1,3 +1,5 @@
+package io.pzstorm.storm;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;

From 1c8f3b67ad402de6e0a64524c117c9a8a2d7138f Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:43:39 +0200
Subject: [PATCH 008/323] Create storm launcher class

---
 .../java/io/pzstorm/storm/StormLauncher.java  | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/StormLauncher.java

diff --git a/src/main/java/io/pzstorm/storm/StormLauncher.java b/src/main/java/io/pzstorm/storm/StormLauncher.java
new file mode 100644
index 0000000..2f50ed1
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/StormLauncher.java
@@ -0,0 +1,45 @@
+package io.pzstorm.storm;
+
+import java.lang.reflect.Method;
+
+import zombie.debug.DebugLog;
+
+class StormLauncher {
+
+	/**
+	 * Class name of Project Zomboid application entry point. This is the first class
+	 * loaded by {@link StormClassLoader} which in turn loads all game classes.
+	 */
+	private static final String ZOMBOID_ENTRY_POINT_CLASS = "zombie.gameStates.MainScreenState";
+
+	/**
+	 * Name of the method that is the entry point to Project Zomboid execution.
+	 * This will be invoked through reflection from {@link #launch(String[])} to launch the game
+	 */
+	private static final String ZOMBOID_ENTRY_POINT = "main";
+
+	/**
+	 * Launch Project Zomboid with given array or arguments.
+	 *
+	 * @param args array of arguments to use to launch the game.
+	 *
+	 * @throws ReflectiveOperationException if loading or invoking entry point failed.
+	 */
+	static void launch(String[] args) throws ReflectiveOperationException {
+
+		StormClassLoader stormLoader = new StormClassLoader();
+		Class<?> entryPointClass = stormLoader.loadClass(ZOMBOID_ENTRY_POINT_CLASS);
+		Method entryPoint = entryPointClass.getMethod(ZOMBOID_ENTRY_POINT, String[].class);
+		try {
+			/* we invoke the entry point using reflection because we don't want to reference
+			 * the entry point class which would to the class being loaded by application class loader
+			 */
+			entryPoint.invoke(null, (Object) args);
+		}
+		catch (Throwable e)
+		{
+			DebugLog.General.error("An unhandled exception occurred while running Project Zomboid");
+			throw new RuntimeException(e);
+		}
+	}
+}

From 836d3c41413ccd60155e993e4394b0e6ff2c5bbe Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:44:07 +0200
Subject: [PATCH 009/323] Run storm launcher from entry point

---
 src/main/java/io/pzstorm/storm/Main.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/Main.java b/src/main/java/io/pzstorm/storm/Main.java
index 7d14d89..30a427f 100644
--- a/src/main/java/io/pzstorm/storm/Main.java
+++ b/src/main/java/io/pzstorm/storm/Main.java
@@ -1,6 +1,8 @@
 package io.pzstorm.storm;
 
 public class Main {
+
 	public static void main(String[] args) throws ReflectiveOperationException {
+		StormLauncher.launch(args);
 	}
 }

From a9cac4ed6ed964b66c255ec91b5ccd03a181adaa Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:51:42 +0200
Subject: [PATCH 010/323] Change storm application entry point

---
 src/main/java/io/pzstorm/storm/Main.java          | 8 --------
 src/main/java/io/pzstorm/storm/StormLauncher.java | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 src/main/java/io/pzstorm/storm/Main.java

diff --git a/src/main/java/io/pzstorm/storm/Main.java b/src/main/java/io/pzstorm/storm/Main.java
deleted file mode 100644
index 30a427f..0000000
--- a/src/main/java/io/pzstorm/storm/Main.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.pzstorm.storm;
-
-public class Main {
-
-	public static void main(String[] args) throws ReflectiveOperationException {
-		StormLauncher.launch(args);
-	}
-}
diff --git a/src/main/java/io/pzstorm/storm/StormLauncher.java b/src/main/java/io/pzstorm/storm/StormLauncher.java
index 2f50ed1..f3d1c71 100644
--- a/src/main/java/io/pzstorm/storm/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/StormLauncher.java
@@ -14,7 +14,7 @@ class StormLauncher {
 
 	/**
 	 * Name of the method that is the entry point to Project Zomboid execution.
-	 * This will be invoked through reflection from {@link #launch(String[])} to launch the game
+	 * This will be invoked through reflection from {@link #main(String[])} to launch the game
 	 */
 	private static final String ZOMBOID_ENTRY_POINT = "main";
 
@@ -25,7 +25,7 @@ class StormLauncher {
 	 *
 	 * @throws ReflectiveOperationException if loading or invoking entry point failed.
 	 */
-	static void launch(String[] args) throws ReflectiveOperationException {
+	public static void main(String[] args) throws ReflectiveOperationException {
 
 		StormClassLoader stormLoader = new StormClassLoader();
 		Class<?> entryPointClass = stormLoader.loadClass(ZOMBOID_ENTRY_POINT_CLASS);

From 95476fe8cc6979e5ff4c31f8b343030c228eb437 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 09:55:02 +0200
Subject: [PATCH 011/323] Use immutable container declaration

---
 src/main/java/io/pzstorm/storm/StormClassLoader.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 7356540..9502f7b 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -6,7 +6,6 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Objects;
-import java.util.Set;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 import com.google.common.collect.ImmutableSet;
@@ -30,7 +29,7 @@ public class StormClassLoader extends ClassLoader {
 	 * If the native libraries are loaded using a different class loader they
 	 * will not be accessible to game classes.
 	 */
-	private static final Set<String> CLASS_WHITELIST = ImmutableSet.of(
+	private static final ImmutableSet<String> CLASS_WHITELIST = ImmutableSet.of(
 			// zomboid library classes
 			"org.lwjgl.", "net.java.games.", "jassimp.",
 			// zomboid main classes

From c5700d96f998fdf386069dc7ed4927a2ba829d02 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 10:23:30 +0200
Subject: [PATCH 012/323] Fix truncated class error in class loading

---
 src/main/java/io/pzstorm/storm/StormClassLoader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 9502f7b..9c4f26a 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -133,7 +133,7 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 				DebugLog.General.debugln("STORM: Loading with StormClassLoader");
 				try {
 					byte[] input = getRawClassByteArray(name);
-					if (input != null)
+					if (input.length > 0)
 					{
 						// package has to be created before we define the class
 						definePackageForName(name);

From 7c71161da4f9bf8ecb6c9c3d3534f918ab7707d0 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 10:28:15 +0200
Subject: [PATCH 013/323] Configure capsid gradle plugin

---
 build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.gradle b/build.gradle
index 55d1ef9..cc67893 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,12 @@ apply from: "https://gist.githubusercontent.com/yooksi/${spotlessGistID}/raw/spo
 
 version '0.1.0'
 
+capsid {
+	isModProject = false
+	setRepositoryOwner("pzstorm")
+	setRepositoryName("storm")
+}
+
 dependencies {
 	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
 	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1'

From 32897287a8fbc42de5b6ec4c6396cfe8dab855f1 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 10:28:31 +0200
Subject: [PATCH 014/323] Apply spotless code formatting

---
 src/main/java/io/pzstorm/storm/StormClassLoader.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 9c4f26a..3fb2552 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -6,8 +6,10 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Objects;
+
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
+
 import com.google.common.collect.ImmutableSet;
 
 import zombie.debug.DebugLog;

From f9cc1ddd1198c2a51989427b80409955677ba540 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 19:49:10 +0200
Subject: [PATCH 015/323] Add IDEA search scopes

---
 .idea/scopes/pz_java.xml | 3 +++
 .idea/scopes/pz_lua.xml  | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 .idea/scopes/pz_java.xml
 create mode 100644 .idea/scopes/pz_lua.xml

diff --git a/.idea/scopes/pz_java.xml b/.idea/scopes/pz_java.xml
new file mode 100644
index 0000000..552dbfd
--- /dev/null
+++ b/.idea/scopes/pz_java.xml
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="pz-java" pattern="lib:zombie..*||lib:se..*||lib:fmod..*" />
+</component>
\ No newline at end of file
diff --git a/.idea/scopes/pz_lua.xml b/.idea/scopes/pz_lua.xml
new file mode 100644
index 0000000..d18fdac
--- /dev/null
+++ b/.idea/scopes/pz_lua.xml
@@ -0,0 +1,3 @@
+<component name="DependencyValidationManager">
+  <scope name="pz-lua" pattern="lib:media.lua..*" />
+</component>
\ No newline at end of file

From 4f50093e604945d6e4b496296c0a260cf0865add Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 22:33:12 +0200
Subject: [PATCH 016/323] Rename storm URLClassLoader field

---
 src/main/java/io/pzstorm/storm/StormClassLoader.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 3fb2552..8bb18d9 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -47,11 +47,11 @@ public class StormClassLoader extends ClassLoader {
 	 * their loading process delegated to this {@code ClassLoader}.
 	 */
 	private final ClassLoader parentClassLoader;
-	private final URLClassLoader urlClassLoader;
+	protected final URLClassLoader resourceClassLoader;
 
 	StormClassLoader() {
 		parentClassLoader = getClass().getClassLoader();
-		urlClassLoader = (URLClassLoader) getParent();
+		resourceClassLoader = (URLClassLoader) getParent();
 	}
 
 	/**
@@ -68,7 +68,7 @@ protected static boolean isWhitelistedClass(String name) {
 	public @Nullable URL getResource(String name) {
 		Objects.requireNonNull(name);
 
-		URL url = urlClassLoader.getResource(name);
+		URL url = resourceClassLoader.getResource(name);
 		if (url == null) {
 			url = parentClassLoader.getResource(name);
 		}
@@ -77,7 +77,7 @@ protected static boolean isWhitelistedClass(String name) {
 
 	@Override
 	protected @Nullable URL findResource(String name) {
-		return urlClassLoader.findResource(name);
+		return resourceClassLoader.findResource(name);
 	}
 
 	/**
@@ -167,7 +167,7 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 	@Override
 	public @Nullable InputStream getResourceAsStream(String name) {
 
-		InputStream inputStream = urlClassLoader.getResourceAsStream(name);
+		InputStream inputStream = resourceClassLoader.getResourceAsStream(name);
 		if (inputStream == null) {
 			inputStream = parentClassLoader.getResourceAsStream(name);
 		}

From cb5eff3ea64867defc5a6a9b1b635ecdca0e1994 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 22:34:06 +0200
Subject: [PATCH 017/323] Expand storm class loader resource locations

---
 src/main/java/io/pzstorm/storm/StormClassLoader.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 8bb18d9..09178ae 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -49,7 +49,17 @@ public class StormClassLoader extends ClassLoader {
 	private final ClassLoader parentClassLoader;
 	protected final URLClassLoader resourceClassLoader;
 
-	StormClassLoader() {
+	/**
+	 * Create {@code StormClassLoader} with additional locations to search for resources.
+	 *
+	 * @param resourceLocations the URLs from which to load classes and resources.
+	 */
+	protected StormClassLoader(URL[] resourceLocations) {
+		parentClassLoader = getClass().getClassLoader();
+		resourceClassLoader = new URLClassLoader(resourceLocations, getParent());
+	}
+
+	protected StormClassLoader() {
 		parentClassLoader = getClass().getClassLoader();
 		resourceClassLoader = (URLClassLoader) getParent();
 	}

From 05d6af5aba09cb12d1cbdbea63b1a2041625e5d0 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 22:36:52 +0200
Subject: [PATCH 018/323] Create unit test interface class

---
 src/test/java/io/pzstorm/storm/UnitTest.java | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/UnitTest.java

diff --git a/src/test/java/io/pzstorm/storm/UnitTest.java b/src/test/java/io/pzstorm/storm/UnitTest.java
new file mode 100644
index 0000000..af682b3
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/UnitTest.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm;
+
+import org.junit.jupiter.api.Tag;
+
+@Tag("unit")
+public interface UnitTest {
+}

From 2700e7623a54b8c09ea7b1e9a0d3281444b0aee5 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 22:41:25 +0200
Subject: [PATCH 019/323] Exclude resource class files from gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 634e66f..9445672 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@ out/
 # Compiled class file
 *.class
 
+# Exclude class files used as resources
+!**/resources/**/*.class
+
 # Log file
 *.log
 

From 42341f35328c96ecb6c3362c5fa2681a442f690f Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 22:41:37 +0200
Subject: [PATCH 020/323] Write storm class loader unit tests

---
 .../pzstorm/storm/StormClassLoaderTest.java   | 100 ++++++++++++++++++
 .../io/pzstorm/storm/SampleClass.class        | Bin 0 -> 460 bytes
 src/test/resources/delegate/delegate.resource |   0
 3 files changed, 100 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
 create mode 100644 src/test/resources/classes/io/pzstorm/storm/SampleClass.class
 create mode 100644 src/test/resources/delegate/delegate.resource

diff --git a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
new file mode 100644
index 0000000..c2815a0
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
@@ -0,0 +1,100 @@
+package io.pzstorm.storm;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.util.*;
+
+import com.google.common.collect.ImmutableMap;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class StormClassLoaderTest extends StormClassLoader implements UnitTest {
+
+	private static final ClassLoader CL = StormClassLoaderTest.class.getClassLoader();
+	private static final URL CLASSES_RESOURCE_DIR = CL.getResource("./classes/");
+	private static final URL DELEGATE_RESOURCE_DIR = CL.getResource("./delegate/");
+
+	StormClassLoaderTest() {
+		super(new URL[] { CLASSES_RESOURCE_DIR, DELEGATE_RESOURCE_DIR });
+	}
+
+	@Test
+	void shouldMatchRawClassByteArrayToClassFile() throws URISyntaxException, IOException {
+
+		File resourceDir = new File(Objects.requireNonNull(CLASSES_RESOURCE_DIR).toURI());
+		File expectedClass = new File(resourceDir, "io/pzstorm/storm/SampleClass.class");
+
+		String className = "io.pzstorm.storm.SampleClass";
+
+		byte[] expectedBytes = Files.readAllBytes(expectedClass.toPath());
+		byte[] actualBytes = getRawClassByteArray(className);
+
+		for (int i = 0; i < expectedBytes.length; i++) {
+			Assertions.assertEquals(expectedBytes[i], actualBytes[i]);
+		}
+	}
+
+	@Test
+	void shouldDelegateToResourceClassLoaderWhenResolvingResource() {
+
+		Assertions.assertNotNull(getResourceAsStream("delegate.resource"));
+		Assertions.assertNotNull(findResource("delegate.resource"));
+		Assertions.assertNotNull(getResource("delegate.resource"));
+	}
+
+	@Test
+	void whenIncorrectPackageNameShouldNotDefinePackage() {
+
+		String[] incorrectPackageNames = new String[]{
+				"package", ".package", ".", ""
+		};
+		for (String incorrectPackageName : incorrectPackageNames) {
+			Assertions.assertNull(definePackageForName(incorrectPackageName));
+		}
+	}
+
+	@Test
+	void shouldDefinePackageWhenPackageNameIsValid() {
+
+		Map<String, String> validPackageNames = ImmutableMap.of(
+				"valid.package", "valid",
+				"another.valid.package", "another.valid",
+				"yet.another.valid.package", "yet.another.valid"
+		);
+		for (Map.Entry<String, String> entry : validPackageNames.entrySet())
+		{
+			Package resultPackage = definePackageForName(entry.getKey());
+			Assertions.assertEquals(entry.getValue(), Objects.requireNonNull(resultPackage).getName());
+		}
+	}
+
+	@Test
+	@SuppressWarnings("unchecked")
+	void shouldProperlyRecognizeWhitelistedClassNames() throws ReflectiveOperationException {
+
+		Field field = StormClassLoader.class.getDeclaredField("CLASS_WHITELIST");
+		field.setAccessible(true);
+
+		Set<String> whitelist = (Set<String>) field.get(null);
+		for (String className : whitelist) {
+			Assertions.assertTrue(isWhitelistedClass(className));
+		}
+		Random rand = new Random();
+		for (int i1 = 10; i1 > 0; i1--)
+		{
+			StringBuilder sb = new StringBuilder();
+			sb.append(UUID.randomUUID().toString().replaceAll("-", ""));
+
+			// random number of package directories
+			for (int i2 = rand.nextInt(5) + 1; i2 > 0; i2--) {
+				sb.append(".").append(UUID.randomUUID().toString().replaceAll("-", ""));
+			}
+			Assertions.assertFalse(isWhitelistedClass(sb.toString()));
+		}
+	}
+}
diff --git a/src/test/resources/classes/io/pzstorm/storm/SampleClass.class b/src/test/resources/classes/io/pzstorm/storm/SampleClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..94f6096b564296cec09f5d191d16aadc66310fc4
GIT binary patch
literal 460
zcmaJ-%Syvg5IvKoiN<Ij+Ui0Ccdd(N<4$o?5DLLAD&612YrQ3pa+7r7SLsS|;RpCp
z;-o25p*V{(%*;7+hWYyb_yll?69*=m4q9m2IJ9v@u&!02@*6^}*Pjy1Vfr8m4PPbl
zu80Gv??n)Cr|qYqh^9iTvR*gM{7GemGhe0N;yKGx9eWi{M7)UPFcMjIMR2vu3!PL8
z37uZwpNpmNB9Y9zQIgA<)J$_GX`w@Tt4hP>uN8xm?V=9LM#n`L$Ar`WJXyXm7zcA1
z=7iR!we}>~OA!@v{7C5bM%%8!Icog0G7M080;A29$C)_SFWx|}tMLwFIR;C18QqEi
c2YX!c8?ev#M{K^sc;TUejo8{MK3K6DKPPcup8x;=

literal 0
HcmV?d00001

diff --git a/src/test/resources/delegate/delegate.resource b/src/test/resources/delegate/delegate.resource
new file mode 100644
index 0000000..e69de29

From b6ab64b5409efc2b22ea94085aa6d4a998b78d15 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 23:55:02 +0200
Subject: [PATCH 021/323] Refactor StormClassLoader test class

---
 .../pzstorm/storm/StormClassLoaderTest.java   | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
index c2815a0..3bbd86f 100644
--- a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
@@ -74,27 +74,35 @@ void shouldDefinePackageWhenPackageNameIsValid() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void shouldProperlyRecognizeWhitelistedClassNames() throws ReflectiveOperationException {
 
-		Field field = StormClassLoader.class.getDeclaredField("CLASS_WHITELIST");
-		field.setAccessible(true);
-
-		Set<String> whitelist = (Set<String>) field.get(null);
-		for (String className : whitelist) {
+		for (String className : getWhitelistedClasses()) {
 			Assertions.assertTrue(isWhitelistedClass(className));
 		}
 		Random rand = new Random();
 		for (int i1 = 10; i1 > 0; i1--)
 		{
 			StringBuilder sb = new StringBuilder();
-			sb.append(UUID.randomUUID().toString().replaceAll("-", ""));
+			sb.append(getRandomString());
 
 			// random number of package directories
 			for (int i2 = rand.nextInt(5) + 1; i2 > 0; i2--) {
-				sb.append(".").append(UUID.randomUUID().toString().replaceAll("-", ""));
+				sb.append(".").append(getRandomString());
 			}
 			Assertions.assertFalse(isWhitelistedClass(sb.toString()));
 		}
 	}
+
+	private static String getRandomString() {
+		return UUID.randomUUID().toString().replaceAll("-", "");
+	}
+
+	@SuppressWarnings("unchecked")
+	private static Set<String> getWhitelistedClasses() throws ReflectiveOperationException {
+
+		Field field = StormClassLoader.class.getDeclaredField("CLASS_WHITELIST");
+		field.setAccessible(true);
+
+		return (Set<String>) field.get(null);
+	}
 }

From 418438c12cf3a74bd9b952822aee94776d2c6075 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Thu, 22 Apr 2021 23:57:18 +0200
Subject: [PATCH 022/323] Test storm loading whitelisted classes

---
 .../pzstorm/storm/StormClassLoaderTest.java   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
index 3bbd86f..64c9f17 100644
--- a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
@@ -9,6 +9,7 @@
 import java.util.*;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -23,6 +24,24 @@ class StormClassLoaderTest extends StormClassLoader implements UnitTest {
 		super(new URL[] { CLASSES_RESOURCE_DIR, DELEGATE_RESOURCE_DIR });
 	}
 
+	@Test
+	void shouldLoadWhitelistedClassesWithStormClassLoader() throws ReflectiveOperationException {
+
+		for (String whitelistedClass : getWhitelistedClasses()) {
+			Assertions.assertNull(findLoadedClass(whitelistedClass));
+		}
+		ImmutableSet<String> dummyGameClasses = ImmutableSet.of(
+				"fmod.FmodClass", "jassimp.JassimpLibraryClass", "javax.vecmath.MathClass",
+				"org.lwjgl.LwjglLibraryClass", "zombie.ZombieClass"
+		);
+		for (String dummyGameClass : dummyGameClasses)
+		{
+			Class<?> loadedClass = loadClass(dummyGameClass, true);
+			Assertions.assertEquals(loadedClass, findLoadedClass(dummyGameClass));
+			Assertions.assertEquals(this, loadedClass.getClassLoader());
+		}
+	}
+
 	@Test
 	void shouldMatchRawClassByteArrayToClassFile() throws URISyntaxException, IOException {
 

From 4743cdf648b458d79396b811bd382b93a48ae7cb Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Fri, 23 Apr 2021 01:35:36 +0200
Subject: [PATCH 023/323] Add compiled dummy classes as resources

---
 .../classes/com/dummy/PancakeClass.class          | Bin 0 -> 281 bytes
 .../classes/com/dummy/PineappleClass.class        | Bin 0 -> 287 bytes
 .../classes/com/dummy/StrawberryClass.class       | Bin 0 -> 290 bytes
 src/test/resources/classes/fmod/FmodClass.class   | Bin 0 -> 334 bytes
 .../classes/jassimp/JassimpLibraryClass.class     | Bin 0 -> 298 bytes
 .../classes/javax/vecmath/MathClass.class         | Bin 0 -> 475 bytes
 .../classes/org/lwjgl/LwjglLibraryClass.class     | Bin 0 -> 296 bytes
 .../resources/classes/zombie/ZombieClass.class    | Bin 0 -> 347 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/test/resources/classes/com/dummy/PancakeClass.class
 create mode 100644 src/test/resources/classes/com/dummy/PineappleClass.class
 create mode 100644 src/test/resources/classes/com/dummy/StrawberryClass.class
 create mode 100644 src/test/resources/classes/fmod/FmodClass.class
 create mode 100644 src/test/resources/classes/jassimp/JassimpLibraryClass.class
 create mode 100644 src/test/resources/classes/javax/vecmath/MathClass.class
 create mode 100644 src/test/resources/classes/org/lwjgl/LwjglLibraryClass.class
 create mode 100644 src/test/resources/classes/zombie/ZombieClass.class

diff --git a/src/test/resources/classes/com/dummy/PancakeClass.class b/src/test/resources/classes/com/dummy/PancakeClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..d0d028b6c7ceb6f6de6be513d380a410099d0b8c
GIT binary patch
literal 281
zcmZvWyH3ME5Jm4eet=`Jp+K~Bkb-UKf@myJS%3seKi;fh6F($BBJo*NNECcPJ}P21
zqM%?#y4rhY?rOHXuWtZ1$YM-z6yZ2RN(gUlV~0D!<nn4k@bh+Q2x(y(^Dx$>>0Y?3
zgq#+w=4!#6b^aIn!<+31=Y?)-wH)jET|IH5d2RBF`+iP{pWCt1=H9wLPW}$BSG?f_
zJ_5qo|9L{@mQ=;ft9mR~Mi01vC+E8&X-SKQ;?&*)!R!<CA;3c<8VZI44n&jvJHR1g
KafGR;hvWx!T|0OH

literal 0
HcmV?d00001

diff --git a/src/test/resources/classes/com/dummy/PineappleClass.class b/src/test/resources/classes/com/dummy/PineappleClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..df5a193f685a2686d03a74eade0ef75a4c0dc21f
GIT binary patch
literal 287
zcmZ`!yKcfj5S%rBfHA=eO_YufD7c0WM1z#dN+KnqKbuo>=xifDkoYXBNGbRLJ_@l$
zX(+NQjdo^tM%we`_XJ>u&_@eB4-X#t1b3k`T`dW%(RfX;SNTQ}`jO7mYn{fb_>{3>
z<uS?=Y1XpP4gVAE>RXqD=P1cjv8mJaAl}(1cRQn2MwaEA;D6+Gk*F8lqzvxY)2-ag
z05%-L(|;L+usIV(W?$kh-m0X+5Eeht6mhek(PbuX9B?K-pd$+wJVuvgu%XQu+-3(I
L_{<1hMhn3e@Q*$}

literal 0
HcmV?d00001

diff --git a/src/test/resources/classes/com/dummy/StrawberryClass.class b/src/test/resources/classes/com/dummy/StrawberryClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..1c30f85e90563242d5d273bb36329863ceb4be12
GIT binary patch
literal 290
zcmZ`!O>4qX5S)$q(3sXBy@)4o>Y?w_TZ<RLQ_zFO`%8T2lYGES(vqLmQ=tccfIq5q
zBc6or!mu;DGq9K6pEH0Lgg!cW@bKtiKycr5uB!#1Go9@S_OjS3!XVPQTGv^u%)5+J
zR)$fL$aE)-Zuw2LtD`On<0vUIv9GhN5!=ehPqvw6naZ+!CHUK-Hi=s4Hs<MW|9p}k
zGJp+-F#0!z5Vm(BmH9zz;*&}$OknXJZ4oyIFuKgdl>^TF8}!A31&`5X8Eoh>2G`j^
M4?Z(OpV30_2X1CS2LJ#7

literal 0
HcmV?d00001

diff --git a/src/test/resources/classes/fmod/FmodClass.class b/src/test/resources/classes/fmod/FmodClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..5883315dcaf4f8c6ba0e3c10c04e43c8ab33f38c
GIT binary patch
literal 334
zcmZ8byKcfj5S;asIOh2W>GF``CS4E`LZY%l0ir+KXE<bhk{|i6RFP8T1NbPEwG&x{
zD`szIXGVKEe|-aZ!PtX|fs3Jw5y6?NTvaoIdH=8_SPPv<!Z1|1e5;R<EH)y_Seb-6
z7TH!5s^Nd4Rqa(t7=`IkC&7|ok%_W=CHRS+*NM{Ws!mgax7KwL%cW|n2A%QwAl`)!
z3pT6&JGix32ARlr!74h)xWXL_KD~Jc_*B@84zqwK@w6X5K_BhfWprB6M34XeuK_pk
Ym=SKf@KeiKyAC=RLF$4&+YR)807`v23;+NC

literal 0
HcmV?d00001

diff --git a/src/test/resources/classes/jassimp/JassimpLibraryClass.class b/src/test/resources/classes/jassimp/JassimpLibraryClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..4acf09b273c9b948c4ec6f90e2c10fc966f99ce1
GIT binary patch
literal 298
zcmaKn&1%9x6ot=?`O%m*!IdB`y0cw08+Vm%1Q!x?p}3!<LpvcqWfFxxR#$=xAHata
zZ`5V!44gaP;oJjrIv<Vz#t2-r@ZjLlflsg}s!;Vip*4Em5X@=$Aqjq@3c1+kvD9l3
zXYBN%G7;HEXw~rDH0v)_5r$DJs!HYG;ruou6>Fh?rWxZK!CjSGoyeJLiu!+KUQ@9X
z9!yw-!9QJuph<?AC_ckwoXVue6Ab=ObBHfju-Z)Fl>zHz5Bg=pfWvCD4PI!ode^sw
M4qPTem(_rG0h8ZDE&u=k

literal 0
HcmV?d00001

diff --git a/src/test/resources/classes/javax/vecmath/MathClass.class b/src/test/resources/classes/javax/vecmath/MathClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..2076e0a5c081d4cb9bbc211867d4cf03a98ca662
GIT binary patch
literal 475
zcmZ`#%T5A85Uk-fu&#h0B0dh@z=Lx!UNl}vOib{RK)4UfL<aXkb_b%Lr3Xzs_yK;D
zv1c_94$dUqT~*zcng06z_yll@LkD?OOV~oqK^@y14UQd#!i5gCxn#(;J41$CHySI3
zN>7LCb{>pWJdh)wm|8FLq(79gw)l_CnTbvqTD_@U$S1K-ULegx+)(KHGD*%EoN;8~
zKqij_`q4c0)Rnf5<z?H69d}Ux=V-dvMT=w4#Xb%gn*UfcRIMU>89s=+(NuY6jp{!q
zMg{b(Xih>SeWB2ixQ}&c`X*K~px4z?k9C@X&uo()(mLALogt2pqvhF?0c{MNVv&%b
z%qZuN-@#r|xkRy$l36%ZyT1+CpbAuPE{D%jGobj241Ys*HSdsOT{zv9M{(&<CN+b~
E5BzdoP5=M^

literal 0
HcmV?d00001

diff --git a/src/test/resources/classes/org/lwjgl/LwjglLibraryClass.class b/src/test/resources/classes/org/lwjgl/LwjglLibraryClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..8e1c48164fd4c1e677532e7eda6674ef6bda2963
GIT binary patch
literal 296
zcmaKnKT88a5XIkI?oT{V6H=rJ7IwzMZS0gZ0jnh`64LLT%elwq4)!jJAInOx$OrI4
z1!qILfHUx8-ecy${2qSx03I<+(Zf}O>jVQr{A_B|%?Q1_>4p%_n^#R3NK@;@Zkubj
zR=H(oB%4CnjdI58lNokzrX}3S#+AZ;RHYTtQ<~f<_c^z!ZJ!9~s@b_hzZf4hKHGSx
z)Vs<MA|g!wNg@pWrm(6m#WJsS(cu;Wf8&d|If5Cp5=RY0_urr|HUcEfm~HSupP3!!
N2p33M5iXelvOjx_LFWJf

literal 0
HcmV?d00001

diff --git a/src/test/resources/classes/zombie/ZombieClass.class b/src/test/resources/classes/zombie/ZombieClass.class
new file mode 100644
index 0000000000000000000000000000000000000000..247875e75caa88e41aac3da9ec5b01d5748726ef
GIT binary patch
literal 347
zcmZWkyKcfj5S;ZB91<Sl2k1x?#Z9`PG)Pny6d($^vvYz&#+GbD!8fHz6)8nNARmRY
zcUS_6D|U8gXXftyPCvf@UeOC+qwS;Pqf78cDpS=v!5%&?3C=kGkc4)mGCAGvVp%Li
zoHEmk@<gOdQ7Apvq*HBFN$5w%d>1Pjt_+M*QI>CnhAPj5311O{dA=_aIZ-;Wb0vP+
zii2pufy)=&X0ccc!c=7Ia29W6Qegm#zoCx>el}dL9#0`7F}hFRpf9ubxq61Q(cr#y
f7NCj1?C%Vt&Cj*jvOmq{;`FYZR_!F*8`Z-<1*AQu

literal 0
HcmV?d00001


From f6c166df83e965fb6ff9e83459f6ab3f814209b7 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Fri, 23 Apr 2021 01:35:49 +0200
Subject: [PATCH 024/323] Test delegating storm class loading

---
 .../io/pzstorm/storm/StormClassLoaderTest.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
index 64c9f17..79854e9 100644
--- a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
@@ -42,6 +43,23 @@ void shouldLoadWhitelistedClassesWithStormClassLoader() throws ReflectiveOperati
 		}
 	}
 
+	@Test
+	void shouldDelegateLoadingNonWhitelistedClassesToParentClassLoader() throws ReflectiveOperationException {
+
+		Method method = ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class);
+		method.setAccessible(true);
+
+		ImmutableSet<String> dummyClasses = ImmutableSet.of(
+				"com.dummy.PancakeClass", "com.dummy.PineappleClass", "com.dummy.StrawberryClass"
+		);
+		for (String dummyClass : dummyClasses)
+		{
+			Class<?> loadedClass = loadClass(dummyClass, true);
+			Assertions.assertEquals(loadedClass, method.invoke(getParent(), dummyClass));
+			Assertions.assertEquals(this.getParent(), loadedClass.getClassLoader());
+		}
+	}
+
 	@Test
 	void shouldMatchRawClassByteArrayToClassFile() throws URISyntaxException, IOException {
 

From 837cced599edb7992c075f91bc47020ca76db446 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Fri, 23 Apr 2021 15:41:47 +0200
Subject: [PATCH 025/323] Expand project gitignore rules

---
 .gitignore       | 6 +++---
 .idea/.gitignore | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9445672..66f3b69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,9 @@ version.properties
 ### Intellij ###
 
 # File-based project format
- *.iml
- *.ipr
- *.iws
+**/*.iml
+**/*.ipr
+**/*.iws
 
 # IntelliJ
 out/
diff --git a/.idea/.gitignore b/.idea/.gitignore
index 12e280c..27c8e6b 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -16,5 +16,6 @@ gradle.xml
 /artifacts/
 /modules/
 compiler.xml
+libraries-with-intellij-classes.xml
 jarRepositories.xml
 modules.xml

From 2983511e63eb6e5ee429600e868aada9cbb6359a Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Fri, 23 Apr 2021 19:48:57 +0200
Subject: [PATCH 026/323] Remove and ignore IDEA search scopes

---
 .idea/.gitignore         | 1 +
 .idea/scopes/pz_java.xml | 3 ---
 .idea/scopes/pz_lua.xml  | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 .idea/scopes/pz_java.xml
 delete mode 100644 .idea/scopes/pz_lua.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 27c8e6b..5851056 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,6 +1,7 @@
 # User-specific stuff
 /dictionaries/
 /shelf/
+/scopes/
 workspace.xml
 tasks.xml
 usage.statistics.xml
diff --git a/.idea/scopes/pz_java.xml b/.idea/scopes/pz_java.xml
deleted file mode 100644
index 552dbfd..0000000
--- a/.idea/scopes/pz_java.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="pz-java" pattern="lib:zombie..*||lib:se..*||lib:fmod..*" />
-</component>
\ No newline at end of file
diff --git a/.idea/scopes/pz_lua.xml b/.idea/scopes/pz_lua.xml
deleted file mode 100644
index d18fdac..0000000
--- a/.idea/scopes/pz_lua.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="pz-lua" pattern="lib:media.lua..*" />
-</component>
\ No newline at end of file

From 667f34e85553b1db7656edb58f84c4b65d046f77 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Fri, 23 Apr 2021 20:22:02 +0200
Subject: [PATCH 027/323] Define IDEA project code style

---
 .idea/codeStyles/Project.xml         | 40 ++++++++++++++++++++++++++++
 .idea/codeStyles/codeStyleConfig.xml |  5 ++++
 2 files changed, 45 insertions(+)
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..527b8a1
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,40 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
+    <option name="RIGHT_MARGIN" value="200" />
+    <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
+    <option name="FORMATTER_TAGS_ENABLED" value="true" />
+    <option name="SOFT_MARGINS" value="200" />
+    <JavaCodeStyleSettings>
+      <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+      <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+      <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
+      <option name="JD_P_AT_EMPTY_LINES" value="false" />
+      <option name="JD_KEEP_EMPTY_LINES" value="false" />
+      <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+      <option name="JD_INDENT_ON_CONTINUATION" value="true" />
+    </JavaCodeStyleSettings>
+    <editorconfig>
+      <option name="ENABLED" value="false" />
+    </editorconfig>
+    <codeStyleSettings language="JAVA">
+      <option name="RIGHT_MARGIN" value="110" />
+      <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="KEEP_BLANK_LINES_BETWEEN_PACKAGE_DECLARATION_AND_HEADER" value="1" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="BLANK_LINES_BEFORE_METHOD_BODY" value="1" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="BRACE_STYLE" value="2" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="WRAP_LONG_LINES" value="true" />
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..307554b
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
\ No newline at end of file

From ce8f4d88318776195d399b4814975445027a3f2b Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Fri, 23 Apr 2021 23:05:39 +0200
Subject: [PATCH 028/323] Update capsid plugin configuration

---
 build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index cc67893..57e0d95 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,8 +15,7 @@ version '0.1.0'
 
 capsid {
 	isModProject = false
-	setRepositoryOwner("pzstorm")
-	setRepositoryName("storm")
+	setProjectRepository('pzstorm', 'storm')
 }
 
 dependencies {

From ae998636f1474bd9cb89ed9e9dcec2794a908c78 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Fri, 23 Apr 2021 23:57:03 +0200
Subject: [PATCH 029/323] Generate Launch Storm run configuration

---
 build.gradle | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/build.gradle b/build.gradle
index 57e0d95..927f306 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,6 @@
+import io.pzstorm.capsid.setup.xml.LaunchRunConfig
+import io.pzstorm.capsid.setup.VmParameter
+
 plugins {
 	id 'io.pzstorm.capsid' version '0.2.0'
 
@@ -42,3 +45,17 @@ test {
 	useJUnitPlatform()
 	testLogging.events "passed", "skipped", "failed"
 }
+
+tasks.createLaunchRunConfigs.configure {
+	actions.clear()
+	doLast {
+		//@formatter:off
+		LaunchRunConfig launchStorm = new LaunchRunConfig(
+				"Launch Storm", "io.pzstorm.storm.StormLauncher",
+				new VmParameter.Builder().build(), [
+						Main: new File((gameDir as File), "logs/main.log").toPath() ,
+						Debug: new File((gameDir as File), "logs/debug.log").toPath()] as Map
+		)//@formatter:on
+		launchStorm.configure(getProject()).writeToFile()
+	}
+}
\ No newline at end of file

From b912c8865ca079213bcb3c0f912ef9ebf81fcc3f Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 01:59:53 +0200
Subject: [PATCH 030/323] Remove redundant distribution files

---
 src/main/dist/.idea/scopes/pz_java.xml | 3 ---
 src/main/dist/.idea/scopes/pz_lua.xml  | 3 ---
 2 files changed, 6 deletions(-)
 delete mode 100644 src/main/dist/.idea/scopes/pz_java.xml
 delete mode 100644 src/main/dist/.idea/scopes/pz_lua.xml

diff --git a/src/main/dist/.idea/scopes/pz_java.xml b/src/main/dist/.idea/scopes/pz_java.xml
deleted file mode 100644
index 552dbfd..0000000
--- a/src/main/dist/.idea/scopes/pz_java.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="pz-java" pattern="lib:zombie..*||lib:se..*||lib:fmod..*" />
-</component>
\ No newline at end of file
diff --git a/src/main/dist/.idea/scopes/pz_lua.xml b/src/main/dist/.idea/scopes/pz_lua.xml
deleted file mode 100644
index d18fdac..0000000
--- a/src/main/dist/.idea/scopes/pz_lua.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="DependencyValidationManager">
-  <scope name="pz-lua" pattern="lib:media.lua..*" />
-</component>
\ No newline at end of file

From 430c9a34c47f09dff3e8380862f2fea72682a4b3 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 02:36:33 +0200
Subject: [PATCH 031/323] Ignore IDEA run configurations

They are now generated with gradle task.
---
 .idea/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 5851056..6265ce5 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -16,6 +16,7 @@ gradle.xml
 # Other stuff
 /artifacts/
 /modules/
+/runConfigurations/
 compiler.xml
 libraries-with-intellij-classes.xml
 jarRepositories.xml

From f8c78ea55f537a6593de059ac6327b3684799a57 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 02:37:24 +0200
Subject: [PATCH 032/323] Change launch run config log directory

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 927f306..1e2cd82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,8 +53,8 @@ tasks.createLaunchRunConfigs.configure {
 		LaunchRunConfig launchStorm = new LaunchRunConfig(
 				"Launch Storm", "io.pzstorm.storm.StormLauncher",
 				new VmParameter.Builder().build(), [
-						Main: new File((gameDir as File), "logs/main.log").toPath() ,
-						Debug: new File((gameDir as File), "logs/debug.log").toPath()] as Map
+						Main: new File((gameDir as File), "logs/storm/main.log").toPath() ,
+						Debug: new File((gameDir as File), "logs/storm/debug.log").toPath()] as Map
 		)//@formatter:on
 		launchStorm.configure(getProject()).writeToFile()
 	}

From 27171ba24399ec8df63fba1eb021af115c4c9322 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 02:37:51 +0200
Subject: [PATCH 033/323] Add Log4j2 project dependency

---
 build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.gradle b/build.gradle
index 1e2cd82..ba053f6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,6 +28,9 @@ dependencies {
 	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
 	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1'
 
+	// https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
+	implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
+
 	// https://mvnrepository.com/artifact/com.google.guava/guava
 	implementation 'com.google.guava:guava:30.1-jre'
 

From e902b576caf2e86ff0973e01fd6a10fdc227ca6c Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 03:20:23 +0200
Subject: [PATCH 034/323] Create logger implementation

---
 .../java/io/pzstorm/storm/StormLogger.java    | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/StormLogger.java

diff --git a/src/main/java/io/pzstorm/storm/StormLogger.java b/src/main/java/io/pzstorm/storm/StormLogger.java
new file mode 100644
index 0000000..ea2a117
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/StormLogger.java
@@ -0,0 +1,106 @@
+package io.pzstorm.storm;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configurator;
+
+/**
+ * <p>Simple wrapper class for logging with Log4j 2 logger.
+ * To configure root logger level launch Storm with {@code JVM_PROPERTY} set to a custom logger level.
+ * </p><p>
+ * Logs will automatically be printed to console and configured log files.
+ * Check {@code log4j2.xml} for log file locations.
+ * </p>
+ * Use the {@code static} methods to print logs with desired log level.
+ * If you want to print with a log level not covered by {@code static} methods
+ * use {@link #get()} method to get a reference to logger instance.
+ */
+@SuppressWarnings({ "unused", "WeakerAccess" })
+public class StormLogger {
+
+	public static final Level VERBOSE = Level.forName("VERBOSE", 450);
+	private static final String JVM_PROPERTY = "storm.logger";
+	private static final org.apache.logging.log4j.Logger LOGGER;
+
+	static
+	{
+		LOGGER = LogManager.getLogger("Storm");
+		String sLevel = System.getProperty("storm.logger");
+		if (sLevel != null && sLevel.isEmpty())
+		{
+			Level level = Level.getLevel(sLevel);
+			if (level != null)
+			{
+				Configurator.setLevel("Storm", level);
+				LOGGER.debug("Setting custom level for Storm logger '" + sLevel + '\'');
+			}
+			else LOGGER.error("Unable to resolve logging level '" + sLevel + '\'');
+		}
+		LOGGER.debug("Initialized Storm logger");
+	}
+
+	/* Make the constructor private to disable instantiation */
+	private StormLogger() {
+		throw new UnsupportedOperationException();
+	}
+
+	/**
+	 * Returns an instance of Log4j {@link Logger} used for logging.
+	 */
+	public static Logger get() {
+		return LOGGER;
+	}
+
+	public static void info(String log) {
+		LOGGER.info(log);
+	}
+
+	public static void info(String log, Object... params) {
+		LOGGER.printf(Level.INFO, log, params);
+	}
+
+	public static void detail(String log) {
+		LOGGER.log(VERBOSE, log);
+	}
+
+	public static void detail(String log, Object... params) {
+		LOGGER.printf(VERBOSE, log, params);
+	}
+
+	public static void error(String log) {
+		LOGGER.error(log);
+	}
+
+	public static void error(String log, Object... args) {
+		LOGGER.printf(Level.ERROR, log, args);
+	}
+
+	public static void error(String log, Throwable t) {
+		LOGGER.error(log, t);
+	}
+
+	public static void warn(String log) {
+		LOGGER.warn(log);
+	}
+
+	public static void warn(String format, Object... params) {
+		LOGGER.printf(Level.WARN, format, params);
+	}
+
+	public static void debug(String log) {
+		LOGGER.debug(log);
+	}
+
+	public static void debug(String format, Object... args) {
+		LOGGER.printf(Level.DEBUG, format, args);
+	}
+
+	public static void debug(String log, Throwable t) {
+		LOGGER.debug(log, t);
+	}
+
+	public static void printf(Level level, String format, Object... params) {
+		LOGGER.printf(level, format, params);
+	}
+}

From 4bd04004a743ce77806d4b0d396b1f42d6839395 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 03:20:58 +0200
Subject: [PATCH 035/323] Configure log4j2 implementation

---
 src/main/resources/log4j2.xml | 45 +++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 src/main/resources/log4j2.xml

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..37ca2b9
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+    <Properties>
+        <Property name="logLevelPattern">
+            %level{VERBOSE=INFO}
+        </Property>
+        <Property name="logFilePattern">
+            logs/storm/$${date:yyyy-MM}/pz-storm-%d{MM-dd-yyyy}
+        </Property>
+    </Properties>
+    <CustomLevels>
+        <CustomLevel name="VERBOSE" intLevel="450" />
+    </CustomLevels>
+    <Appenders>
+        <!-- Console for use in production environment -->
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{[HH:mm:ss]} [${logLevelPattern}] %c{1} - %msg%n"/>
+        </Console>
+        <!-- Log file for standard use in development environment -->
+        <RollingFile name="MainFile" fileName="logs/storm/main.log" filePattern="${logFilePattern}-%i.log.zip">
+            <PatternLayout pattern="%d{[yyyy-MM-dd][HH:mm:ss]} [${logLevelPattern}] %c{1} - %msg%n"/>
+            <Policies>
+                <OnStartupTriggeringPolicy/>
+                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+            </Policies>
+            <DefaultRolloverStrategy max="10"/>
+        </RollingFile>
+        <!-- Log file for debugging use in development environment -->
+        <RollingFile name="DebugFile" fileName="logs/storm/debug.log" filePattern="${logFilePattern}-debug-%i.log.zip">
+            <PatternLayout pattern="%d{[yyyy-MM-dd][HH:mm:ss]} [${logLevelPattern}] %c{1} - %msg%n"/>
+            <Policies>
+                <OnStartupTriggeringPolicy/>
+                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+            </Policies>
+            <DefaultRolloverStrategy max="10"/>
+        </RollingFile>
+    </Appenders>
+    <Loggers>
+        <Root level="debug">
+            <AppenderRef ref="Console" level="verbose"/>
+            <AppenderRef ref="MainFile" level="verbose"/>
+            <AppenderRef ref="DebugFile"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file

From a5653a2cd667a7a164e3fb8469128bb41e08a77c Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 03:27:01 +0200
Subject: [PATCH 036/323] Start logging with StormLogger

---
 src/main/java/io/pzstorm/storm/StormClassLoader.java | 11 +++++------
 src/main/java/io/pzstorm/storm/StormLauncher.java    |  7 ++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 09178ae..44d7b98 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -12,8 +12,6 @@
 
 import com.google.common.collect.ImmutableSet;
 
-import zombie.debug.DebugLog;
-
 /**
  * This is a custom {@code ClassLoader} used to define, transform and load Project Zomboid classes.
  * It is initially invoked by {@link StormLauncher} when launching the game.
@@ -60,6 +58,7 @@ protected StormClassLoader(URL[] resourceLocations) {
 	}
 
 	protected StormClassLoader() {
+		StormLogger.debug("Initialized StormClassLoader");
 		parentClassLoader = getClass().getClassLoader();
 		resourceClassLoader = (URLClassLoader) getParent();
 	}
@@ -139,10 +138,10 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 		Class<?> clazz = findLoadedClass(name);
 		if (clazz == null)
 		{
-			DebugLog.General.debugln("STORM: Preparing to load class " + name);
+			StormLogger.debug("Preparing to load class " + name);
 			if (isWhitelistedClass(name))
 			{
-				DebugLog.General.debugln("STORM: Loading with StormClassLoader");
+				StormLogger.debug("Loading with StormClassLoader");
 				try {
 					byte[] input = getRawClassByteArray(name);
 					if (input.length > 0)
@@ -152,7 +151,7 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 
 						clazz = defineClass(name, input, 0, input.length);
 						if (clazz.getClassLoader() == this) {
-							DebugLog.General.debugln("STORM: Successfully loaded class with StormClassLoader");
+							StormLogger.debug("STORM: Successfully loaded class with StormClassLoader");
 						}
 						else throw new RuntimeException("Unable to load class with StormClassLoader");
 					}
@@ -165,7 +164,7 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 		// if the class is not whitelisted delegate loading to parent class loader
 		if (clazz == null)
 		{
-			DebugLog.General.debugln("STORM: Loading with application class loader");
+			StormLogger.debug("Loading with application class loader");
 			clazz = parentClassLoader.loadClass(name);
 		}
 		if (resolve) {
diff --git a/src/main/java/io/pzstorm/storm/StormLauncher.java b/src/main/java/io/pzstorm/storm/StormLauncher.java
index f3d1c71..4109658 100644
--- a/src/main/java/io/pzstorm/storm/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/StormLauncher.java
@@ -2,8 +2,6 @@
 
 import java.lang.reflect.Method;
 
-import zombie.debug.DebugLog;
-
 class StormLauncher {
 
 	/**
@@ -27,18 +25,21 @@ class StormLauncher {
 	 */
 	public static void main(String[] args) throws ReflectiveOperationException {
 
+		StormLogger.debug("Preparing to launch Project Zomboid");
 		StormClassLoader stormLoader = new StormClassLoader();
+
 		Class<?> entryPointClass = stormLoader.loadClass(ZOMBOID_ENTRY_POINT_CLASS);
 		Method entryPoint = entryPointClass.getMethod(ZOMBOID_ENTRY_POINT, String[].class);
 		try {
 			/* we invoke the entry point using reflection because we don't want to reference
 			 * the entry point class which would to the class being loaded by application class loader
 			 */
+			StormLogger.debug("Launching Project Zomboid...");
 			entryPoint.invoke(null, (Object) args);
 		}
 		catch (Throwable e)
 		{
-			DebugLog.General.error("An unhandled exception occurred while running Project Zomboid");
+			StormLogger.error("An unhandled exception occurred while running Project Zomboid");
 			throw new RuntimeException(e);
 		}
 	}

From 9519f6be4fd15a4f8d8e91188eb09681bd85302c Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 03:35:35 +0200
Subject: [PATCH 037/323] Bump guava dependency version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ba053f6..665f69c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ dependencies {
 	implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
 
 	// https://mvnrepository.com/artifact/com.google.guava/guava
-	implementation 'com.google.guava:guava:30.1-jre'
+	implementation 'com.google.guava:guava:30.1.1-jre'
 
 	// https://mvnrepository.com/artifact/org.jetbrains/annotations
 	compileOnly 'org.jetbrains:annotations:20.1.0'

From fc19b93275439555f03e914ef89f8e989bf05fd8 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 03:40:03 +0200
Subject: [PATCH 038/323] Ignore only launch run configurations

---
 .idea/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 6265ce5..9292ba8 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -16,7 +16,7 @@ gradle.xml
 # Other stuff
 /artifacts/
 /modules/
-/runConfigurations/
+/runConfigurations/Launch_*
 compiler.xml
 libraries-with-intellij-classes.xml
 jarRepositories.xml

From 5ee1d44b304fcc5743d0daa3e4a3eff815f919e4 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 03:42:58 +0200
Subject: [PATCH 039/323] Add unit test run configuration

---
 .idea/runConfigurations/Run_Unit_Tests.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .idea/runConfigurations/Run_Unit_Tests.xml

diff --git a/.idea/runConfigurations/Run_Unit_Tests.xml b/.idea/runConfigurations/Run_Unit_Tests.xml
new file mode 100644
index 0000000..1fc729b
--- /dev/null
+++ b/.idea/runConfigurations/Run_Unit_Tests.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Unit Tests" type="JUnit" factoryName="JUnit">
+    <module name="pz-storm.test" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="tags" />
+    <tag value="unit" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file

From 3398b97a7425047e96fa9c550ee14d2e2b1908e8 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 04:06:47 +0200
Subject: [PATCH 040/323] Recompile test resource classes

Tests were failing to find classes.
---
 .../classes/com/dummy/PancakeClass.class        | Bin 281 -> 285 bytes
 .../classes/com/dummy/PineappleClass.class      | Bin 287 -> 291 bytes
 .../classes/com/dummy/StrawberryClass.class     | Bin 290 -> 294 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/test/resources/classes/com/dummy/PancakeClass.class b/src/test/resources/classes/com/dummy/PancakeClass.class
index d0d028b6c7ceb6f6de6be513d380a410099d0b8c..69c6d3b44acdaa6b1a4539718e4b0c04e2c29695 100644
GIT binary patch
delta 26
gcmbQqG?!_@eMaMn55%~+7?>Cs7+8RiZQ@@U0AUygGynhq

delta 23
fcmbQsG?Qt<eMbF>55(Bn7#JBC7?>wBGRgn|QECMv

diff --git a/src/test/resources/classes/com/dummy/PineappleClass.class b/src/test/resources/classes/com/dummy/PineappleClass.class
index df5a193f685a2686d03a74eade0ef75a4c0dc21f..e3edd29cd98401da4c63211cd193d3e5e6f4018c 100644
GIT binary patch
delta 69
zcmbQww3unaQ#)e@Mj&KhVAa~rz_<~}U}9hgl3YNVfq?}G*%&y0EFOp=22P+11CY%P
IB$*g^04k9MF#rGn

delta 65
zcmZ3?G@oh0Q!9N2Mj&KhVAa~rz_<~}U}9hgl5Ai>W(E!*n+KwRfs=s?$YW&S2CL!$
E025IK82|tP

diff --git a/src/test/resources/classes/com/dummy/StrawberryClass.class b/src/test/resources/classes/com/dummy/StrawberryClass.class
index 1c30f85e90563242d5d273bb36329863ceb4be12..78611c862faff17b97598cc0cf9f7d12c1a17695 100644
GIT binary patch
delta 69
zcmZ3)w2W!O3p-;5Mj&KhVAa~rz_<~}U}9hgl3YNVfq?}G*%&y0EFOp=22P+11CY%P
IB$*g^04(VRIsgCw

delta 41
pcmZ3+w1{cK3psrTMj&KhVAa~rz_<~}U}9hgl5Ai>=E+=)G60*~1$h7f


From 6843206de2c3e36e205a0bd6901b1abd784d8f33 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 06:18:20 +0200
Subject: [PATCH 041/323] Bump capsid plugin version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 665f69c..1cbf1d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import io.pzstorm.capsid.setup.xml.LaunchRunConfig
 import io.pzstorm.capsid.setup.VmParameter
 
 plugins {
-	id 'io.pzstorm.capsid' version '0.2.0'
+	id 'io.pzstorm.capsid' version '0.3.0'
 
 	// Plugin that keeps your code spotless with Gradle
 	// https://plugins.gradle.org/plugin/com.diffplug.spotless

From 1acd5298eae5d0f2483fbd08fdfaf2a9ebf3dc62 Mon Sep 17 00:00:00 2001
From: Matthew Cain <yooksi@zoho.com>
Date: Sat, 24 Apr 2021 06:38:19 +0200
Subject: [PATCH 042/323] Fix class delegation test failing

Unknown cause as to why the test was failing.
---
 .../io/pzstorm/storm/StormClassLoaderTest.java    |   3 ++-
 .../classes/com/dummy/PancakeClass.class          | Bin 285 -> 0 bytes
 .../classes/com/dummy/PineappleClass.class        | Bin 291 -> 0 bytes
 .../classes/com/dummy/StrawberryClass.class       | Bin 294 -> 0 bytes
 4 files changed, 2 insertions(+), 1 deletion(-)
 delete mode 100644 src/test/resources/classes/com/dummy/PancakeClass.class
 delete mode 100644 src/test/resources/classes/com/dummy/PineappleClass.class
 delete mode 100644 src/test/resources/classes/com/dummy/StrawberryClass.class

diff --git a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
index 79854e9..ee20f57 100644
--- a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
@@ -50,7 +50,8 @@ void shouldDelegateLoadingNonWhitelistedClassesToParentClassLoader() throws Refl
 		method.setAccessible(true);
 
 		ImmutableSet<String> dummyClasses = ImmutableSet.of(
-				"com.dummy.PancakeClass", "com.dummy.PineappleClass", "com.dummy.StrawberryClass"
+				"com.google.common.io.Files", "com.google.common.util.concurrent.Atomics",
+				"org.apache.logging.log4j.Logger", "org.apache.logging.log4j.Level"
 		);
 		for (String dummyClass : dummyClasses)
 		{
diff --git a/src/test/resources/classes/com/dummy/PancakeClass.class b/src/test/resources/classes/com/dummy/PancakeClass.class
deleted file mode 100644
index 69c6d3b44acdaa6b1a4539718e4b0c04e2c29695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmZvWy>7xl5QJxq!NfQ~C{WsTfg&!F4n%`QWhIe<=-0<7Iq;9<A0!@&3MoY%AP*I>
z7g11fC(Yi>e!IHgzwaLaFX;Pd;MPOeLyyp!n#@!)LgR6?BDnK>tqHxzWcsyEV_hsc
zP9zybx#DESg|Yq|y49B{3HOo8({Np<={|htOz~FF6E4dM!T-qXLg|IEJMJ!<PaEEG
z02fWd@cKNVZ=o>Z>@$3eH(FJAfFs|xhvdq%XiMDlzXzJ*Bj_N315ebK3c*}~+VTnn
O69_lbu`4>F4uTV9G&_s{

diff --git a/src/test/resources/classes/com/dummy/PineappleClass.class b/src/test/resources/classes/com/dummy/PineappleClass.class
deleted file mode 100644
index e3edd29cd98401da4c63211cd193d3e5e6f4018c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 291
zcmZ`!yH3ME5S(?KI5>txq(O9akOCLb1*M5ZWdTy6^k?S;7oF|M4<tS-RU`^NARmR8
zLun}3lV)#bXGhw@_vaUYdyGPKa2nt&z);Y8FokJmg3k5LO5o4SwH6E$Q|PBQPj$6a
zsiktBl$o+CRT;;RqTjrkT5y?UWgf5FJpYJaxTv;UtLIkL^;8fp%C^e%qj4$YzvJ7D
zdRGyAbOjgxWe7&j7F$)k#?R?SXAQ34@d#JK$9-at?CzHX-N_!Zqu?PRhU}otr>W0h
PL>o;w;lxD@h#sOJ>w-R0

diff --git a/src/test/resources/classes/com/dummy/StrawberryClass.class b/src/test/resources/classes/com/dummy/StrawberryClass.class
deleted file mode 100644
index 78611c862faff17b97598cc0cf9f7d12c1a17695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 294
zcmZ{fzfQw27{u>O)24(#E7Yax#0Ct_P&N=trA`qHMctj$0$2GXIZ3NN7E`4TJOB@c
zdPYo0*wWc|-_Ixc>-+c#;2y&e9b5#s3@{M%9!+VQCqd`tb|vuV)mjS%i7EASTcp~)
zsx)VEl~kF^SIQdae?z}{H??4rWK|Kb+oIUV%f_l5pV|F9S9Sd$2$xlBGrcgbX7p!1
z-KedK;G-)T|Jx!MIxfyt`4+#V8=W<{hR1)nCEP5a_UL9m9_Zd3ARi1o1k{ixi1~#2
RyhX$a;fxbkaZdFRod9roKpOx6


From 3565219eaa4b18a543018b732b47bcee5893b84d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 27 Apr 2021 12:03:51 +0200
Subject: [PATCH 043/323] Ignore IDEA project name file

---
 .idea/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 9292ba8..e070dc0 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -21,3 +21,4 @@ compiler.xml
 libraries-with-intellij-classes.xml
 jarRepositories.xml
 modules.xml
+.name

From 35833f08b1330692f16d454fb8f8544e5abaab62 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 27 Apr 2021 12:04:46 +0200
Subject: [PATCH 044/323] Fix logger initialization code

---
 src/main/java/io/pzstorm/storm/StormLogger.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/StormLogger.java b/src/main/java/io/pzstorm/storm/StormLogger.java
index ea2a117..4c134cf 100644
--- a/src/main/java/io/pzstorm/storm/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/StormLogger.java
@@ -20,14 +20,13 @@
 public class StormLogger {
 
 	public static final Level VERBOSE = Level.forName("VERBOSE", 450);
-	private static final String JVM_PROPERTY = "storm.logger";
 	private static final org.apache.logging.log4j.Logger LOGGER;
 
 	static
 	{
 		LOGGER = LogManager.getLogger("Storm");
 		String sLevel = System.getProperty("storm.logger");
-		if (sLevel != null && sLevel.isEmpty())
+		if (sLevel != null && !sLevel.isEmpty())
 		{
 			Level level = Level.getLevel(sLevel);
 			if (level != null)

From de247b61405e2d79f6805c980e829304cd7d94ee Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 27 Apr 2021 12:07:39 +0200
Subject: [PATCH 045/323] Test setting storm logger level

---
 .../io/pzstorm/storm/StormLoggerTest.java     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/StormLoggerTest.java

diff --git a/src/test/java/io/pzstorm/storm/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
new file mode 100644
index 0000000..9752c1c
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
@@ -0,0 +1,29 @@
+package io.pzstorm.storm;
+
+import org.apache.logging.log4j.Level;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+class StormLoggerTest implements UnitTest {
+
+	private static final String LOGGER_PROPERTY = "storm.logger";
+
+	@Test
+	void shouldSetStormLoggerLevelFromSystemProperties() {
+
+		// assert that key does not exist first
+		Assertions.assertNull(System.getProperty(LOGGER_PROPERTY));
+
+		Level level = Level.forName("CUSTOM_LEVEL", 1);
+		System.setProperty(LOGGER_PROPERTY, level.name());
+
+		// assert that system property was properly set
+		String systemProperty = System.getProperty(LOGGER_PROPERTY);
+		Assertions.assertEquals(level.name(), systemProperty);
+
+		// assert that logger has correct level
+		Assertions.assertEquals(level, StormLogger.get().getLevel());
+	}
+}

From 3f0d6e83bfb314d29e0dd178a67f437626d9c287 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 27 Apr 2021 20:35:37 +0200
Subject: [PATCH 046/323] Grant gradlew execution permissions

---
 gradlew | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755

From cf142fccbed3dc7d43d58ecd3d606f6ddbb99535 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 15:59:49 +0200
Subject: [PATCH 047/323] Add launch run config Linux support

---
 build.gradle | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1cbf1d0..fbf770e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,13 +52,20 @@ test {
 tasks.createLaunchRunConfigs.configure {
 	actions.clear()
 	doLast {
+		def vmParameterBuilder = new VmParameter.Builder()
+		def os = org.gradle.internal.os.OperatingSystem.current()
+		if (os == org.gradle.internal.os.OperatingSystem.LINUX) {
+			vmParameterBuilder = vmParameterBuilder
+					.withJavaLibraryPaths(gameDir as String, "${gameDir}/linux64" as String, "${gameDir}/jre64/lib/amd64" as String)
+					.withLwjglLibraryPaths(gameDir)
+		}
 		//@formatter:off
 		LaunchRunConfig launchStorm = new LaunchRunConfig(
 				"Launch Storm", "io.pzstorm.storm.StormLauncher",
-				new VmParameter.Builder().build(), [
-						Main: new File((gameDir as File), "logs/storm/main.log").toPath() ,
-						Debug: new File((gameDir as File), "logs/storm/debug.log").toPath()] as Map
+				vmParameterBuilder.build(), [
+						Main: new File(file(gameDir), "logs/storm/main.log").toPath() ,
+						Debug: new File(file(gameDir), "logs/storm/debug.log").toPath()] as Map
 		)//@formatter:on
 		launchStorm.configure(getProject()).writeToFile()
 	}
-}
\ No newline at end of file
+}

From 161a1dbd5bafb15468fd24f06f4e7cb096b54589 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 16:01:08 +0200
Subject: [PATCH 048/323] Change dependency declaration format

---
 build.gradle | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index fbf770e..65d5986 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,17 +23,14 @@ capsid {
 
 dependencies {
 	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
-	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.1'
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
 
 	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
-	testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.1'
+	testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
 
 	// https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
 	implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
 
-	// https://mvnrepository.com/artifact/com.google.guava/guava
-	implementation 'com.google.guava:guava:30.1.1-jre'
-
 	// https://mvnrepository.com/artifact/org.jetbrains/annotations
 	compileOnly 'org.jetbrains:annotations:20.1.0'
 
@@ -42,6 +39,10 @@ dependencies {
 
 	// https://mvnrepository.com/artifact/com.google.errorprone/javac
 	errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
+
+	// https://mvnrepository.com/artifact/com.google.guava/guava
+	implementation 'com.google.guava:guava:30.1.1-jre'
+
 }
 
 test {

From b59306960781041dbb185187193d499870e401fc Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 16:23:10 +0200
Subject: [PATCH 049/323] Ignore swing designer config file

---
 .idea/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.idea/.gitignore b/.idea/.gitignore
index e070dc0..b5a6551 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -8,6 +8,7 @@ usage.statistics.xml
 
 # Generated files
 contentModel.xml
+uiDesigner.xml
 
 # Gradle
 /libraries/

From d8732a26fc3dd05a37f9e7bf175393dd310e87c1 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 16:23:32 +0200
Subject: [PATCH 050/323] Create NonNullPackage annotation

---
 .../java/io/pzstorm/storm/NonNullPackage.java     | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/NonNullPackage.java

diff --git a/src/main/java/io/pzstorm/storm/NonNullPackage.java b/src/main/java/io/pzstorm/storm/NonNullPackage.java
new file mode 100644
index 0000000..37e7fe2
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/NonNullPackage.java
@@ -0,0 +1,15 @@
+package io.pzstorm.storm;
+
+import javax.annotation.Nonnull;
+import javax.annotation.meta.TypeQualifierDefault;
+import javax.annotation.meta.TypeQualifierNickname;
+import java.lang.annotation.*;
+
+@Documented
+@TypeQualifierNickname
+@TypeQualifierDefault({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER })
+@Nonnull
+@Target(ElementType.PACKAGE)
+@Retention(RetentionPolicy.CLASS)
+public @interface NonNullPackage {
+}
\ No newline at end of file

From 27e9b865adb3e78de66c787002d411512e22eb99 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 16:24:01 +0200
Subject: [PATCH 051/323] Annotate package as NonNull

---
 src/main/java/io/pzstorm/storm/package-info.java | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/package-info.java

diff --git a/src/main/java/io/pzstorm/storm/package-info.java b/src/main/java/io/pzstorm/storm/package-info.java
new file mode 100644
index 0000000..be56d48
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/package-info.java
@@ -0,0 +1,2 @@
+@NonNullPackage
+package io.pzstorm.storm;
\ No newline at end of file

From 21b5dcd9eeebdfdb177dd54360a09d4d2d188649 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 16:24:50 +0200
Subject: [PATCH 052/323] Remove unneeded contract annotations

---
 src/main/java/io/pzstorm/storm/StormClassLoader.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 44d7b98..93e0323 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -67,13 +67,11 @@ protected StormClassLoader() {
 	 * Returns {@code true} if at least one prefix pattern in whitelist matches the given name.
 	 * When a class name is considered whitelisted it will be loaded by this {@code ClassLoader}.
 	 */
-	@Contract("null -> fail")
 	protected static boolean isWhitelistedClass(String name) {
 		return CLASS_WHITELIST.stream().anyMatch(name::startsWith);
 	}
 
 	@Override
-	@Contract("null -> fail")
 	public @Nullable URL getResource(String name) {
 		Objects.requireNonNull(name);
 
@@ -98,7 +96,6 @@ protected static boolean isWhitelistedClass(String name) {
 	 * @throws IllegalArgumentException if package name duplicates an existing
 	 * 		package either in this class loader or one of its ancestors
 	 */
-	@Contract("null -> fail")
 	protected @Nullable Package definePackageForName(String name) {
 
 		int pkgDelimiterPos = name.lastIndexOf('.');
@@ -186,7 +183,7 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 	/**
 	 * Converts the given class name to a file name.
 	 */
-	@Contract(pure = true, value = "null -> fail")
+	@Contract(pure = true)
 	private String getClassFileName(String name) {
 		return name.replace('.', '/') + ".class";
 	}
@@ -200,7 +197,6 @@ private String getClassFileName(String name) {
 	 *
 	 * @throws IOException if an I/O error occurred while reading or writing to stream.
 	 */
-	@Contract("null -> fail")
 	protected byte[] getRawClassByteArray(String name) throws IOException {
 
 		// opens an input stream to read the class for given name

From 8c421372ad60309438987e03f4f40b578d210379 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 16:25:11 +0200
Subject: [PATCH 053/323] Suppress spell checking warning

---
 src/main/java/io/pzstorm/storm/StormClassLoader.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/StormClassLoader.java
index 93e0323..ce7dcc5 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/StormClassLoader.java
@@ -29,6 +29,7 @@ public class StormClassLoader extends ClassLoader {
 	 * If the native libraries are loaded using a different class loader they
 	 * will not be accessible to game classes.
 	 */
+	@SuppressWarnings("SpellCheckingInspection")
 	private static final ImmutableSet<String> CLASS_WHITELIST = ImmutableSet.of(
 			// zomboid library classes
 			"org.lwjgl.", "net.java.games.", "jassimp.",

From eba0f897c5724d4f1b780f98a584f7eefc107e81 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 16:51:57 +0200
Subject: [PATCH 054/323] Move and encapsulate core classes

---
 .../storm/{ => core}/StormClassLoader.java    | 19 ++++++++++++++-----
 .../storm/{ => core}/StormLauncher.java       |  4 +++-
 .../{ => core}/StormClassLoaderTest.java      |  8 +++++---
 3 files changed, 22 insertions(+), 9 deletions(-)
 rename src/main/java/io/pzstorm/storm/{ => core}/StormClassLoader.java (95%)
 rename src/main/java/io/pzstorm/storm/{ => core}/StormLauncher.java (95%)
 rename src/test/java/io/pzstorm/storm/{ => core}/StormClassLoaderTest.java (98%)

diff --git a/src/main/java/io/pzstorm/storm/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
similarity index 95%
rename from src/main/java/io/pzstorm/storm/StormClassLoader.java
rename to src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index ce7dcc5..56d103c 100644
--- a/src/main/java/io/pzstorm/storm/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -1,4 +1,4 @@
-package io.pzstorm.storm;
+package io.pzstorm.storm.core;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -12,12 +12,14 @@
 
 import com.google.common.collect.ImmutableSet;
 
+import io.pzstorm.storm.StormLogger;
+
 /**
  * This is a custom {@code ClassLoader} used to define, transform and load Project Zomboid classes.
  * It is initially invoked by {@link StormLauncher} when launching the game.
  */
 @SuppressWarnings("WeakerAccess")
-public class StormClassLoader extends ClassLoader {
+class StormClassLoader extends ClassLoader {
 
 	/**
 	 * <p>{@code Set} of class prefixes that mark classes to be loaded with this class loader.
@@ -39,14 +41,13 @@ public class StormClassLoader extends ClassLoader {
 			"javax.vecmath.", "org.joml.", "org.luaj.kahluafork.compiler.",
 			"org.mindrot.jbcrypt.", "se.krka.kahlua.", "zombie."
 	);
-
+	protected final URLClassLoader resourceClassLoader;
 	/**
 	 * {@code ClassLoader} that is the parent of this {@code ClassLoader}.
 	 * When loading classes, those classes not matching the whitelist pattern will have
 	 * their loading process delegated to this {@code ClassLoader}.
 	 */
 	private final ClassLoader parentClassLoader;
-	protected final URLClassLoader resourceClassLoader;
 
 	/**
 	 * Create {@code StormClassLoader} with additional locations to search for resources.
@@ -54,11 +55,13 @@ public class StormClassLoader extends ClassLoader {
 	 * @param resourceLocations the URLs from which to load classes and resources.
 	 */
 	protected StormClassLoader(URL[] resourceLocations) {
+
 		parentClassLoader = getClass().getClassLoader();
 		resourceClassLoader = new URLClassLoader(resourceLocations, getParent());
 	}
 
 	protected StormClassLoader() {
+
 		StormLogger.debug("Initialized StormClassLoader");
 		parentClassLoader = getClass().getClassLoader();
 		resourceClassLoader = (URLClassLoader) getParent();
@@ -142,6 +145,11 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 				StormLogger.debug("Loading with StormClassLoader");
 				try {
 					byte[] input = getRawClassByteArray(name);
+
+					StormClassTransformer transformer = StormClassTransformer.getRegistered(name);
+					if (transformer != null) {
+						input = transformer.read(input).visit().transform();
+					}
 					if (input.length > 0)
 					{
 						// package has to be created before we define the class
@@ -155,7 +163,8 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 					}
 				}
 				catch (IOException e) {
-					throw new RuntimeException("I/O exception occurred while transforming class to byte array");
+					throw new RuntimeException("I/O exception occurred while transforming class to byte " +
+							"array");
 				}
 			}
 		}
diff --git a/src/main/java/io/pzstorm/storm/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
similarity index 95%
rename from src/main/java/io/pzstorm/storm/StormLauncher.java
rename to src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 4109658..15dc475 100644
--- a/src/main/java/io/pzstorm/storm/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -1,7 +1,9 @@
-package io.pzstorm.storm;
+package io.pzstorm.storm.core;
 
 import java.lang.reflect.Method;
 
+import io.pzstorm.storm.StormLogger;
+
 class StormLauncher {
 
 	/**
diff --git a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
similarity index 98%
rename from src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
rename to src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
index ee20f57..f8601e6 100644
--- a/src/test/java/io/pzstorm/storm/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
@@ -1,4 +1,4 @@
-package io.pzstorm.storm;
+package io.pzstorm.storm.core;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,11 +9,13 @@
 import java.nio.file.Files;
 import java.util.*;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
+import io.pzstorm.storm.UnitTest;
 
 class StormClassLoaderTest extends StormClassLoader implements UnitTest {
 

From e971f5aed1326932e94265e5163daa4bf19c5fa5 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 16:52:25 +0200
Subject: [PATCH 055/323] Do minor spotless formatting

---
 src/main/java/io/pzstorm/storm/NonNullPackage.java | 5 +++--
 src/main/java/io/pzstorm/storm/package-info.java   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/NonNullPackage.java b/src/main/java/io/pzstorm/storm/NonNullPackage.java
index 37e7fe2..8e5ec16 100644
--- a/src/main/java/io/pzstorm/storm/NonNullPackage.java
+++ b/src/main/java/io/pzstorm/storm/NonNullPackage.java
@@ -1,9 +1,10 @@
 package io.pzstorm.storm;
 
+import java.lang.annotation.*;
+
 import javax.annotation.Nonnull;
 import javax.annotation.meta.TypeQualifierDefault;
 import javax.annotation.meta.TypeQualifierNickname;
-import java.lang.annotation.*;
 
 @Documented
 @TypeQualifierNickname
@@ -12,4 +13,4 @@
 @Target(ElementType.PACKAGE)
 @Retention(RetentionPolicy.CLASS)
 public @interface NonNullPackage {
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/pzstorm/storm/package-info.java b/src/main/java/io/pzstorm/storm/package-info.java
index be56d48..7693995 100644
--- a/src/main/java/io/pzstorm/storm/package-info.java
+++ b/src/main/java/io/pzstorm/storm/package-info.java
@@ -1,2 +1,2 @@
 @NonNullPackage
-package io.pzstorm.storm;
\ No newline at end of file
+package io.pzstorm.storm;

From 9d07a2a8255ea14615cbcdccdd59a522927db6cf Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 18:09:59 +0200
Subject: [PATCH 056/323] Add ASM 9.1 dependencies

---
 build.gradle | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/build.gradle b/build.gradle
index 65d5986..38c5d40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,6 +43,20 @@ dependencies {
 	// https://mvnrepository.com/artifact/com.google.guava/guava
 	implementation 'com.google.guava:guava:30.1.1-jre'
 
+	// https://mvnrepository.com/artifact/org.ow2.asm/asm
+	implementation 'org.ow2.asm:asm:9.1'
+
+	// https://mvnrepository.com/artifact/org.ow2.asm/asm-commons
+	implementation 'org.ow2.asm:asm-commons:9.1'
+
+	// https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
+	implementation 'org.ow2.asm:asm-tree:9.1'
+
+	// https://mvnrepository.com/artifact/org.ow2.asm/asm-util
+	implementation 'org.ow2.asm:asm-util:9.1'
+
+	// https://mvnrepository.com/artifact/org.ow2.asm/asm-analysis
+	implementation 'org.ow2.asm:asm-analysis:9.1'
 }
 
 test {

From b1d76c2ac78f18e2ed8d886402499f792c5bbb03 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 18:10:06 +0200
Subject: [PATCH 057/323] Create StormClassTransformer class

---
 .../pzstorm/storm/core/StormClassLoader.java  |   3 +-
 .../storm/core/StormClassTransformer.java     | 167 ++++++++++++++++++
 2 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/pzstorm/storm/core/StormClassTransformer.java

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 56d103c..0062d1f 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -71,6 +71,7 @@ protected StormClassLoader() {
 	 * Returns {@code true} if at least one prefix pattern in whitelist matches the given name.
 	 * When a class name is considered whitelisted it will be loaded by this {@code ClassLoader}.
 	 */
+	@Contract(pure = true)
 	protected static boolean isWhitelistedClass(String name) {
 		return CLASS_WHITELIST.stream().anyMatch(name::startsWith);
 	}
@@ -148,7 +149,7 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 
 					StormClassTransformer transformer = StormClassTransformer.getRegistered(name);
 					if (transformer != null) {
-						input = transformer.read(input).visit().transform();
+						input = transformer.transform(input);
 					}
 					if (input.length > 0)
 					{
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
new file mode 100644
index 0000000..356d048
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -0,0 +1,167 @@
+package io.pzstorm.storm.core;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.MethodNode;
+
+import io.pzstorm.storm.StormLogger;
+
+/**
+ * This class represents a {@code Class} transformer used to alter {@code Class}
+ * bytecode using ASM. When new instance of {@code StormClassTransformer} is created
+ * it is automatically mapped in internal registry. To check if transformer is registered
+ * use {@link #isRegistered(String)} and to retrieve a mapped instance use {@link #getRegistered(String)}.
+ * The transformation process calls the following method in fixed order:
+ * <ul>
+ * <li>{@link #read(byte[])} to read given byte array with {@link ClassReader}.</li>
+ * <li>{@link #visit()} to use the visitation system to parse the class with visitor.</li>
+ * <li>{@link #transform()} to transform the visited class before writing it.</li>
+ * <li>{@link #write()} to write the class using {@link ClassWriter}</li>
+ * </ul>
+ */
+@SuppressWarnings("WeakerAccess")
+abstract class StormClassTransformer {
+
+	/**
+	 * Internal registry of created transformers. This map is checked for entries
+	 * by {@link StormClassLoader} when loading classes and invokes the transformation
+	 * chain of methods to transform the class before defining it via JVM.
+	 */
+	private static final Map<String, StormClassTransformer> TRANSFORMERS = new HashMap<>();
+
+	private final ClassNode visitor;
+	private @Nullable ClassReader classReader;
+
+	StormClassTransformer(String className, ClassNode visitor) {
+
+		TRANSFORMERS.put(className, this);
+		this.visitor = visitor;
+	}
+
+	StormClassTransformer(String className) {
+		this(className, new ClassNode());
+	}
+
+	/**
+	 * Returns {@code true} if transformer with given name is registered.
+	 */
+	static boolean isRegistered(String name) {
+		return TRANSFORMERS.containsKey(name);
+	}
+
+	/**
+	 * Returns registered instance of {@link StormClassTransformer}.
+	 *
+	 * @return {@code StormClassTransformer} or {@code null} if no registered instance found.
+	 */
+	@Contract(pure = true)
+	static @Nullable StormClassTransformer getRegistered(String className) {
+		return TRANSFORMERS.getOrDefault(className, null);
+	}
+
+	/**
+	 * Returns list of instructions for method that matches given parameters.
+	 *
+	 * @param name name of the method to match.
+	 * @param descriptor descriptor of the method to match.
+	 * @return list of instructions for matched method or an empty {@link InsnList}.
+	 *
+	 * @see <a href="https://asm.ow2.io/asm4-guide.pdf#subsection.2.1.4">
+	 * 		ASM User Guide - Method descriptors</a>
+	 */
+	@Contract(pure = true)
+	final InsnList getInstructionsForMethod(String name, String descriptor) {
+
+		if (classReader != null)
+		{
+			Optional<MethodNode> methodNode = visitor.methods.stream()
+					.filter(m -> m.name.equals(name) && m.desc.equals(descriptor)).findFirst();
+
+			if (methodNode.isPresent()) {
+				return methodNode.get().instructions;
+			}
+		}
+		return new InsnList();
+	}
+
+	/**
+	 * Read or parse class byte array using {@link ClassReader}.
+	 *
+	 * @param rawClass array of bytes to read.
+	 * @return {@code this} instance of {@link StormClassTransformer}.
+	 *
+	 * @see <a href="https://asm.ow2.io/asm4-guide.pdf#subsection.2.2.2">
+	 * 		ASM User Guide - Parsing classes</a>
+	 */
+	@Contract("_ -> this")
+	StormClassTransformer read(byte[] rawClass) {
+
+		classReader = new ClassReader(rawClass);
+		return this;
+	}
+
+	/**
+	 * Visit class structure with {@link ClassVisitor} passed
+	 * as constructor argument to this transformer instance.
+	 *
+	 * @return {@code this} instance of {@link StormClassTransformer}.
+	 *
+	 * @see <a href="https://asm.ow2.io/asm4-guide.pdf#section.2.2">
+	 * 		ASM User Guide - Class interfaces and components</a>
+	 */
+	@Contract("-> this")
+	StormClassTransformer visit() {
+
+		if (classReader != null) {
+			classReader.accept(visitor, 0);
+		}
+		else StormLogger.warn("Tried to visit null ClassReader");
+		return this;
+	}
+
+	/**
+	 * Write the class parsed by visitor using {@link ClassWriter} to
+	 * convert the visited class to byte array. The resulting byte array
+	 * can then be used to define the class by class loaders.
+	 *
+	 * @return byte array representing transformed class.
+	 *
+	 * @see <a href="https://asm.ow2.io/asm4-guide.pdf#subsection.6.2.1">
+	 * 		ASM User Guide - Components composition</a>
+	 */
+	byte[] write() {
+
+		ClassWriter classWriter = new ClassWriter(0);
+		visitor.accept(classWriter);
+		return classWriter.toByteArray();
+	}
+
+	/**
+	 * Calls method chain to transform the given {@code Class} byte array.
+	 *
+	 * @param rawClass byte array representing the {@code Class} to transform.
+	 * @return byte array representing transformed class.
+	 */
+	final byte[] transform(byte[] rawClass) {
+		return read(rawClass).visit().transform().write();
+	}
+
+	/**
+	 * Intermediary step between visiting and writing class.
+	 * {@link StormClassTransformer} implementations need to override
+	 * this method and are free to write their own transformation steps.
+	 *
+	 * @return {@code this} instance of {@link StormClassTransformer}.
+	 */
+	@Contract("-> this")
+	abstract StormClassTransformer transform();
+}

From f1a9a2dd2341f8f3e952844052e9897da9a2f73f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 23:06:24 +0200
Subject: [PATCH 058/323] Apply custom logger level to console

---
 .../java/io/pzstorm/storm/StormLogger.java    | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/StormLogger.java b/src/main/java/io/pzstorm/storm/StormLogger.java
index 4c134cf..652c34e 100644
--- a/src/main/java/io/pzstorm/storm/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/StormLogger.java
@@ -3,11 +3,14 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.LoggerConfig;
 
 /**
  * <p>Simple wrapper class for logging with Log4j 2 logger.
- * To configure root logger level launch Storm with {@code JVM_PROPERTY} set to a custom logger level.
+ * To configure console logging level launch Storm with {@code JVM_PROPERTY}
+ * set to a custom logger level. The level will be matched with {@link Logger#getLevel()}.
  * </p><p>
  * Logs will automatically be printed to console and configured log files.
  * Check {@code log4j2.xml} for log file locations.
@@ -31,8 +34,17 @@ public class StormLogger {
 			Level level = Level.getLevel(sLevel);
 			if (level != null)
 			{
-				Configurator.setLevel("Storm", level);
-				LOGGER.debug("Setting custom level for Storm logger '" + sLevel + '\'');
+				LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+				Configuration config = ctx.getConfiguration();
+
+				LoggerConfig rootLoggerConfig = config.getLoggers().get("");
+				for (String appender : new String[]{ "Console", "ManFile" })
+				{
+					rootLoggerConfig.removeAppender(appender);
+					rootLoggerConfig.addAppender(config.getAppender(appender), level, null);
+				}
+				ctx.updateLoggers();
+				LOGGER.info("Setting custom level for Storm logger '" + sLevel + '\'');
 			}
 			else LOGGER.error("Unable to resolve logging level '" + sLevel + '\'');
 		}

From c71f340b54f86875e173ec38128661a5b73196c0 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 29 Apr 2021 23:07:13 +0200
Subject: [PATCH 059/323] Remove StormLogger unit test

Changed appender levels cannot be tested so easily.
---
 .../io/pzstorm/storm/StormLoggerTest.java     | 29 -------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 src/test/java/io/pzstorm/storm/StormLoggerTest.java

diff --git a/src/test/java/io/pzstorm/storm/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
deleted file mode 100644
index 9752c1c..0000000
--- a/src/test/java/io/pzstorm/storm/StormLoggerTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package io.pzstorm.storm;
-
-import org.apache.logging.log4j.Level;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-
-@TestInstance(TestInstance.Lifecycle.PER_METHOD)
-class StormLoggerTest implements UnitTest {
-
-	private static final String LOGGER_PROPERTY = "storm.logger";
-
-	@Test
-	void shouldSetStormLoggerLevelFromSystemProperties() {
-
-		// assert that key does not exist first
-		Assertions.assertNull(System.getProperty(LOGGER_PROPERTY));
-
-		Level level = Level.forName("CUSTOM_LEVEL", 1);
-		System.setProperty(LOGGER_PROPERTY, level.name());
-
-		// assert that system property was properly set
-		String systemProperty = System.getProperty(LOGGER_PROPERTY);
-		Assertions.assertEquals(level.name(), systemProperty);
-
-		// assert that logger has correct level
-		Assertions.assertEquals(level, StormLogger.get().getLevel());
-	}
-}

From 1ccbe1028d68d2bc2ab2ca49fa615302e95dedef Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 30 Apr 2021 14:25:12 +0200
Subject: [PATCH 060/323] Make StormClassLoader constructor null-safe

---
 src/main/java/io/pzstorm/storm/core/StormClassLoader.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 0062d1f..98db532 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -57,7 +57,9 @@ class StormClassLoader extends ClassLoader {
 	protected StormClassLoader(URL[] resourceLocations) {
 
 		parentClassLoader = getClass().getClassLoader();
-		resourceClassLoader = new URLClassLoader(resourceLocations, getParent());
+		resourceClassLoader = new URLClassLoader(
+				Objects.requireNonNull(resourceLocations), getParent()
+		);
 	}
 
 	protected StormClassLoader() {

From 4c72e91c0380969457454f5d0060e3950e869bc1 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 30 Apr 2021 14:30:17 +0200
Subject: [PATCH 061/323] Create ClassTransformationException class

---
 .../storm/core/ClassTransformationException.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/core/ClassTransformationException.java

diff --git a/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java b/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java
new file mode 100644
index 0000000..bbb0997
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java
@@ -0,0 +1,16 @@
+package io.pzstorm.storm.core;
+
+/**
+ * Signals that an unexpected error occurred while transforming classes.
+ * This exception is only meant to be used by {@link StormClassTransformer} classes.
+ */
+class ClassTransformationException extends RuntimeException {
+
+	ClassTransformationException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	ClassTransformationException(String message) {
+		super(message);
+	}
+}

From 5ecc0b4f56ced27bf9ce51120c3cecc56bca3ec7 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 30 Apr 2021 14:30:55 +0200
Subject: [PATCH 062/323] Make transformation more safe

---
 .../java/io/pzstorm/storm/core/StormClassTransformer.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index 356d048..400e4fe 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -99,12 +99,16 @@ final InsnList getInstructionsForMethod(String name, String descriptor) {
 	 * @param rawClass array of bytes to read.
 	 * @return {@code this} instance of {@link StormClassTransformer}.
 	 *
+	 * @throws ClassTransformationException if given byte array is empty.
 	 * @see <a href="https://asm.ow2.io/asm4-guide.pdf#subsection.2.2.2">
 	 * 		ASM User Guide - Parsing classes</a>
 	 */
 	@Contract("_ -> this")
 	StormClassTransformer read(byte[] rawClass) {
 
+		if (rawClass.length == 0) {
+			throw new ClassTransformationException("Tried to read empty byte array");
+		}
 		classReader = new ClassReader(rawClass);
 		return this;
 	}
@@ -149,6 +153,8 @@ byte[] write() {
 	 * Calls method chain to transform the given {@code Class} byte array.
 	 *
 	 * @param rawClass byte array representing the {@code Class} to transform.
+	 *
+	 * @throws ClassTransformationException if given byte array is empty.
 	 * @return byte array representing transformed class.
 	 */
 	final byte[] transform(byte[] rawClass) {

From f114ef62162c3e10a9d56aad56783c809d4bbd7f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 30 Apr 2021 14:32:12 +0200
Subject: [PATCH 063/323] Fix StormLogger custom level not applied

---
 src/main/java/io/pzstorm/storm/StormLogger.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/StormLogger.java b/src/main/java/io/pzstorm/storm/StormLogger.java
index 652c34e..baa6e5e 100644
--- a/src/main/java/io/pzstorm/storm/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/StormLogger.java
@@ -38,7 +38,7 @@ public class StormLogger {
 				Configuration config = ctx.getConfiguration();
 
 				LoggerConfig rootLoggerConfig = config.getLoggers().get("");
-				for (String appender : new String[]{ "Console", "ManFile" })
+				for (String appender : new String[]{ "Console", "MainFile" })
 				{
 					rootLoggerConfig.removeAppender(appender);
 					rootLoggerConfig.addAppender(config.getAppender(appender), level, null);

From fbc9959852df057705b2715aadbc6b9901a25170 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 30 Apr 2021 14:36:44 +0200
Subject: [PATCH 064/323] Revert "Remove StormLogger unit test"

This reverts commit c71f340b54f86875e173ec38128661a5b73196c0.
---
 .../io/pzstorm/storm/StormLoggerTest.java     | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/StormLoggerTest.java

diff --git a/src/test/java/io/pzstorm/storm/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
new file mode 100644
index 0000000..9752c1c
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
@@ -0,0 +1,29 @@
+package io.pzstorm.storm;
+
+import org.apache.logging.log4j.Level;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+class StormLoggerTest implements UnitTest {
+
+	private static final String LOGGER_PROPERTY = "storm.logger";
+
+	@Test
+	void shouldSetStormLoggerLevelFromSystemProperties() {
+
+		// assert that key does not exist first
+		Assertions.assertNull(System.getProperty(LOGGER_PROPERTY));
+
+		Level level = Level.forName("CUSTOM_LEVEL", 1);
+		System.setProperty(LOGGER_PROPERTY, level.name());
+
+		// assert that system property was properly set
+		String systemProperty = System.getProperty(LOGGER_PROPERTY);
+		Assertions.assertEquals(level.name(), systemProperty);
+
+		// assert that logger has correct level
+		Assertions.assertEquals(level, StormLogger.get().getLevel());
+	}
+}

From 85f6b451d1cc6e2675b77914ce9a41afa73420ee Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 30 Apr 2021 14:55:22 +0200
Subject: [PATCH 065/323] Implement real logger unit test

---
 .../io/pzstorm/storm/StormLoggerTest.java     | 51 ++++++++++++++++---
 1 file changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
index 9752c1c..fd4ceb3 100644
--- a/src/test/java/io/pzstorm/storm/StormLoggerTest.java
+++ b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
@@ -1,29 +1,64 @@
 package io.pzstorm.storm;
 
 import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.config.AppenderControl;
+import org.apache.logging.log4j.core.config.AppenderControlArraySet;
+import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
-@TestInstance(TestInstance.Lifecycle.PER_METHOD)
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
 class StormLoggerTest implements UnitTest {
 
 	private static final String LOGGER_PROPERTY = "storm.logger";
 
 	@Test
-	void shouldSetStormLoggerLevelFromSystemProperties() {
+	void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationException {
 
 		// assert that key does not exist first
 		Assertions.assertNull(System.getProperty(LOGGER_PROPERTY));
 
-		Level level = Level.forName("CUSTOM_LEVEL", 1);
-		System.setProperty(LOGGER_PROPERTY, level.name());
+		Level expectedLevel = Level.forName("CUSTOM_LEVEL", 1);
+		System.setProperty(LOGGER_PROPERTY, expectedLevel.name());
 
 		// assert that system property was properly set
 		String systemProperty = System.getProperty(LOGGER_PROPERTY);
-		Assertions.assertEquals(level.name(), systemProperty);
+		Assertions.assertEquals(expectedLevel.name(), systemProperty);
+
+		// initialize StormLogger class
+		Class.forName("io.pzstorm.storm.StormLogger");
+
+		LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+		LoggerConfig rootLoggerConfig = ctx.getConfiguration().getLoggers().get("");
+
+		Field appendersField = LoggerConfig.class.getDeclaredField("appenders");
+		appendersField.setAccessible(true);
+
+		Field appenderLevelField = AppenderControl.class.getDeclaredField("level");
+		appenderLevelField.setAccessible(true);
+
+		Map<String, Level> actualLevels = new HashMap<>();
+
+		AppenderControlArraySet appenders = (AppenderControlArraySet) appendersField.get(rootLoggerConfig);
+		for (AppenderControl appenderControl : appenders.get())
+		{
+			String appenderName = appenderControl.getAppenderName();
+			if (appenderName.equals("Console") || appenderName.equals("MainFile")) {
+				actualLevels.put(appenderName, (Level) appenderLevelField.get(appenderControl));
+			}
+		}
+		// assert that all appenders were found
+		Assertions.assertTrue(actualLevels.containsKey("Console"));
+		Assertions.assertTrue(actualLevels.containsKey("MainFile"));
 
-		// assert that logger has correct level
-		Assertions.assertEquals(level, StormLogger.get().getLevel());
+		// assert that logger has correct levels
+		for (Map.Entry<String, Level> entry : actualLevels.entrySet()) {
+			Assertions.assertEquals(expectedLevel, entry.getValue());
+		}
 	}
 }

From 9637e03b8ed20ba6990c5bfd20575fedf7fbdcb2 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 30 Apr 2021 23:12:07 +0200
Subject: [PATCH 066/323] Expand code style margin width

---
 .idea/codeStyles/Project.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 527b8a1..be8fc47 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,10 +1,10 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="RIGHT_MARGIN" value="200" />
+    <option name="RIGHT_MARGIN" value="125" />
     <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
-    <option name="SOFT_MARGINS" value="200" />
+    <option name="SOFT_MARGINS" value="110" />
     <JavaCodeStyleSettings>
       <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
       <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
@@ -18,7 +18,7 @@
       <option name="ENABLED" value="false" />
     </editorconfig>
     <codeStyleSettings language="JAVA">
-      <option name="RIGHT_MARGIN" value="110" />
+      <option name="RIGHT_MARGIN" value="125" />
       <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
@@ -31,7 +31,7 @@
       <option name="CATCH_ON_NEW_LINE" value="true" />
       <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
       <option name="WRAP_LONG_LINES" value="true" />
-      <option name="SOFT_MARGINS" value="100" />
+      <option name="SOFT_MARGINS" value="110" />
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
       </indentOptions>

From b713a3ae5491de79c800cc71dac0bdf0425765f5 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 30 Apr 2021 23:43:31 +0200
Subject: [PATCH 067/323] Start loading classes against blacklist

---
 .../pzstorm/storm/core/StormClassLoader.java  | 33 +++++++-----------
 .../storm/core/StormClassLoaderTest.java      | 34 +++++++++++--------
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 98db532..d907da4 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -22,24 +22,17 @@
 class StormClassLoader extends ClassLoader {
 
 	/**
-	 * <p>{@code Set} of class prefixes that mark classes to be loaded with this class loader.
-	 * If a class does not match this patter it's loading will be delegated to the parent loader.
+	 * <p>
+	 * {@code Set} of class prefixes that mark classes to not load with this {@code ClassLoader}.
+	 * If a class matches this patter it's loading will be delegated to the parent loader.
 	 * </p>
-	 * This {@code Set} includes both Java libraries and main classes. Java Libraries have to be
-	 * loaded by the same class loader loading the game so that native libraries loaded from
-	 * those Java libraries become associated with the class loader loading the game.
-	 * If the native libraries are loaded using a different class loader they
-	 * will not be accessible to game classes.
+	 * Classes matching this prefix are causing exceptions when loaded with this {@code ClassLoader},
+	 * and they also do not need to be loaded with this {@code ClassLoader}.
 	 */
 	@SuppressWarnings("SpellCheckingInspection")
-	private static final ImmutableSet<String> CLASS_WHITELIST = ImmutableSet.of(
-			// zomboid library classes
-			"org.lwjgl.", "net.java.games.", "jassimp.",
-			// zomboid main classes
-			"astar.", "com.evildevil.engines.bubble.texture.",
-			"com.jcraft.", "com.sixlegs.png.", "de.jarnbjo.", "fmod.",
-			"javax.vecmath.", "org.joml.", "org.luaj.kahluafork.compiler.",
-			"org.mindrot.jbcrypt.", "se.krka.kahlua.", "zombie."
+	private static final ImmutableSet<String> CLASS_BLACKLIST = ImmutableSet.of(
+			"java.", "org.objectweb.asm.", "sun.", "com.sun.",
+			"javax.imageio.", "javax.xml.", "org.w3c."
 	);
 	protected final URLClassLoader resourceClassLoader;
 	/**
@@ -70,12 +63,12 @@ protected StormClassLoader() {
 	}
 
 	/**
-	 * Returns {@code true} if at least one prefix pattern in whitelist matches the given name.
-	 * When a class name is considered whitelisted it will be loaded by this {@code ClassLoader}.
+	 * Returns {@code true} if at least one prefix pattern in blacklist matches the given name.
+	 * When a class name is considered <i>blacklisted</i> it will not be loaded by this {@code ClassLoader}.
 	 */
 	@Contract(pure = true)
-	protected static boolean isWhitelistedClass(String name) {
-		return CLASS_WHITELIST.stream().anyMatch(name::startsWith);
+	protected static boolean isBlacklistedClass(String name) {
+		return CLASS_BLACKLIST.stream().anyMatch(name::startsWith);
 	}
 
 	@Override
@@ -143,7 +136,7 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 		if (clazz == null)
 		{
 			StormLogger.debug("Preparing to load class " + name);
-			if (isWhitelistedClass(name))
+			if (!isBlacklistedClass(name))
 			{
 				StormLogger.debug("Loading with StormClassLoader");
 				try {
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
index f8601e6..eae3586 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
@@ -28,10 +28,10 @@ class StormClassLoaderTest extends StormClassLoader implements UnitTest {
 	}
 
 	@Test
-	void shouldLoadWhitelistedClassesWithStormClassLoader() throws ReflectiveOperationException {
+	void shouldLoadNonBlacklistedClassesWithStormClassLoader() throws ReflectiveOperationException {
 
-		for (String whitelistedClass : getWhitelistedClasses()) {
-			Assertions.assertNull(findLoadedClass(whitelistedClass));
+		for (String blacklistedClasses : getBlacklistedClasses()) {
+			Assertions.assertNull(findLoadedClass(blacklistedClasses));
 		}
 		ImmutableSet<String> dummyGameClasses = ImmutableSet.of(
 				"fmod.FmodClass", "jassimp.JassimpLibraryClass", "javax.vecmath.MathClass",
@@ -46,20 +46,24 @@ void shouldLoadWhitelistedClassesWithStormClassLoader() throws ReflectiveOperati
 	}
 
 	@Test
-	void shouldDelegateLoadingNonWhitelistedClassesToParentClassLoader() throws ReflectiveOperationException {
+	void shouldDelegateLoadingBlacklistedClassesToParentClassLoader() throws ReflectiveOperationException {
 
 		Method method = ClassLoader.class.getDeclaredMethod("findLoadedClass", String.class);
 		method.setAccessible(true);
 
 		ImmutableSet<String> dummyClasses = ImmutableSet.of(
-				"com.google.common.io.Files", "com.google.common.util.concurrent.Atomics",
-				"org.apache.logging.log4j.Logger", "org.apache.logging.log4j.Level"
+				"java.util.concurrent.CountDownLatch",
+				"org.objectweb.asm.ClassWriter",
+				"sun.reflect.FieldInfo",
+				"com.sun.java.util.jar.pack.DriverResource",
+				"javax.imageio.IIOImage",
+				"javax.xml.XMLConstants",
+				"org.w3c.dom.Attr"
 		);
 		for (String dummyClass : dummyClasses)
 		{
-			Class<?> loadedClass = loadClass(dummyClass, true);
-			Assertions.assertEquals(loadedClass, method.invoke(getParent(), dummyClass));
-			Assertions.assertEquals(this.getParent(), loadedClass.getClassLoader());
+			ClassLoader classLoader = loadClass(dummyClass, true).getClassLoader();
+			Assertions.assertTrue(classLoader == null || !classLoader.equals(this));
 		}
 	}
 
@@ -114,10 +118,10 @@ void shouldDefinePackageWhenPackageNameIsValid() {
 	}
 
 	@Test
-	void shouldProperlyRecognizeWhitelistedClassNames() throws ReflectiveOperationException {
+	void shouldProperlyRecognizeBlacklistedClassNames() throws ReflectiveOperationException {
 
-		for (String className : getWhitelistedClasses()) {
-			Assertions.assertTrue(isWhitelistedClass(className));
+		for (String className : getBlacklistedClasses()) {
+			Assertions.assertTrue(isBlacklistedClass(className));
 		}
 		Random rand = new Random();
 		for (int i1 = 10; i1 > 0; i1--)
@@ -129,7 +133,7 @@ void shouldProperlyRecognizeWhitelistedClassNames() throws ReflectiveOperationEx
 			for (int i2 = rand.nextInt(5) + 1; i2 > 0; i2--) {
 				sb.append(".").append(getRandomString());
 			}
-			Assertions.assertFalse(isWhitelistedClass(sb.toString()));
+			Assertions.assertFalse(isBlacklistedClass(sb.toString()));
 		}
 	}
 
@@ -138,9 +142,9 @@ private static String getRandomString() {
 	}
 
 	@SuppressWarnings("unchecked")
-	private static Set<String> getWhitelistedClasses() throws ReflectiveOperationException {
+	private static Set<String> getBlacklistedClasses() throws ReflectiveOperationException {
 
-		Field field = StormClassLoader.class.getDeclaredField("CLASS_WHITELIST");
+		Field field = StormClassLoader.class.getDeclaredField("CLASS_BLACKLIST");
 		field.setAccessible(true);
 
 		return (Set<String>) field.get(null);

From 2367d4e97048033262d271dbfc03f49237f91163 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 13:25:30 +0200
Subject: [PATCH 068/323] Convert gitattributes EOL to LF

---
 .gitattributes | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 61793db..00a51af 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,6 @@
-#
-# https://help.github.com/articles/dealing-with-line-endings/
-#
-# These are explicitly windows files and should use crlf
-*.bat           text eol=crlf
-
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+

From eb66aa599485419ae41e8fd26bd06ef70d343ff9 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 14:03:29 +0200
Subject: [PATCH 069/323] Suppress spell checking inspection

---
 build.gradle                                                  | 1 +
 gradle/wrapper/gradle-wrapper.properties                      | 1 +
 src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java | 1 +
 3 files changed, 3 insertions(+)

diff --git a/build.gradle b/build.gradle
index 38c5d40..ea66b75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,4 @@
+//file:noinspection SpellCheckingInspection
 import io.pzstorm.capsid.setup.xml.LaunchRunConfig
 import io.pzstorm.capsid.setup.VmParameter
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a257bc7..28fceaa 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,4 @@
+# suppress inspection "SpellCheckingInspection" for whole file
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
index eae3586..29f1459 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
@@ -17,6 +17,7 @@
 
 import io.pzstorm.storm.UnitTest;
 
+@SuppressWarnings("SpellCheckingInspection")
 class StormClassLoaderTest extends StormClassLoader implements UnitTest {
 
 	private static final ClassLoader CL = StormClassLoaderTest.class.getClassLoader();

From 840ffff59cb503afa07487eee3bab4e3b77ee2e5 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 14:27:07 +0200
Subject: [PATCH 070/323] Improve class encapsulation

---
 .../java/io/pzstorm/storm/core/StormClassLoader.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index d907da4..4393e69 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -47,7 +47,7 @@ class StormClassLoader extends ClassLoader {
 	 *
 	 * @param resourceLocations the URLs from which to load classes and resources.
 	 */
-	protected StormClassLoader(URL[] resourceLocations) {
+	StormClassLoader(URL[] resourceLocations) {
 
 		parentClassLoader = getClass().getClassLoader();
 		resourceClassLoader = new URLClassLoader(
@@ -55,7 +55,7 @@ protected StormClassLoader(URL[] resourceLocations) {
 		);
 	}
 
-	protected StormClassLoader() {
+	StormClassLoader() {
 
 		StormLogger.debug("Initialized StormClassLoader");
 		parentClassLoader = getClass().getClassLoader();
@@ -67,7 +67,7 @@ protected StormClassLoader() {
 	 * When a class name is considered <i>blacklisted</i> it will not be loaded by this {@code ClassLoader}.
 	 */
 	@Contract(pure = true)
-	protected static boolean isBlacklistedClass(String name) {
+	static boolean isBlacklistedClass(String name) {
 		return CLASS_BLACKLIST.stream().anyMatch(name::startsWith);
 	}
 
@@ -96,7 +96,7 @@ protected static boolean isBlacklistedClass(String name) {
 	 * @throws IllegalArgumentException if package name duplicates an existing
 	 * 		package either in this class loader or one of its ancestors
 	 */
-	protected @Nullable Package definePackageForName(String name) {
+	@Nullable Package definePackageForName(String name) {
 
 		int pkgDelimiterPos = name.lastIndexOf('.');
 		if (pkgDelimiterPos > 0)
@@ -203,7 +203,7 @@ private String getClassFileName(String name) {
 	 *
 	 * @throws IOException if an I/O error occurred while reading or writing to stream.
 	 */
-	protected byte[] getRawClassByteArray(String name) throws IOException {
+	byte[] getRawClassByteArray(String name) throws IOException {
 
 		// opens an input stream to read the class for given name
 		InputStream inputStream = getResourceAsStream(getClassFileName(name));

From 01884c631c919fceeb54bbf26d3a20ddd36b241b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 16:23:06 +0200
Subject: [PATCH 071/323] Bootstrap class loader and transformer

---
 .../io/pzstorm/storm/core/StormBootstrap.java | 76 +++++++++++++++++++
 .../pzstorm/storm/core/StormClassLoader.java  | 17 +++--
 .../storm/core/StormClassTransformer.java     |  6 +-
 .../io/pzstorm/storm/core/StormLauncher.java  |  6 +-
 4 files changed, 93 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/io/pzstorm/storm/core/StormBootstrap.java

diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
new file mode 100644
index 0000000..0142261
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -0,0 +1,76 @@
+package io.pzstorm.storm.core;
+
+import java.lang.reflect.Method;
+
+/**
+ * This class bootstraps everything needed to launch the game with static initialization.
+ * It should be loaded from {@link StormLauncher} before Storm attempts to launch the game.
+ */
+class StormBootstrap {
+
+	/**
+	 * {@code ClassLoader} used to transform and load all needed classes. Because class loaders
+	 * maintain their own set of class instances and native libraries you should always use
+	 * this loader to load classes that access or modify transformed class fields or methods.
+	 */
+	static final StormClassLoader CLASS_LOADER = new StormClassLoader();
+
+	/**
+	 * Loaded and initialized {@link StormClassTransformer} {@code Class}. To transform specific
+	 * classes during load time (<i>on-fly</i>) {@link StormClassLoader} has to read and invoke
+	 * registered transformers. Due to how class loading works in Java references to classes within
+	 * {@code ClassLoader} do not get loaded by that specific {@code ClassLoader} but get delegate
+	 * to {@code AppClassLoader}. For this reason we have to use bootstrapping and reflection to
+	 * access transformers from {@code StormClassLoader}.
+	 */
+	static final Class<?> TRANSFORMER_CLASS;
+
+	/**
+	 * Represents {@link StormClassTransformer#getRegistered(String)} method.
+	 *
+	 * @see #getRegisteredTransformer(String)
+	 */
+	private static final Method TRANSFORMER_GETTER;
+
+	/**
+	 * Represents {@link StormClassTransformer#transform(byte[])} method.
+	 *
+	 * @see #invokeTransformer(Object, byte[])
+	 */
+	private static final Method TRANSFORMER_INVOKER;
+
+	static
+	{
+		try {
+			String transformerClass = "io.pzstorm.storm.core.StormClassTransformer";
+			TRANSFORMER_CLASS = Class.forName(transformerClass, true, CLASS_LOADER);
+
+			TRANSFORMER_GETTER = TRANSFORMER_CLASS.getDeclaredMethod("getRegistered", String.class);
+			TRANSFORMER_INVOKER = TRANSFORMER_CLASS.getDeclaredMethod("transform", byte[].class);
+		}
+		catch (ReflectiveOperationException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * Returns registered instance of {@link StormClassTransformer} that matches the given name.
+	 *
+	 * @throws ReflectiveOperationException if an error occurred while invoking method.
+	 * @see StormClassTransformer#getRegistered(String)
+	 */
+	static Object getRegisteredTransformer(String name) throws ReflectiveOperationException {
+		return TRANSFORMER_GETTER.invoke(null, name);
+	}
+
+	/**
+	 * Calls method chain to transform the given {@code Class} byte array.
+	 *
+	 * @throws ReflectiveOperationException if an error occurred while invoking method.
+	 * @see StormClassTransformer#transform(byte[])
+	 */
+	@SuppressWarnings("RedundantCast")
+	static byte[] invokeTransformer(Object transformer, byte[] rawClass) throws ReflectiveOperationException {
+		return (byte[]) TRANSFORMER_INVOKER.invoke(transformer, (Object) rawClass);
+	}
+}
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 4393e69..4eacc81 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -142,9 +142,13 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 				try {
 					byte[] input = getRawClassByteArray(name);
 
-					StormClassTransformer transformer = StormClassTransformer.getRegistered(name);
-					if (transformer != null) {
-						input = transformer.transform(input);
+					Class<?> transformerClass = StormBootstrap.TRANSFORMER_CLASS;
+					if (transformerClass != null)
+					{
+						Object transformer = StormBootstrap.getRegisteredTransformer(name);
+						if (transformer != null) {
+							input = StormBootstrap.invokeTransformer(transformer, input);
+						}
 					}
 					if (input.length > 0)
 					{
@@ -153,14 +157,13 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 
 						clazz = defineClass(name, input, 0, input.length);
 						if (clazz.getClassLoader() == this) {
-							StormLogger.debug("STORM: Successfully loaded class with StormClassLoader");
+							StormLogger.debug("Successfully loaded class with StormClassLoader");
 						}
 						else throw new RuntimeException("Unable to load class with StormClassLoader");
 					}
 				}
-				catch (IOException e) {
-					throw new RuntimeException("I/O exception occurred while transforming class to byte " +
-							"array");
+				catch (IOException | ReflectiveOperationException e) {
+					throw new RuntimeException(e);
 				}
 			}
 		}
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index 400e4fe..580ee9e 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -29,7 +29,7 @@
  * </ul>
  */
 @SuppressWarnings("WeakerAccess")
-abstract class StormClassTransformer {
+public abstract class StormClassTransformer {
 
 	/**
 	 * Internal registry of created transformers. This map is checked for entries
@@ -59,12 +59,12 @@ static boolean isRegistered(String name) {
 	}
 
 	/**
-	 * Returns registered instance of {@link StormClassTransformer}.
+	 * Returns registered instance of {@link StormClassTransformer} that matches the given name.
 	 *
 	 * @return {@code StormClassTransformer} or {@code null} if no registered instance found.
 	 */
 	@Contract(pure = true)
-	static @Nullable StormClassTransformer getRegistered(String className) {
+	public static @Nullable StormClassTransformer getRegistered(String className) {
 		return TRANSFORMERS.getOrDefault(className, null);
 	}
 
diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 15dc475..0ae7bab 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -28,9 +28,11 @@ class StormLauncher {
 	public static void main(String[] args) throws ReflectiveOperationException {
 
 		StormLogger.debug("Preparing to launch Project Zomboid");
-		StormClassLoader stormLoader = new StormClassLoader();
 
-		Class<?> entryPointClass = stormLoader.loadClass(ZOMBOID_ENTRY_POINT_CLASS);
+		StormClassLoader classLoader = StormBootstrap.CLASS_LOADER;
+		Class.forName("io.pzstorm.storm.core.StormEventHooks", true, classLoader);
+
+		Class<?> entryPointClass = classLoader.loadClass(ZOMBOID_ENTRY_POINT_CLASS);
 		Method entryPoint = entryPointClass.getMethod(ZOMBOID_ENTRY_POINT, String[].class);
 		try {
 			/* we invoke the entry point using reflection because we don't want to reference

From 36509c4d6d3c55f7ceadf7007b4c3714e602e9d3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 16:24:38 +0200
Subject: [PATCH 072/323] Do minor code formatting

---
 src/main/java/io/pzstorm/storm/NonNullPackage.java  | 1 +
 src/test/java/io/pzstorm/storm/StormLoggerTest.java | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/NonNullPackage.java b/src/main/java/io/pzstorm/storm/NonNullPackage.java
index 8e5ec16..14b5087 100644
--- a/src/main/java/io/pzstorm/storm/NonNullPackage.java
+++ b/src/main/java/io/pzstorm/storm/NonNullPackage.java
@@ -13,4 +13,5 @@
 @Target(ElementType.PACKAGE)
 @Retention(RetentionPolicy.CLASS)
 public @interface NonNullPackage {
+
 }
diff --git a/src/test/java/io/pzstorm/storm/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
index fd4ceb3..4b9280c 100644
--- a/src/test/java/io/pzstorm/storm/StormLoggerTest.java
+++ b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
@@ -1,5 +1,9 @@
 package io.pzstorm.storm;
 
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -9,10 +13,6 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-
 class StormLoggerTest implements UnitTest {
 
 	private static final String LOGGER_PROPERTY = "storm.logger";

From e3022fbe3a88009c261ee5d240a1f5ed40b0f35a Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 17:39:09 +0200
Subject: [PATCH 073/323] Add more class names to blacklist

---
 src/main/java/io/pzstorm/storm/core/StormClassLoader.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 4eacc81..db2f09f 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -31,8 +31,8 @@ class StormClassLoader extends ClassLoader {
 	 */
 	@SuppressWarnings("SpellCheckingInspection")
 	private static final ImmutableSet<String> CLASS_BLACKLIST = ImmutableSet.of(
-			"java.", "org.objectweb.asm.", "sun.", "com.sun.",
-			"javax.imageio.", "javax.xml.", "org.w3c."
+			"java.", "org.objectweb.asm.", "sun.", "com.sun.", "org.xml.", "org.w3c.",
+			"javax.script.", "javax.management.", "javax.imageio.", "javax.xml."
 	);
 	protected final URLClassLoader resourceClassLoader;
 	/**

From b7d31394953a2f458ce93c45fbac2440016b9b72 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 17:40:12 +0200
Subject: [PATCH 074/323] Lower logger initialization log level

---
 src/main/java/io/pzstorm/storm/StormLogger.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/StormLogger.java b/src/main/java/io/pzstorm/storm/StormLogger.java
index baa6e5e..b0b3ac4 100644
--- a/src/main/java/io/pzstorm/storm/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/StormLogger.java
@@ -48,7 +48,7 @@ public class StormLogger {
 			}
 			else LOGGER.error("Unable to resolve logging level '" + sLevel + '\'');
 		}
-		LOGGER.debug("Initialized Storm logger");
+		LOGGER.info("Initialized Storm logger");
 	}
 
 	/* Make the constructor private to disable instantiation */

From a05b4379925a553bd6055aa29c4c048af7c71bfa Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 17:40:48 +0200
Subject: [PATCH 075/323] Fix missing logger level error in test

---
 src/test/java/io/pzstorm/storm/StormLoggerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/io/pzstorm/storm/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
index 4b9280c..04ca3d2 100644
--- a/src/test/java/io/pzstorm/storm/StormLoggerTest.java
+++ b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
@@ -23,7 +23,7 @@ void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationE
 		// assert that key does not exist first
 		Assertions.assertNull(System.getProperty(LOGGER_PROPERTY));
 
-		Level expectedLevel = Level.forName("CUSTOM_LEVEL", 1);
+		Level expectedLevel = Level.forName("ALL", 1);
 		System.setProperty(LOGGER_PROPERTY, expectedLevel.name());
 
 		// assert that system property was properly set

From 5180fe9836efa7e8605c69767a7e017fd38bc870 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 17:52:02 +0200
Subject: [PATCH 076/323] Define zombie testing module

---
 build.gradle | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/build.gradle b/build.gradle
index ea66b75..cc40feb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,22 @@ capsid {
 	setProjectRepository('pzstorm', 'storm')
 }
 
+sourceSets {
+	// this sourceSet is used for testing class transformation
+	zombie {
+		runtimeClasspath += sourceSets.main.output
+		compileClasspath += sourceSets.main.output
+	}
+	test {
+		// tests need to see classes used in class transformation tests
+		runtimeClasspath += sourceSets.zombie.output
+		compileClasspath += sourceSets.zombie.output
+	}
+}
+configurations {
+	zombieImplementation.extendsFrom(compileOnly, zomboidImplementation)
+}
+
 dependencies {
 	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
 	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'

From 505cc4da4662a8dae28fec5d78fa4d3544e3da21 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 17:58:33 +0200
Subject: [PATCH 077/323] Test transforming stack constant

---
 .../storm/core/StormClassTransformerTest.java | 32 +++++++++++++++++++
 .../storm/core/ZombieHelloTransformer.java    | 26 +++++++++++++++
 src/zombie/java/zombie/ZombieHello.java       | 17 ++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
 create mode 100644 src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
 create mode 100644 src/zombie/java/zombie/ZombieHello.java

diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
new file mode 100644
index 0000000..a8f225e
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
@@ -0,0 +1,32 @@
+package io.pzstorm.storm.core;
+
+import java.lang.reflect.Constructor;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import io.pzstorm.storm.UnitTest;
+
+class StormClassTransformerTest implements UnitTest {
+
+	@Test
+	void shouldChangeStackConstantInInstructionList() throws ReflectiveOperationException {
+
+		String className = "zombie.ZombieHello";
+
+		// create and register transformer
+		Class<?> transformerClass = Class.forName(
+				"io.pzstorm.storm.core.ZombieHelloTransformer",
+				true, StormBootstrap.CLASS_LOADER
+		);
+		Constructor<?> constructor = transformerClass.getConstructor();
+		constructor.setAccessible(true);
+		constructor.newInstance();
+
+		Class<?> zombieHello = StormBootstrap.CLASS_LOADER.loadClass(className, true);
+		String hello = (String) zombieHello.getDeclaredMethod("getHello").invoke(null);
+		Assertions.assertEquals("Zombie says: you die today!", hello);
+
+		zombieHello.getDeclaredMethod("sayHello").invoke(null);
+	}
+}
diff --git a/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java b/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
new file mode 100644
index 0000000..6e98c07
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.core;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.LdcInsnNode;
+
+class ZombieHelloTransformer extends StormClassTransformer {
+
+	ZombieHelloTransformer() {
+		super("zombie.ZombieHello");
+	}
+
+	@Override
+	public StormClassTransformer transform() {
+
+		InsnList instructions = getInstructionsForMethod("getHello", "()Ljava/lang/String;");
+		for (AbstractInsnNode instruction : instructions)
+		{
+			if (instruction.getOpcode() == Opcodes.LDC) {
+				((LdcInsnNode) instruction).cst = "Zombie says: you die today!";
+			}
+		}
+		return this;
+	}
+}
diff --git a/src/zombie/java/zombie/ZombieHello.java b/src/zombie/java/zombie/ZombieHello.java
new file mode 100644
index 0000000..dd5cd35
--- /dev/null
+++ b/src/zombie/java/zombie/ZombieHello.java
@@ -0,0 +1,17 @@
+package zombie;
+
+import java.io.FileNotFoundException;
+
+import org.jetbrains.annotations.TestOnly;
+
+@TestOnly
+public class ZombieHello {
+
+	public static void sayHello() {
+		System.out.println(getHello());
+	}
+
+	public static String getHello() {
+		return "Zombie says: hello!";
+	}
+}

From 0c3791d92a16a8c5bd157600d482456f21d10387 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 19:51:14 +0200
Subject: [PATCH 078/323] Fix StormLogger initialized twice

---
 src/main/java/io/pzstorm/storm/core/StormClassLoader.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index db2f09f..95107a4 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -32,7 +32,8 @@ class StormClassLoader extends ClassLoader {
 	@SuppressWarnings("SpellCheckingInspection")
 	private static final ImmutableSet<String> CLASS_BLACKLIST = ImmutableSet.of(
 			"java.", "org.objectweb.asm.", "sun.", "com.sun.", "org.xml.", "org.w3c.",
-			"javax.script.", "javax.management.", "javax.imageio.", "javax.xml."
+			"javax.script.", "javax.management.", "javax.imageio.", "javax.xml.",
+			"io.pzstorm.storm.StormLogger"
 	);
 	protected final URLClassLoader resourceClassLoader;
 	/**

From e7f10496f5eb491196f56b3afa9787e63a683501 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 19:53:02 +0200
Subject: [PATCH 079/323] Fix tests logged at debug level

---
 src/test/java/io/pzstorm/storm/StormLoggerTest.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
index 04ca3d2..d770cf2 100644
--- a/src/test/java/io/pzstorm/storm/StormLoggerTest.java
+++ b/src/test/java/io/pzstorm/storm/StormLoggerTest.java
@@ -9,6 +9,7 @@
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.AppenderControl;
 import org.apache.logging.log4j.core.config.AppenderControlArraySet;
+import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -20,8 +21,8 @@ class StormLoggerTest implements UnitTest {
 	@Test
 	void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationException {
 
-		// assert that key does not exist first
-		Assertions.assertNull(System.getProperty(LOGGER_PROPERTY));
+		// store current level from system properties
+		Level originalLevel = Level.toLevel(System.getProperty(LOGGER_PROPERTY, "INFO"));
 
 		Level expectedLevel = Level.forName("ALL", 1);
 		System.setProperty(LOGGER_PROPERTY, expectedLevel.name());
@@ -35,6 +36,7 @@ void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationE
 
 		LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
 		LoggerConfig rootLoggerConfig = ctx.getConfiguration().getLoggers().get("");
+		Configuration config = ctx.getConfiguration();
 
 		Field appendersField = LoggerConfig.class.getDeclaredField("appenders");
 		appendersField.setAccessible(true);
@@ -60,5 +62,12 @@ void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationE
 		for (Map.Entry<String, Level> entry : actualLevels.entrySet()) {
 			Assertions.assertEquals(expectedLevel, entry.getValue());
 		}
+		// reset the logger levels to original values
+		for (String appender : new String[]{ "Console", "MainFile" })
+		{
+			rootLoggerConfig.removeAppender(appender);
+			rootLoggerConfig.addAppender(config.getAppender(appender), originalLevel, null);
+		}
+		ctx.updateLoggers();
 	}
 }

From 1020549c68d48ad89afd77399f478bae098adafd Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 19:56:41 +0200
Subject: [PATCH 080/323] Fix test transformer not accessible

---
 .../java/io/pzstorm/storm/core/ZombieHelloTransformer.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java b/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
index 6e98c07..a1c4007 100644
--- a/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
@@ -5,9 +5,9 @@
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.LdcInsnNode;
 
-class ZombieHelloTransformer extends StormClassTransformer {
+public class ZombieHelloTransformer extends StormClassTransformer {
 
-	ZombieHelloTransformer() {
+	public ZombieHelloTransformer() {
 		super("zombie.ZombieHello");
 	}
 

From f921f1c80f39a6822abc2e9fd87cbe0490c853e9 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 20:00:25 +0200
Subject: [PATCH 081/323] Make StormClassTransformer accessible

---
 .../java/io/pzstorm/storm/core/StormClassTransformer.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index 580ee9e..0135d03 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -38,7 +38,8 @@ public abstract class StormClassTransformer {
 	 */
 	private static final Map<String, StormClassTransformer> TRANSFORMERS = new HashMap<>();
 
-	private final ClassNode visitor;
+	protected final String className;
+	protected final ClassNode visitor;
 	private @Nullable ClassReader classReader;
 
 	StormClassTransformer(String className, ClassNode visitor) {
@@ -153,11 +154,11 @@ byte[] write() {
 	 * Calls method chain to transform the given {@code Class} byte array.
 	 *
 	 * @param rawClass byte array representing the {@code Class} to transform.
+	 * @return byte array representing transformed class.
 	 *
 	 * @throws ClassTransformationException if given byte array is empty.
-	 * @return byte array representing transformed class.
 	 */
-	final byte[] transform(byte[] rawClass) {
+	public byte[] transform(byte[] rawClass) {
 		return read(rawClass).visit().transform().write();
 	}
 

From 6f1de304c30bd64e42c42ac7186eaf07bd3f91b3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 23:23:05 +0200
Subject: [PATCH 082/323] Add diff-utils test dependency

---
 build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.gradle b/build.gradle
index cc40feb..d290ecb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,6 +45,9 @@ dependencies {
 	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
 	testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
 
+	// https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils
+	testImplementation 'io.github.java-diff-utils:java-diff-utils:4.10'
+
 	// https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
 	implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
 

From 23cb2012869f7435ae97ac68ccd54656ab4f5f7e Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 23:28:33 +0200
Subject: [PATCH 083/323] Generate bytecode diff in transformer tests

---
 .../storm/core/StormClassTestTransformer.java | 110 ++++++++++++++++++
 .../storm/core/ZombieHelloTransformer.java    |   2 +-
 2 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java

diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
new file mode 100644
index 0000000..25e3232
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
@@ -0,0 +1,110 @@
+package io.pzstorm.storm.core;
+
+import com.github.difflib.DiffUtils;
+import com.github.difflib.UnifiedDiffUtils;
+import com.github.difflib.patch.Patch;
+import io.pzstorm.storm.StormLogger;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.util.Printer;
+import org.objectweb.asm.util.Textifier;
+import org.objectweb.asm.util.TraceMethodVisitor;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This class represents a {@code Class} transformer used to alter {@code Class}
+ * bytecode using ASM when running JUnit tests. When transforming it will print a
+ * detailed diff of changed bytecode using {@link StormLogger} to make debugging easier.
+ */
+public abstract class StormClassTestTransformer extends StormClassTransformer {
+
+	private static final Printer ASM_PRINTER = new Textifier();
+	private static final TraceMethodVisitor METHOD_PRINTER = new TraceMethodVisitor(ASM_PRINTER);
+
+	StormClassTestTransformer(String className) {
+		super(className);
+	}
+
+	@Override
+	public byte[] transform(byte[] rawClass) {
+
+		read(rawClass).visit();
+		String original = getBytecodeFor(visitor);
+
+		byte[] result = transform().write();
+		String modifier = getBytecodeFor(visitor);
+
+		StormLogger.info("Generating class bytecode diff");
+		String diff = getBytecodeDiff(className, original, modifier);
+		if (!diff.isEmpty()) {
+			StormLogger.info(diff);
+		}
+		else StormLogger.warn("No diff available, class bytecode is identical");
+		return result;
+	}
+
+	/**
+	 * Returns the text constructed from given node's bytecode.
+	 * @param insnNode node to construct the text for.
+	 */
+	private static String getBytecodeFor(AbstractInsnNode insnNode) {
+
+		insnNode.accept(METHOD_PRINTER);
+
+		StringWriter stringWriter = new StringWriter();
+		ASM_PRINTER.print(new PrintWriter(stringWriter));
+		ASM_PRINTER.getText().clear();
+
+		return stringWriter.toString();
+	}
+
+	/**
+	 * Returns the text constructed from given {@link ClassNode} bytecode.
+	 * @param classNode node to construct the text for.
+	 */
+	private static String getBytecodeFor(ClassNode classNode) {
+
+		StringBuilder builder = new StringBuilder();
+		for (MethodNode methodNode: classNode.methods)
+		{
+			builder.append(String.format("Method %s -> %s\n", methodNode.name, methodNode.desc));
+			for (AbstractInsnNode insnNode: methodNode.instructions) {
+				builder.append(String.format(".... %s", getBytecodeFor(insnNode)));
+			}
+		}
+		return builder.toString();
+	}
+
+	/**
+	 * Returns the Unified Diff format text that represents the bytecode difference
+	 * between {@code originalCode} and {@code modifiedCode}.
+	 *
+	 * @param className filename of the original (unrevised file).
+	 * @param originalCode lines of the original file.
+	 * @param modifiedCode lines of the modified file.
+	 *
+	 * @return bytecode difference between two set of code lines.
+	 */
+	private static String getBytecodeDiff(String className, String originalCode, String modifiedCode) {
+
+		List<String> originalLines = Arrays.asList(originalCode.split("\n"));
+		List<String> modifiedLines = Arrays.asList(modifiedCode.split("\n"));
+
+		Patch<String> bytecodePatch = DiffUtils.diff(originalLines, modifiedLines);
+		List<String> unifiedDiff = UnifiedDiffUtils.generateUnifiedDiff(
+				className + ".class (original)",
+				className + ".class (transformed)",
+				originalLines, bytecodePatch, 4
+		);
+		StringBuilder builder = new StringBuilder();
+		for (String diffLine : unifiedDiff) {
+			builder.append(diffLine).append("\n");
+		}
+		return builder.toString();
+	}
+}
diff --git a/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java b/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
index a1c4007..bbfb120 100644
--- a/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
@@ -5,7 +5,7 @@
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.LdcInsnNode;
 
-public class ZombieHelloTransformer extends StormClassTransformer {
+public class ZombieHelloTransformer extends StormClassTestTransformer {
 
 	public ZombieHelloTransformer() {
 		super("zombie.ZombieHello");

From d1647dcc3f62ce057ce9c434a303b83b02d2d953 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 1 May 2021 23:32:51 +0200
Subject: [PATCH 084/323] Do IDEA and spotless code formatting

---
 src/main/dist/build.gradle                    |  2 +-
 .../storm/core/StormClassTransformer.java     |  4 +-
 src/main/resources/log4j2.xml                 |  2 +-
 src/test/java/io/pzstorm/storm/UnitTest.java  |  1 +
 .../storm/core/StormClassLoaderTest.java      | 28 ++++-----
 .../storm/core/StormClassTestTransformer.java | 62 ++++++++++---------
 src/zombie/java/zombie/ZombieHello.java       |  2 -
 7 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/src/main/dist/build.gradle b/src/main/dist/build.gradle
index b138032..bedf752 100644
--- a/src/main/dist/build.gradle
+++ b/src/main/dist/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'io.pzstorm.capsid' version '1.0.0'
+    id 'io.pzstorm.capsid' version '1.0.0'
 }
 
 capsid {
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index 0135d03..524bd42 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -44,8 +44,10 @@ public abstract class StormClassTransformer {
 
 	StormClassTransformer(String className, ClassNode visitor) {
 
-		TRANSFORMERS.put(className, this);
+		this.className = className;
 		this.visitor = visitor;
+
+		TRANSFORMERS.put(className, this);
 	}
 
 	StormClassTransformer(String className) {
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 37ca2b9..ae92071 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -9,7 +9,7 @@
         </Property>
     </Properties>
     <CustomLevels>
-        <CustomLevel name="VERBOSE" intLevel="450" />
+        <CustomLevel name="VERBOSE" intLevel="450"/>
     </CustomLevels>
     <Appenders>
         <!-- Console for use in production environment -->
diff --git a/src/test/java/io/pzstorm/storm/UnitTest.java b/src/test/java/io/pzstorm/storm/UnitTest.java
index af682b3..c8fbe36 100644
--- a/src/test/java/io/pzstorm/storm/UnitTest.java
+++ b/src/test/java/io/pzstorm/storm/UnitTest.java
@@ -4,4 +4,5 @@
 
 @Tag("unit")
 public interface UnitTest {
+
 }
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
index 29f1459..2b217c2 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
@@ -25,7 +25,20 @@ class StormClassLoaderTest extends StormClassLoader implements UnitTest {
 	private static final URL DELEGATE_RESOURCE_DIR = CL.getResource("./delegate/");
 
 	StormClassLoaderTest() {
-		super(new URL[] { CLASSES_RESOURCE_DIR, DELEGATE_RESOURCE_DIR });
+		super(new URL[]{ CLASSES_RESOURCE_DIR, DELEGATE_RESOURCE_DIR });
+	}
+
+	private static String getRandomString() {
+		return UUID.randomUUID().toString().replaceAll("-", "");
+	}
+
+	@SuppressWarnings("unchecked")
+	private static Set<String> getBlacklistedClasses() throws ReflectiveOperationException {
+
+		Field field = StormClassLoader.class.getDeclaredField("CLASS_BLACKLIST");
+		field.setAccessible(true);
+
+		return (Set<String>) field.get(null);
 	}
 
 	@Test
@@ -137,17 +150,4 @@ void shouldProperlyRecognizeBlacklistedClassNames() throws ReflectiveOperationEx
 			Assertions.assertFalse(isBlacklistedClass(sb.toString()));
 		}
 	}
-
-	private static String getRandomString() {
-		return UUID.randomUUID().toString().replaceAll("-", "");
-	}
-
-	@SuppressWarnings("unchecked")
-	private static Set<String> getBlacklistedClasses() throws ReflectiveOperationException {
-
-		Field field = StormClassLoader.class.getDeclaredField("CLASS_BLACKLIST");
-		field.setAccessible(true);
-
-		return (Set<String>) field.get(null);
-	}
 }
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
index 25e3232..17f37a4 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
@@ -1,9 +1,10 @@
 package io.pzstorm.storm.core;
 
-import com.github.difflib.DiffUtils;
-import com.github.difflib.UnifiedDiffUtils;
-import com.github.difflib.patch.Patch;
-import io.pzstorm.storm.StormLogger;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.List;
+
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
@@ -11,10 +12,11 @@
 import org.objectweb.asm.util.Textifier;
 import org.objectweb.asm.util.TraceMethodVisitor;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.List;
+import com.github.difflib.DiffUtils;
+import com.github.difflib.UnifiedDiffUtils;
+import com.github.difflib.patch.Patch;
+
+import io.pzstorm.storm.StormLogger;
 
 /**
  * This class represents a {@code Class} transformer used to alter {@code Class}
@@ -30,30 +32,12 @@ public abstract class StormClassTestTransformer extends StormClassTransformer {
 		super(className);
 	}
 
-	@Override
-	public byte[] transform(byte[] rawClass) {
-
-		read(rawClass).visit();
-		String original = getBytecodeFor(visitor);
-
-		byte[] result = transform().write();
-		String modifier = getBytecodeFor(visitor);
-
-		StormLogger.info("Generating class bytecode diff");
-		String diff = getBytecodeDiff(className, original, modifier);
-		if (!diff.isEmpty()) {
-			StormLogger.info(diff);
-		}
-		else StormLogger.warn("No diff available, class bytecode is identical");
-		return result;
-	}
-
 	/**
 	 * Returns the text constructed from given node's bytecode.
+	 *
 	 * @param insnNode node to construct the text for.
 	 */
 	private static String getBytecodeFor(AbstractInsnNode insnNode) {
-
 		insnNode.accept(METHOD_PRINTER);
 
 		StringWriter stringWriter = new StringWriter();
@@ -65,15 +49,16 @@ private static String getBytecodeFor(AbstractInsnNode insnNode) {
 
 	/**
 	 * Returns the text constructed from given {@link ClassNode} bytecode.
+	 *
 	 * @param classNode node to construct the text for.
 	 */
 	private static String getBytecodeFor(ClassNode classNode) {
 
 		StringBuilder builder = new StringBuilder();
-		for (MethodNode methodNode: classNode.methods)
+		for (MethodNode methodNode : classNode.methods)
 		{
 			builder.append(String.format("Method %s -> %s\n", methodNode.name, methodNode.desc));
-			for (AbstractInsnNode insnNode: methodNode.instructions) {
+			for (AbstractInsnNode insnNode : methodNode.instructions) {
 				builder.append(String.format(".... %s", getBytecodeFor(insnNode)));
 			}
 		}
@@ -87,7 +72,6 @@ private static String getBytecodeFor(ClassNode classNode) {
 	 * @param className filename of the original (unrevised file).
 	 * @param originalCode lines of the original file.
 	 * @param modifiedCode lines of the modified file.
-	 *
 	 * @return bytecode difference between two set of code lines.
 	 */
 	private static String getBytecodeDiff(String className, String originalCode, String modifiedCode) {
@@ -107,4 +91,22 @@ private static String getBytecodeDiff(String className, String originalCode, Str
 		}
 		return builder.toString();
 	}
+
+	@Override
+	public byte[] transform(byte[] rawClass) {
+
+		read(rawClass).visit();
+		String original = getBytecodeFor(visitor);
+
+		byte[] result = transform().write();
+		String modifier = getBytecodeFor(visitor);
+
+		StormLogger.info("Generating class bytecode diff");
+		String diff = getBytecodeDiff(className, original, modifier);
+		if (!diff.isEmpty()) {
+			StormLogger.info(diff);
+		}
+		else StormLogger.warn("No diff available, class bytecode is identical");
+		return result;
+	}
 }
diff --git a/src/zombie/java/zombie/ZombieHello.java b/src/zombie/java/zombie/ZombieHello.java
index dd5cd35..68191ae 100644
--- a/src/zombie/java/zombie/ZombieHello.java
+++ b/src/zombie/java/zombie/ZombieHello.java
@@ -1,7 +1,5 @@
 package zombie;
 
-import java.io.FileNotFoundException;
-
 import org.jetbrains.annotations.TestOnly;
 
 @TestOnly

From d7bb9bf202caa45fbd24a374fb144d359e51d48c Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 2 May 2021 21:17:13 +0200
Subject: [PATCH 085/323] Create ASM utility class

---
 src/main/java/io/pzstorm/storm/util/AsmUtils.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/util/AsmUtils.java

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
new file mode 100644
index 0000000..aae40f0
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -0,0 +1,14 @@
+package io.pzstorm.storm.util;
+
+import org.jetbrains.annotations.Nullable;
+import org.objectweb.asm.tree.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * This class contains an assortment of helpful methods when working with ASM.
+ */
+public class AsmUtils {
+
+}

From 503de2c888c370328c7bde82f3f656dc2e2631fa Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 2 May 2021 21:18:24 +0200
Subject: [PATCH 086/323] Add createInsnList utility method

---
 .../java/io/pzstorm/storm/util/AsmUtils.java  |  13 +++
 .../io/pzstorm/storm/util/AsmUtilsTest.java   | 109 ++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index aae40f0..0544eef 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -11,4 +11,17 @@
  */
 public class AsmUtils {
 
+	/**
+	 * Create a new {@link InsnList} from given array of instructions.
+	 *
+	 * @param instructions array of instructions to use.
+	 */
+	public static InsnList createInsnList(AbstractInsnNode... instructions) {
+
+		InsnList result = new InsnList();
+		for (AbstractInsnNode instruction : instructions) {
+			result.add(instruction);
+		}
+		return result;
+	}
 }
diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
new file mode 100644
index 0000000..ddfde72
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -0,0 +1,109 @@
+package io.pzstorm.storm.util;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import io.pzstorm.storm.UnitTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+class AsmUtilsTest implements UnitTest {
+
+	private static final String intDesc = "(I)Ljava/lang/Integer;";
+	private static final LabelNode[] LABELS = new LabelNode[]{
+			new LabelNode(), new LabelNode(), new LabelNode(),
+			new LabelNode(), new LabelNode()
+	};
+	private static final AbstractInsnNode LAST_METHOD_NODE =
+			new MethodInsnNode(Opcodes.INVOKESTATIC, "java/lang/Integer", "valueOf", intDesc);
+	private static final AbstractInsnNode LAST_LINE_NODE = new LineNumberNode(25, LABELS[2]);
+	private static final AbstractInsnNode LAST_VAR_NODE = new VarInsnNode(Opcodes.ALOAD, 1);
+
+	private final InsnList instructions = createInstructionList();
+	private static InsnList createInstructionList() {
+
+		InsnList result = new InsnList();
+		/* L0
+		 *   LINENUMBER 20 L0
+		 *   NEW java/util/Random
+		 *   DUP
+		 *   INVOKESPECIAL java/util/Random.<init> ()V
+		 *   ASTORE 0
+		 */
+		result.add(LABELS[0]);
+		result.add(new LineNumberNode(20, LABELS[0]));
+		result.add(new TypeInsnNode(Opcodes.NEW, "java/util/Random"));
+		result.add(new InsnNode(Opcodes.POP));
+		result.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, "java/util/Random", "<init>", "()V"));
+		result.add(new VarInsnNode(Opcodes.ASTORE, 0));
+		/*
+		 * L1
+		 *   LINENUMBER 22 L1
+		 *   ALOAD 0
+		 *   INVOKEVIRTUAL java/util/Random.nextInt ()I
+		 *   INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer;
+		 *   ASTORE 1
+		 */
+		result.add(LABELS[1]);
+		result.add(new LineNumberNode(22, LABELS[1]));
+		result.add(new VarInsnNode(Opcodes.ALOAD, 0));
+		result.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/util/Random", "nextInt", "()I"));
+		result.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "java/lang/Integer", "valueOf", intDesc));
+		result.add(new VarInsnNode(Opcodes.ASTORE, 1));
+		/*
+		 * L2
+		 *   LINENUMBER 23 L2
+		 *   ALOAD 1
+		 *   INVOKEVIRTUAL java/lang/Integer.intValue ()I
+		 *   NEW java/util/Random
+		 *   DUP
+		 *   INVOKESPECIAL java/util/Random.<init> ()V
+		 *   INVOKEVIRTUAL java/util/Random.nextInt ()I
+		 *   IADD
+		 *   INVOKESTATIC java/lang/Integer.valueOf (I)Ljava/lang/Integer;
+		 *   ASTORE 1
+		 */
+		result.add(LABELS[2]);
+		result.add(new LineNumberNode(23, LABELS[2]));
+		result.add(new VarInsnNode(Opcodes.ALOAD, 1));
+		result.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/lang/Integer", "intValue", "()I"));
+		result.add(new TypeInsnNode(Opcodes.NEW, "java/util/Random"));
+		result.add(new InsnNode(Opcodes.DUP));
+		result.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, "java/util/Random", "<init>", "()V"));
+		result.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/util/Random", "nextInt", "()I"));
+		result.add(new InsnNode(Opcodes.IADD));
+		result.add(LAST_METHOD_NODE);
+		result.add(new VarInsnNode(Opcodes.ASTORE, 1));
+		/*
+		 * L3
+		 *   LINENUMBER 25 L3
+		 *   ALOAD 1
+		 *   ARETURN
+		 */
+		result.add(LABELS[3]);
+		result.add(LAST_LINE_NODE);
+		result.add(LAST_VAR_NODE);
+		result.add(new InsnNode(Opcodes.ARETURN));
+		result.add(LABELS[4]);
+
+		return result;
+	}
+
+	@Test
+	void shouldCreateInstructionListFromArguments() {
+
+		AbstractInsnNode[] insnList = new AbstractInsnNode[instructions.size()];
+		for (int i = 0; i < instructions.size(); i++) {
+			insnList[i] = instructions.get(i);
+ 		}
+		InsnList actualList = AsmUtils.createInsnList(insnList);
+		for (int i = 0; i < actualList.size(); i++) {
+			Assertions.assertEquals(instructions.get(i), actualList.get(i));
+		}
+	}
+}

From 9b2ca1dde1010a9e51fc8b8c2477cf81a0933a43 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 2 May 2021 21:19:08 +0200
Subject: [PATCH 087/323] Add node equality check utility method

---
 .../java/io/pzstorm/storm/util/AsmUtils.java  | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index 0544eef..74d2ce3 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -24,4 +24,114 @@ public static InsnList createInsnList(AbstractInsnNode... instructions) {
 		}
 		return result;
 	}
+	/**
+	 * Compare the given nodes and return {@code true} if they are equal.
+	 * Since instances of {@link AbstractInsnNode} do not implement a equality comparison,
+	 * comparing two node instances will compare object addresses and omit comparing fields.
+	 * This method does a deep comparison, comparing instance fields.
+	 *
+	 * @param a first node to compare.
+	 * @param b second node to compare.
+	 * @return {@code true} if node fields are equal, {@code false} otherwise.
+	 */
+	public static boolean equalNodes(AbstractInsnNode a, AbstractInsnNode b) {
+
+		if (!a.getClass().isInstance(b)) {
+			return false;
+		}
+		if (a.getType() != b.getType()) {
+			return false;
+		}
+		if (a.getOpcode() != b.getOpcode()) {
+			return false;
+		}
+		if (a instanceof FieldInsnNode)
+		{
+			return ((FieldInsnNode) a).owner.equals(((FieldInsnNode) b).owner) &&
+					((FieldInsnNode) a).name.equals(((FieldInsnNode) b).name) &&
+					((FieldInsnNode) a).desc.equals(((FieldInsnNode) b).desc);
+		}
+		if (a instanceof FrameNode)
+		{
+			return ((FrameNode) a).local.equals(((FrameNode) b).local) &&
+					((FrameNode) a).stack.equals(((FrameNode) b).stack);
+		}
+		if (a instanceof IincInsnNode)
+		{
+			return ((IincInsnNode) a).var == ((IincInsnNode) b).var &&
+					((IincInsnNode) a).incr == ((IincInsnNode) b).incr;
+		}
+		if (a instanceof IntInsnNode) {
+			return ((IntInsnNode) a).operand == ((IntInsnNode) b).operand;
+		}
+		if (a instanceof InvokeDynamicInsnNode)
+		{
+			return ((InvokeDynamicInsnNode) a).name.equals(((InvokeDynamicInsnNode) b).name) &&
+					((InvokeDynamicInsnNode) a).desc.equals(((InvokeDynamicInsnNode) b).desc) &&
+					((InvokeDynamicInsnNode) a).bsm.equals(((InvokeDynamicInsnNode) b).bsm) &&
+					Arrays.equals(((InvokeDynamicInsnNode) a).bsmArgs, ((InvokeDynamicInsnNode) b).bsmArgs);
+		}
+		if (a instanceof JumpInsnNode) {
+			return AsmUtils.equalNodes(((JumpInsnNode) a).label, ((JumpInsnNode) b).label);
+		}
+		if (a instanceof LabelNode) {
+			return ((LabelNode) a).getLabel().equals(((LabelNode) b).getLabel());
+		}
+		if (a instanceof LdcInsnNode) {
+			return ((LdcInsnNode) a).cst.equals(((LdcInsnNode) b).cst);
+		}
+		if (a instanceof LineNumberNode)
+		{
+			return ((LineNumberNode) a).line == ((LineNumberNode) b).line &&
+					AsmUtils.equalNodes(((LineNumberNode) a).start, ((LineNumberNode) b).start);
+		}
+		if (a instanceof LookupSwitchInsnNode)
+		{
+			return (AsmUtils.equalNodes(((LookupSwitchInsnNode) a).dflt, ((LookupSwitchInsnNode) b).dflt) &&
+					((LookupSwitchInsnNode) a).keys.equals(((LookupSwitchInsnNode) b).keys) &&
+					((LookupSwitchInsnNode) a).labels.equals(((LookupSwitchInsnNode) b).labels));
+		}
+		if (a instanceof MethodInsnNode)
+		{
+			return ((MethodInsnNode) a).owner.equals(((MethodInsnNode) b).owner) &&
+					((MethodInsnNode) a).name.equals(((MethodInsnNode) b).name) &&
+					((MethodInsnNode) a).desc.equals(((MethodInsnNode) b).desc) &&
+					((MethodInsnNode) a).itf == (((MethodInsnNode) b).itf);
+		}
+		if (a instanceof MultiANewArrayInsnNode)
+		{
+			return ((MultiANewArrayInsnNode) a).desc.equals(((MultiANewArrayInsnNode) b).desc) &&
+					((MultiANewArrayInsnNode) a).dims == ((MultiANewArrayInsnNode) b).dims;
+		}
+		if (a instanceof TableSwitchInsnNode)
+		{
+			if (((TableSwitchInsnNode) a).min != ((TableSwitchInsnNode) b).min) {
+				return false;
+			}
+			if (((TableSwitchInsnNode) a).max != ((TableSwitchInsnNode) b).max) {
+				return false;
+			}
+			if (!AsmUtils.equalNodes(((TableSwitchInsnNode) a).dflt, ((TableSwitchInsnNode) b).dflt)) {
+				return false;
+			}
+			List<LabelNode> aLabelNodes = ((TableSwitchInsnNode) a).labels;
+			List<LabelNode> bLabelNodes = ((TableSwitchInsnNode) b).labels;
+			if (aLabelNodes.size() != bLabelNodes.size()) {
+				return false;
+			}
+			for (int i = 0; i < ((TableSwitchInsnNode) a).labels.size(); i++)
+			{
+				if (!AsmUtils.equalNodes(aLabelNodes.get(i), bLabelNodes.get(i))) {
+					return false;
+				}
+			}
+		}
+		if (a instanceof TypeInsnNode) {
+			return ((TypeInsnNode) a).desc.equals(((TypeInsnNode) b).desc);
+		}
+		if (a instanceof VarInsnNode) {
+			return ((VarInsnNode) a).var == (((VarInsnNode) b).var);
+		}
+		return true;
+	}
 }

From 440946b98f6e997c8fd190c1d3c00530cb9fa1a9 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 2 May 2021 21:19:57 +0200
Subject: [PATCH 088/323] Add getLastInstructionOfType utility method

---
 .../java/io/pzstorm/storm/util/AsmUtils.java  | 20 +++++++++++++++++++
 .../io/pzstorm/storm/util/AsmUtilsTest.java   | 15 ++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index 74d2ce3..6761dab 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -24,6 +24,26 @@ public static InsnList createInsnList(AbstractInsnNode... instructions) {
 		}
 		return result;
 	}
+
+	/**
+	 * Finds and returns the last instructions of a specific {@code Class} in a given list.
+	 *
+	 * @param list list of instructions to search.
+	 * @param node {@link AbstractInsnNode} to match.
+	 * @param <T> type of instruction to match.
+	 */
+	@SuppressWarnings("unchecked")
+	public static @Nullable <T extends AbstractInsnNode> T getLastInstructionOfType(InsnList list, Class<T> node) {
+
+		AbstractInsnNode result = null;
+		for (AbstractInsnNode instruction : list)
+		{
+			if (node.isInstance(instruction)) {
+				result = instruction;
+			}
+		}
+		return (T) result;
+	}
 	/**
 	 * Compare the given nodes and return {@code true} if they are equal.
 	 * Since instances of {@link AbstractInsnNode} do not implement a equality comparison,
diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index ddfde72..3350a62 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -106,4 +106,19 @@ void shouldCreateInstructionListFromArguments() {
 			Assertions.assertEquals(instructions.get(i), actualList.get(i));
 		}
 	}
+
+	@Test
+	@SuppressWarnings("ConstantConditions")
+	void shouldGetLastInstructionOfType() {
+
+		Map<AbstractInsnNode, AbstractInsnNode> instructionsOfType = ImmutableMap.of(
+				LABELS[4], AsmUtils.getLastInstructionOfType(instructions, LabelNode.class),
+				LAST_METHOD_NODE, AsmUtils.getLastInstructionOfType(instructions, MethodInsnNode.class),
+				LAST_LINE_NODE, AsmUtils.getLastInstructionOfType(instructions, LineNumberNode.class),
+				LAST_VAR_NODE, AsmUtils.getLastInstructionOfType(instructions, VarInsnNode.class)
+		);
+		for (Map.Entry<AbstractInsnNode, AbstractInsnNode> entry : instructionsOfType.entrySet()) {
+			Assertions.assertEquals(entry.getKey(), entry.getValue());
+		}
+	}
 }

From a5f626582137434f3547fcfe8ef391a1034ae98c Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 2 May 2021 21:20:23 +0200
Subject: [PATCH 089/323] Add getFirstMatchingLabelNode utility method

---
 .../java/io/pzstorm/storm/util/AsmUtils.java  | 31 +++++++++++++++++++
 .../io/pzstorm/storm/util/AsmUtilsTest.java   | 20 ++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index 6761dab..9481753 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -44,6 +44,37 @@ public static InsnList createInsnList(AbstractInsnNode... instructions) {
 		}
 		return (T) result;
 	}
+
+	/**
+	 * Find and return first {@link LabelNode} that contains given list of instructions.
+	 *
+	 * @param list list of instructions to search.
+	 * @param match list of instructions to match.
+	 * @return first {@code LabelNode} that was matched or {@code null} if no node was matched.
+	 */
+	public static @Nullable LabelNode getFirstMatchingLabelNode(InsnList list, List<AbstractInsnNode> match) {
+
+		//@formatter:off
+		for (int i1 = 0; i1 < list.size(); i1++)
+		{
+			AbstractInsnNode labelInstruction = list.get(i1);
+			if (labelInstruction instanceof LabelNode)
+			{
+				boolean matchedInstructions = true;
+				for (int i2 = 0; i2 < match.size() && i1 < list.size(); i2++, i1++)
+				{
+					if (!AsmUtils.equalNodes(list.get(i1), match.get(i2))) {
+						matchedInstructions = false; break;
+					}
+				}
+				if (matchedInstructions) {
+					return (LabelNode) labelInstruction;
+				}
+			}
+		}//@formatter:on
+		return null;
+	}
+
 	/**
 	 * Compare the given nodes and return {@code true} if they are equal.
 	 * Since instances of {@link AbstractInsnNode} do not implement a equality comparison,
diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index 3350a62..a28b89a 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -121,4 +121,24 @@ void shouldGetLastInstructionOfType() {
 			Assertions.assertEquals(entry.getKey(), entry.getValue());
 		}
 	}
+
+	@Test
+	void shouldGetFirstMatchingLabelNodeInstruction() {
+
+		List<Integer[]> labelIndexPairs = ImmutableList.of(
+				new Integer[] { 0, 6 }, new Integer[] { 6, 12 },
+				new Integer[] { 12, 23 }, new Integer[] { 23, 27 }
+		);
+		for (int i1 = 0; i1 < labelIndexPairs.size(); i1++)
+		{
+			List<AbstractInsnNode> insnToMatch = new ArrayList<>();
+			Integer[] labelIndexPair = labelIndexPairs.get(i1);
+			for (int i2 = labelIndexPair[0]; i2 < labelIndexPair[1]; i2++) {
+				insnToMatch.add(instructions.get(i2));
+			}
+			LabelNode expectedLabel = LABELS[i1];
+			LabelNode actualLabel = AsmUtils.getFirstMatchingLabelNode(createInstructionList(), insnToMatch);
+			Assertions.assertEquals(expectedLabel, actualLabel);
+		}
+	}
 }

From a537a58d9e2045d3b348117a40c35523189a0a77 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 3 May 2021 02:25:55 +0200
Subject: [PATCH 090/323] Improve bytecode diff log format

---
 .../java/io/pzstorm/storm/core/StormClassTestTransformer.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
index 17f37a4..b1fd606 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
@@ -104,7 +104,8 @@ public byte[] transform(byte[] rawClass) {
 		StormLogger.info("Generating class bytecode diff");
 		String diff = getBytecodeDiff(className, original, modifier);
 		if (!diff.isEmpty()) {
-			StormLogger.info(diff);
+			//noinspection UseOfSystemOutOrSystemErr
+			System.out.println(diff);
 		}
 		else StormLogger.warn("No diff available, class bytecode is identical");
 		return result;

From 1f96e0a72fabd0f4fbba4d0dfe1916aa7acc196f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 3 May 2021 02:33:17 +0200
Subject: [PATCH 091/323] Fix and improve matching LabelNode

---
 .../java/io/pzstorm/storm/util/AsmUtils.java  | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index 9481753..abd3d05 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -47,6 +47,8 @@ public static InsnList createInsnList(AbstractInsnNode... instructions) {
 
 	/**
 	 * Find and return first {@link LabelNode} that contains given list of instructions.
+	 * Note that {@link LineNumberNode} and {@link LabelNode} instructions will be excluded when
+	 * comparing entries which means that these instructions are safe to be included in {@code match} list.
 	 *
 	 * @param list list of instructions to search.
 	 * @param match list of instructions to match.
@@ -57,18 +59,31 @@ public static InsnList createInsnList(AbstractInsnNode... instructions) {
 		//@formatter:off
 		for (int i1 = 0; i1 < list.size(); i1++)
 		{
-			AbstractInsnNode labelInstruction = list.get(i1);
-			if (labelInstruction instanceof LabelNode)
+			AbstractInsnNode instruction = list.get(i1);
+			if (instruction instanceof LabelNode)
 			{
+				int i3 = i1 + 1;
 				boolean matchedInstructions = true;
-				for (int i2 = 0; i2 < match.size() && i1 < list.size(); i2++, i1++)
+				for (int i2 = 0; i2 < match.size() && i3 < list.size(); i2++, i3++)
 				{
-					if (!AsmUtils.equalNodes(list.get(i1), match.get(i2))) {
-						matchedInstructions = false; break;
-					}
+					AbstractInsnNode a = list.get(i3);
+					// ignore line number nodes
+					if (!(a instanceof LineNumberNode))
+					{
+						AbstractInsnNode b = match.get(i2);
+						// ignore label and line number nodes
+						if (!(b instanceof LabelNode) && !(b instanceof LineNumberNode))
+						{
+							if (!AsmUtils.equalNodes(a, b)) {
+								matchedInstructions = false; break;
+							}
+						}
+						else i3 -= 1;	// when ignoring nodes counter variables
+					}					// need to be adjusted to compensate for
+					else i2 -= 1;		// the for-loop auto-incremental operation
 				}
 				if (matchedInstructions) {
-					return (LabelNode) labelInstruction;
+					return (LabelNode) instruction;
 				}
 			}
 		}//@formatter:on

From 9064ab52b14018ffbd2135b9300c3e4ce498ca9a Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 3 May 2021 02:34:17 +0200
Subject: [PATCH 092/323] Do minor code refactoring

---
 .../storm/core/StormClassTransformerTest.java   | 17 ++++++++---------
 src/zombie/java/zombie/ZombieHello.java         |  5 ++++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
index a8f225e..7e50196 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
@@ -13,15 +13,7 @@ class StormClassTransformerTest implements UnitTest {
 	void shouldChangeStackConstantInInstructionList() throws ReflectiveOperationException {
 
 		String className = "zombie.ZombieHello";
-
-		// create and register transformer
-		Class<?> transformerClass = Class.forName(
-				"io.pzstorm.storm.core.ZombieHelloTransformer",
-				true, StormBootstrap.CLASS_LOADER
-		);
-		Constructor<?> constructor = transformerClass.getConstructor();
-		constructor.setAccessible(true);
-		constructor.newInstance();
+		createAndLoadTransformer("io.pzstorm.storm.core.ZombieHelloTransformer");
 
 		Class<?> zombieHello = StormBootstrap.CLASS_LOADER.loadClass(className, true);
 		String hello = (String) zombieHello.getDeclaredMethod("getHello").invoke(null);
@@ -29,4 +21,11 @@ void shouldChangeStackConstantInInstructionList() throws ReflectiveOperationExce
 
 		zombieHello.getDeclaredMethod("sayHello").invoke(null);
 	}
+	private static void createAndLoadTransformer(String transformer) throws ReflectiveOperationException{
+
+		Class<?> transformerClass = Class.forName(transformer, true, StormBootstrap.CLASS_LOADER);
+		Constructor<?> constructor = transformerClass.getConstructor();
+		constructor.setAccessible(true);
+		constructor.newInstance();
+	}
 }
diff --git a/src/zombie/java/zombie/ZombieHello.java b/src/zombie/java/zombie/ZombieHello.java
index 68191ae..ebea7c0 100644
--- a/src/zombie/java/zombie/ZombieHello.java
+++ b/src/zombie/java/zombie/ZombieHello.java
@@ -1,12 +1,15 @@
 package zombie;
 
+import io.pzstorm.storm.StormLogger;
 import org.jetbrains.annotations.TestOnly;
 
+
 @TestOnly
+@SuppressWarnings({ "unused", "WeakerAccess" })
 public class ZombieHello {
 
 	public static void sayHello() {
-		System.out.println(getHello());
+		StormLogger.info(getHello());
 	}
 
 	public static String getHello() {

From b3e82df20411289d333f88a35c4cdc812160400e Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 3 May 2021 02:34:52 +0200
Subject: [PATCH 093/323] Write ASM utility test stub

---
 src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index a28b89a..6bdac46 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -141,4 +141,14 @@ void shouldGetFirstMatchingLabelNodeInstruction() {
 			Assertions.assertEquals(expectedLabel, actualLabel);
 		}
 	}
+
+	@Test
+	void shouldCompareInstructionNodeFields() {
+
+		// TODO: finish writing this test
+
+		FieldInsnNode fia = new FieldInsnNode(Opcodes.GETSTATIC, "owner", "name", "desc");
+		FieldInsnNode fib = new FieldInsnNode(Opcodes.GETSTATIC, "owner", "name", "desc");
+		Assertions.assertTrue((AsmUtils.equalNodes(fia, fib)));
+	}
 }

From 601022b18bee9546b441b37f3a64796773161dc8 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 3 May 2021 02:35:50 +0200
Subject: [PATCH 094/323] Test inserting instruction before LabelNode

---
 .../storm/core/StormClassTransformerTest.java | 18 +++++++++++
 .../storm/core/ZombieUtilsTransformer.java    | 31 +++++++++++++++++++
 src/zombie/java/zombie/ZombieUtils.java       | 19 ++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/core/ZombieUtilsTransformer.java
 create mode 100644 src/zombie/java/zombie/ZombieUtils.java

diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
index 7e50196..8d5f892 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
@@ -21,6 +21,24 @@ void shouldChangeStackConstantInInstructionList() throws ReflectiveOperationExce
 
 		zombieHello.getDeclaredMethod("sayHello").invoke(null);
 	}
+
+	@Test
+	void shouldInsertInstructionBeforeMatchedLabel() throws ReflectiveOperationException {
+
+		String className = "zombie.ZombieUtils";
+		createAndLoadTransformer("io.pzstorm.storm.core.ZombieUtilsTransformer");
+
+		Class<?> zombieUtils = StormBootstrap.CLASS_LOADER.loadClass(className, true);
+		zombieUtils.getDeclaredMethod("setZombieProperties", int.class, boolean.class)
+				.invoke(null, 21, true);
+
+		int propertyA = (int) zombieUtils.getDeclaredField("zombiePropertyA").get(null);
+		boolean propertyC = (boolean) zombieUtils.getDeclaredField("zombiePropertyC").get(null);
+
+		Assertions.assertEquals(21, propertyA);
+		Assertions.assertTrue(propertyC);
+	}
+
 	private static void createAndLoadTransformer(String transformer) throws ReflectiveOperationException{
 
 		Class<?> transformerClass = Class.forName(transformer, true, StormBootstrap.CLASS_LOADER);
diff --git a/src/test/java/io/pzstorm/storm/core/ZombieUtilsTransformer.java b/src/test/java/io/pzstorm/storm/core/ZombieUtilsTransformer.java
new file mode 100644
index 0000000..29a6237
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/core/ZombieUtilsTransformer.java
@@ -0,0 +1,31 @@
+package io.pzstorm.storm.core;
+
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
+import com.google.common.collect.ImmutableList;
+
+import io.pzstorm.storm.util.AsmUtils;
+
+@SuppressWarnings("unused")
+public class ZombieUtilsTransformer extends StormClassTestTransformer {
+
+	public ZombieUtilsTransformer() {
+		super("zombie.ZombieUtils");
+	}
+
+	@Override
+	StormClassTransformer transform() {
+
+		InsnList instructions = getInstructionsForMethod("setZombieProperties", "(IZ)V");
+		AbstractInsnNode target = AsmUtils.getFirstMatchingLabelNode(instructions, ImmutableList.of(
+				new VarInsnNode(Opcodes.ILOAD, 1),
+				new FieldInsnNode(Opcodes.PUTSTATIC, "zombie/ZombieUtils", "zombiePropertyC", "Z")
+		));
+		instructions.insertBefore(target, AsmUtils.createInsnList(
+				new LabelNode(), new LdcInsnNode("property"),
+				new FieldInsnNode(Opcodes.PUTSTATIC, "zombie/ZombieUtils", "zombiePropertyB", "Ljava/lang/String;")
+		));
+		return this;
+	}
+}
diff --git a/src/zombie/java/zombie/ZombieUtils.java b/src/zombie/java/zombie/ZombieUtils.java
new file mode 100644
index 0000000..903f191
--- /dev/null
+++ b/src/zombie/java/zombie/ZombieUtils.java
@@ -0,0 +1,19 @@
+package zombie;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class ZombieUtils {
+
+	public static int zombiePropertyA = 0;
+	public static String zombiePropertyB = "";
+	public static boolean zombiePropertyC = false;
+
+	public static void setZombieProperties(int a, boolean c) {
+
+		zombiePropertyA = a;
+
+		// inject instruction to set zombiePropertyB here
+		//zombiePropertyB = "property";
+
+		zombiePropertyC = c;
+	}
+}

From 0b4efd35ba01bc2fcc52282e89baa970179b803f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 3 May 2021 02:38:59 +0200
Subject: [PATCH 095/323] Do test code formatting

---
 .../java/io/pzstorm/storm/util/AsmUtils.java  |  6 ++---
 .../storm/core/StormClassTestTransformer.java |  3 ++-
 .../storm/core/StormClassTransformerTest.java | 16 +++++++-------
 .../io/pzstorm/storm/util/AsmUtilsTest.java   | 22 ++++++++++---------
 src/zombie/java/zombie/ZombieHello.java       |  2 +-
 src/zombie/java/zombie/ZombieUtils.java       |  2 --
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index abd3d05..a271105 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -1,11 +1,11 @@
 package io.pzstorm.storm.util;
 
-import org.jetbrains.annotations.Nullable;
-import org.objectweb.asm.tree.*;
-
 import java.util.Arrays;
 import java.util.List;
 
+import org.jetbrains.annotations.Nullable;
+import org.objectweb.asm.tree.*;
+
 /**
  * This class contains an assortment of helpful methods when working with ASM.
  */
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
index b1fd606..91a4b4a 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
@@ -103,7 +103,8 @@ public byte[] transform(byte[] rawClass) {
 
 		StormLogger.info("Generating class bytecode diff");
 		String diff = getBytecodeDiff(className, original, modifier);
-		if (!diff.isEmpty()) {
+		if (!diff.isEmpty())
+		{
 			//noinspection UseOfSystemOutOrSystemErr
 			System.out.println(diff);
 		}
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
index 8d5f892..f6c6cdb 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
@@ -9,6 +9,14 @@
 
 class StormClassTransformerTest implements UnitTest {
 
+	private static void createAndLoadTransformer(String transformer) throws ReflectiveOperationException {
+
+		Class<?> transformerClass = Class.forName(transformer, true, StormBootstrap.CLASS_LOADER);
+		Constructor<?> constructor = transformerClass.getConstructor();
+		constructor.setAccessible(true);
+		constructor.newInstance();
+	}
+
 	@Test
 	void shouldChangeStackConstantInInstructionList() throws ReflectiveOperationException {
 
@@ -38,12 +46,4 @@ void shouldInsertInstructionBeforeMatchedLabel() throws ReflectiveOperationExcep
 		Assertions.assertEquals(21, propertyA);
 		Assertions.assertTrue(propertyC);
 	}
-
-	private static void createAndLoadTransformer(String transformer) throws ReflectiveOperationException{
-
-		Class<?> transformerClass = Class.forName(transformer, true, StormBootstrap.CLASS_LOADER);
-		Constructor<?> constructor = transformerClass.getConstructor();
-		constructor.setAccessible(true);
-		constructor.newInstance();
-	}
 }
diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index 6bdac46..7305359 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -1,16 +1,18 @@
 package io.pzstorm.storm.util;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import io.pzstorm.storm.UnitTest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.*;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import io.pzstorm.storm.UnitTest;
 
 class AsmUtilsTest implements UnitTest {
 
@@ -25,6 +27,7 @@ class AsmUtilsTest implements UnitTest {
 	private static final AbstractInsnNode LAST_VAR_NODE = new VarInsnNode(Opcodes.ALOAD, 1);
 
 	private final InsnList instructions = createInstructionList();
+
 	private static InsnList createInstructionList() {
 
 		InsnList result = new InsnList();
@@ -100,7 +103,7 @@ void shouldCreateInstructionListFromArguments() {
 		AbstractInsnNode[] insnList = new AbstractInsnNode[instructions.size()];
 		for (int i = 0; i < instructions.size(); i++) {
 			insnList[i] = instructions.get(i);
- 		}
+		}
 		InsnList actualList = AsmUtils.createInsnList(insnList);
 		for (int i = 0; i < actualList.size(); i++) {
 			Assertions.assertEquals(instructions.get(i), actualList.get(i));
@@ -126,8 +129,8 @@ void shouldGetLastInstructionOfType() {
 	void shouldGetFirstMatchingLabelNodeInstruction() {
 
 		List<Integer[]> labelIndexPairs = ImmutableList.of(
-				new Integer[] { 0, 6 }, new Integer[] { 6, 12 },
-				new Integer[] { 12, 23 }, new Integer[] { 23, 27 }
+				new Integer[]{ 0, 6 }, new Integer[]{ 6, 12 },
+				new Integer[]{ 12, 23 }, new Integer[]{ 23, 27 }
 		);
 		for (int i1 = 0; i1 < labelIndexPairs.size(); i1++)
 		{
@@ -144,7 +147,6 @@ void shouldGetFirstMatchingLabelNodeInstruction() {
 
 	@Test
 	void shouldCompareInstructionNodeFields() {
-
 		// TODO: finish writing this test
 
 		FieldInsnNode fia = new FieldInsnNode(Opcodes.GETSTATIC, "owner", "name", "desc");
diff --git a/src/zombie/java/zombie/ZombieHello.java b/src/zombie/java/zombie/ZombieHello.java
index ebea7c0..33f1118 100644
--- a/src/zombie/java/zombie/ZombieHello.java
+++ b/src/zombie/java/zombie/ZombieHello.java
@@ -1,8 +1,8 @@
 package zombie;
 
-import io.pzstorm.storm.StormLogger;
 import org.jetbrains.annotations.TestOnly;
 
+import io.pzstorm.storm.StormLogger;
 
 @TestOnly
 @SuppressWarnings({ "unused", "WeakerAccess" })
diff --git a/src/zombie/java/zombie/ZombieUtils.java b/src/zombie/java/zombie/ZombieUtils.java
index 903f191..06e42eb 100644
--- a/src/zombie/java/zombie/ZombieUtils.java
+++ b/src/zombie/java/zombie/ZombieUtils.java
@@ -10,10 +10,8 @@ public class ZombieUtils {
 	public static void setZombieProperties(int a, boolean c) {
 
 		zombiePropertyA = a;
-
 		// inject instruction to set zombiePropertyB here
 		//zombiePropertyB = "property";
-
 		zombiePropertyC = c;
 	}
 }

From 2e95301d578d9ffcc9b00aa757102d1188638bcf Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 3 May 2021 05:41:54 +0200
Subject: [PATCH 096/323] Improve bootstrap loaded check

---
 .../io/pzstorm/storm/core/StormBootstrap.java | 19 +++++++++++++++++++
 .../pzstorm/storm/core/StormClassLoader.java  |  3 +--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index 0142261..c5fe93e 100644
--- a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -39,6 +39,13 @@ class StormBootstrap {
 	 */
 	private static final Method TRANSFORMER_INVOKER;
 
+	/**
+	 * Marks the {@code StormBoostrap} as being fully loaded. This variable will be
+	 * {@code true} when the static block has finished initializing. Required by classes
+	 * that are loaded before {@code StormBoostrap} but still depend on it.
+	 */
+	private static final boolean hasLoaded;
+
 	static
 	{
 		try {
@@ -47,6 +54,9 @@ class StormBootstrap {
 
 			TRANSFORMER_GETTER = TRANSFORMER_CLASS.getDeclaredMethod("getRegistered", String.class);
 			TRANSFORMER_INVOKER = TRANSFORMER_CLASS.getDeclaredMethod("transform", byte[].class);
+
+			// mark StormBootstrap as finished loading
+			hasLoaded = true;
 		}
 		catch (ReflectiveOperationException e) {
 			throw new RuntimeException(e);
@@ -73,4 +83,13 @@ static Object getRegisteredTransformer(String name) throws ReflectiveOperationEx
 	static byte[] invokeTransformer(Object transformer, byte[] rawClass) throws ReflectiveOperationException {
 		return (byte[]) TRANSFORMER_INVOKER.invoke(transformer, (Object) rawClass);
 	}
+
+	/**
+	 * Returns if {@code StormBoostrap} has finished loading.
+	 *
+	 * @return {@code true} if boostrap has been fully loaded.
+	 */
+	static boolean hasLoaded() {
+		return hasLoaded;
+	}
 }
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 95107a4..9ea275e 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -143,8 +143,7 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 				try {
 					byte[] input = getRawClassByteArray(name);
 
-					Class<?> transformerClass = StormBootstrap.TRANSFORMER_CLASS;
-					if (transformerClass != null)
+					if (StormBootstrap.hasLoaded())
 					{
 						Object transformer = StormBootstrap.getRegisteredTransformer(name);
 						if (transformer != null) {

From dfdaaf4d621f9fe60123c3b12238611e626797c6 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 3 May 2021 05:43:37 +0200
Subject: [PATCH 097/323] Migrate transformer registry map

---
 .../io/pzstorm/storm/core/StormBootstrap.java | 22 ++++++----
 .../storm/core/StormClassTransformer.java     | 36 +---------------
 .../storm/core/StormClassTransformers.java    | 42 +++++++++++++++++++
 .../io/pzstorm/storm/core/StormLauncher.java  |  2 +-
 4 files changed, 60 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/io/pzstorm/storm/core/StormClassTransformers.java

diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index c5fe93e..60e3461 100644
--- a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -23,10 +23,15 @@ class StormBootstrap {
 	 * to {@code AppClassLoader}. For this reason we have to use bootstrapping and reflection to
 	 * access transformers from {@code StormClassLoader}.
 	 */
-	static final Class<?> TRANSFORMER_CLASS;
+	private static final Class<?> TRANSFORMER_CLASS;
 
 	/**
-	 * Represents {@link StormClassTransformer#getRegistered(String)} method.
+	 * Loaded and initialized {@link StormClassTransformers} {@code Class}.
+	 */
+	private static final Class<?> TRANSFORMERS_CLASS;
+
+	/**
+	 * Represents {@link StormClassTransformers#getRegistered(String)} method.
 	 *
 	 * @see #getRegisteredTransformer(String)
 	 */
@@ -49,10 +54,13 @@ class StormBootstrap {
 	static
 	{
 		try {
-			String transformerClass = "io.pzstorm.storm.core.StormClassTransformer";
-			TRANSFORMER_CLASS = Class.forName(transformerClass, true, CLASS_LOADER);
-
-			TRANSFORMER_GETTER = TRANSFORMER_CLASS.getDeclaredMethod("getRegistered", String.class);
+			TRANSFORMER_CLASS = Class.forName(
+					"io.pzstorm.storm.core.StormClassTransformer", true, CLASS_LOADER
+			);
+			TRANSFORMERS_CLASS = Class.forName(
+					"io.pzstorm.storm.core.StormClassTransformers", true, CLASS_LOADER
+			);
+			TRANSFORMER_GETTER = TRANSFORMERS_CLASS.getDeclaredMethod("getRegistered", String.class);
 			TRANSFORMER_INVOKER = TRANSFORMER_CLASS.getDeclaredMethod("transform", byte[].class);
 
 			// mark StormBootstrap as finished loading
@@ -67,7 +75,7 @@ class StormBootstrap {
 	 * Returns registered instance of {@link StormClassTransformer} that matches the given name.
 	 *
 	 * @throws ReflectiveOperationException if an error occurred while invoking method.
-	 * @see StormClassTransformer#getRegistered(String)
+	 * @see StormClassTransformers#getRegistered(String)
 	 */
 	static Object getRegisteredTransformer(String name) throws ReflectiveOperationException {
 		return TRANSFORMER_GETTER.invoke(null, name);
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index 524bd42..abcf3a7 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -1,7 +1,5 @@
 package io.pzstorm.storm.core;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Optional;
 
 import org.jetbrains.annotations.Contract;
@@ -17,10 +15,7 @@
 
 /**
  * This class represents a {@code Class} transformer used to alter {@code Class}
- * bytecode using ASM. When new instance of {@code StormClassTransformer} is created
- * it is automatically mapped in internal registry. To check if transformer is registered
- * use {@link #isRegistered(String)} and to retrieve a mapped instance use {@link #getRegistered(String)}.
- * The transformation process calls the following method in fixed order:
+ * bytecode using ASM. The transformation process calls the following method in fixed order:
  * <ul>
  * <li>{@link #read(byte[])} to read given byte array with {@link ClassReader}.</li>
  * <li>{@link #visit()} to use the visitation system to parse the class with visitor.</li>
@@ -28,16 +23,8 @@
  * <li>{@link #write()} to write the class using {@link ClassWriter}</li>
  * </ul>
  */
-@SuppressWarnings("WeakerAccess")
 public abstract class StormClassTransformer {
 
-	/**
-	 * Internal registry of created transformers. This map is checked for entries
-	 * by {@link StormClassLoader} when loading classes and invokes the transformation
-	 * chain of methods to transform the class before defining it via JVM.
-	 */
-	private static final Map<String, StormClassTransformer> TRANSFORMERS = new HashMap<>();
-
 	protected final String className;
 	protected final ClassNode visitor;
 	private @Nullable ClassReader classReader;
@@ -46,31 +33,12 @@ public abstract class StormClassTransformer {
 
 		this.className = className;
 		this.visitor = visitor;
-
-		TRANSFORMERS.put(className, this);
 	}
 
 	StormClassTransformer(String className) {
 		this(className, new ClassNode());
 	}
 
-	/**
-	 * Returns {@code true} if transformer with given name is registered.
-	 */
-	static boolean isRegistered(String name) {
-		return TRANSFORMERS.containsKey(name);
-	}
-
-	/**
-	 * Returns registered instance of {@link StormClassTransformer} that matches the given name.
-	 *
-	 * @return {@code StormClassTransformer} or {@code null} if no registered instance found.
-	 */
-	@Contract(pure = true)
-	public static @Nullable StormClassTransformer getRegistered(String className) {
-		return TRANSFORMERS.getOrDefault(className, null);
-	}
-
 	/**
 	 * Returns list of instructions for method that matches given parameters.
 	 *
@@ -82,7 +50,7 @@ static boolean isRegistered(String name) {
 	 * 		ASM User Guide - Method descriptors</a>
 	 */
 	@Contract(pure = true)
-	final InsnList getInstructionsForMethod(String name, String descriptor) {
+	public final InsnList getInstructionsForMethod(String name, String descriptor) {
 
 		if (classReader != null)
 		{
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
new file mode 100644
index 0000000..05a760a
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -0,0 +1,42 @@
+package io.pzstorm.storm.core;
+
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class defines, initializes and stores {@link StormClassTransformer} instances.
+ * <ul>
+ * <li>Check if transformer is registered by calling {@link #isRegistered(String)}.</li>
+ * <li>Retrieve a mapped instance of registered transformer by calling {@link #getRegistered(String)}</li>
+ * </ul>
+ */
+public class StormClassTransformers {
+
+	/**
+	 * Internal registry of created transformers. This map is checked for entries
+	 * by {@link StormClassLoader} when loading classes and invokes the transformation
+	 * chain of methods to transform the class before defining it via JVM.
+	 */
+	private static final Map<String, StormClassTransformer> TRANSFORMERS = new HashMap<>();
+
+
+	/**
+	 * Returns {@code true} if transformer with given name is registered.
+	 */
+	static boolean isRegistered(String name) {
+		return TRANSFORMERS.containsKey(name);
+	}
+
+	/**
+	 * Returns registered instance of {@link StormClassTransformer} that matches the given name.
+	 *
+	 * @return {@code StormClassTransformer} or {@code null} if no registered instance found.
+	 */
+	@Contract(pure = true)
+	public static @Nullable StormClassTransformer getRegistered(String className) {
+		return TRANSFORMERS.getOrDefault(className, null);
+	}
+}
diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 0ae7bab..773a17e 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -30,7 +30,7 @@ public static void main(String[] args) throws ReflectiveOperationException {
 		StormLogger.debug("Preparing to launch Project Zomboid");
 
 		StormClassLoader classLoader = StormBootstrap.CLASS_LOADER;
-		Class.forName("io.pzstorm.storm.core.StormEventHooks", true, classLoader);
+		Class.forName("io.pzstorm.storm.core.StormClassTransformers", true, classLoader);
 
 		Class<?> entryPointClass = classLoader.loadClass(ZOMBOID_ENTRY_POINT_CLASS);
 		Method entryPoint = entryPointClass.getMethod(ZOMBOID_ENTRY_POINT, String[].class);

From edc172f5c5f21cdf4501fda7c856b29ffa9a4156 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 5 May 2021 18:15:59 +0200
Subject: [PATCH 098/323] Bump capsid version number

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d290ecb..558d069 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ import io.pzstorm.capsid.setup.xml.LaunchRunConfig
 import io.pzstorm.capsid.setup.VmParameter
 
 plugins {
-	id 'io.pzstorm.capsid' version '0.3.0'
+	id 'io.pzstorm.capsid' version '0.4.0'
 
 	// Plugin that keeps your code spotless with Gradle
 	// https://plugins.gradle.org/plugin/com.diffplug.spotless

From bac3ae7e69a5c0ee0ccd4b1197abf1e301b806d3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 5 May 2021 18:16:10 +0200
Subject: [PATCH 099/323] Update build.gradle script

---
 build.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 558d069..e490c0b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,7 +84,7 @@ test {
 	testLogging.events "passed", "skipped", "failed"
 }
 
-tasks.createLaunchRunConfigs.configure {
+tasks.createRunConfigurations.configure {
 	actions.clear()
 	doLast {
 		def vmParameterBuilder = new VmParameter.Builder()
@@ -96,11 +96,12 @@ tasks.createLaunchRunConfigs.configure {
 		}
 		//@formatter:off
 		LaunchRunConfig launchStorm = new LaunchRunConfig(
-				"Launch Storm", "io.pzstorm.storm.StormLauncher",
-				vmParameterBuilder.build(), [
+				"Launch Storm", "io.pzstorm.storm.core.StormLauncher",
+				vmParameterBuilder, [
 						Main: new File(file(gameDir), "logs/storm/main.log").toPath() ,
 						Debug: new File(file(gameDir), "logs/storm/debug.log").toPath()] as Map
 		)//@formatter:on
+		launchStorm.vmParamBuilder.build()
 		launchStorm.configure(getProject()).writeToFile()
 	}
 }

From 2f3c752ece3c1f2287e89bee098e3b42691eedfd Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 5 May 2021 18:23:14 +0200
Subject: [PATCH 100/323] Remove distribution run configurations

Run configurations are generated by Capsid since v0.4.0:

- https://github.com/pzstorm/capsid/issues/7
- https://github.com/pzstorm/capsid/issues/8
---
 .../runConfigurations/decompileZomboid.xml    | 25 -----------------
 .../.idea/runConfigurations/initializeMod.xml | 26 ------------------
 .../.idea/runConfigurations/runZomboidDoc.xml | 25 -----------------
 .../runConfigurations/setupWorkspace.xml      | 27 -------------------
 4 files changed, 103 deletions(-)
 delete mode 100644 src/main/dist/.idea/runConfigurations/decompileZomboid.xml
 delete mode 100644 src/main/dist/.idea/runConfigurations/initializeMod.xml
 delete mode 100644 src/main/dist/.idea/runConfigurations/runZomboidDoc.xml
 delete mode 100644 src/main/dist/.idea/runConfigurations/setupWorkspace.xml

diff --git a/src/main/dist/.idea/runConfigurations/decompileZomboid.xml b/src/main/dist/.idea/runConfigurations/decompileZomboid.xml
deleted file mode 100644
index d1dd6a8..0000000
--- a/src/main/dist/.idea/runConfigurations/decompileZomboid.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="decompileZomboid" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="decompileZomboid" />
-          <option value="zomboidJar" />
-          <option value="zomboidSourcesJar" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/src/main/dist/.idea/runConfigurations/initializeMod.xml b/src/main/dist/.idea/runConfigurations/initializeMod.xml
deleted file mode 100644
index 7eb4805..0000000
--- a/src/main/dist/.idea/runConfigurations/initializeMod.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="initializeMod" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list />
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2">
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="initLocalProperties" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="initModInfo" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="createModStructure" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="applyModTemplate" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/src/main/dist/.idea/runConfigurations/runZomboidDoc.xml b/src/main/dist/.idea/runConfigurations/runZomboidDoc.xml
deleted file mode 100644
index 42f41db..0000000
--- a/src/main/dist/.idea/runConfigurations/runZomboidDoc.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="runZomboidDoc" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="annotateZomboidLua" />
-          <option value="compileZomboidLua" />
-          <option value="zomboidLuaJar" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/src/main/dist/.idea/runConfigurations/setupWorkspace.xml b/src/main/dist/.idea/runConfigurations/setupWorkspace.xml
deleted file mode 100644
index f03f7f6..0000000
--- a/src/main/dist/.idea/runConfigurations/setupWorkspace.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="setupWorkspace" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list />
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2">
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="createLaunchRunConfigs" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="createModSearchScopes" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="createDiscordIntegration" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="decompileZomboid" run_configuration_type="GradleRunConfiguration" />
-      <option name="RunConfigurationTask" enabled="true" run_configuration_name="runZomboidDoc" run_configuration_type="GradleRunConfiguration" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file

From b22ccc8852afb82615ba3e447f7800b9af163764 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 6 May 2021 15:58:25 +0200
Subject: [PATCH 101/323] Create StormUtils utility class

---
 src/main/java/io/pzstorm/storm/util/StormUtils.java | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/util/StormUtils.java

diff --git a/src/main/java/io/pzstorm/storm/util/StormUtils.java b/src/main/java/io/pzstorm/storm/util/StormUtils.java
new file mode 100644
index 0000000..c35eac9
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/util/StormUtils.java
@@ -0,0 +1,5 @@
+package io.pzstorm.storm.util;
+
+public class StormUtils {
+
+}

From bc505401c59acc7f7bcf4a2abd749ecd303f2798 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 6 May 2021 15:58:48 +0200
Subject: [PATCH 102/323] Add invokeRestrictedMethod utility method

---
 .../io/pzstorm/storm/util/StormUtils.java     | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/util/StormUtils.java b/src/main/java/io/pzstorm/storm/util/StormUtils.java
index c35eac9..33e29d8 100644
--- a/src/main/java/io/pzstorm/storm/util/StormUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/StormUtils.java
@@ -1,5 +1,35 @@
 package io.pzstorm.storm.util;
 
+import io.pzstorm.storm.StormLogger;
+
+import java.lang.reflect.Method;
+
 public class StormUtils {
 
+	/**
+	 * Invokes the given inaccessible {@code Method} without leaving method accessible.
+	 * After the method was invoked the {@code accessible} flag will be set to it's original state.
+	 *
+	 * @param method inaccessible {@code Method} to invoke.
+	 * @param obj the object the underlying method is invoked from.
+	 * @param args the arguments used for the method call.
+	 *
+	 * @throws ReflectiveOperationException if an exception occurred while invoking method.
+	 */
+	public static void invokeRestrictedMethod(Method method, Object obj, Object...args) throws ReflectiveOperationException {
+
+		boolean wasAccessible = false;
+		if (method.isAccessible())
+		{
+			StormLogger.warn("Calling 'invokeRestrictedMethod' to invoker accessible method.");
+			wasAccessible = true;
+		}
+		else method.setAccessible(true);
+
+		method.invoke(obj, args);
+		// set accessibility state to original
+		if (!wasAccessible) {
+			method.setAccessible(false);
+		}
+	}
 }

From c4f26727d25f5c08ac1e54281af19c77a57c28d3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 6 May 2021 16:00:13 +0200
Subject: [PATCH 103/323] Test invoking restricted methods

---
 .../io/pzstorm/storm/util/StormUtilsTest.java | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/util/StormUtilsTest.java

diff --git a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
new file mode 100644
index 0000000..69098e7
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
@@ -0,0 +1,34 @@
+package io.pzstorm.storm.util;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.Method;
+
+class StormUtilsTest {
+
+	private boolean hasInvokedRestrictedMethod = false;
+
+	@Test
+	void shouldResetAccessibilityAfterInvokingRestrictedMethod() throws ReflectiveOperationException {
+
+		Method method = StormUtilsTest.class.getDeclaredMethod("inaccessibleMethod", String.class, Integer.class);
+
+		Assertions.assertFalse(method.isAccessible());
+		StormUtils.invokeRestrictedMethod(method, this, "sample", 0);
+		Assertions.assertFalse(method.isAccessible());
+	}
+
+	@Test
+	void shouldInvokeRestrictedMethod() throws ReflectiveOperationException {
+
+		Method method = StormUtilsTest.class.getDeclaredMethod("inaccessibleMethod", String.class, Integer.class);
+
+		StormUtils.invokeRestrictedMethod(method, this, "sample", 0);
+		Assertions.assertTrue(hasInvokedRestrictedMethod);
+	}
+
+	private void inaccessibleMethod(String arg1, Integer arg2) {
+		hasInvokedRestrictedMethod = true;
+	}
+}

From 5c3878858751d3e0de6bb3e09dc40ed10f69d712 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 00:17:17 +0200
Subject: [PATCH 104/323] Clean StormClassTransformers class

---
 .../storm/core/StormClassTransformers.java      | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index 05a760a..3a4ce00 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -1,18 +1,18 @@
 package io.pzstorm.storm.core;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.HashMap;
-import java.util.Map;
+import io.pzstorm.storm.hook.StormHook;
 
 /**
  * This class defines, initializes and stores {@link StormClassTransformer} instances.
- * <ul>
- * <li>Check if transformer is registered by calling {@link #isRegistered(String)}.</li>
- * <li>Retrieve a mapped instance of registered transformer by calling {@link #getRegistered(String)}</li>
- * </ul>
+ * To retrieve a mapped instance of registered transformer call {@link #getRegistered(String)}.
  */
+@SuppressWarnings("WeakerAccess")
 public class StormClassTransformers {
 
 	/**
@@ -23,11 +23,6 @@ public class StormClassTransformers {
 	private static final Map<String, StormClassTransformer> TRANSFORMERS = new HashMap<>();
 
 
-	/**
-	 * Returns {@code true} if transformer with given name is registered.
-	 */
-	static boolean isRegistered(String name) {
-		return TRANSFORMERS.containsKey(name);
 	}
 
 	/**

From c2f8f6f8ea696af7541015e874d8df1df5765488 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 00:30:54 +0200
Subject: [PATCH 105/323] Create StormHook interface class

---
 .../java/io/pzstorm/storm/hook/StormHook.java | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/hook/StormHook.java

diff --git a/src/main/java/io/pzstorm/storm/hook/StormHook.java b/src/main/java/io/pzstorm/storm/hook/StormHook.java
new file mode 100644
index 0000000..6d4daba
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/hook/StormHook.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.hook;
+
+import io.pzstorm.storm.core.StormClassTransformer;
+import io.pzstorm.storm.event.StormEventDispatcher;
+import io.pzstorm.storm.event.ZomboidEvent;
+
+/**
+ * This interface represents a hook in game code that creates an instance of {@link ZomboidEvent}
+ * and calls {@link StormEventDispatcher}. The dispatcher then forwards the event to all registered
+ * methods that have subscribed to event in context. Hooks are only intended for <b>internal</b> use
+ * to generate and send events from game code.
+ *
+ * @see StormEventDispatcher#dispatchEvent(ZomboidEvent)
+ */
+public interface StormHook {
+
+	/**
+	 * Use the given transformer to install {@link StormHook} in game code. The installation is
+	 * done by altering method bytecode with the use of ASM to create an instance of {@link ZomboidEvent}
+	 * and create a direct callback to {@link StormEventDispatcher} class. Note that the transformers
+	 * used to install hooks need to be registered in the static block of {@link StormClassTransformer}.
+	 *
+	 * @param transformer {@link StormClassTransformer} to use to install the hook.
+	 */
+	void installHook(StormClassTransformer transformer);
+}

From 8f4011a24fbd0410c1b7d9903a33e42bc78f03c9 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 15:57:24 +0200
Subject: [PATCH 106/323] Create method to register transformers

---
 .../storm/core/StormClassTransformers.java      | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index 3a4ce00..2813d93 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -22,7 +22,24 @@ public class StormClassTransformers {
 	 */
 	private static final Map<String, StormClassTransformer> TRANSFORMERS = new HashMap<>();
 
+	/**
+	 * Create and register a new {@link StormClassTransformer} with given name
+	 * that installs a {@link StormHook} designated by method parameter.
+	 *
+	 * @param className name of the target class to transform.
+	 * @param hook {@link StormHook} to install with transformation.
+	 */
+	private static void registerTransformer(String className, StormHook hook) {
+
+		TRANSFORMERS.put(className, new StormClassTransformer(className) {
+
+			@Override
+			StormClassTransformer transform() {
 
+				hook.installHook(this);
+				return this;
+			}
+		});
 	}
 
 	/**

From f49e5b6a4895a130c6bf80a97489e1baecc98f82 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 16:49:47 +0200
Subject: [PATCH 107/323] Add getClassAsPath utility method

---
 .../java/io/pzstorm/storm/util/StormUtils.java     | 14 ++++++++++++--
 .../java/io/pzstorm/storm/util/StormUtilsTest.java | 11 +++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/util/StormUtils.java b/src/main/java/io/pzstorm/storm/util/StormUtils.java
index 33e29d8..f82ee1f 100644
--- a/src/main/java/io/pzstorm/storm/util/StormUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/StormUtils.java
@@ -1,11 +1,21 @@
 package io.pzstorm.storm.util;
 
-import io.pzstorm.storm.StormLogger;
-
 import java.lang.reflect.Method;
 
+import io.pzstorm.storm.StormLogger;
+
 public class StormUtils {
 
+	/**
+	 * Returns a path representation of the name for given {@code Class}.
+	 *
+	 * @param clazz {@code Class} whose name should be converted to path.
+	 * @return {@code String} representing a path.
+	 */
+	public static String getClassAsPath(Class<?> clazz) {
+		return clazz.getName().replace('.', '/');
+	}
+
 	/**
 	 * Invokes the given inaccessible {@code Method} without leaving method accessible.
 	 * After the method was invoked the {@code accessible} flag will be set to it's original state.
diff --git a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
index 69098e7..02add2a 100644
--- a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
@@ -1,14 +1,21 @@
 package io.pzstorm.storm.util;
 
+import java.lang.reflect.Method;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.Method;
-
 class StormUtilsTest {
 
 	private boolean hasInvokedRestrictedMethod = false;
 
+	@Test
+	void shouldGetClassAsCorrectPath() {
+
+		String expected = "io/pzstorm/storm/util/StormUtilsTest";
+		Assertions.assertEquals(expected, StormUtils.getClassAsPath(StormUtilsTest.class));
+	}
+
 	@Test
 	void shouldResetAccessibilityAfterInvokingRestrictedMethod() throws ReflectiveOperationException {
 

From e1069c3dfb73e0d616133636438361f6e7d40824 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 16:53:33 +0200
Subject: [PATCH 108/323] Create ZomboidEvent interface class

---
 .../io/pzstorm/storm/event/ZomboidEvent.java     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/event/ZomboidEvent.java

diff --git a/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java b/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
new file mode 100644
index 0000000..3626081
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
@@ -0,0 +1,16 @@
+package io.pzstorm.storm.event;
+
+import io.pzstorm.storm.hook.StormHook;
+
+/**
+ * This class represents game events recognized by Storm. These events are created by installed
+ * {@link StormHook}s and included as a method parameter in a callback to {@link StormEventDispatcher}.
+ * They are then dispatched to all methods that subscribe to those specific events.
+ */
+public interface ZomboidEvent {
+
+	/**
+	 * Returns a readable name that identifies this event.
+	 */
+	String getName();
+}

From 2ccd9fd4e6c55f1b704c698f218ce5ca05c07444 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 18:02:17 +0200
Subject: [PATCH 109/323] Create SubscribeEvent interface class

---
 .../io/pzstorm/storm/event/SubscribeEvent.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/event/SubscribeEvent.java

diff --git a/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java b/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
new file mode 100644
index 0000000..168d793
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
@@ -0,0 +1,18 @@
+package io.pzstorm.storm.event;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation is used to subscribe methods to {@link ZomboidEvent} types. Methods are registered
+ * in bulk via event handler classes. To register an event handler call an appropriate class in
+ * {@link StormEventDispatcher}. Once the event handler has been registered all methods belonging to
+ * the event handler annotated with {@link SubscribeEvent} will be subscribed to events they specify
+ * as method parameters. Read more about this process in {@link StormEventDispatcher} class documentation.
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SubscribeEvent {
+}

From eebf92dad9c3caf5d15e183931c7902e37b661c8 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 18:03:05 +0200
Subject: [PATCH 110/323] Implement Storm event dispatcher

---
 .../storm/event/StormEventDispatcher.java     | 200 ++++++++++++++++++
 1 file changed, 200 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java

diff --git a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
new file mode 100644
index 0000000..b8df451
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
@@ -0,0 +1,200 @@
+package io.pzstorm.storm.event;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.LabelNode;
+import org.objectweb.asm.tree.MethodInsnNode;
+import io.pzstorm.storm.hook.StormHook;
+
+import com.google.common.collect.Sets;
+
+import io.pzstorm.storm.StormLogger;
+
+/**
+ * This class is responsible for registering event handlers and dispatching {@link ZomboidEvent} instances.
+ * <p>
+ * To register an event handler call one of the following methods:
+ * </p><ul>
+ * <li>{@link #registerEventHandler(Object)} - when subscribed methods are instance methods.</li>
+ * <li>{@link #registerEventHandler(Class)} - when subscribed methods are static methods.</li>
+ * </ul>
+ * All methods in registered event handlers annotated with {@link SubscribeEvent} will be called
+ * by {@link #dispatchEvent(ZomboidEvent)} method when an appropriate event is created by installed
+ * {@link StormHook}. Each subscribed method has to have exactly one parameter that matches the type
+ * of event it wants to subscribe to. For example if a method wanted to subscribe to {@code OnRenderEvent}
+ * it would define itself in one of two ways depending on the handler registration method used:
+ * <br><br><pre>
+ *     // handler must be registered as a class
+ *     public static void handleRenderEvent(OnRenderEvent event) {
+ *         ...
+ *     }
+ *     // handler must be registered as an instance
+ *     public void handleRenderEvent(OnRenderEvent event) {
+ *         ...
+ *     }
+ * </pre>
+ * Do not mix static and instance subscribed methods. A registered handler has to have all
+ * subscribed methods declared as either static or instance methods depending on the method used
+ * to register the handler.
+ */
+@SuppressWarnings({ "unused", "WeakerAccess" })
+public class StormEventDispatcher {
+
+	/**
+	 * Internal registry that maps {@link ZomboidEvent} classes to handler methods.
+	 * These methods are then invoked when dispatching matching events.
+	 */
+	private static final Map<Class<? extends ZomboidEvent>, Set<EventHandlerMethod>> DISPATCH_REGISTRY = new HashMap<>();
+
+	/**
+	 * Internally register given method for specified event handler.
+	 *
+	 * @param method {@code Method} to register with event handler.
+	 * @param handler event handler to register along with {@code Method}. It can be either an
+	 * 		instance of an object or a {@code Class} that represents the handler.
+	 * @throws IllegalArgumentException if the given {@code Method} does not have exactly one argument,
+	 * 		or the argument is not an instance of {@link ZomboidEvent}.
+	 */
+	@SuppressWarnings("unchecked")
+	private static void registerEventHandlerMethod(Method method, @Nullable Object handler) {
+
+		if (method.isAnnotationPresent(SubscribeEvent.class))
+		{
+			Class<?>[] parameters = method.getParameterTypes();
+			if (parameters.length == 1)
+			{
+				Class<?> cEventClass = parameters[0];
+				if (ZomboidEvent.class.isAssignableFrom(cEventClass))
+				{
+					Class<? extends ZomboidEvent> eventClass = (Class<? extends ZomboidEvent>) cEventClass;
+					EventHandlerMethod eventHandlerMethod = new EventHandlerMethod(method, handler);
+
+					Set<EventHandlerMethod> handlerMethods = DISPATCH_REGISTRY.get(eventClass);
+					if (handlerMethods == null) {
+						DISPATCH_REGISTRY.put(eventClass, Sets.newHashSet(eventHandlerMethod));
+					}
+					else handlerMethods.add(eventHandlerMethod);
+				}
+				else {
+					String className = handler instanceof Class ? ((Class<?>) handler).getName() :
+							(handler != null ? handler.getClass().getName() : "null");
+
+					String text = "Invalid arguments for method %s(%s). Expected ZomboidEvent but found %s";
+					throw new IllegalArgumentException(String.format(
+							text, method.getName(), className, cEventClass.getName()));
+				}
+			}
+			else {
+				String className = handler instanceof Class ? ((Class<?>) handler).getName() :
+						(handler != null ? handler.getClass().getName() : "null");
+
+				String text = "Invalid arguments for method %s(%s). Expected exactly one argument but found %d";
+				throw new IllegalArgumentException(String.format(text, method.getName(), className, parameters.length));
+			}
+		}
+	}
+
+	/**
+	 * Register all <b>static</b> methods subscribed with {@link SubscribeEvent} annotation in the given
+	 * {@code Class} to dispatch registry. The registered methods will then be called by dispatched whenever
+	 * an event they are subscribed to fires. Note that the methods have to be properly defined see
+	 * {@link StormEventDispatcher} class documentation for more information.
+	 *
+	 * @param handlerClass {@code Class} of the event handler to register.
+	 * @see #registerEventHandler(Object)
+	 */
+	public static void registerEventHandler(Class<?> handlerClass) {
+
+		StormLogger.debug("Registering event handler for class " + handlerClass.getName());
+		for (Method method : handlerClass.getMethods()) {
+			registerEventHandlerMethod(method, null);
+		}
+	}
+
+	/**
+	 * Register all <b>instance</b> methods subscribed with {@link SubscribeEvent} annotation in the given
+	 * object instance to dispatch registry. The registered methods will then be called by dispatched whenever
+	 * an event they are subscribed to fires. Note that the methods have to be properly defined see
+	 * {@link StormEventDispatcher} class documentation for more information.
+	 *
+	 * @param handler instance of the event handler to register.
+	 * @see #registerEventHandler(Class)
+	 */
+	public static void registerEventHandler(Object handler) {
+
+		StormLogger.debug("Registering event handler for instance of class " + handler.getClass().getName());
+		for (Method method : handler.getClass().getMethods()) {
+			registerEventHandlerMethod(method, handler);
+		}
+	}
+
+	/**
+	 * Create and return a list of instructions that calls {@link #dispatchEvent(ZomboidEvent)} method.
+	 * This is a convenience method intended to be used <b>only</b> by {@link StormHook} implementations to
+	 * get a list of instructions that represents a dispatch call for given event.
+	 *
+	 * @param eventConstructorInsn list of instructions that represent constructing a new
+	 *        {@link ZomboidEvent} instance and adding the result to the stack. These instructions
+	 * 		will be <i>transferred</i> to the start of the resulting instruction list.
+	 * @see #dispatchEvent(ZomboidEvent)
+	 */
+	public static InsnList callDispatchEvent(List<AbstractInsnNode> eventConstructorInsn) {
+
+		InsnList result = new InsnList();
+		if (!LabelNode.class.isAssignableFrom(eventConstructorInsn.get(0).getClass())) {
+			result.add(new LabelNode());
+		}
+		for (AbstractInsnNode constructorInsn : eventConstructorInsn) {
+			result.add(constructorInsn);
+		}
+		result.add(new MethodInsnNode(
+				Opcodes.INVOKESTATIC, "io/pzstorm/storm/event/StormEventDispatcher",
+				"dispatchEvent", "(Lio/pzstorm/storm/event/ZomboidEvent;)V"
+		));
+		return result;
+	}
+
+	/**
+	 * Dispatch the given event to all methods registered in dispatch registry. This is an internal
+	 * method <b>only</b> called by {@link StormHook} implementations installed in game code.
+	 *
+	 * @param event {@link ZomboidEvent} to dispatch.
+	 * @see #callDispatchEvent(List)
+	 */
+	public static void dispatchEvent(ZomboidEvent event) {
+
+		for (EventHandlerMethod handler : DISPATCH_REGISTRY.get(event.getClass())) {
+			handler.invoke(event);
+		}
+	}
+
+	private static class EventHandlerMethod {
+
+		private final Method method;
+		private final @Nullable Object handler;
+
+		private EventHandlerMethod(Method method, @Nullable Object handler) {
+
+			this.method = method;
+			this.handler = handler;
+		}
+
+		private void invoke(ZomboidEvent event) {
+
+			try {
+				method.invoke(handler, event);
+			}
+			catch (ReflectiveOperationException e) {
+				throw new RuntimeException(e);
+			}
+		}
+	}
+}

From 91fde4fedd26e7b9b4648fabeaee74b33344352d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 18:08:53 +0200
Subject: [PATCH 111/323] Add first zomboid render events

---
 .../storm/event/OnMainScreenRenderEvent.java  | 21 ++++++++++++++
 .../event/OnUIElementPreRenderEvent.java      | 28 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
 create mode 100644 src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java

diff --git a/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java b/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
new file mode 100644
index 0000000..488fde1
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
@@ -0,0 +1,21 @@
+package io.pzstorm.storm.event;
+
+import zombie.gameStates.MainScreenState;
+
+/**
+ * This event fires on each tick when the main screen is being rendered.
+ *
+ * @see MainScreenState#render()
+ */
+public class OnMainScreenRenderEvent implements ZomboidEvent {
+
+	@Override
+	public String getName() {
+		return "onMainScreenRender";
+	}
+
+	@Override
+	public String toString() {
+		return getName();
+	}
+}
diff --git a/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java b/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
new file mode 100644
index 0000000..fd2c3a6
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
@@ -0,0 +1,28 @@
+package io.pzstorm.storm.event;
+
+import zombie.ui.UIElement;
+
+/**
+ * This event fires when an {@link UIElement} is being pre-rendered.
+ *
+ * @see UIElement#render()
+ */
+@SuppressWarnings("WeakerAccess")
+public class OnUIElementPreRenderEvent implements ZomboidEvent {
+
+	public final UIElement element;
+
+	public OnUIElementPreRenderEvent(UIElement element) {
+		this.element = element;
+	}
+
+	@Override
+	public String getName() {
+		return "onUIElementPreRender";
+	}
+
+	@Override
+	public String toString() {
+		return getName();
+	}
+}

From d139b3e8e553daeeafaaba81750c29c1ed2e9222 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 18:15:19 +0200
Subject: [PATCH 112/323] Add first render event hooks

---
 .../storm/hook/OnMainScreenRenderHook.java    | 41 ++++++++++++++
 .../storm/hook/OnUIElementPreRenderHook.java  | 56 +++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
 create mode 100644 src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java

diff --git a/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java b/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
new file mode 100644
index 0000000..856e8f1
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
@@ -0,0 +1,41 @@
+package io.pzstorm.storm.hook;
+
+import com.google.common.collect.ImmutableList;
+import io.pzstorm.storm.core.StormClassTransformer;
+import io.pzstorm.storm.event.OnMainScreenRenderEvent;
+import io.pzstorm.storm.event.StormEventDispatcher;
+import io.pzstorm.storm.util.AsmUtils;
+import io.pzstorm.storm.util.StormUtils;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
+public class OnMainScreenRenderHook implements StormHook {
+
+	@Override
+	public void installHook(StormClassTransformer transformer) {
+
+		// public void render()
+		InsnList instructions = transformer.getInstructionsForMethod("render", "()V");
+		String eventDescriptor = StormUtils.getClassAsPath(OnMainScreenRenderEvent.class);
+
+		// new OnMainScreenRenderEvent()
+		InsnList dispatchOnRenderEvent = StormEventDispatcher.callDispatchEvent(ImmutableList.of(
+				new TypeInsnNode(Opcodes.NEW, eventDescriptor), new InsnNode(Opcodes.DUP),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL, eventDescriptor, "<init>", "()V")
+		));
+		// ...
+		// -> insert <-
+		// Core.getInstance().EndFrameUI();
+		// ...
+		LabelNode target = AsmUtils.getFirstMatchingLabelNode(instructions, ImmutableList.of(
+				// INVOKESTATIC zombie/core/Core.getInstance ()Lzombie/core/Core;
+				new MethodInsnNode(Opcodes.INVOKESTATIC,
+						"zombie/core/Core", "getInstance", "()Lzombie/core/Core;"
+				),
+				// INVOKEVIRTUAL zombie/core/Core.EndFrameUI ()V
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL,
+						"zombie/core/Core", "EndFrameUI", "()V"))
+		);
+		instructions.insertBefore(target, dispatchOnRenderEvent);
+	}
+}
diff --git a/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java b/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
new file mode 100644
index 0000000..92a6e3e
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
@@ -0,0 +1,56 @@
+package io.pzstorm.storm.hook;
+
+import com.google.common.collect.ImmutableList;
+import io.pzstorm.storm.core.StormClassTransformer;
+import io.pzstorm.storm.event.OnUIElementPreRenderEvent;
+import io.pzstorm.storm.event.StormEventDispatcher;
+import io.pzstorm.storm.util.AsmUtils;
+import io.pzstorm.storm.util.StormUtils;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
+public class OnUIElementPreRenderHook implements StormHook {
+
+	@Override
+	public void installHook(StormClassTransformer transformer) {
+
+		// public void render()
+		InsnList instructions = transformer.getInstructionsForMethod("render", "()V");
+		String eventDescriptor = StormUtils.getClassAsPath(OnUIElementPreRenderEvent.class);
+
+		// new OnUIElementPreRenderEvent(UIElement)
+		InsnList dispatchOnUIElementPreRenderEvent = StormEventDispatcher.callDispatchEvent(ImmutableList.of(
+				new TypeInsnNode(Opcodes.NEW, eventDescriptor),
+				new InsnNode(Opcodes.DUP), new VarInsnNode(Opcodes.ALOAD, 0),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL,
+						eventDescriptor, "<init>", "(Lzombie/ui/UIElement;)V")
+		));
+		// ...
+		// LuaManager.caller.pcallvoid(UIManager.getDefaultThread(), this.getTable().rawget("prerender"), this.table);
+		// -> insert <-
+		// ...
+		LabelNode callPrerender = AsmUtils.getFirstMatchingLabelNode(instructions, ImmutableList.of(
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "caller",
+						"Lse/krka/kahlua/integration/LuaCaller;"
+				),
+				new MethodInsnNode(Opcodes.INVOKESTATIC, "zombie/ui/UIManager", "getDefaultThread",
+						"()Lse/krka/kahlua/vm/KahluaThread;"
+				),
+				new VarInsnNode(Opcodes.ALOAD, 0),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/ui/UIElement", "getTable",
+						"()Lse/krka/kahlua/vm/KahluaTable;"
+				),
+				new LdcInsnNode("prerender"),
+				new MethodInsnNode(Opcodes.INVOKEINTERFACE, "se/krka/kahlua/vm/KahluaTable", "rawget",
+								"(Ljava/lang/Object;)Ljava/lang/Object;", true
+				),
+				new VarInsnNode(Opcodes.ALOAD, 0),
+				new FieldInsnNode(Opcodes.GETFIELD, "zombie/ui/UIElement", "table",
+						"Lse/krka/kahlua/vm/KahluaTable;"
+				),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "se/krka/kahlua/integration/LuaCaller", "pcallvoid",
+						"(Lse/krka/kahlua/vm/KahluaThread;Ljava/lang/Object;Ljava/lang/Object;)V"))
+		);
+		instructions.insert(callPrerender, dispatchOnUIElementPreRenderEvent);
+	}
+}

From f3461c54858702f54fc7dbb60fac7d9af7bff145 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 18:15:58 +0200
Subject: [PATCH 113/323] Register transformers that install hooks

---
 .../io/pzstorm/storm/core/StormClassTransformers.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index 2813d93..0905d59 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -6,6 +6,8 @@
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
+import io.pzstorm.storm.hook.OnMainScreenRenderHook;
+import io.pzstorm.storm.hook.OnUIElementPreRenderHook;
 import io.pzstorm.storm.hook.StormHook;
 
 /**
@@ -22,6 +24,12 @@ public class StormClassTransformers {
 	 */
 	private static final Map<String, StormClassTransformer> TRANSFORMERS = new HashMap<>();
 
+	static
+	{
+		registerTransformer("zombie.gameStates.MainScreenState", new OnMainScreenRenderHook());
+		registerTransformer("zombie.ui.UIElement", new OnUIElementPreRenderHook());
+	}
+
 	/**
 	 * Create and register a new {@link StormClassTransformer} with given name
 	 * that installs a {@link StormHook} designated by method parameter.

From 1a6bba2b7d6f296b728736bb20426b654ec162a3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 19:22:19 +0200
Subject: [PATCH 114/323] Create StormEventHandler class

---
 .../io/pzstorm/storm/event/StormEventHandler.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/event/StormEventHandler.java

diff --git a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
new file mode 100644
index 0000000..4292e55
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.event;
+
+/**
+ * This class responds to all events needed for Storm to implement custom features.
+ * Note that not all functionality implementations that are weaved into game bytecode is handled here.
+ * Sometimes subscribing to events is not enough to alter game behavior and more invasive
+ * actions need to be preformed, like editing or removing lines from game code.
+ */
+public class StormEventHandler {
+
+}

From c2328fa5167eaf7fcfbb159722a3985979664643 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 19:22:50 +0200
Subject: [PATCH 115/323] Implement render event handlers

---
 .../storm/event/StormEventHandler.java        | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
index 4292e55..7e2f54b 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
+++ b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
@@ -1,5 +1,11 @@
 package io.pzstorm.storm.event;
 
+import se.krka.kahlua.j2se.KahluaTableImpl;
+import se.krka.kahlua.vm.KahluaTable;
+import zombie.core.Core;
+import zombie.ui.TextManager;
+import zombie.ui.UIFont;
+
 /**
  * This class responds to all events needed for Storm to implement custom features.
  * Note that not all functionality implementations that are weaved into game bytecode is handled here.
@@ -8,4 +14,26 @@
  */
 public class StormEventHandler {
 
+	@SubscribeEvent
+	public static void handleRenderEvent(OnMainScreenRenderEvent event) {
+	}
+
+	@SubscribeEvent
+	public static void handleUIElementRenderEvent(OnUIElementPreRenderEvent event) {
+
+		if (event.element.Parent != null)
+		{
+			KahluaTable table = event.element.Parent.table;
+			if (table instanceof KahluaTableImpl)
+			{
+				Object internal = ((KahluaTableImpl)table).delegate.get("internal");
+				if (internal instanceof String && internal.equals("VERSIONDETAIL"))
+				{
+					String text = "Storm version 0.1.0-alpha";
+					TextManager.instance.DrawString(UIFont.Small, Core.width - 235.0,
+							Core.height - 50.0, text, 1.0, 1.0, 1.0, 0.7);
+				}
+			}
+		}
+	}
 }

From e360391779736f92ea2d631a7b233d46e21aae9e Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 19:23:51 +0200
Subject: [PATCH 116/323] Load event handler and dispatcher classes

---
 src/main/java/io/pzstorm/storm/core/StormLauncher.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 773a17e..e9b37ad 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -32,6 +32,8 @@ public static void main(String[] args) throws ReflectiveOperationException {
 		StormClassLoader classLoader = StormBootstrap.CLASS_LOADER;
 		Class.forName("io.pzstorm.storm.core.StormClassTransformers", true, classLoader);
 
+		Class<?> eventHandler = classLoader.loadClass("io.pzstorm.storm.event.StormEventHandler");
+		Class<?> eventDispatcher = classLoader.loadClass("io.pzstorm.storm.event.StormEventDispatcher");
 		Class<?> entryPointClass = classLoader.loadClass(ZOMBOID_ENTRY_POINT_CLASS);
 		Method entryPoint = entryPointClass.getMethod(ZOMBOID_ENTRY_POINT, String[].class);
 		try {

From 728b1fa2d7a02aea574ddea91f266846d5ef37c2 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 19:24:10 +0200
Subject: [PATCH 117/323] Register Storm event handler class

---
 src/main/java/io/pzstorm/storm/core/StormLauncher.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index e9b37ad..2641fb8 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -34,6 +34,8 @@ public static void main(String[] args) throws ReflectiveOperationException {
 
 		Class<?> eventHandler = classLoader.loadClass("io.pzstorm.storm.event.StormEventHandler");
 		Class<?> eventDispatcher = classLoader.loadClass("io.pzstorm.storm.event.StormEventDispatcher");
+		eventDispatcher.getDeclaredMethod("registerEventHandler", Class.class).invoke(null, eventHandler);
+
 		Class<?> entryPointClass = classLoader.loadClass(ZOMBOID_ENTRY_POINT_CLASS);
 		Method entryPoint = entryPointClass.getMethod(ZOMBOID_ENTRY_POINT, String[].class);
 		try {

From 0370870224df6b4c3d93e153fb9062290db0f81b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 19:29:02 +0200
Subject: [PATCH 118/323] Remove unneeded parentheses

---
 src/main/java/io/pzstorm/storm/util/AsmUtils.java     | 4 ++--
 src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index a271105..6ef8711 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -162,7 +162,7 @@ public static boolean equalNodes(AbstractInsnNode a, AbstractInsnNode b) {
 			return ((MethodInsnNode) a).owner.equals(((MethodInsnNode) b).owner) &&
 					((MethodInsnNode) a).name.equals(((MethodInsnNode) b).name) &&
 					((MethodInsnNode) a).desc.equals(((MethodInsnNode) b).desc) &&
-					((MethodInsnNode) a).itf == (((MethodInsnNode) b).itf);
+					((MethodInsnNode) a).itf == ((MethodInsnNode) b).itf;
 		}
 		if (a instanceof MultiANewArrayInsnNode)
 		{
@@ -196,7 +196,7 @@ public static boolean equalNodes(AbstractInsnNode a, AbstractInsnNode b) {
 			return ((TypeInsnNode) a).desc.equals(((TypeInsnNode) b).desc);
 		}
 		if (a instanceof VarInsnNode) {
-			return ((VarInsnNode) a).var == (((VarInsnNode) b).var);
+			return ((VarInsnNode) a).var == ((VarInsnNode) b).var;
 		}
 		return true;
 	}
diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index 7305359..f4c2a35 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -151,6 +151,6 @@ void shouldCompareInstructionNodeFields() {
 
 		FieldInsnNode fia = new FieldInsnNode(Opcodes.GETSTATIC, "owner", "name", "desc");
 		FieldInsnNode fib = new FieldInsnNode(Opcodes.GETSTATIC, "owner", "name", "desc");
-		Assertions.assertTrue((AsmUtils.equalNodes(fia, fib)));
+		Assertions.assertTrue(AsmUtils.equalNodes(fia, fib));
 	}
 }

From 48256824fbadd4acd8d68cc9efac980e91cd09a8 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 19:30:36 +0200
Subject: [PATCH 119/323] Suppress unused methods warnings

---
 src/test/java/io/pzstorm/storm/util/StormUtilsTest.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
index 02add2a..b2345ef 100644
--- a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("unused")
 class StormUtilsTest {
 
 	private boolean hasInvokedRestrictedMethod = false;

From 32065bc6225c30c3f2da582facdf019c0e67bc4d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 20:02:46 +0200
Subject: [PATCH 120/323] Create dummy zomboid classes

---
 .../se/krka/kahlua/j2se/KahluaTableImpl.java  | 12 +++++++
 .../java/se/krka/kahlua/vm/KahluaTable.java   |  8 +++++
 src/zombie/java/zombie/ZomboidClass.java      | 16 +++++++++
 src/zombie/java/zombie/core/Core.java         | 10 ++++++
 .../zombie/gameStates/MainScreenState.java    | 11 +++++++
 src/zombie/java/zombie/ui/TextManager.java    | 14 ++++++++
 src/zombie/java/zombie/ui/UIElement.java      | 15 +++++++++
 src/zombie/java/zombie/ui/UIFont.java         | 33 +++++++++++++++++++
 8 files changed, 119 insertions(+)
 create mode 100644 src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
 create mode 100644 src/zombie/java/se/krka/kahlua/vm/KahluaTable.java
 create mode 100644 src/zombie/java/zombie/ZomboidClass.java
 create mode 100644 src/zombie/java/zombie/core/Core.java
 create mode 100644 src/zombie/java/zombie/gameStates/MainScreenState.java
 create mode 100644 src/zombie/java/zombie/ui/TextManager.java
 create mode 100644 src/zombie/java/zombie/ui/UIElement.java
 create mode 100644 src/zombie/java/zombie/ui/UIFont.java

diff --git a/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java b/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
new file mode 100644
index 0000000..133e562
--- /dev/null
+++ b/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
@@ -0,0 +1,12 @@
+package se.krka.kahlua.j2se;
+
+import se.krka.kahlua.vm.KahluaTable;
+import zombie.ZomboidClass;
+
+import java.util.Map;
+
+@ZomboidClass
+public class KahluaTableImpl implements KahluaTable {
+
+	public Map<Object, Object> delegate;
+}
diff --git a/src/zombie/java/se/krka/kahlua/vm/KahluaTable.java b/src/zombie/java/se/krka/kahlua/vm/KahluaTable.java
new file mode 100644
index 0000000..8752f23
--- /dev/null
+++ b/src/zombie/java/se/krka/kahlua/vm/KahluaTable.java
@@ -0,0 +1,8 @@
+package se.krka.kahlua.vm;
+
+import zombie.ZomboidClass;
+
+@ZomboidClass
+public interface KahluaTable {
+
+}
diff --git a/src/zombie/java/zombie/ZomboidClass.java b/src/zombie/java/zombie/ZomboidClass.java
new file mode 100644
index 0000000..5a7e1ac
--- /dev/null
+++ b/src/zombie/java/zombie/ZomboidClass.java
@@ -0,0 +1,16 @@
+package zombie;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This class is used to mark dummy Zomboid classes that are used instead of real Zomboid classes
+ * when compiling Java on CI server. Without these classes the compile task will fail on CI.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.SOURCE)
+public @interface ZomboidClass {
+
+}
diff --git a/src/zombie/java/zombie/core/Core.java b/src/zombie/java/zombie/core/Core.java
new file mode 100644
index 0000000..48d71d2
--- /dev/null
+++ b/src/zombie/java/zombie/core/Core.java
@@ -0,0 +1,10 @@
+package zombie.core;
+
+import zombie.ZomboidClass;
+
+@ZomboidClass
+public class Core {
+
+	public static int width = 0;
+	public static int height = 0;
+}
diff --git a/src/zombie/java/zombie/gameStates/MainScreenState.java b/src/zombie/java/zombie/gameStates/MainScreenState.java
new file mode 100644
index 0000000..255db34
--- /dev/null
+++ b/src/zombie/java/zombie/gameStates/MainScreenState.java
@@ -0,0 +1,11 @@
+package zombie.gameStates;
+
+import zombie.ZomboidClass;
+
+@ZomboidClass
+public class MainScreenState {
+
+	public void render() {
+
+	}
+}
diff --git a/src/zombie/java/zombie/ui/TextManager.java b/src/zombie/java/zombie/ui/TextManager.java
new file mode 100644
index 0000000..101103c
--- /dev/null
+++ b/src/zombie/java/zombie/ui/TextManager.java
@@ -0,0 +1,14 @@
+package zombie.ui;
+
+import zombie.ZomboidClass;
+
+@ZomboidClass
+public class TextManager {
+
+	public static TextManager instance;
+
+	@SuppressWarnings("unused")
+	public void DrawString(UIFont var1, double var2, double var4, String var6, double var7, double var9, double var11, double var13) {
+
+	}
+}
diff --git a/src/zombie/java/zombie/ui/UIElement.java b/src/zombie/java/zombie/ui/UIElement.java
new file mode 100644
index 0000000..44d2313
--- /dev/null
+++ b/src/zombie/java/zombie/ui/UIElement.java
@@ -0,0 +1,15 @@
+package zombie.ui;
+
+import se.krka.kahlua.vm.KahluaTable;
+import zombie.ZomboidClass;
+
+@ZomboidClass
+public class UIElement {
+
+	public UIElement Parent;
+	public KahluaTable table;
+
+	public void render() {
+
+	}
+}
diff --git a/src/zombie/java/zombie/ui/UIFont.java b/src/zombie/java/zombie/ui/UIFont.java
new file mode 100644
index 0000000..4f5c0e5
--- /dev/null
+++ b/src/zombie/java/zombie/ui/UIFont.java
@@ -0,0 +1,33 @@
+package zombie.ui;
+
+import zombie.ZomboidClass;
+
+@ZomboidClass
+@SuppressWarnings("unused")
+public enum UIFont {
+
+	Small,
+	Medium,
+	Large,
+	Massive,
+	MainMenu1,
+	MainMenu2,
+	Cred1,
+	Cred2,
+	NewSmall,
+	NewMedium,
+	NewLarge,
+	Code,
+	MediumNew,
+	AutoNormSmall,
+	AutoNormMedium,
+	AutoNormLarge,
+	Dialogue,
+	Intro,
+	Handwritten,
+	DebugConsole,
+	Title;
+
+	UIFont() {
+	}
+}

From 8b228188700aa939b6e3afdded300680d50606ca Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 20:06:30 +0200
Subject: [PATCH 121/323] Add dummy classes to CI classpath

---
 build.gradle | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.gradle b/build.gradle
index e490c0b..f843dc6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,6 +28,12 @@ sourceSets {
 		runtimeClasspath += sourceSets.main.output
 		compileClasspath += sourceSets.main.output
 	}
+	main {
+		// add dummy zomboid classes to classpath when compiling on CI
+		if (System.getenv("CI") != null) {
+			compileClasspath += sourceSets.zombie.output
+		}
+	}
 	test {
 		// tests need to see classes used in class transformation tests
 		runtimeClasspath += sourceSets.zombie.output

From ec6e633e1fa9f321ba9805eaac82d547ee002afc Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 20:20:42 +0200
Subject: [PATCH 122/323] Fix circular task dependency error

https://github.com/pzstorm/storm/runs/2529875890#step:5:104
---
 build.gradle                            | 4 +---
 src/zombie/java/zombie/ZombieHello.java | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index f843dc6..63cf52b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,10 +23,8 @@ capsid {
 }
 
 sourceSets {
-	// this sourceSet is used for testing class transformation
 	zombie {
-		runtimeClasspath += sourceSets.main.output
-		compileClasspath += sourceSets.main.output
+		java.srcDir('src/main/java')
 	}
 	main {
 		// add dummy zomboid classes to classpath when compiling on CI
diff --git a/src/zombie/java/zombie/ZombieHello.java b/src/zombie/java/zombie/ZombieHello.java
index 33f1118..7e9a4ae 100644
--- a/src/zombie/java/zombie/ZombieHello.java
+++ b/src/zombie/java/zombie/ZombieHello.java
@@ -2,14 +2,13 @@
 
 import org.jetbrains.annotations.TestOnly;
 
-import io.pzstorm.storm.StormLogger;
-
 @TestOnly
 @SuppressWarnings({ "unused", "WeakerAccess" })
 public class ZombieHello {
 
+	@SuppressWarnings("UseOfSystemOutOrSystemErr")
 	public static void sayHello() {
-		StormLogger.info(getHello());
+		System.out.println(getHello());
 	}
 
 	public static String getHello() {

From 29a07682df493a6d577801bd1cec8ed749ef77e9 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 20:52:05 +0200
Subject: [PATCH 123/323] Reorder project dependencies

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 63cf52b..5dee8f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,15 +55,15 @@ dependencies {
 	// https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
 	implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
 
-	// https://mvnrepository.com/artifact/org.jetbrains/annotations
-	compileOnly 'org.jetbrains:annotations:20.1.0'
-
 	// https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
 	errorprone 'com.google.errorprone:error_prone_core:2.6.0'
 
 	// https://mvnrepository.com/artifact/com.google.errorprone/javac
 	errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
 
+	// https://mvnrepository.com/artifact/org.jetbrains/annotations
+	compileOnly 'org.jetbrains:annotations:20.1.0'
+
 	// https://mvnrepository.com/artifact/com.google.guava/guava
 	implementation 'com.google.guava:guava:30.1.1-jre'
 

From 3b8d2b355deb9fe94b0d776beae28f61f1a38079 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 20:55:17 +0200
Subject: [PATCH 124/323] Fix invalid sourceSet directory path

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5dee8f5..6641289 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,9 +23,9 @@ capsid {
 }
 
 sourceSets {
-	zombie {
-		java.srcDir('src/main/java')
-	}
+	// module containing zomboid dummy classes and classes used in testing
+	// this module is only required by tests and CI compiler
+	zombie {}
 	main {
 		// add dummy zomboid classes to classpath when compiling on CI
 		if (System.getenv("CI") != null) {

From a6dfcdc8597db284f665c8caa1afec27c76c25ac Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 21:42:19 +0200
Subject: [PATCH 125/323] Create transformer registration method

---
 .../io/pzstorm/storm/core/StormClassTransformers.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index 0905d59..bb90e9b 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -30,6 +30,16 @@ public class StormClassTransformers {
 		registerTransformer("zombie.ui.UIElement", new OnUIElementPreRenderHook());
 	}
 
+	/**
+	 * Register designated {@link StormClassTransformer} with given name.
+	 *
+	 * @param className name of the target class to transform.
+	 * @param transformer {@code StormClassTransformer} to register.
+	 */
+	private static void registerTransformer(String className, StormClassTransformer transformer) {
+		TRANSFORMERS.put(className, transformer);
+	}
+
 	/**
 	 * Create and register a new {@link StormClassTransformer} with given name
 	 * that installs a {@link StormHook} designated by method parameter.

From d8510bd53e0a293852e49f0b09aaaba6eb75ad4f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 21:42:50 +0200
Subject: [PATCH 126/323] Update StormClassTransformer tests

---
 .../storm/core/StormClassTransformerTest.java | 35 +++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
index f6c6cdb..74d2afe 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
@@ -1,6 +1,7 @@
 package io.pzstorm.storm.core;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -9,20 +10,42 @@
 
 class StormClassTransformerTest implements UnitTest {
 
-	private static void createAndLoadTransformer(String transformer) throws ReflectiveOperationException {
+	private static final Class<?> STORM_CLASS_TRANSFORMER, STORM_CLASS_TRANSFORMERS;
 
-		Class<?> transformerClass = Class.forName(transformer, true, StormBootstrap.CLASS_LOADER);
+	static {
+		try {
+			STORM_CLASS_TRANSFORMER = Class.forName(
+					"io.pzstorm.storm.core.StormClassTransformer",
+					true, StormBootstrap.CLASS_LOADER
+			);
+			STORM_CLASS_TRANSFORMERS = Class.forName(
+					"io.pzstorm.storm.core.StormClassTransformers",
+					true, StormBootstrap.CLASS_LOADER);
+		}
+		catch (ClassNotFoundException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private static void createAndRegisterTransformer(String className, String sTransformerClass) throws ReflectiveOperationException {
+
+		Class<?> transformerClass = Class.forName(sTransformerClass, true, StormBootstrap.CLASS_LOADER);
 		Constructor<?> constructor = transformerClass.getConstructor();
 		constructor.setAccessible(true);
-		constructor.newInstance();
+
+		Object transformer = constructor.newInstance();
+		Method registerTransformer = STORM_CLASS_TRANSFORMERS.getDeclaredMethod(
+				"registerTransformer", String.class, STORM_CLASS_TRANSFORMER
+		);
+		registerTransformer.setAccessible(true);
+		registerTransformer.invoke(null, className, STORM_CLASS_TRANSFORMER.cast(transformer));
 	}
 
 	@Test
 	void shouldChangeStackConstantInInstructionList() throws ReflectiveOperationException {
 
 		String className = "zombie.ZombieHello";
-		createAndLoadTransformer("io.pzstorm.storm.core.ZombieHelloTransformer");
-
+		createAndRegisterTransformer(className, "io.pzstorm.storm.core.ZombieHelloTransformer");
 		Class<?> zombieHello = StormBootstrap.CLASS_LOADER.loadClass(className, true);
 		String hello = (String) zombieHello.getDeclaredMethod("getHello").invoke(null);
 		Assertions.assertEquals("Zombie says: you die today!", hello);
@@ -34,7 +57,7 @@ void shouldChangeStackConstantInInstructionList() throws ReflectiveOperationExce
 	void shouldInsertInstructionBeforeMatchedLabel() throws ReflectiveOperationException {
 
 		String className = "zombie.ZombieUtils";
-		createAndLoadTransformer("io.pzstorm.storm.core.ZombieUtilsTransformer");
+		createAndRegisterTransformer(className, "io.pzstorm.storm.core.ZombieUtilsTransformer");
 
 		Class<?> zombieUtils = StormBootstrap.CLASS_LOADER.loadClass(className, true);
 		zombieUtils.getDeclaredMethod("setZombieProperties", int.class, boolean.class)

From e2784fe06bf7883b4a2fac767a5b1ec47941c145 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 21:45:16 +0200
Subject: [PATCH 127/323] Declare StormUtilsTest as UnitTest

---
 src/test/java/io/pzstorm/storm/util/StormUtilsTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
index b2345ef..7a406eb 100644
--- a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
@@ -2,11 +2,12 @@
 
 import java.lang.reflect.Method;
 
+import io.pzstorm.storm.UnitTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 @SuppressWarnings("unused")
-class StormUtilsTest {
+class StormUtilsTest implements UnitTest {
 
 	private boolean hasInvokedRestrictedMethod = false;
 

From 825710960494d797a065d7ecbc74cb8b845236d2 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 22:59:31 +0200
Subject: [PATCH 128/323] Move StormLogger to core package

---
 src/main/java/io/pzstorm/storm/core/StormClassLoader.java    | 4 +---
 .../java/io/pzstorm/storm/core/StormClassTransformer.java    | 2 --
 src/main/java/io/pzstorm/storm/core/StormLauncher.java       | 2 --
 src/main/java/io/pzstorm/storm/{ => core}/StormLogger.java   | 2 +-
 .../java/io/pzstorm/storm/event/StormEventDispatcher.java    | 3 +--
 src/main/java/io/pzstorm/storm/util/StormUtils.java          | 4 ++--
 .../io/pzstorm/storm/core/StormClassTestTransformer.java     | 2 --
 .../java/io/pzstorm/storm/{ => core}/StormLoggerTest.java    | 5 +++--
 8 files changed, 8 insertions(+), 16 deletions(-)
 rename src/main/java/io/pzstorm/storm/{ => core}/StormLogger.java (99%)
 rename src/test/java/io/pzstorm/storm/{ => core}/StormLoggerTest.java (95%)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 9ea275e..3d69c22 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -12,8 +12,6 @@
 
 import com.google.common.collect.ImmutableSet;
 
-import io.pzstorm.storm.StormLogger;
-
 /**
  * This is a custom {@code ClassLoader} used to define, transform and load Project Zomboid classes.
  * It is initially invoked by {@link StormLauncher} when launching the game.
@@ -33,7 +31,7 @@ class StormClassLoader extends ClassLoader {
 	private static final ImmutableSet<String> CLASS_BLACKLIST = ImmutableSet.of(
 			"java.", "org.objectweb.asm.", "sun.", "com.sun.", "org.xml.", "org.w3c.",
 			"javax.script.", "javax.management.", "javax.imageio.", "javax.xml.",
-			"io.pzstorm.storm.StormLogger"
+			"io.pzstorm.storm.core.StormLogger"
 	);
 	protected final URLClassLoader resourceClassLoader;
 	/**
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index abcf3a7..35269a1 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -11,8 +11,6 @@
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.MethodNode;
 
-import io.pzstorm.storm.StormLogger;
-
 /**
  * This class represents a {@code Class} transformer used to alter {@code Class}
  * bytecode using ASM. The transformation process calls the following method in fixed order:
diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 2641fb8..f99210b 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -2,8 +2,6 @@
 
 import java.lang.reflect.Method;
 
-import io.pzstorm.storm.StormLogger;
-
 class StormLauncher {
 
 	/**
diff --git a/src/main/java/io/pzstorm/storm/StormLogger.java b/src/main/java/io/pzstorm/storm/core/StormLogger.java
similarity index 99%
rename from src/main/java/io/pzstorm/storm/StormLogger.java
rename to src/main/java/io/pzstorm/storm/core/StormLogger.java
index b0b3ac4..fb97905 100644
--- a/src/main/java/io/pzstorm/storm/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLogger.java
@@ -1,4 +1,4 @@
-package io.pzstorm.storm;
+package io.pzstorm.storm.core;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
index b8df451..8c5a2ee 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
+++ b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import io.pzstorm.storm.core.StormLogger;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
@@ -16,8 +17,6 @@
 
 import com.google.common.collect.Sets;
 
-import io.pzstorm.storm.StormLogger;
-
 /**
  * This class is responsible for registering event handlers and dispatching {@link ZomboidEvent} instances.
  * <p>
diff --git a/src/main/java/io/pzstorm/storm/util/StormUtils.java b/src/main/java/io/pzstorm/storm/util/StormUtils.java
index f82ee1f..6533eeb 100644
--- a/src/main/java/io/pzstorm/storm/util/StormUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/StormUtils.java
@@ -1,8 +1,8 @@
 package io.pzstorm.storm.util;
 
-import java.lang.reflect.Method;
+import io.pzstorm.storm.core.StormLogger;
 
-import io.pzstorm.storm.StormLogger;
+import java.lang.reflect.Method;
 
 public class StormUtils {
 
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
index 91a4b4a..2c62800 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
@@ -16,8 +16,6 @@
 import com.github.difflib.UnifiedDiffUtils;
 import com.github.difflib.patch.Patch;
 
-import io.pzstorm.storm.StormLogger;
-
 /**
  * This class represents a {@code Class} transformer used to alter {@code Class}
  * bytecode using ASM when running JUnit tests. When transforming it will print a
diff --git a/src/test/java/io/pzstorm/storm/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
similarity index 95%
rename from src/test/java/io/pzstorm/storm/StormLoggerTest.java
rename to src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
index d770cf2..beeef40 100644
--- a/src/test/java/io/pzstorm/storm/StormLoggerTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
@@ -1,9 +1,10 @@
-package io.pzstorm.storm;
+package io.pzstorm.storm.core;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.pzstorm.storm.UnitTest;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -32,7 +33,7 @@ void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationE
 		Assertions.assertEquals(expectedLevel.name(), systemProperty);
 
 		// initialize StormLogger class
-		Class.forName("io.pzstorm.storm.StormLogger");
+		Class.forName("io.pzstorm.storm.core.StormLogger");
 
 		LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
 		LoggerConfig rootLoggerConfig = ctx.getConfiguration().getLoggers().get("");

From af86282ebdce8122585d459f632273071d401cf3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:04:57 +0200
Subject: [PATCH 129/323] Improve StormLogger initialization

---
 .../io/pzstorm/storm/core/StormLauncher.java  |  4 +
 .../io/pzstorm/storm/core/StormLogger.java    | 24 +++---
 .../pzstorm/storm/core/StormLoggerTest.java   | 76 +++++++++----------
 3 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index f99210b..bcede28 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -30,6 +30,10 @@ public static void main(String[] args) throws ReflectiveOperationException {
 		StormClassLoader classLoader = StormBootstrap.CLASS_LOADER;
 		Class.forName("io.pzstorm.storm.core.StormClassTransformers", true, classLoader);
 
+		// initialize logging system
+		StormLogger.initialize();
+
+		// initialize dispatcher system
 		Class<?> eventHandler = classLoader.loadClass("io.pzstorm.storm.event.StormEventHandler");
 		Class<?> eventDispatcher = classLoader.loadClass("io.pzstorm.storm.event.StormEventDispatcher");
 		eventDispatcher.getDeclaredMethod("registerEventHandler", Class.class).invoke(null, eventHandler);
diff --git a/src/main/java/io/pzstorm/storm/core/StormLogger.java b/src/main/java/io/pzstorm/storm/core/StormLogger.java
index fb97905..eab7eda 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLogger.java
@@ -10,25 +10,27 @@
 /**
  * <p>Simple wrapper class for logging with Log4j 2 logger.
  * To configure console logging level launch Storm with {@code JVM_PROPERTY}
- * set to a custom logger level. The level will be matched with {@link Logger#getLevel()}.
+ * set to a custom logger level and call {@link #initialize()} method.
  * </p><p>
  * Logs will automatically be printed to console and configured log files.
- * Check {@code log4j2.xml} for log file locations.
- * </p>
- * Use the {@code static} methods to print logs with desired log level.
- * If you want to print with a log level not covered by {@code static} methods
- * use {@link #get()} method to get a reference to logger instance.
+ * Check {@code log4j2.xml} for log file locations. Use the {@code static} methods to
+ * print logs with desired log level. If you want to print with a log level not covered
+ * by {@code static} methods use {@link #get()} method to get a reference to logger instance.
  */
 @SuppressWarnings({ "unused", "WeakerAccess" })
 public class StormLogger {
 
 	public static final Level VERBOSE = Level.forName("VERBOSE", 450);
-	private static final org.apache.logging.log4j.Logger LOGGER;
+	private static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger("Storm");
+	static final String LOGGER_PROPERTY = "storm.logger";
 
-	static
-	{
-		LOGGER = LogManager.getLogger("Storm");
-		String sLevel = System.getProperty("storm.logger");
+	/**
+	 * Initialize {@link StormLogger} system by setting logging level resolved from system properties.
+	 * To configure console logging level launch Storm with {@code JVM_PROPERTY} set to a custom logger level.
+	 */
+	static void initialize() {
+
+		String sLevel = System.getProperty(LOGGER_PROPERTY);
 		if (sLevel != null && !sLevel.isEmpty())
 		{
 			Level level = Level.getLevel(sLevel);
diff --git a/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
index beeef40..46373cf 100644
--- a/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
@@ -17,58 +17,58 @@
 
 class StormLoggerTest implements UnitTest {
 
-	private static final String LOGGER_PROPERTY = "storm.logger";
-
 	@Test
 	void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationException {
 
 		// store current level from system properties
-		Level originalLevel = Level.toLevel(System.getProperty(LOGGER_PROPERTY, "INFO"));
+		Level originalLevel = Level.toLevel(System.getProperty(StormLogger.LOGGER_PROPERTY, "INFO"));
 
-		Level expectedLevel = Level.forName("ALL", 1);
-		System.setProperty(LOGGER_PROPERTY, expectedLevel.name());
+		for (Level expectedLevel : Level.values())
+		{
+			System.setProperty(StormLogger.LOGGER_PROPERTY, expectedLevel.name());
 
-		// assert that system property was properly set
-		String systemProperty = System.getProperty(LOGGER_PROPERTY);
-		Assertions.assertEquals(expectedLevel.name(), systemProperty);
+			// assert that system property was properly set
+			String systemProperty = System.getProperty(StormLogger.LOGGER_PROPERTY);
+			Assertions.assertEquals(expectedLevel.name(), systemProperty);
 
-		// initialize StormLogger class
-		Class.forName("io.pzstorm.storm.core.StormLogger");
+			// initialize logging system
+			StormLogger.initialize();
 
-		LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
-		LoggerConfig rootLoggerConfig = ctx.getConfiguration().getLoggers().get("");
-		Configuration config = ctx.getConfiguration();
+			LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
+			LoggerConfig rootLoggerConfig = ctx.getConfiguration().getLoggers().get("");
+			Configuration config = ctx.getConfiguration();
 
-		Field appendersField = LoggerConfig.class.getDeclaredField("appenders");
-		appendersField.setAccessible(true);
+			Field appendersField = LoggerConfig.class.getDeclaredField("appenders");
+			appendersField.setAccessible(true);
 
-		Field appenderLevelField = AppenderControl.class.getDeclaredField("level");
-		appenderLevelField.setAccessible(true);
+			Field appenderLevelField = AppenderControl.class.getDeclaredField("level");
+			appenderLevelField.setAccessible(true);
 
-		Map<String, Level> actualLevels = new HashMap<>();
+			Map<String, Level> actualLevels = new HashMap<>();
 
-		AppenderControlArraySet appenders = (AppenderControlArraySet) appendersField.get(rootLoggerConfig);
-		for (AppenderControl appenderControl : appenders.get())
-		{
-			String appenderName = appenderControl.getAppenderName();
-			if (appenderName.equals("Console") || appenderName.equals("MainFile")) {
-				actualLevels.put(appenderName, (Level) appenderLevelField.get(appenderControl));
+			AppenderControlArraySet appenders = (AppenderControlArraySet) appendersField.get(rootLoggerConfig);
+			for (AppenderControl appenderControl : appenders.get())
+			{
+				String appenderName = appenderControl.getAppenderName();
+				if (appenderName.equals("Console") || appenderName.equals("MainFile")) {
+					actualLevels.put(appenderName, (Level) appenderLevelField.get(appenderControl));
+				}
 			}
-		}
-		// assert that all appenders were found
-		Assertions.assertTrue(actualLevels.containsKey("Console"));
-		Assertions.assertTrue(actualLevels.containsKey("MainFile"));
+			// assert that all appenders were found
+			Assertions.assertTrue(actualLevels.containsKey("Console"));
+			Assertions.assertTrue(actualLevels.containsKey("MainFile"));
 
-		// assert that logger has correct levels
-		for (Map.Entry<String, Level> entry : actualLevels.entrySet()) {
-			Assertions.assertEquals(expectedLevel, entry.getValue());
-		}
-		// reset the logger levels to original values
-		for (String appender : new String[]{ "Console", "MainFile" })
-		{
-			rootLoggerConfig.removeAppender(appender);
-			rootLoggerConfig.addAppender(config.getAppender(appender), originalLevel, null);
+			// assert that logger has correct levels
+			for (Map.Entry<String, Level> entry : actualLevels.entrySet()) {
+				Assertions.assertEquals(expectedLevel, entry.getValue());
+			}
+			// reset the logger levels to original values
+			for (String appender : new String[]{ "Console", "MainFile" })
+			{
+				rootLoggerConfig.removeAppender(appender);
+				rootLoggerConfig.addAppender(config.getAppender(appender), originalLevel, null);
+			}
+			ctx.updateLoggers();
 		}
-		ctx.updateLoggers();
 	}
 }

From a794cfd6a10a28dbc50b3cae221de417485919b5 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:18:56 +0200
Subject: [PATCH 130/323] Annotate packages as NonNull

---
 src/main/java/io/pzstorm/storm/core/package-info.java  | 4 ++++
 src/main/java/io/pzstorm/storm/event/package-info.java | 4 ++++
 src/main/java/io/pzstorm/storm/hook/package-info.java  | 4 ++++
 src/main/java/io/pzstorm/storm/util/package-info.java  | 4 ++++
 4 files changed, 16 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/core/package-info.java
 create mode 100644 src/main/java/io/pzstorm/storm/event/package-info.java
 create mode 100644 src/main/java/io/pzstorm/storm/hook/package-info.java
 create mode 100644 src/main/java/io/pzstorm/storm/util/package-info.java

diff --git a/src/main/java/io/pzstorm/storm/core/package-info.java b/src/main/java/io/pzstorm/storm/core/package-info.java
new file mode 100644
index 0000000..622dd6c
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/core/package-info.java
@@ -0,0 +1,4 @@
+@NonNullPackage
+package io.pzstorm.storm.core;
+
+import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file
diff --git a/src/main/java/io/pzstorm/storm/event/package-info.java b/src/main/java/io/pzstorm/storm/event/package-info.java
new file mode 100644
index 0000000..f54c5a7
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/event/package-info.java
@@ -0,0 +1,4 @@
+@NonNullPackage
+package io.pzstorm.storm.event;
+
+import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file
diff --git a/src/main/java/io/pzstorm/storm/hook/package-info.java b/src/main/java/io/pzstorm/storm/hook/package-info.java
new file mode 100644
index 0000000..5510c69
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/hook/package-info.java
@@ -0,0 +1,4 @@
+@NonNullPackage
+package io.pzstorm.storm.hook;
+
+import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file
diff --git a/src/main/java/io/pzstorm/storm/util/package-info.java b/src/main/java/io/pzstorm/storm/util/package-info.java
new file mode 100644
index 0000000..7643d01
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/util/package-info.java
@@ -0,0 +1,4 @@
+@NonNullPackage
+package io.pzstorm.storm.util;
+
+import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file

From cccc905285b437a7a751eb96c6be421e6577006f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:19:59 +0200
Subject: [PATCH 131/323] Improve handling nullability

---
 src/main/java/io/pzstorm/storm/core/StormBootstrap.java       | 4 +++-
 src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index 60e3461..3e5c5d1 100644
--- a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -1,5 +1,7 @@
 package io.pzstorm.storm.core;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.lang.reflect.Method;
 
 /**
@@ -77,7 +79,7 @@ class StormBootstrap {
 	 * @throws ReflectiveOperationException if an error occurred while invoking method.
 	 * @see StormClassTransformers#getRegistered(String)
 	 */
-	static Object getRegisteredTransformer(String name) throws ReflectiveOperationException {
+	static @Nullable Object getRegisteredTransformer(String name) throws ReflectiveOperationException {
 		return TRANSFORMER_GETTER.invoke(null, name);
 	}
 
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
index 2b217c2..5262219 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
@@ -21,8 +21,8 @@
 class StormClassLoaderTest extends StormClassLoader implements UnitTest {
 
 	private static final ClassLoader CL = StormClassLoaderTest.class.getClassLoader();
-	private static final URL CLASSES_RESOURCE_DIR = CL.getResource("./classes/");
-	private static final URL DELEGATE_RESOURCE_DIR = CL.getResource("./delegate/");
+	private static final URL CLASSES_RESOURCE_DIR = Objects.requireNonNull(CL.getResource("./classes/"));
+	private static final URL DELEGATE_RESOURCE_DIR = Objects.requireNonNull(CL.getResource("./delegate/"));
 
 	StormClassLoaderTest() {
 		super(new URL[]{ CLASSES_RESOURCE_DIR, DELEGATE_RESOURCE_DIR });

From 497cec553f5fdcef6349ed326af3d6f31a307775 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:26:01 +0200
Subject: [PATCH 132/323] Suppress warnings on class level

---
 .../java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java    | 1 +
 .../java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java  | 2 +-
 src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java | 1 +
 src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java        | 1 +
 src/zombie/java/se/krka/kahlua/vm/KahluaTable.java              | 1 +
 src/zombie/java/zombie/ZombieHello.java                         | 2 +-
 src/zombie/java/zombie/core/Core.java                           | 1 +
 src/zombie/java/zombie/gameStates/MainScreenState.java          | 1 +
 src/zombie/java/zombie/ui/TextManager.java                      | 1 +
 src/zombie/java/zombie/ui/UIElement.java                        | 1 +
 src/zombie/java/zombie/ui/UIFont.java                           | 2 +-
 11 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java b/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
index 488fde1..a0212ac 100644
--- a/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
+++ b/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
@@ -7,6 +7,7 @@
  *
  * @see MainScreenState#render()
  */
+@SuppressWarnings("unused")
 public class OnMainScreenRenderEvent implements ZomboidEvent {
 
 	@Override
diff --git a/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java b/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
index fd2c3a6..f956a1f 100644
--- a/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
+++ b/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
@@ -7,7 +7,7 @@
  *
  * @see UIElement#render()
  */
-@SuppressWarnings("WeakerAccess")
+@SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnUIElementPreRenderEvent implements ZomboidEvent {
 
 	public final UIElement element;
diff --git a/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java b/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
index bbfb120..8759e10 100644
--- a/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
@@ -5,6 +5,7 @@
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.LdcInsnNode;
 
+@SuppressWarnings("unused")
 public class ZombieHelloTransformer extends StormClassTestTransformer {
 
 	public ZombieHelloTransformer() {
diff --git a/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java b/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
index 133e562..1f85116 100644
--- a/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
+++ b/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 
 @ZomboidClass
+@SuppressWarnings("ALL")
 public class KahluaTableImpl implements KahluaTable {
 
 	public Map<Object, Object> delegate;
diff --git a/src/zombie/java/se/krka/kahlua/vm/KahluaTable.java b/src/zombie/java/se/krka/kahlua/vm/KahluaTable.java
index 8752f23..d32c73e 100644
--- a/src/zombie/java/se/krka/kahlua/vm/KahluaTable.java
+++ b/src/zombie/java/se/krka/kahlua/vm/KahluaTable.java
@@ -3,6 +3,7 @@
 import zombie.ZomboidClass;
 
 @ZomboidClass
+@SuppressWarnings("ALL")
 public interface KahluaTable {
 
 }
diff --git a/src/zombie/java/zombie/ZombieHello.java b/src/zombie/java/zombie/ZombieHello.java
index 7e9a4ae..dddca2d 100644
--- a/src/zombie/java/zombie/ZombieHello.java
+++ b/src/zombie/java/zombie/ZombieHello.java
@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.TestOnly;
 
 @TestOnly
-@SuppressWarnings({ "unused", "WeakerAccess" })
+@SuppressWarnings("ALL")
 public class ZombieHello {
 
 	@SuppressWarnings("UseOfSystemOutOrSystemErr")
diff --git a/src/zombie/java/zombie/core/Core.java b/src/zombie/java/zombie/core/Core.java
index 48d71d2..50d1f9a 100644
--- a/src/zombie/java/zombie/core/Core.java
+++ b/src/zombie/java/zombie/core/Core.java
@@ -3,6 +3,7 @@
 import zombie.ZomboidClass;
 
 @ZomboidClass
+@SuppressWarnings("ALL")
 public class Core {
 
 	public static int width = 0;
diff --git a/src/zombie/java/zombie/gameStates/MainScreenState.java b/src/zombie/java/zombie/gameStates/MainScreenState.java
index 255db34..6dee3f2 100644
--- a/src/zombie/java/zombie/gameStates/MainScreenState.java
+++ b/src/zombie/java/zombie/gameStates/MainScreenState.java
@@ -3,6 +3,7 @@
 import zombie.ZomboidClass;
 
 @ZomboidClass
+@SuppressWarnings("ALL")
 public class MainScreenState {
 
 	public void render() {
diff --git a/src/zombie/java/zombie/ui/TextManager.java b/src/zombie/java/zombie/ui/TextManager.java
index 101103c..1b84a2e 100644
--- a/src/zombie/java/zombie/ui/TextManager.java
+++ b/src/zombie/java/zombie/ui/TextManager.java
@@ -3,6 +3,7 @@
 import zombie.ZomboidClass;
 
 @ZomboidClass
+@SuppressWarnings("ALL")
 public class TextManager {
 
 	public static TextManager instance;
diff --git a/src/zombie/java/zombie/ui/UIElement.java b/src/zombie/java/zombie/ui/UIElement.java
index 44d2313..d25a359 100644
--- a/src/zombie/java/zombie/ui/UIElement.java
+++ b/src/zombie/java/zombie/ui/UIElement.java
@@ -4,6 +4,7 @@
 import zombie.ZomboidClass;
 
 @ZomboidClass
+@SuppressWarnings("ALL")
 public class UIElement {
 
 	public UIElement Parent;
diff --git a/src/zombie/java/zombie/ui/UIFont.java b/src/zombie/java/zombie/ui/UIFont.java
index 4f5c0e5..4d7d84f 100644
--- a/src/zombie/java/zombie/ui/UIFont.java
+++ b/src/zombie/java/zombie/ui/UIFont.java
@@ -3,7 +3,7 @@
 import zombie.ZomboidClass;
 
 @ZomboidClass
-@SuppressWarnings("unused")
+@SuppressWarnings("ALL")
 public enum UIFont {
 
 	Small,

From f497a54324868bec85698be7efbd758138e945d2 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:26:19 +0200
Subject: [PATCH 133/323] Remove redundant event subscription

---
 src/main/java/io/pzstorm/storm/event/StormEventHandler.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
index 7e2f54b..8c03d7a 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
+++ b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
@@ -14,10 +14,6 @@
  */
 public class StormEventHandler {
 
-	@SubscribeEvent
-	public static void handleRenderEvent(OnMainScreenRenderEvent event) {
-	}
-
 	@SubscribeEvent
 	public static void handleUIElementRenderEvent(OnUIElementPreRenderEvent event) {
 

From 538cccf6237e50c53c684bd3ec6c9d1bdc1e5831 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:32:41 +0200
Subject: [PATCH 134/323] Suppress more warnings on class level

---
 src/main/java/io/pzstorm/storm/core/StormClassTransformers.java | 2 +-
 src/main/java/io/pzstorm/storm/event/StormEventHandler.java     | 1 +
 src/main/java/io/pzstorm/storm/event/SubscribeEvent.java        | 1 +
 src/main/java/io/pzstorm/storm/event/ZomboidEvent.java          | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index bb90e9b..6ebdbf5 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -14,7 +14,7 @@
  * This class defines, initializes and stores {@link StormClassTransformer} instances.
  * To retrieve a mapped instance of registered transformer call {@link #getRegistered(String)}.
  */
-@SuppressWarnings("WeakerAccess")
+@SuppressWarnings({ "WeakerAccess", "unused" })
 public class StormClassTransformers {
 
 	/**
diff --git a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
index 8c03d7a..675ce4a 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
+++ b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
@@ -12,6 +12,7 @@
  * Sometimes subscribing to events is not enough to alter game behavior and more invasive
  * actions need to be preformed, like editing or removing lines from game code.
  */
+@SuppressWarnings("unused")
 public class StormEventHandler {
 
 	@SubscribeEvent
diff --git a/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java b/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
index 168d793..7cbd433 100644
--- a/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
+++ b/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
@@ -14,5 +14,6 @@
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
+@SuppressWarnings("WeakerAccess")
 public @interface SubscribeEvent {
 }
diff --git a/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java b/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
index 3626081..dec63bd 100644
--- a/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
+++ b/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
@@ -7,6 +7,7 @@
  * {@link StormHook}s and included as a method parameter in a callback to {@link StormEventDispatcher}.
  * They are then dispatched to all methods that subscribe to those specific events.
  */
+@SuppressWarnings("WeakerAccess")
 public interface ZomboidEvent {
 
 	/**

From b5be7a6ad6c235da101e61031c27ec12e9dcf4e0 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:32:56 +0200
Subject: [PATCH 135/323] Improve StormClassTransformer encapsulation

---
 .../java/io/pzstorm/storm/core/StormClassTransformer.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index 35269a1..ecd1b3b 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -23,9 +23,9 @@
  */
 public abstract class StormClassTransformer {
 
-	protected final String className;
-	protected final ClassNode visitor;
 	private @Nullable ClassReader classReader;
+	final String className;
+	final ClassNode visitor;
 
 	StormClassTransformer(String className, ClassNode visitor) {
 

From 184e780b624e332b56ea208054701206d21933ea Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:45:36 +0200
Subject: [PATCH 136/323] Create IntegrationTest interface

---
 src/test/java/io/pzstorm/storm/IntegrationTest.java | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/IntegrationTest.java

diff --git a/src/test/java/io/pzstorm/storm/IntegrationTest.java b/src/test/java/io/pzstorm/storm/IntegrationTest.java
new file mode 100644
index 0000000..ca8ba14
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/IntegrationTest.java
@@ -0,0 +1,8 @@
+package io.pzstorm.storm;
+
+import org.junit.jupiter.api.Tag;
+
+@Tag("integration")
+public interface IntegrationTest {
+
+}

From 08aa7687721d7dbcc209f706d190cf7f5802d65c Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:46:09 +0200
Subject: [PATCH 137/323] Convert unit tests to integration tests

---
 ...derTest.java => StormClassLoaderIntegrationTest.java} | 9 ++++-----
 ...st.java => StormClassTransformerIntegrationTest.java} | 5 ++---
 2 files changed, 6 insertions(+), 8 deletions(-)
 rename src/test/java/io/pzstorm/storm/core/{StormClassLoaderTest.java => StormClassLoaderIntegrationTest.java} (94%)
 rename src/test/java/io/pzstorm/storm/core/{StormClassTransformerTest.java => StormClassTransformerIntegrationTest.java} (95%)

diff --git a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java
similarity index 94%
rename from src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
rename to src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java
index 5262219..3faec22 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java
@@ -9,22 +9,21 @@
 import java.nio.file.Files;
 import java.util.*;
 
+import io.pzstorm.storm.IntegrationTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
-import io.pzstorm.storm.UnitTest;
-
 @SuppressWarnings("SpellCheckingInspection")
-class StormClassLoaderTest extends StormClassLoader implements UnitTest {
+class StormClassLoaderIntegrationTest extends StormClassLoader implements IntegrationTest {
 
-	private static final ClassLoader CL = StormClassLoaderTest.class.getClassLoader();
+	private static final ClassLoader CL = StormClassLoaderIntegrationTest.class.getClassLoader();
 	private static final URL CLASSES_RESOURCE_DIR = Objects.requireNonNull(CL.getResource("./classes/"));
 	private static final URL DELEGATE_RESOURCE_DIR = Objects.requireNonNull(CL.getResource("./delegate/"));
 
-	StormClassLoaderTest() {
+	StormClassLoaderIntegrationTest() {
 		super(new URL[]{ CLASSES_RESOURCE_DIR, DELEGATE_RESOURCE_DIR });
 	}
 
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java b/src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java
similarity index 95%
rename from src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
rename to src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java
index 74d2afe..0a78602 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTransformerTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java
@@ -3,12 +3,11 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
+import io.pzstorm.storm.IntegrationTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import io.pzstorm.storm.UnitTest;
-
-class StormClassTransformerTest implements UnitTest {
+class StormClassTransformerIntegrationTest implements IntegrationTest {
 
 	private static final Class<?> STORM_CLASS_TRANSFORMER, STORM_CLASS_TRANSFORMERS;
 

From 3b95ad818473eba6099417137fe882e93c48c54b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 7 May 2021 23:50:37 +0200
Subject: [PATCH 138/323] Add test IDEA run configurations

---
 .idea/runConfigurations/Run_All_Tests.xml         | 12 ++++++++++++
 .idea/runConfigurations/Run_Integration_Tests.xml | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 .idea/runConfigurations/Run_All_Tests.xml
 create mode 100644 .idea/runConfigurations/Run_Integration_Tests.xml

diff --git a/.idea/runConfigurations/Run_All_Tests.xml b/.idea/runConfigurations/Run_All_Tests.xml
new file mode 100644
index 0000000..28c8c2a
--- /dev/null
+++ b/.idea/runConfigurations/Run_All_Tests.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run All Tests" type="JUnit" factoryName="JUnit">
+    <module name="pz-storm.test" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="directory" />
+    <dir value="$PROJECT_DIR$/src/test" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Run_Integration_Tests.xml b/.idea/runConfigurations/Run_Integration_Tests.xml
new file mode 100644
index 0000000..6a6f75c
--- /dev/null
+++ b/.idea/runConfigurations/Run_Integration_Tests.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run Integration Tests" type="JUnit" factoryName="JUnit">
+    <module name="pz-storm.test" />
+    <option name="MAIN_CLASS_NAME" value="" />
+    <option name="METHOD_NAME" value="" />
+    <option name="TEST_OBJECT" value="tags" />
+    <tag value="integration" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file

From 0e18c3d523d1245635a62ef941225a30d17cdbb6 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 04:10:10 +0200
Subject: [PATCH 139/323] Throw exception on bad handler context

---
 .../storm/event/StormEventDispatcher.java     | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
index 8c5a2ee..0a37e3f 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
+++ b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
@@ -1,6 +1,7 @@
 package io.pzstorm.storm.event;
 
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -59,7 +60,10 @@ public class StormEventDispatcher {
 	 * @param method {@code Method} to register with event handler.
 	 * @param handler event handler to register along with {@code Method}. It can be either an
 	 * 		instance of an object or a {@code Class} that represents the handler.
-	 * @throws IllegalArgumentException if the given {@code Method} does not have exactly one argument,
+	 *
+	 * @throws IllegalArgumentException if the handler parameter is {@code null} and given method is
+	 * 		<i>not</i> declared as {@code static}, handler is <i>not</i> {@code null} and given method is
+	 * 		declared as {@code static}, if the given {@code Method} does not have exactly one argument
 	 * 		or the argument is not an instance of {@link ZomboidEvent}.
 	 */
 	@SuppressWarnings("unchecked")
@@ -73,6 +77,24 @@ private static void registerEventHandlerMethod(Method method, @Nullable Object h
 				Class<?> cEventClass = parameters[0];
 				if (ZomboidEvent.class.isAssignableFrom(cEventClass))
 				{
+					if (handler == null)
+					{
+						if (!Modifier.isStatic(method.getModifiers()))
+						{
+							throw new IllegalArgumentException("Tried to register INSTANCE event handler method " +
+									"by passing null event handler. Either make the method STATIC or use a " +
+									"different context to register the handler. See StormEventDispatcher class " +
+									"documentation for more information. Method: " + method.getName());
+						}
+					}
+					else if (Modifier.isStatic(method.getModifiers()))
+					{
+						throw new IllegalArgumentException("Tried to register STATIC event handler method " +
+								"by passing an instance of handler class. Either remove the STATIC modifier " +
+								"or use a different context to register the handler. See StormEventDispatcher " +
+								"class documentation for more information. Method: " + method.getName());
+					}
+
 					Class<? extends ZomboidEvent> eventClass = (Class<? extends ZomboidEvent>) cEventClass;
 					EventHandlerMethod eventHandlerMethod = new EventHandlerMethod(method, handler);
 
@@ -108,6 +130,11 @@ private static void registerEventHandlerMethod(Method method, @Nullable Object h
 	 * {@link StormEventDispatcher} class documentation for more information.
 	 *
 	 * @param handlerClass {@code Class} of the event handler to register.
+	 *
+	 * @throws IllegalArgumentException if any subscribing method declared in handler is <i>not</i> declared as
+	 * 		{@code static}, if the any subscribing method does not have exactly one argument
+	 *		or the argument is not an instance of {@link ZomboidEvent}.
+	 *
 	 * @see #registerEventHandler(Object)
 	 */
 	public static void registerEventHandler(Class<?> handlerClass) {
@@ -125,6 +152,11 @@ public static void registerEventHandler(Class<?> handlerClass) {
 	 * {@link StormEventDispatcher} class documentation for more information.
 	 *
 	 * @param handler instance of the event handler to register.
+	 *
+	 * @throws IllegalArgumentException if any subscribing method declared in handler is declared as
+	 * 		{@code static}, if the any subscribing method does not have exactly one argument
+	 * 		or the argument is not an instance of {@link ZomboidEvent}.
+	 *
 	 * @see #registerEventHandler(Class)
 	 */
 	public static void registerEventHandler(Object handler) {

From 11f70b7b18b2cacce6d8d6cec9f7c4fc20f27499 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 04:10:58 +0200
Subject: [PATCH 140/323] Test registering event handler in contexts

---
 .../StormEventDispatcherIntegrationTest.java  | 39 +++++++++++++++++++
 .../TestInstanceContextEventHandler.java      | 17 ++++++++
 .../event/TestStaticContextEventHandler.java  | 17 ++++++++
 .../storm/event/TestZomboidEventA.java        |  9 +++++
 .../storm/event/TestZomboidEventB.java        |  9 +++++
 5 files changed, 91 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
 create mode 100644 src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java
 create mode 100644 src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java
 create mode 100644 src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java
 create mode 100644 src/test/java/io/pzstorm/storm/event/TestZomboidEventB.java

diff --git a/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java b/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
new file mode 100644
index 0000000..1752a10
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
@@ -0,0 +1,39 @@
+package io.pzstorm.storm.event;
+
+import io.pzstorm.storm.IntegrationTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+@SuppressWarnings("unused")
+class StormEventDispatcherIntegrationTest implements IntegrationTest {
+
+	@Test
+	void shouldRegisterEventHandlerWithInstanceContextAndDispatchEvents() {
+
+		TestInstanceContextEventHandler handler = new TestInstanceContextEventHandler();
+		StormEventDispatcher.registerEventHandler(handler);
+
+		Assertions.assertFalse(handler.eventsCalled[0]);
+		StormEventDispatcher.dispatchEvent(new TestZomboidEventA());
+		Assertions.assertTrue(handler.eventsCalled[0]);
+
+		Assertions.assertFalse(handler.eventsCalled[1]);
+		StormEventDispatcher.dispatchEvent(new TestZomboidEventB());
+		Assertions.assertTrue(handler.eventsCalled[1]);
+	}
+
+	@Test
+	void shouldRegisterEventHandlerWithStaticContextAndDispatchEvents() {
+
+		StormEventDispatcher.registerEventHandler(TestStaticContextEventHandler.class);
+
+		Assertions.assertFalse(TestStaticContextEventHandler.eventsCalled[0]);
+		StormEventDispatcher.dispatchEvent(new TestZomboidEventA());
+		Assertions.assertTrue(TestStaticContextEventHandler.eventsCalled[0]);
+
+		Assertions.assertFalse(TestStaticContextEventHandler.eventsCalled[1]);
+		StormEventDispatcher.dispatchEvent(new TestZomboidEventB());
+		Assertions.assertTrue(TestStaticContextEventHandler.eventsCalled[1]);
+	}
+
+}
diff --git a/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java b/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java
new file mode 100644
index 0000000..48cd950
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java
@@ -0,0 +1,17 @@
+package io.pzstorm.storm.event;
+
+@SuppressWarnings("unused")
+public class TestInstanceContextEventHandler {
+
+	Boolean[] eventsCalled = new Boolean[] { false, false };
+
+	@SubscribeEvent
+	public void handleTestZomboidEventA(TestZomboidEventA event) {
+		eventsCalled[0] = true;
+	}
+
+	@SubscribeEvent
+	public void handleTestZomboidEventB(TestZomboidEventB event) {
+		eventsCalled[1] = true;
+	}
+}
diff --git a/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java b/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java
new file mode 100644
index 0000000..24c57cf
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java
@@ -0,0 +1,17 @@
+package io.pzstorm.storm.event;
+
+@SuppressWarnings("unused")
+public class TestStaticContextEventHandler {
+
+	static Boolean[] eventsCalled = new Boolean[] { false, false };
+
+	@SubscribeEvent
+	public static void handleTestZomboidEventA(TestZomboidEventA event) {
+		eventsCalled[0] = true;
+	}
+
+	@SubscribeEvent
+	public static void handleTestZomboidEventB(TestZomboidEventB event) {
+		eventsCalled[1] = true;
+	}
+}
diff --git a/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java b/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java
new file mode 100644
index 0000000..d5e49eb
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event;
+
+public class TestZomboidEventA implements ZomboidEvent{
+
+	@Override
+	public String getName() {
+		return "zomboidEventA";
+	}
+}
diff --git a/src/test/java/io/pzstorm/storm/event/TestZomboidEventB.java b/src/test/java/io/pzstorm/storm/event/TestZomboidEventB.java
new file mode 100644
index 0000000..1dbf341
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/event/TestZomboidEventB.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event;
+
+public class TestZomboidEventB implements ZomboidEvent {
+
+	@Override
+	public String getName() {
+		return "zomboidEventB";
+	}
+}

From 56c58297808be340bc1273f9998f8f2565ab956a Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 04:14:55 +0200
Subject: [PATCH 141/323] Test throwing exceptions on handler registration

---
 .../StormEventDispatcherIntegrationTest.java  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java b/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
index 1752a10..7593b99 100644
--- a/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
@@ -36,4 +36,58 @@ void shouldRegisterEventHandlerWithStaticContextAndDispatchEvents() {
 		Assertions.assertTrue(TestStaticContextEventHandler.eventsCalled[1]);
 	}
 
+	@Test
+	void shouldThrowExceptionWhenHandlerRegisteredInWrongContext() {
+
+		// registration of instance context
+		Assertions.assertThrows(IllegalArgumentException.class, () ->
+				StormEventDispatcher.registerEventHandler(TestInstanceContextEventHandler.class)
+		);
+		// registration of static context
+		//noinspection InstantiationOfUtilityClass
+		Assertions.assertThrows(IllegalArgumentException.class, () ->
+				StormEventDispatcher.registerEventHandler(new TestStaticContextEventHandler())
+		);
+		// completely valid method
+		Assertions.assertDoesNotThrow(() ->
+				StormEventDispatcher.registerEventHandler(new Object() {
+					@SubscribeEvent
+					public void handleEvent(ZomboidEvent event) {}
+				})
+		);
+	}
+
+	@Test
+	void shouldThrowExceptionWhenHandlerRegisteredWithInvalidMethodParameters() {
+
+		// missing method parameters
+		Assertions.assertThrows(IllegalArgumentException.class, () ->
+				StormEventDispatcher.registerEventHandler(new Object() {
+					@SuppressWarnings("unused")
+					@SubscribeEvent
+					public void handleEvent() {}
+				})
+		);
+		// invalid method parameter type
+		Assertions.assertThrows(IllegalArgumentException.class, () ->
+				StormEventDispatcher.registerEventHandler(new Object() {
+					@SubscribeEvent
+					public void handleEvent(Object object) {}
+				})
+		);
+		// extra method parameters
+		Assertions.assertThrows(IllegalArgumentException.class, () ->
+				StormEventDispatcher.registerEventHandler(new Object() {
+					@SubscribeEvent
+					public void handleEvent(ZomboidEvent event, Object object) {}
+				})
+		);
+		// completely valid method
+		Assertions.assertDoesNotThrow(() ->
+				StormEventDispatcher.registerEventHandler(new Object() {
+					@SubscribeEvent
+					public void handleEvent(ZomboidEvent event) {}
+				})
+		);
+	}
 }

From d2ea8a7c44d42d0b8d770a6a01c618617f9fbb73 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 04:31:21 +0200
Subject: [PATCH 142/323] Do spotless code formatting

---
 .../io/pzstorm/storm/core/StormBootstrap.java |  4 +--
 .../pzstorm/storm/core/StormClassLoader.java  |  4 ++-
 .../storm/core/StormClassTransformer.java     |  6 +++--
 .../io/pzstorm/storm/core/StormLogger.java    | 14 +++++-----
 .../io/pzstorm/storm/core/package-info.java   |  2 +-
 .../storm/event/StormEventDispatcher.java     | 15 +++++------
 .../storm/event/StormEventHandler.java        |  2 +-
 .../pzstorm/storm/event/SubscribeEvent.java   |  1 +
 .../io/pzstorm/storm/event/package-info.java  |  2 +-
 .../storm/hook/OnMainScreenRenderHook.java    |  6 +++--
 .../storm/hook/OnUIElementPreRenderHook.java  | 26 ++++++++++---------
 .../io/pzstorm/storm/hook/package-info.java   |  2 +-
 .../java/io/pzstorm/storm/util/AsmUtils.java  |  2 ++
 .../io/pzstorm/storm/util/StormUtils.java     |  6 ++---
 .../io/pzstorm/storm/util/package-info.java   |  2 +-
 .../core/StormClassLoaderIntegrationTest.java |  7 ++---
 .../storm/core/StormClassTestTransformer.java |  1 +
 .../StormClassTransformerIntegrationTest.java |  6 +++--
 .../pzstorm/storm/core/StormLoggerTest.java   |  5 ++--
 .../StormEventDispatcherIntegrationTest.java  | 19 +++++++++-----
 .../storm/event/TestZomboidEventA.java        |  2 +-
 .../io/pzstorm/storm/util/AsmUtilsTest.java   |  6 ++---
 .../io/pzstorm/storm/util/StormUtilsTest.java |  3 ++-
 .../se/krka/kahlua/j2se/KahluaTableImpl.java  |  5 ++--
 .../zombie/gameStates/MainScreenState.java    |  2 --
 src/zombie/java/zombie/ui/TextManager.java    |  4 +--
 src/zombie/java/zombie/ui/UIElement.java      |  1 -
 27 files changed, 86 insertions(+), 69 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index 3e5c5d1..7531c51 100644
--- a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -1,9 +1,9 @@
 package io.pzstorm.storm.core;
 
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.reflect.Method;
 
+import org.jetbrains.annotations.Nullable;
+
 /**
  * This class bootstraps everything needed to launch the game with static initialization.
  * It should be loaded from {@link StormLauncher} before Storm attempts to launch the game.
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 3d69c22..9be10a0 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -90,6 +90,7 @@ static boolean isBlacklistedClass(String name) {
 	 * Defines and returns a package by name in this {@code ClassLoader}.
 	 *
 	 * @param name name of the package to define.
+	 *
 	 * @return instance of {@link Package} defined or {@code null} if no package defined.
 	 *
 	 * @throws IllegalArgumentException if package name duplicates an existing
@@ -125,8 +126,8 @@ public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundExce
 	 *
 	 * @param name the binary name of the class.
 	 * @param resolve if {@code true} then resolve the class.
-	 * @return the resulting {@code Class} object.
 	 *
+	 * @return the resulting {@code Class} object.
 	 * @throws ClassNotFoundException if the class could not be found.
 	 */
 	private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNotFoundException {
@@ -199,6 +200,7 @@ private String getClassFileName(String name) {
 	 * Reads the {@code Class} with given name into a {@code byte} array and return the result.
 	 *
 	 * @param name name of the {@code Class} to read.
+	 *
 	 * @return {@code byte} array read from {@code Class} or an empty array
 	 * 		if the {@code Class} with the given name could not be found.
 	 *
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index ecd1b3b..804bf99 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -23,9 +23,9 @@
  */
 public abstract class StormClassTransformer {
 
-	private @Nullable ClassReader classReader;
 	final String className;
 	final ClassNode visitor;
+	private @Nullable ClassReader classReader;
 
 	StormClassTransformer(String className, ClassNode visitor) {
 
@@ -42,6 +42,7 @@ public abstract class StormClassTransformer {
 	 *
 	 * @param name name of the method to match.
 	 * @param descriptor descriptor of the method to match.
+	 *
 	 * @return list of instructions for matched method or an empty {@link InsnList}.
 	 *
 	 * @see <a href="https://asm.ow2.io/asm4-guide.pdf#subsection.2.1.4">
@@ -66,6 +67,7 @@ public final InsnList getInstructionsForMethod(String name, String descriptor) {
 	 * Read or parse class byte array using {@link ClassReader}.
 	 *
 	 * @param rawClass array of bytes to read.
+	 *
 	 * @return {@code this} instance of {@link StormClassTransformer}.
 	 *
 	 * @throws ClassTransformationException if given byte array is empty.
@@ -122,8 +124,8 @@ byte[] write() {
 	 * Calls method chain to transform the given {@code Class} byte array.
 	 *
 	 * @param rawClass byte array representing the {@code Class} to transform.
-	 * @return byte array representing transformed class.
 	 *
+	 * @return byte array representing transformed class.
 	 * @throws ClassTransformationException if given byte array is empty.
 	 */
 	public byte[] transform(byte[] rawClass) {
diff --git a/src/main/java/io/pzstorm/storm/core/StormLogger.java b/src/main/java/io/pzstorm/storm/core/StormLogger.java
index eab7eda..8f31069 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLogger.java
@@ -21,8 +21,13 @@
 public class StormLogger {
 
 	public static final Level VERBOSE = Level.forName("VERBOSE", 450);
-	private static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger("Storm");
 	static final String LOGGER_PROPERTY = "storm.logger";
+	private static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger("Storm");
+
+	/* Make the constructor private to disable instantiation */
+	private StormLogger() {
+		throw new UnsupportedOperationException();
+	}
 
 	/**
 	 * Initialize {@link StormLogger} system by setting logging level resolved from system properties.
@@ -40,7 +45,7 @@ static void initialize() {
 				Configuration config = ctx.getConfiguration();
 
 				LoggerConfig rootLoggerConfig = config.getLoggers().get("");
-				for (String appender : new String[]{ "Console", "MainFile" })
+				for (String appender : new String[] { "Console", "MainFile" })
 				{
 					rootLoggerConfig.removeAppender(appender);
 					rootLoggerConfig.addAppender(config.getAppender(appender), level, null);
@@ -53,11 +58,6 @@ static void initialize() {
 		LOGGER.info("Initialized Storm logger");
 	}
 
-	/* Make the constructor private to disable instantiation */
-	private StormLogger() {
-		throw new UnsupportedOperationException();
-	}
-
 	/**
 	 * Returns an instance of Log4j {@link Logger} used for logging.
 	 */
diff --git a/src/main/java/io/pzstorm/storm/core/package-info.java b/src/main/java/io/pzstorm/storm/core/package-info.java
index 622dd6c..af12c85 100644
--- a/src/main/java/io/pzstorm/storm/core/package-info.java
+++ b/src/main/java/io/pzstorm/storm/core/package-info.java
@@ -1,4 +1,4 @@
 @NonNullPackage
 package io.pzstorm.storm.core;
 
-import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file
+import io.pzstorm.storm.NonNullPackage;
diff --git a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
index 0a37e3f..dbda5c8 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
+++ b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
@@ -7,17 +7,18 @@
 import java.util.Map;
 import java.util.Set;
 
-import io.pzstorm.storm.core.StormLogger;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.LabelNode;
 import org.objectweb.asm.tree.MethodInsnNode;
-import io.pzstorm.storm.hook.StormHook;
 
 import com.google.common.collect.Sets;
 
+import io.pzstorm.storm.core.StormLogger;
+import io.pzstorm.storm.hook.StormHook;
+
 /**
  * This class is responsible for registering event handlers and dispatching {@link ZomboidEvent} instances.
  * <p>
@@ -94,7 +95,6 @@ else if (Modifier.isStatic(method.getModifiers()))
 								"or use a different context to register the handler. See StormEventDispatcher " +
 								"class documentation for more information. Method: " + method.getName());
 					}
-
 					Class<? extends ZomboidEvent> eventClass = (Class<? extends ZomboidEvent>) cEventClass;
 					EventHandlerMethod eventHandlerMethod = new EventHandlerMethod(method, handler);
 
@@ -132,9 +132,8 @@ else if (Modifier.isStatic(method.getModifiers()))
 	 * @param handlerClass {@code Class} of the event handler to register.
 	 *
 	 * @throws IllegalArgumentException if any subscribing method declared in handler is <i>not</i> declared as
-	 * 		{@code static}, if the any subscribing method does not have exactly one argument
-	 *		or the argument is not an instance of {@link ZomboidEvent}.
-	 *
+	 *        {@code static}, if the any subscribing method does not have exactly one argument
+	 * 		or the argument is not an instance of {@link ZomboidEvent}.
 	 * @see #registerEventHandler(Object)
 	 */
 	public static void registerEventHandler(Class<?> handlerClass) {
@@ -154,9 +153,8 @@ public static void registerEventHandler(Class<?> handlerClass) {
 	 * @param handler instance of the event handler to register.
 	 *
 	 * @throws IllegalArgumentException if any subscribing method declared in handler is declared as
-	 * 		{@code static}, if the any subscribing method does not have exactly one argument
+	 *        {@code static}, if the any subscribing method does not have exactly one argument
 	 * 		or the argument is not an instance of {@link ZomboidEvent}.
-	 *
 	 * @see #registerEventHandler(Class)
 	 */
 	public static void registerEventHandler(Object handler) {
@@ -175,6 +173,7 @@ public static void registerEventHandler(Object handler) {
 	 * @param eventConstructorInsn list of instructions that represent constructing a new
 	 *        {@link ZomboidEvent} instance and adding the result to the stack. These instructions
 	 * 		will be <i>transferred</i> to the start of the resulting instruction list.
+	 *
 	 * @see #dispatchEvent(ZomboidEvent)
 	 */
 	public static InsnList callDispatchEvent(List<AbstractInsnNode> eventConstructorInsn) {
diff --git a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
index 675ce4a..b610827 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
+++ b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
@@ -23,7 +23,7 @@ public static void handleUIElementRenderEvent(OnUIElementPreRenderEvent event) {
 			KahluaTable table = event.element.Parent.table;
 			if (table instanceof KahluaTableImpl)
 			{
-				Object internal = ((KahluaTableImpl)table).delegate.get("internal");
+				Object internal = ((KahluaTableImpl) table).delegate.get("internal");
 				if (internal instanceof String && internal.equals("VERSIONDETAIL"))
 				{
 					String text = "Storm version 0.1.0-alpha";
diff --git a/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java b/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
index 7cbd433..ca45e49 100644
--- a/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
+++ b/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
@@ -16,4 +16,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 @SuppressWarnings("WeakerAccess")
 public @interface SubscribeEvent {
+
 }
diff --git a/src/main/java/io/pzstorm/storm/event/package-info.java b/src/main/java/io/pzstorm/storm/event/package-info.java
index f54c5a7..24eda10 100644
--- a/src/main/java/io/pzstorm/storm/event/package-info.java
+++ b/src/main/java/io/pzstorm/storm/event/package-info.java
@@ -1,4 +1,4 @@
 @NonNullPackage
 package io.pzstorm.storm.event;
 
-import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file
+import io.pzstorm.storm.NonNullPackage;
diff --git a/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java b/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
index 856e8f1..44546d8 100644
--- a/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
+++ b/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
@@ -1,13 +1,15 @@
 package io.pzstorm.storm.hook;
 
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
 import com.google.common.collect.ImmutableList;
+
 import io.pzstorm.storm.core.StormClassTransformer;
 import io.pzstorm.storm.event.OnMainScreenRenderEvent;
 import io.pzstorm.storm.event.StormEventDispatcher;
 import io.pzstorm.storm.util.AsmUtils;
 import io.pzstorm.storm.util.StormUtils;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
 
 public class OnMainScreenRenderHook implements StormHook {
 
diff --git a/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java b/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
index 92a6e3e..35023ba 100644
--- a/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
+++ b/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
@@ -1,13 +1,15 @@
 package io.pzstorm.storm.hook;
 
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
 import com.google.common.collect.ImmutableList;
+
 import io.pzstorm.storm.core.StormClassTransformer;
 import io.pzstorm.storm.event.OnUIElementPreRenderEvent;
 import io.pzstorm.storm.event.StormEventDispatcher;
 import io.pzstorm.storm.util.AsmUtils;
 import io.pzstorm.storm.util.StormUtils;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
 
 public class OnUIElementPreRenderHook implements StormHook {
 
@@ -30,23 +32,23 @@ public void installHook(StormClassTransformer transformer) {
 		// -> insert <-
 		// ...
 		LabelNode callPrerender = AsmUtils.getFirstMatchingLabelNode(instructions, ImmutableList.of(
-				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "caller",
-						"Lse/krka/kahlua/integration/LuaCaller;"
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager",
+						"caller", "Lse/krka/kahlua/integration/LuaCaller;"
 				),
-				new MethodInsnNode(Opcodes.INVOKESTATIC, "zombie/ui/UIManager", "getDefaultThread",
-						"()Lse/krka/kahlua/vm/KahluaThread;"
+				new MethodInsnNode(Opcodes.INVOKESTATIC, "zombie/ui/UIManager",
+						"getDefaultThread", "()Lse/krka/kahlua/vm/KahluaThread;"
 				),
 				new VarInsnNode(Opcodes.ALOAD, 0),
-				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/ui/UIElement", "getTable",
-						"()Lse/krka/kahlua/vm/KahluaTable;"
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/ui/UIElement",
+						"getTable", "()Lse/krka/kahlua/vm/KahluaTable;"
 				),
 				new LdcInsnNode("prerender"),
-				new MethodInsnNode(Opcodes.INVOKEINTERFACE, "se/krka/kahlua/vm/KahluaTable", "rawget",
-								"(Ljava/lang/Object;)Ljava/lang/Object;", true
+				new MethodInsnNode(Opcodes.INVOKEINTERFACE, "se/krka/kahlua/vm/KahluaTable",
+						"rawget", "(Ljava/lang/Object;)Ljava/lang/Object;", true
 				),
 				new VarInsnNode(Opcodes.ALOAD, 0),
-				new FieldInsnNode(Opcodes.GETFIELD, "zombie/ui/UIElement", "table",
-						"Lse/krka/kahlua/vm/KahluaTable;"
+				new FieldInsnNode(Opcodes.GETFIELD, "zombie/ui/UIElement",
+						"table", "Lse/krka/kahlua/vm/KahluaTable;"
 				),
 				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "se/krka/kahlua/integration/LuaCaller", "pcallvoid",
 						"(Lse/krka/kahlua/vm/KahluaThread;Ljava/lang/Object;Ljava/lang/Object;)V"))
diff --git a/src/main/java/io/pzstorm/storm/hook/package-info.java b/src/main/java/io/pzstorm/storm/hook/package-info.java
index 5510c69..72877ea 100644
--- a/src/main/java/io/pzstorm/storm/hook/package-info.java
+++ b/src/main/java/io/pzstorm/storm/hook/package-info.java
@@ -1,4 +1,4 @@
 @NonNullPackage
 package io.pzstorm.storm.hook;
 
-import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file
+import io.pzstorm.storm.NonNullPackage;
diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index 6ef8711..d438cb1 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -52,6 +52,7 @@ public static InsnList createInsnList(AbstractInsnNode... instructions) {
 	 *
 	 * @param list list of instructions to search.
 	 * @param match list of instructions to match.
+	 *
 	 * @return first {@code LabelNode} that was matched or {@code null} if no node was matched.
 	 */
 	public static @Nullable LabelNode getFirstMatchingLabelNode(InsnList list, List<AbstractInsnNode> match) {
@@ -98,6 +99,7 @@ public static InsnList createInsnList(AbstractInsnNode... instructions) {
 	 *
 	 * @param a first node to compare.
 	 * @param b second node to compare.
+	 *
 	 * @return {@code true} if node fields are equal, {@code false} otherwise.
 	 */
 	public static boolean equalNodes(AbstractInsnNode a, AbstractInsnNode b) {
diff --git a/src/main/java/io/pzstorm/storm/util/StormUtils.java b/src/main/java/io/pzstorm/storm/util/StormUtils.java
index 6533eeb..396546d 100644
--- a/src/main/java/io/pzstorm/storm/util/StormUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/StormUtils.java
@@ -1,9 +1,9 @@
 package io.pzstorm.storm.util;
 
-import io.pzstorm.storm.core.StormLogger;
-
 import java.lang.reflect.Method;
 
+import io.pzstorm.storm.core.StormLogger;
+
 public class StormUtils {
 
 	/**
@@ -26,7 +26,7 @@ public static String getClassAsPath(Class<?> clazz) {
 	 *
 	 * @throws ReflectiveOperationException if an exception occurred while invoking method.
 	 */
-	public static void invokeRestrictedMethod(Method method, Object obj, Object...args) throws ReflectiveOperationException {
+	public static void invokeRestrictedMethod(Method method, Object obj, Object... args) throws ReflectiveOperationException {
 
 		boolean wasAccessible = false;
 		if (method.isAccessible())
diff --git a/src/main/java/io/pzstorm/storm/util/package-info.java b/src/main/java/io/pzstorm/storm/util/package-info.java
index 7643d01..d4fc46f 100644
--- a/src/main/java/io/pzstorm/storm/util/package-info.java
+++ b/src/main/java/io/pzstorm/storm/util/package-info.java
@@ -1,4 +1,4 @@
 @NonNullPackage
 package io.pzstorm.storm.util;
 
-import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file
+import io.pzstorm.storm.NonNullPackage;
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java
index 3faec22..1161be2 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java
@@ -9,13 +9,14 @@
 import java.nio.file.Files;
 import java.util.*;
 
-import io.pzstorm.storm.IntegrationTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
+import io.pzstorm.storm.IntegrationTest;
+
 @SuppressWarnings("SpellCheckingInspection")
 class StormClassLoaderIntegrationTest extends StormClassLoader implements IntegrationTest {
 
@@ -24,7 +25,7 @@ class StormClassLoaderIntegrationTest extends StormClassLoader implements Integr
 	private static final URL DELEGATE_RESOURCE_DIR = Objects.requireNonNull(CL.getResource("./delegate/"));
 
 	StormClassLoaderIntegrationTest() {
-		super(new URL[]{ CLASSES_RESOURCE_DIR, DELEGATE_RESOURCE_DIR });
+		super(new URL[] { CLASSES_RESOURCE_DIR, DELEGATE_RESOURCE_DIR });
 	}
 
 	private static String getRandomString() {
@@ -107,7 +108,7 @@ void shouldDelegateToResourceClassLoaderWhenResolvingResource() {
 	@Test
 	void whenIncorrectPackageNameShouldNotDefinePackage() {
 
-		String[] incorrectPackageNames = new String[]{
+		String[] incorrectPackageNames = new String[] {
 				"package", ".package", ".", ""
 		};
 		for (String incorrectPackageName : incorrectPackageNames) {
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
index 2c62800..92f2f1b 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
@@ -70,6 +70,7 @@ private static String getBytecodeFor(ClassNode classNode) {
 	 * @param className filename of the original (unrevised file).
 	 * @param originalCode lines of the original file.
 	 * @param modifiedCode lines of the modified file.
+	 *
 	 * @return bytecode difference between two set of code lines.
 	 */
 	private static String getBytecodeDiff(String className, String originalCode, String modifiedCode) {
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java
index 0a78602..4b9d6b6 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java
@@ -3,15 +3,17 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
-import io.pzstorm.storm.IntegrationTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import io.pzstorm.storm.IntegrationTest;
+
 class StormClassTransformerIntegrationTest implements IntegrationTest {
 
 	private static final Class<?> STORM_CLASS_TRANSFORMER, STORM_CLASS_TRANSFORMERS;
 
-	static {
+	static
+	{
 		try {
 			STORM_CLASS_TRANSFORMER = Class.forName(
 					"io.pzstorm.storm.core.StormClassTransformer",
diff --git a/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
index 46373cf..fa09a08 100644
--- a/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import io.pzstorm.storm.UnitTest;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -15,6 +14,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import io.pzstorm.storm.UnitTest;
+
 class StormLoggerTest implements UnitTest {
 
 	@Test
@@ -63,7 +64,7 @@ void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationE
 				Assertions.assertEquals(expectedLevel, entry.getValue());
 			}
 			// reset the logger levels to original values
-			for (String appender : new String[]{ "Console", "MainFile" })
+			for (String appender : new String[] { "Console", "MainFile" })
 			{
 				rootLoggerConfig.removeAppender(appender);
 				rootLoggerConfig.addAppender(config.getAppender(appender), originalLevel, null);
diff --git a/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java b/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
index 7593b99..eceb345 100644
--- a/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
@@ -1,9 +1,10 @@
 package io.pzstorm.storm.event;
 
-import io.pzstorm.storm.IntegrationTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import io.pzstorm.storm.IntegrationTest;
+
 @SuppressWarnings("unused")
 class StormEventDispatcherIntegrationTest implements IntegrationTest {
 
@@ -24,7 +25,6 @@ void shouldRegisterEventHandlerWithInstanceContextAndDispatchEvents() {
 
 	@Test
 	void shouldRegisterEventHandlerWithStaticContextAndDispatchEvents() {
-
 		StormEventDispatcher.registerEventHandler(TestStaticContextEventHandler.class);
 
 		Assertions.assertFalse(TestStaticContextEventHandler.eventsCalled[0]);
@@ -52,7 +52,8 @@ void shouldThrowExceptionWhenHandlerRegisteredInWrongContext() {
 		Assertions.assertDoesNotThrow(() ->
 				StormEventDispatcher.registerEventHandler(new Object() {
 					@SubscribeEvent
-					public void handleEvent(ZomboidEvent event) {}
+					public void handleEvent(ZomboidEvent event) {
+					}
 				})
 		);
 	}
@@ -65,28 +66,32 @@ void shouldThrowExceptionWhenHandlerRegisteredWithInvalidMethodParameters() {
 				StormEventDispatcher.registerEventHandler(new Object() {
 					@SuppressWarnings("unused")
 					@SubscribeEvent
-					public void handleEvent() {}
+					public void handleEvent() {
+					}
 				})
 		);
 		// invalid method parameter type
 		Assertions.assertThrows(IllegalArgumentException.class, () ->
 				StormEventDispatcher.registerEventHandler(new Object() {
 					@SubscribeEvent
-					public void handleEvent(Object object) {}
+					public void handleEvent(Object object) {
+					}
 				})
 		);
 		// extra method parameters
 		Assertions.assertThrows(IllegalArgumentException.class, () ->
 				StormEventDispatcher.registerEventHandler(new Object() {
 					@SubscribeEvent
-					public void handleEvent(ZomboidEvent event, Object object) {}
+					public void handleEvent(ZomboidEvent event, Object object) {
+					}
 				})
 		);
 		// completely valid method
 		Assertions.assertDoesNotThrow(() ->
 				StormEventDispatcher.registerEventHandler(new Object() {
 					@SubscribeEvent
-					public void handleEvent(ZomboidEvent event) {}
+					public void handleEvent(ZomboidEvent event) {
+					}
 				})
 		);
 	}
diff --git a/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java b/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java
index d5e49eb..288eed2 100644
--- a/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java
+++ b/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java
@@ -1,6 +1,6 @@
 package io.pzstorm.storm.event;
 
-public class TestZomboidEventA implements ZomboidEvent{
+public class TestZomboidEventA implements ZomboidEvent {
 
 	@Override
 	public String getName() {
diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index f4c2a35..587d04d 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -17,7 +17,7 @@
 class AsmUtilsTest implements UnitTest {
 
 	private static final String intDesc = "(I)Ljava/lang/Integer;";
-	private static final LabelNode[] LABELS = new LabelNode[]{
+	private static final LabelNode[] LABELS = new LabelNode[] {
 			new LabelNode(), new LabelNode(), new LabelNode(),
 			new LabelNode(), new LabelNode()
 	};
@@ -129,8 +129,8 @@ void shouldGetLastInstructionOfType() {
 	void shouldGetFirstMatchingLabelNodeInstruction() {
 
 		List<Integer[]> labelIndexPairs = ImmutableList.of(
-				new Integer[]{ 0, 6 }, new Integer[]{ 6, 12 },
-				new Integer[]{ 12, 23 }, new Integer[]{ 23, 27 }
+				new Integer[] { 0, 6 }, new Integer[] { 6, 12 },
+				new Integer[] { 12, 23 }, new Integer[] { 23, 27 }
 		);
 		for (int i1 = 0; i1 < labelIndexPairs.size(); i1++)
 		{
diff --git a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
index 7a406eb..6fba0a1 100644
--- a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
@@ -2,10 +2,11 @@
 
 import java.lang.reflect.Method;
 
-import io.pzstorm.storm.UnitTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import io.pzstorm.storm.UnitTest;
+
 @SuppressWarnings("unused")
 class StormUtilsTest implements UnitTest {
 
diff --git a/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java b/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
index 1f85116..0f4e4f7 100644
--- a/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
+++ b/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
@@ -1,13 +1,12 @@
 package se.krka.kahlua.j2se;
 
+import java.util.Map;
+
 import se.krka.kahlua.vm.KahluaTable;
 import zombie.ZomboidClass;
 
-import java.util.Map;
-
 @ZomboidClass
 @SuppressWarnings("ALL")
 public class KahluaTableImpl implements KahluaTable {
-
 	public Map<Object, Object> delegate;
 }
diff --git a/src/zombie/java/zombie/gameStates/MainScreenState.java b/src/zombie/java/zombie/gameStates/MainScreenState.java
index 6dee3f2..02fbe08 100644
--- a/src/zombie/java/zombie/gameStates/MainScreenState.java
+++ b/src/zombie/java/zombie/gameStates/MainScreenState.java
@@ -5,8 +5,6 @@
 @ZomboidClass
 @SuppressWarnings("ALL")
 public class MainScreenState {
-
 	public void render() {
-
 	}
 }
diff --git a/src/zombie/java/zombie/ui/TextManager.java b/src/zombie/java/zombie/ui/TextManager.java
index 1b84a2e..3a15ab0 100644
--- a/src/zombie/java/zombie/ui/TextManager.java
+++ b/src/zombie/java/zombie/ui/TextManager.java
@@ -9,7 +9,7 @@ public class TextManager {
 	public static TextManager instance;
 
 	@SuppressWarnings("unused")
-	public void DrawString(UIFont var1, double var2, double var4, String var6, double var7, double var9, double var11, double var13) {
-
+	public void DrawString(UIFont var1, double var2, double var4, String var6,
+						   double var7, double var9, double var11, double var13) {
 	}
 }
diff --git a/src/zombie/java/zombie/ui/UIElement.java b/src/zombie/java/zombie/ui/UIElement.java
index d25a359..7dd4a5f 100644
--- a/src/zombie/java/zombie/ui/UIElement.java
+++ b/src/zombie/java/zombie/ui/UIElement.java
@@ -11,6 +11,5 @@ public class UIElement {
 	public KahluaTable table;
 
 	public void render() {
-
 	}
 }

From b8a7ebce3cb0c9c8037a62d62ea627cb3f58d4ed Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 04:31:46 +0200
Subject: [PATCH 143/323] Update IDEA project code style

---
 .idea/codeStyles/Project.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index be8fc47..f5514e9 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -8,6 +8,7 @@
     <JavaCodeStyleSettings>
       <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
       <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+      <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
       <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
       <option name="JD_P_AT_EMPTY_LINES" value="false" />
       <option name="JD_KEEP_EMPTY_LINES" value="false" />
@@ -30,6 +31,7 @@
       <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="CATCH_ON_NEW_LINE" value="true" />
       <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
       <option name="WRAP_LONG_LINES" value="true" />
       <option name="SOFT_MARGINS" value="110" />
       <indentOptions>

From 7f9d64c0d3f31c3f9a7c1a54a18ee5472c76420d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 04:40:25 +0200
Subject: [PATCH 144/323] Fix zombie module compiler error

KahluaTableImpl is not abstract and does not override abstract method getString(String) in KahluaTable
---
 src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java b/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
index 0f4e4f7..6bc25e2 100644
--- a/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
+++ b/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
@@ -7,6 +7,6 @@
 
 @ZomboidClass
 @SuppressWarnings("ALL")
-public class KahluaTableImpl implements KahluaTable {
+public abstract class KahluaTableImpl implements KahluaTable {
 	public Map<Object, Object> delegate;
 }

From c93c61d54a1761ba600dfecba64771e09e5601d3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 17:12:54 +0200
Subject: [PATCH 145/323] Remove media sourceSet

This sourceSet was added by capsid for mod development.
---
 build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.gradle b/build.gradle
index 6641289..aa49a77 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,8 @@ sourceSets {
 		runtimeClasspath += sourceSets.zombie.output
 		compileClasspath += sourceSets.zombie.output
 	}
+	// remove media sourceSet created by capsid
+	remove(sourceSets.media)
 }
 configurations {
 	zombieImplementation.extendsFrom(compileOnly, zomboidImplementation)

From a20fdb30837c19a7ed6da277104f21748c0b1a57 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 21:55:58 +0200
Subject: [PATCH 146/323] Add main to zombie module classpath

---
 build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index aa49a77..49063cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,9 @@ capsid {
 sourceSets {
 	// module containing zomboid dummy classes and classes used in testing
 	// this module is only required by tests and CI compiler
-	zombie {}
+	zombie {
+		compileClasspath += sourceSets.main.output
+	}
 	main {
 		// add dummy zomboid classes to classpath when compiling on CI
 		if (System.getenv("CI") != null) {
@@ -41,7 +43,7 @@ sourceSets {
 	remove(sourceSets.media)
 }
 configurations {
-	zombieImplementation.extendsFrom(compileOnly, zomboidImplementation)
+	zombieImplementation.extendsFrom(compileOnly, implementation, zomboidImplementation)
 }
 
 dependencies {

From ed1c36d3ac2d8f8fc604ab83fe6af141e8106a86 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 21:56:49 +0200
Subject: [PATCH 147/323] Fix dispatchEvent method throwing NPE

---
 .../io/pzstorm/storm/event/StormEventDispatcher.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
index dbda5c8..d2912c2 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
+++ b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
@@ -51,7 +51,9 @@ public class StormEventDispatcher {
 
 	/**
 	 * Internal registry that maps {@link ZomboidEvent} classes to handler methods.
-	 * These methods are then invoked when dispatching matching events.
+	 * These methods are then invoked when dispatching matching events. Event registration happens
+	 * on-demand which means that registry will only contain an event entry if at least one registered
+	 * handler contains at least one method that subscribe to that event.
 	 */
 	private static final Map<Class<? extends ZomboidEvent>, Set<EventHandlerMethod>> DISPATCH_REGISTRY = new HashMap<>();
 
@@ -201,8 +203,12 @@ public static InsnList callDispatchEvent(List<AbstractInsnNode> eventConstructor
 	 */
 	public static void dispatchEvent(ZomboidEvent event) {
 
-		for (EventHandlerMethod handler : DISPATCH_REGISTRY.get(event.getClass())) {
-			handler.invoke(event);
+		Set<EventHandlerMethod> handlerMethods = DISPATCH_REGISTRY.get(event.getClass());
+		if (handlerMethods != null)
+		{
+			for (EventHandlerMethod method : handlerMethods) {
+				method.invoke(event);
+			}
 		}
 	}
 

From 7c45ce7258eed293062ccf902e06220dfd30a0d5 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 22:00:01 +0200
Subject: [PATCH 148/323] Remove redundant class qualifier

---
 src/main/java/io/pzstorm/storm/core/StormLogger.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormLogger.java b/src/main/java/io/pzstorm/storm/core/StormLogger.java
index 8f31069..836879c 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLogger.java
@@ -22,7 +22,7 @@ public class StormLogger {
 
 	public static final Level VERBOSE = Level.forName("VERBOSE", 450);
 	static final String LOGGER_PROPERTY = "storm.logger";
-	private static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger("Storm");
+	private static final Logger LOGGER = LogManager.getLogger("Storm");
 
 	/* Make the constructor private to disable instantiation */
 	private StormLogger() {

From 9d26aaeafe6aacbd1223698ab010e3eb711e57d6 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 22:03:19 +0200
Subject: [PATCH 149/323] Add new ASM utility method

---
 .../java/io/pzstorm/storm/util/AsmUtils.java  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index d438cb1..a531811 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.ListIterator;
 
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.tree.*;
@@ -91,6 +92,38 @@ public static InsnList createInsnList(AbstractInsnNode... instructions) {
 		return null;
 	}
 
+	/**
+	 * Replace all instructions between the given {@link LabelNode} and next label node in
+	 * specified list of instructions. Note that label nodes will not be altered in any way,
+	 * they are only used to mark the start and end of replacement operation.
+	 *
+	 * @param list list of instructions to replace nodes in.
+	 * @param target {@link LabelNode} that marks the start of replacement.
+	 * @param content list of instructions to insert after target node.
+	 *
+	 * @return {@code true} if replacement was successful, {@code false} otherwise.
+	 *///@formatter:off
+	public static boolean replaceFirstMatchingLabelNode(InsnList list, LabelNode target, List<AbstractInsnNode> content) {
+
+		ListIterator<AbstractInsnNode> iterator = list.iterator();
+		while (iterator.hasNext())
+		{
+			if (iterator.next().equals(target))
+			{
+				while (iterator.hasNext())
+				{
+					if (iterator.next() instanceof LabelNode) {
+						iterator.previous(); break;
+					}
+					iterator.remove();
+				}
+				content.forEach(iterator::add);
+				return true;
+			}
+		}//@formatter:on
+		return false;
+	}
+
 	/**
 	 * Compare the given nodes and return {@code true} if they are equal.
 	 * Since instances of {@link AbstractInsnNode} do not implement a equality comparison,

From 89832847a252451b84b3ecbcba3be8039804f421 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 8 May 2021 22:04:15 +0200
Subject: [PATCH 150/323] Test replacing matched node instructions

---
 .../io/pzstorm/storm/util/AsmUtilsTest.java   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index 587d04d..04c96e4 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -1,6 +1,7 @@
 package io.pzstorm.storm.util;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -145,6 +146,26 @@ void shouldGetFirstMatchingLabelNodeInstruction() {
 		}
 	}
 
+	@Test
+	void shouldReplaceFirstMatchingLabelNodeInstructions() {
+
+		// String a = String.valueOf(2 + 2);
+		List<AbstractInsnNode> expectedList = ImmutableList.of(
+				new InsnNode(Opcodes.ICONST_4),
+				new MethodInsnNode(Opcodes.INVOKESTATIC,
+						"java/lang/String", "valueOf", "(I)Ljava/lang/String;"),
+				new VarInsnNode(Opcodes.ASTORE, 1)
+		);
+		InsnList instructions = createInstructionList();
+		Assertions.assertTrue(AsmUtils.replaceFirstMatchingLabelNode(instructions, LABELS[1], expectedList));
+
+		Iterator<AbstractInsnNode> iteratorA = instructions.iterator(7);
+		for (AbstractInsnNode expectedNode : expectedList) {
+			Assertions.assertTrue(AsmUtils.equalNodes(iteratorA.next(), expectedNode));
+		}
+		Assertions.assertTrue(iteratorA.next() instanceof LabelNode);
+	}
+
 	@Test
 	void shouldCompareInstructionNodeFields() {
 		// TODO: finish writing this test

From 42a614fe81a4c1fbd26e6e7054372b6e06204b17 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 9 May 2021 21:33:19 +0200
Subject: [PATCH 151/323] Move StormLogger to logging package

---
 .../java/io/pzstorm/storm/core/StormClassLoader.java     | 3 ++-
 .../io/pzstorm/storm/core/StormClassTransformer.java     | 1 +
 src/main/java/io/pzstorm/storm/core/StormLauncher.java   | 2 ++
 .../io/pzstorm/storm/event/StormEventDispatcher.java     | 2 +-
 .../io/pzstorm/storm/{core => logging}/StormLogger.java  | 2 +-
 src/main/java/io/pzstorm/storm/util/StormUtils.java      | 2 +-
 .../io/pzstorm/storm/core/StormClassTestTransformer.java | 1 +
 .../pzstorm/storm/{core => logging}/StormLoggerTest.java | 9 +++++----
 8 files changed, 14 insertions(+), 8 deletions(-)
 rename src/main/java/io/pzstorm/storm/{core => logging}/StormLogger.java (99%)
 rename src/test/java/io/pzstorm/storm/{core => logging}/StormLoggerTest.java (89%)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 9be10a0..276bc8d 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -7,6 +7,7 @@
 import java.net.URLClassLoader;
 import java.util.Objects;
 
+import io.pzstorm.storm.logging.StormLogger;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
@@ -31,7 +32,7 @@ class StormClassLoader extends ClassLoader {
 	private static final ImmutableSet<String> CLASS_BLACKLIST = ImmutableSet.of(
 			"java.", "org.objectweb.asm.", "sun.", "com.sun.", "org.xml.", "org.w3c.",
 			"javax.script.", "javax.management.", "javax.imageio.", "javax.xml.",
-			"io.pzstorm.storm.core.StormLogger"
+			"io.pzstorm.storm.logging.StormLogger"
 	);
 	protected final URLClassLoader resourceClassLoader;
 	/**
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index 804bf99..be5748c 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -2,6 +2,7 @@
 
 import java.util.Optional;
 
+import io.pzstorm.storm.logging.StormLogger;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.ClassReader;
diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index bcede28..eca3943 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -1,5 +1,7 @@
 package io.pzstorm.storm.core;
 
+import io.pzstorm.storm.logging.StormLogger;
+
 import java.lang.reflect.Method;
 
 class StormLauncher {
diff --git a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
index d2912c2..6a46287 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
+++ b/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
@@ -16,7 +16,7 @@
 
 import com.google.common.collect.Sets;
 
-import io.pzstorm.storm.core.StormLogger;
+import io.pzstorm.storm.logging.StormLogger;
 import io.pzstorm.storm.hook.StormHook;
 
 /**
diff --git a/src/main/java/io/pzstorm/storm/core/StormLogger.java b/src/main/java/io/pzstorm/storm/logging/StormLogger.java
similarity index 99%
rename from src/main/java/io/pzstorm/storm/core/StormLogger.java
rename to src/main/java/io/pzstorm/storm/logging/StormLogger.java
index 836879c..49220ca 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/logging/StormLogger.java
@@ -1,4 +1,4 @@
-package io.pzstorm.storm.core;
+package io.pzstorm.storm.logging;
 
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
diff --git a/src/main/java/io/pzstorm/storm/util/StormUtils.java b/src/main/java/io/pzstorm/storm/util/StormUtils.java
index 396546d..2c04871 100644
--- a/src/main/java/io/pzstorm/storm/util/StormUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/StormUtils.java
@@ -2,7 +2,7 @@
 
 import java.lang.reflect.Method;
 
-import io.pzstorm.storm.core.StormLogger;
+import io.pzstorm.storm.logging.StormLogger;
 
 public class StormUtils {
 
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
index 92f2f1b..cc22d19 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
@@ -5,6 +5,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import io.pzstorm.storm.logging.StormLogger;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
diff --git a/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java
similarity index 89%
rename from src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
rename to src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java
index fa09a08..ef72b60 100644
--- a/src/test/java/io/pzstorm/storm/core/StormLoggerTest.java
+++ b/src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java
@@ -1,9 +1,10 @@
-package io.pzstorm.storm.core;
+package io.pzstorm.storm.logging;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Map;
 
+import io.pzstorm.storm.logging.StormLogger;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -51,12 +52,12 @@ void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationE
 			for (AppenderControl appenderControl : appenders.get())
 			{
 				String appenderName = appenderControl.getAppenderName();
-				if (appenderName.equals("Console") || appenderName.equals("MainFile")) {
+				if (appenderName.equals("StormConsole") || appenderName.equals("MainFile")) {
 					actualLevels.put(appenderName, (Level) appenderLevelField.get(appenderControl));
 				}
 			}
 			// assert that all appenders were found
-			Assertions.assertTrue(actualLevels.containsKey("Console"));
+			Assertions.assertTrue(actualLevels.containsKey("StormConsole"));
 			Assertions.assertTrue(actualLevels.containsKey("MainFile"));
 
 			// assert that logger has correct levels
@@ -64,7 +65,7 @@ void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationE
 				Assertions.assertEquals(expectedLevel, entry.getValue());
 			}
 			// reset the logger levels to original values
-			for (String appender : new String[] { "Console", "MainFile" })
+			for (String appender : new String[] { "StormConsole", "MainFile" })
 			{
 				rootLoggerConfig.removeAppender(appender);
 				rootLoggerConfig.addAppender(config.getAppender(appender), originalLevel, null);

From 513efe3600556b5ce592b453c1969a47e29646a3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 9 May 2021 22:19:24 +0200
Subject: [PATCH 152/323] Relax StormLogger encapsulation

---
 src/main/java/io/pzstorm/storm/logging/StormLogger.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/logging/StormLogger.java b/src/main/java/io/pzstorm/storm/logging/StormLogger.java
index 49220ca..f4a797a 100644
--- a/src/main/java/io/pzstorm/storm/logging/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/logging/StormLogger.java
@@ -33,7 +33,7 @@ private StormLogger() {
 	 * Initialize {@link StormLogger} system by setting logging level resolved from system properties.
 	 * To configure console logging level launch Storm with {@code JVM_PROPERTY} set to a custom logger level.
 	 */
-	static void initialize() {
+	public static void initialize() {
 
 		String sLevel = System.getProperty(LOGGER_PROPERTY);
 		if (sLevel != null && !sLevel.isEmpty())

From e2a3fc35e0e3a1730b3ce61265a0ebc08f933267 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 9 May 2021 22:20:35 +0200
Subject: [PATCH 153/323] Exclude StormLogger file level change

---
 .../java/io/pzstorm/storm/logging/StormLogger.java     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/logging/StormLogger.java b/src/main/java/io/pzstorm/storm/logging/StormLogger.java
index f4a797a..e7575f7 100644
--- a/src/main/java/io/pzstorm/storm/logging/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/logging/StormLogger.java
@@ -8,7 +8,7 @@
 import org.apache.logging.log4j.core.config.LoggerConfig;
 
 /**
- * <p>Simple wrapper class for logging with Log4j 2 logger.
+ * <p>Wrapper class for printing Storm logs with Log4j 2 logger.
  * To configure console logging level launch Storm with {@code JVM_PROPERTY}
  * set to a custom logger level and call {@link #initialize()} method.
  * </p><p>
@@ -45,11 +45,9 @@ public static void initialize() {
 				Configuration config = ctx.getConfiguration();
 
 				LoggerConfig rootLoggerConfig = config.getLoggers().get("");
-				for (String appender : new String[] { "Console", "MainFile" })
-				{
-					rootLoggerConfig.removeAppender(appender);
-					rootLoggerConfig.addAppender(config.getAppender(appender), level, null);
-				}
+				rootLoggerConfig.removeAppender("StormConsole");
+				rootLoggerConfig.addAppender(config.getAppender("StormConsole"), level, null);
+
 				ctx.updateLoggers();
 				LOGGER.info("Setting custom level for Storm logger '" + sLevel + '\'');
 			}

From 9c5384250cf910d705414bd3b1f057430c06dd06 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 9 May 2021 22:21:56 +0200
Subject: [PATCH 154/323] Rename log4j2 console appender

---
 src/main/resources/log4j2.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index ae92071..40561c0 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -13,8 +13,9 @@
     </CustomLevels>
     <Appenders>
         <!-- Console for use in production environment -->
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{[HH:mm:ss]} [${logLevelPattern}] %c{1} - %msg%n"/>
+        <Console name="StormConsole" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{[HH:mm:ss]} [${logLevelPattern}] [%c{1}]: %msg%n"/>
+        </Console>
         </Console>
         <!-- Log file for standard use in development environment -->
         <RollingFile name="MainFile" fileName="logs/storm/main.log" filePattern="${logFilePattern}-%i.log.zip">
@@ -37,8 +38,8 @@
     </Appenders>
     <Loggers>
         <Root level="debug">
-            <AppenderRef ref="Console" level="verbose"/>
-            <AppenderRef ref="MainFile" level="verbose"/>
+            <AppenderRef ref="StormConsole" level="verbose"/>
+            <AppenderRef ref="MainFile" level="verbose" />
             <AppenderRef ref="DebugFile"/>
         </Root>
     </Loggers>

From c1c183b5fe66d633058366829f4a4e639fba2540 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 00:26:43 +0200
Subject: [PATCH 155/323] Update StormLogger tests

---
 .../pzstorm/storm/logging/StormLoggerTest.java   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java b/src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java
index ef72b60..e51917e 100644
--- a/src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java
+++ b/src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java
@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import io.pzstorm.storm.logging.StormLogger;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -52,24 +51,21 @@ void shouldSetStormLoggerLevelFromSystemProperties() throws ReflectiveOperationE
 			for (AppenderControl appenderControl : appenders.get())
 			{
 				String appenderName = appenderControl.getAppenderName();
-				if (appenderName.equals("StormConsole") || appenderName.equals("MainFile")) {
+				if (appenderName.equals("StormConsole")) {
 					actualLevels.put(appenderName, (Level) appenderLevelField.get(appenderControl));
 				}
 			}
-			// assert that all appenders were found
+			// assert that appender was found
 			Assertions.assertTrue(actualLevels.containsKey("StormConsole"));
-			Assertions.assertTrue(actualLevels.containsKey("MainFile"));
 
 			// assert that logger has correct levels
 			for (Map.Entry<String, Level> entry : actualLevels.entrySet()) {
 				Assertions.assertEquals(expectedLevel, entry.getValue());
 			}
-			// reset the logger levels to original values
-			for (String appender : new String[] { "StormConsole", "MainFile" })
-			{
-				rootLoggerConfig.removeAppender(appender);
-				rootLoggerConfig.addAppender(config.getAppender(appender), originalLevel, null);
-			}
+			// reset logger level to original values
+			rootLoggerConfig.removeAppender("StormConsole");
+			rootLoggerConfig.addAppender(config.getAppender("StormConsole"), originalLevel, null);
+
 			ctx.updateLoggers();
 		}
 	}

From f013a5b2f4fe4da9c338c3386373ec68056a74f9 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 19:58:12 +0200
Subject: [PATCH 156/323] Create addToInsnList utility method

---
 .../java/io/pzstorm/storm/util/AsmUtils.java     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index a531811..68bfa00 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -26,6 +26,22 @@ public static InsnList createInsnList(AbstractInsnNode... instructions) {
 		return result;
 	}
 
+	/**
+	 * Add the specified array of instructions to the end of given {@link InsnList}.
+	 *
+	 * @param list instruction list to add the array of instructions to.
+	 * @param instructions array of instructions to add to end of list.
+	 *
+	 * @return given instruction list with instructions added to end.
+	 */
+	public static InsnList addToInsnList(InsnList list, AbstractInsnNode... instructions) {
+
+		for (AbstractInsnNode instruction : instructions) {
+			list.add(instruction);
+		}
+		return list;
+	}
+
 	/**
 	 * Finds and returns the last instructions of a specific {@code Class} in a given list.
 	 *

From e6928e870e54f9358069c40a35d2fc4ac5b3ecb5 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 19:59:01 +0200
Subject: [PATCH 157/323] Test adding instructions to end of list

---
 .../io/pzstorm/storm/util/AsmUtilsTest.java   | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index 04c96e4..f901730 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -111,6 +111,38 @@ void shouldCreateInstructionListFromArguments() {
 		}
 	}
 
+	@Test
+	void shouldAddInstructionsToTheEndOfInsnList() {
+
+		AbstractInsnNode[] nodesToAdd = new AbstractInsnNode[] {
+				new LabelNode(),
+				new VarInsnNode(Opcodes.ALOAD, 0),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL,
+						"io.pzstorm.storm.util", "<init>", "()V"),
+				new InsnNode(Opcodes.RETURN)
+		};
+		InsnList expectedList = createInstructionList();
+		for (AbstractInsnNode node : nodesToAdd) {
+			expectedList.add(node);
+		}
+		InsnList actualList = AsmUtils.addToInsnList(
+				createInstructionList(),
+				new LabelNode(),
+				new VarInsnNode(Opcodes.ALOAD, 0),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL,
+						"io.pzstorm.storm.util", "<init>", "()V"),
+				new InsnNode(Opcodes.RETURN)
+		);;
+
+		Assertions.assertEquals(expectedList.size(), actualList.size());
+
+		Iterator<AbstractInsnNode> iteratorExpected = expectedList.iterator();
+		Iterator<AbstractInsnNode> iteratorActual = expectedList.iterator();
+		while (iteratorExpected.hasNext()) {
+			Assertions.assertTrue(AsmUtils.equalNodes(iteratorExpected.next(), iteratorActual.next()));
+		}
+	}
+
 	@Test
 	@SuppressWarnings("ConstantConditions")
 	void shouldGetLastInstructionOfType() {

From cb0a1adae73734ae456935a9a419efb749fd234a Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 20:25:55 +0200
Subject: [PATCH 158/323] Create getNthLabelNode utility method

---
 .../java/io/pzstorm/storm/util/AsmUtils.java  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index 68bfa00..1ca3bbb 100644
--- a/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -62,6 +62,36 @@ public static InsnList addToInsnList(InsnList list, AbstractInsnNode... instruct
 		return (T) result;
 	}
 
+	/**
+	 * Return {@code nth} {@link LabelNode} in given list of instructions.
+	 *
+	 * @param list {@link InsnList} to get the label node from.
+	 * @param n index of the node to retrieve from list. The value of the index
+	 * 		has to larger then {@code 1} otherwise an exception will be thrown.
+	 *
+	 * @return {@code LabelNode} found under the specified index or {@code null}
+	 * 		if no {@code LabelNode} for that index was found.
+	 */
+	public static @Nullable LabelNode getNthLabelNode(InsnList list, int n) {
+
+		if (n < 1) {
+			throw new IllegalArgumentException("Method parameter 'n' has a value < 1");
+		}
+		//@formatter:off
+		int i1 = 1; for (int i2 = 0; i2 < list.size(); i2++)
+		{
+			AbstractInsnNode node = list.get(i2);
+			if (node instanceof LabelNode)
+			{
+				if (i1 == n) {
+					return (LabelNode) node;
+				}
+				else i1 += 1;
+			}
+		}//@formatter:on
+		return null;
+	}
+
 	/**
 	 * Find and return first {@link LabelNode} that contains given list of instructions.
 	 * Note that {@link LineNumberNode} and {@link LabelNode} instructions will be excluded when

From e17fd2c50b32acf35dd47ec2086d29bd3653d487 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 20:26:36 +0200
Subject: [PATCH 159/323] Test getting nth label from instruction list

---
 .../java/io/pzstorm/storm/util/AsmUtilsTest.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index f901730..47fca93 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -143,6 +143,22 @@ void shouldAddInstructionsToTheEndOfInsnList() {
 		}
 	}
 
+	@Test
+	void shouldGetNthLabelNodeFromInsnList() {
+
+		InsnList instructions = createInstructionList();
+		for (int i = 0; i < LABELS.length; i++) {
+			Assertions.assertEquals(LABELS[i], AsmUtils.getNthLabelNode(instructions, i + 1));
+		}
+		Assertions.assertThrows(IllegalArgumentException.class, () ->
+				AsmUtils.getNthLabelNode(instructions, -1)
+		);
+		Assertions.assertThrows(IllegalArgumentException.class, () ->
+				AsmUtils.getNthLabelNode(instructions, 0)
+		);
+		Assertions.assertNull(AsmUtils.getNthLabelNode(instructions, LABELS.length + 1));
+	}
+
 	@Test
 	@SuppressWarnings("ConstantConditions")
 	void shouldGetLastInstructionOfType() {

From 37cf2d4ebb7a69c5dec050d2bb983d18bfd2f4e1 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 20:55:35 +0200
Subject: [PATCH 160/323] Create ZomboidPatch interface class

---
 .../io/pzstorm/storm/patch/ZomboidPatch.java  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java

diff --git a/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java b/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java
new file mode 100644
index 0000000..7306bcb
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.patch;
+
+import io.pzstorm.storm.core.StormClassTransformer;
+
+/**
+ * <p>This class represents a Project Zomboid {@code Class} code patch.
+ * A code patch is a series of instructions that are introduced with ASM class transformation
+ * to remove and/or changes code lines. Patch can also add new lines of code but unlike hooks it
+ * also removes or changes existing code lines which makes it a much more intrusive.</p>
+ * <p>Patches should be applied only in situations where new functionality (which cannot
+ * be implemented with hooks) is being introduced to the game engine.</p>
+ */
+public interface ZomboidPatch {
+
+	/**
+	 * Apply a code patch with the given {@link StormClassTransformer}.
+	 */
+	void applyPatch(StormClassTransformer transformer);
+}

From 4cb246f7a9cf5702938fca4573e5f10e130c0c49 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 21:40:12 +0200
Subject: [PATCH 161/323] Refactor and document StormLogger

---
 .../io/pzstorm/storm/logging/StormLogger.java | 115 +++++++++++++++---
 1 file changed, 96 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/logging/StormLogger.java b/src/main/java/io/pzstorm/storm/logging/StormLogger.java
index e7575f7..1904e15 100644
--- a/src/main/java/io/pzstorm/storm/logging/StormLogger.java
+++ b/src/main/java/io/pzstorm/storm/logging/StormLogger.java
@@ -63,54 +63,131 @@ public static Logger get() {
 		return LOGGER;
 	}
 
+	/**
+	 * Logs a message object with the {@link Level#INFO INFO} level.
+	 */
 	public static void info(String log) {
 		LOGGER.info(log);
 	}
 
-	public static void info(String log, Object... params) {
-		LOGGER.printf(Level.INFO, log, params);
+	/**
+	 * Logs a formatted message with {@link Level#INFO INFO}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
+	public static void info(String format, Object... params) {
+		LOGGER.printf(Level.INFO, format, params);
 	}
 
+	/**
+	 * Logs a message object with the {@link StormLogger#VERBOSE VERBOSE} level.
+	 */
 	public static void detail(String log) {
-		LOGGER.log(VERBOSE, log);
+		LOGGER.log(StormLogger.VERBOSE, log);
 	}
 
-	public static void detail(String log, Object... params) {
-		LOGGER.printf(VERBOSE, log, params);
+	/**
+	 * Logs a formatted message with {@link StormLogger#VERBOSE VERBOSE}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
+	public static void detail(String format, Object... params) {
+		LOGGER.printf(StormLogger.VERBOSE, format, params);
 	}
 
-	public static void error(String log) {
-		LOGGER.error(log);
+	/**
+	 * Logs a message object with the {@link Level#ERROR ERROR} level.
+	 *
+	 * @param message the message string to log.
+	 */
+	public static void error(String message) {
+		LOGGER.error(message);
 	}
 
-	public static void error(String log, Object... args) {
-		LOGGER.printf(Level.ERROR, log, args);
+	/**
+	 * Logs a formatted message with {@link Level#ERROR ERROR}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
+	public static void error(String format, Object... params) {
+		LOGGER.printf(Level.ERROR, format, params);
 	}
 
-	public static void error(String log, Throwable t) {
-		LOGGER.error(log, t);
+	/**
+	 * Logs a message at the {@link Level#ERROR ERROR} level including the
+	 * stack trace of the {@link Throwable} <code>t</code> passed as parameter.
+	 *
+	 * @param message the message object to log.
+	 * @param t the exception to log, including its stack trace.
+	 */
+	public static void error(String message, Throwable t) {
+		LOGGER.error(message, t);
 	}
 
-	public static void warn(String log) {
-		LOGGER.warn(log);
+	/**
+	 * Logs a message object with the {@link Level#WARN WARN} level.
+	 *
+	 * @param message the message string to log.
+	 */
+	public static void warn(String message) {
+		LOGGER.warn(message);
 	}
 
+	/**
+	 * Logs a formatted message with {@link Level#WARN WARN}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
 	public static void warn(String format, Object... params) {
 		LOGGER.printf(Level.WARN, format, params);
 	}
 
-	public static void debug(String log) {
-		LOGGER.debug(log);
+	/**
+	 * Logs a message object with the {@link Level#DEBUG DEBUG} level.
+	 *
+	 * @param message the message string to log.
+	 */
+	public static void debug(String message) {
+		LOGGER.debug(message);
 	}
 
-	public static void debug(String format, Object... args) {
-		LOGGER.printf(Level.DEBUG, format, args);
+	/**
+	 * Logs a formatted message with {@link Level#DEBUG DEBUG}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
+	public static void debug(String format, Object... params) {
+		LOGGER.printf(Level.DEBUG, format, params);
 	}
 
-	public static void debug(String log, Throwable t) {
-		LOGGER.debug(log, t);
+	/**
+	 * Logs a message at the {@link Level#DEBUG DEBUG} level including the
+	 * stack trace of the {@link Throwable} <code>t</code> passed as parameter.
+	 *
+	 * @param message the message to log.
+	 * @param t the exception to log, including its stack trace.
+	 */
+	public static void debug(String message, Throwable t) {
+		LOGGER.debug(message, t);
 	}
 
+	/**
+	 * Logs a formatted message using the specified format string and arguments.
+	 *
+	 * @param level The logging Level.
+	 * @param format The format String.
+	 * @param params Arguments specified by the format.
+	 */
 	public static void printf(Level level, String format, Object... params) {
 		LOGGER.printf(level, format, params);
 	}

From f218d4488b79526d8d4d89d609545f59c36f524a Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 21:43:52 +0200
Subject: [PATCH 162/323] Create Zomboid logger wrapper

---
 .../pzstorm/storm/logging/ZomboidLogger.java  | 206 ++++++++++++++++++
 1 file changed, 206 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java

diff --git a/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java b/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
new file mode 100644
index 0000000..c9b9f09
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
@@ -0,0 +1,206 @@
+package io.pzstorm.storm.logging;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Arrays;
+
+/**
+ * Wrapper class for printing Project Zomboid logs with Log4j 2 logger.
+ */
+@SuppressWarnings({ "unused", "WeakerAccess" })
+public class ZomboidLogger {
+
+	private static final Logger LOGGER = LogManager.getLogger("Zomboid");
+
+	/**
+	 * Returns an instance of Log4j {@link Logger} used for logging.
+	 */
+	public static Logger get() {
+		return LOGGER;
+	}
+
+	/**
+	 * Logs a message object with the {@link Level#INFO INFO} level.
+	 */
+	public static void info(String log) {
+		LOGGER.info(log);
+	}
+
+	/**
+	 * Logs a formatted message with {@link Level#INFO INFO}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
+	public static void info(String format, Object... params) {
+		LOGGER.printf(Level.INFO, format, params);
+	}
+
+	/**
+	 * Logs a message object with the {@link StormLogger#VERBOSE VERBOSE} level.
+	 */
+	public static void detail(String log) {
+		LOGGER.log(StormLogger.VERBOSE, log);
+	}
+
+	/**
+	 * Logs a formatted message with {@link StormLogger#VERBOSE VERBOSE}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
+	public static void detail(String format, Object... params) {
+		LOGGER.printf(StormLogger.VERBOSE, format, params);
+	}
+
+	/**
+	 * Logs a message object with the {@link Level#ERROR ERROR} level.
+	 *
+	 * @param message the message string to log.
+	 */
+	public static void error(String message) {
+		LOGGER.error(message);
+	}
+
+	/**
+	 * Logs a formatted message with {@link Level#ERROR ERROR}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
+	public static void error(String format, Object... params) {
+		LOGGER.printf(Level.ERROR, format, params);
+	}
+
+	/**
+	 * Logs a message at the {@link Level#ERROR ERROR} level including the
+	 * stack trace of the {@link Throwable} <code>t</code> passed as parameter.
+	 *
+	 * @param message the message object to log.
+	 * @param t the exception to log, including its stack trace.
+	 */
+	public static void error(String message, Throwable t) {
+		LOGGER.error(message, t);
+	}
+
+	/**
+	 * Logs a message object with the {@link Level#WARN WARN} level.
+	 *
+	 * @param message the message string to log.
+	 */
+	public static void warn(String message) {
+		LOGGER.warn(message);
+	}
+
+	/**
+	 * Logs a formatted message with {@link Level#WARN WARN}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
+	public static void warn(String format, Object... params) {
+		LOGGER.printf(Level.WARN, format, params);
+	}
+
+	/**
+	 * Logs a message object with the {@link Level#DEBUG DEBUG} level.
+	 *
+	 * @param message the message string to log.
+	 */
+	public static void debug(String message) {
+		LOGGER.debug(message);
+	}
+
+	/**
+	 * Logs a formatted message with {@link Level#DEBUG DEBUG}
+	 * level using the specified format string and arguments.
+	 *
+	 * @param format the format {@code String}.
+	 * @param params arguments specified by the format.
+	 */
+	public static void debug(String format, Object... params) {
+		LOGGER.printf(Level.DEBUG, format, params);
+	}
+
+	/**
+	 * Logs a message at the {@link Level#DEBUG DEBUG} level including the
+	 * stack trace of the {@link Throwable} <code>t</code> passed as parameter.
+	 *
+	 * @param message the message to log.
+	 * @param t the exception to log, including its stack trace.
+	 */
+	public static void debug(String message, Throwable t) {
+		LOGGER.debug(message, t);
+	}
+
+	/**
+	 * Logs a formatted message using the specified format string and arguments.
+	 *
+	 * @param level The logging Level.
+	 * @param format The format String.
+	 * @param params Arguments specified by the format.
+	 */
+	public static void printf(Level level, String format, Object... params) {
+		LOGGER.printf(level, format, params);
+	}
+
+	/**
+	 * Logs a message at the designated {@link LogSeverity LogSeverity}.
+	 *
+	 * @param level {@link LogSeverity LogSeverity} formatted as {@code String}.
+	 * @param message the message to log.
+	 */
+	public static void printf(String level, String message) {
+		LOGGER.printf(LogSeverity.getForName(level, LogSeverity.GENERAL), message);
+	}
+
+	/**
+	 * This enum represents logging levels used by Project Zomboid.
+	 */
+	private enum LogSeverity {
+
+		TRACE("Trace", Level.TRACE),
+		GENERAL("General", Level.INFO),
+		WARNING("Warning", Level.WARN),
+		ERROR("Error", Level.ERROR);
+
+		/**
+		 * Name of the entry that matches the value of Project Zomboid {@code LogSeverity} enum entry
+		 * level exactly. It is important the entry matches exactly because the game enum entries are
+		 * converted to string to communicate at which level should the logging event be printed at.
+		 */
+		private final String name;
+
+		/**
+		 * Log4j 2 level associated with this {@link LogSeverity} entry.
+		 */
+		private final Level level;
+
+		LogSeverity(String name, Level level) {
+
+			this.name = name;
+			this.level = level;
+		}
+
+		/**
+		 * Returns {@link Level} associated with a {@link LogSeverity LogSeverity}
+		 * entry matched by given name. If no entry was found a level associated
+		 * with a specified default {@code LogSeverity} entry will be used instead.
+		 *
+		 * @param name name of the {@code LogSeverity} entry to get the level for.
+		 * @param def default {@code LogSeverity} entry to use if no entry was matched.
+		 *
+ 		 * @return {@code Level} associated with matched entry or {@code Level} associated
+		 * 		with default entry if no entry was matched for given name.
+		 */
+		private static Level getForName(String name, LogSeverity def) {
+			return Arrays.stream(values()).filter(l -> l.name.equals(name)).findFirst().orElse(def).level;
+		}
+	}
+}

From 762e60f114839f9c3f2610e24a669f0f9b67a34f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 21:57:05 +0200
Subject: [PATCH 163/323] Rename log4j appender names

---
 src/main/resources/log4j2.xml | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 40561c0..88bc77a 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -12,23 +12,28 @@
         <CustomLevel name="VERBOSE" intLevel="450"/>
     </CustomLevels>
     <Appenders>
-        <!-- Console for use in production environment -->
+        <!-- Console appenders -->
         <Console name="StormConsole" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{[HH:mm:ss]} [${logLevelPattern}] [%c{1}]: %msg%n"/>
         </Console>
         </Console>
-        <!-- Log file for standard use in development environment -->
-        <RollingFile name="MainFile" fileName="logs/storm/main.log" filePattern="${logFilePattern}-%i.log.zip">
-            <PatternLayout pattern="%d{[yyyy-MM-dd][HH:mm:ss]} [${logLevelPattern}] %c{1} - %msg%n"/>
+        <!-- Storm File appenders -->
+        <RollingFile name="StormMainFile" fileName="logs/storm/main.log" filePattern="${logFilePattern}-%i.log.zip">
+            <PatternLayout pattern="%d{[yyyy-MM-dd][HH:mm:ss]} [${logLevelPattern}] [%c{1}]: %msg%n"/>
+            <Policies>
+                <OnStartupTriggeringPolicy/>
+                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+            </Policies>
+            <DefaultRolloverStrategy max="10"/>
+        </RollingFile>
+        <RollingFile name="StormDebugFile" fileName="logs/storm/debug.log" filePattern="${logFilePattern}-debug-%i.log.zip">
+            <PatternLayout pattern="%d{[yyyy-MM-dd][HH:mm:ss]} [${logLevelPattern}] [%c{1}]: %msg%n"/>
             <Policies>
                 <OnStartupTriggeringPolicy/>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
             </Policies>
             <DefaultRolloverStrategy max="10"/>
         </RollingFile>
-        <!-- Log file for debugging use in development environment -->
-        <RollingFile name="DebugFile" fileName="logs/storm/debug.log" filePattern="${logFilePattern}-debug-%i.log.zip">
-            <PatternLayout pattern="%d{[yyyy-MM-dd][HH:mm:ss]} [${logLevelPattern}] %c{1} - %msg%n"/>
             <Policies>
                 <OnStartupTriggeringPolicy/>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
@@ -39,8 +44,8 @@
     <Loggers>
         <Root level="debug">
             <AppenderRef ref="StormConsole" level="verbose"/>
-            <AppenderRef ref="MainFile" level="verbose" />
-            <AppenderRef ref="DebugFile"/>
+            <AppenderRef ref="StormMainFile" level="verbose" />
+            <AppenderRef ref="StormDebugFile"/>
         </Root>
     </Loggers>
 </Configuration>
\ No newline at end of file

From c9cd86a3c6b61deacfcf5a20bb3b13290c501348 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 22:02:27 +0200
Subject: [PATCH 164/323] Create Zomboid logger configuration

---
 src/main/resources/log4j2.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 88bc77a..2332ce5 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -16,6 +16,8 @@
         <Console name="StormConsole" target="SYSTEM_OUT">
             <PatternLayout pattern="%d{[HH:mm:ss]} [${logLevelPattern}] [%c{1}]: %msg%n"/>
         </Console>
+        <Console name="ZomboidConsole" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{[HH:mm:ss]} [${logLevelPattern}] [%c{1}/%msg%n"/>
         </Console>
         <!-- Storm File appenders -->
         <RollingFile name="StormMainFile" fileName="logs/storm/main.log" filePattern="${logFilePattern}-%i.log.zip">
@@ -34,6 +36,17 @@
             </Policies>
             <DefaultRolloverStrategy max="10"/>
         </RollingFile>
+        <!-- Zomboid File appenders -->
+        <RollingFile name="ZomboidMainFile" fileName="logs/storm/main.log" filePattern="${logFilePattern}-%i.log.zip">
+            <PatternLayout pattern="%d{[yyyy-MM-dd][HH:mm:ss]} [${logLevelPattern}] [%c{1}/%msg%n"/>
+            <Policies>
+                <OnStartupTriggeringPolicy/>
+                <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
+            </Policies>
+            <DefaultRolloverStrategy max="10"/>
+        </RollingFile>
+        <RollingFile name="ZomboidDebugFile" fileName="logs/storm/debug.log" filePattern="${logFilePattern}-debug-%i.log.zip">
+            <PatternLayout pattern="%d{[yyyy-MM-dd][HH:mm:ss]} [${logLevelPattern}] [%c{1}/%msg%n"/>
             <Policies>
                 <OnStartupTriggeringPolicy/>
                 <TimeBasedTriggeringPolicy interval="1" modulate="true"/>
@@ -42,6 +55,11 @@
         </RollingFile>
     </Appenders>
     <Loggers>
+        <Logger name="Zomboid" level="debug" additivity="false">
+            <AppenderRef ref="ZomboidConsole" level="verbose"/>
+            <AppenderRef ref="ZomboidMainFile" level="verbose"/>
+            <AppenderRef ref="ZomboidDebugFile"/>
+        </Logger>
         <Root level="debug">
             <AppenderRef ref="StormConsole" level="verbose"/>
             <AppenderRef ref="StormMainFile" level="verbose" />

From a0f62934d12839ae2f9dbb86664355aeb4211fce Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 22:04:52 +0200
Subject: [PATCH 165/323] Implement printing to debug console

The debug console refers to in-game debug console.
---
 .../pzstorm/storm/logging/ZomboidLogger.java  | 50 ++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java b/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
index c9b9f09..6fbd398 100644
--- a/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
+++ b/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
@@ -3,7 +3,16 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.appender.OutputStreamAppender;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.jetbrains.annotations.NotNull;
+import zombie.core.Core;
+import zombie.ui.UIDebugConsole;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.util.Arrays;
 
 /**
@@ -13,6 +22,24 @@
 public class ZomboidLogger {
 
 	private static final Logger LOGGER = LogManager.getLogger("Zomboid");
+	private static final PrintStream DEBUG_CONSOLE = new ZomboidPrintStream();
+
+	static
+	{
+		Configuration config = LoggerContext.getContext(false).getConfiguration();
+
+		// create appender for printing to debug console
+		Appender appender = OutputStreamAppender.createAppender(
+				config.getAppender("ZomboidConsole").getLayout(),
+				null, DEBUG_CONSOLE, "ZomboidUIConsole", false, true);
+
+		appender.start();
+		config.addAppender(appender);
+
+		// print Storm and Zomboid logs to debug console
+		config.getLoggers().get("Zomboid").addAppender(appender, Level.DEBUG, null);
+		config.getRootLogger().addAppender(appender, Level.DEBUG, null);
+	}
 
 	/**
 	 * Returns an instance of Log4j {@link Logger} used for logging.
@@ -203,4 +230,25 @@ private static Level getForName(String name, LogSeverity def) {
 			return Arrays.stream(values()).filter(l -> l.name.equals(name)).findFirst().orElse(def).level;
 		}
 	}
+
+	/**
+	 * This class represents a {@link PrintStream} for {@link UIDebugConsole}.
+	 * Any content printed by this {@code PrintStream} will automatically print
+	 * to the in-game UI debug console which is viewable by players when playing.
+	 */
+	private static class ZomboidPrintStream extends PrintStream {
+
+		private ZomboidPrintStream() {
+			// this output stream is never actually used
+			super(new ByteArrayOutputStream());
+		}
+
+		@Override
+		public void write(byte @NotNull [] buf, int off, int len) {
+
+			if (Core.bDebug && UIDebugConsole.instance != null) {
+				UIDebugConsole.instance.addOutput(buf, off, len);
+			}
+		}
+	}
 }

From f7b11d63b8e3b155320058bebc71a91b00172e50 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 22:06:18 +0200
Subject: [PATCH 166/323] Load ZomboidLogger class with Storm CL

---
 src/main/java/io/pzstorm/storm/core/StormLauncher.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index eca3943..419327a 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -1,6 +1,7 @@
 package io.pzstorm.storm.core;
 
 import io.pzstorm.storm.logging.StormLogger;
+import io.pzstorm.storm.logging.ZomboidLogger;
 
 import java.lang.reflect.Method;
 
@@ -32,6 +33,9 @@ public static void main(String[] args) throws ReflectiveOperationException {
 		StormClassLoader classLoader = StormBootstrap.CLASS_LOADER;
 		Class.forName("io.pzstorm.storm.core.StormClassTransformers", true, classLoader);
 
+		// load ZomboidLogger with StormClassLoader
+		Class.forName("io.pzstorm.storm.logging.ZomboidLogger", true, classLoader);
+
 		// initialize logging system
 		StormLogger.initialize();
 

From 2e06568adb13b7c419d1ef2871a1aeba66091eee Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 22:17:15 +0200
Subject: [PATCH 167/323] Create DebugLogPatch code patch

---
 .../io/pzstorm/storm/patch/DebugLogPatch.java | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java

diff --git a/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java b/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
new file mode 100644
index 0000000..13d2125
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
@@ -0,0 +1,71 @@
+package io.pzstorm.storm.patch;
+
+import com.google.common.collect.ImmutableList;
+import io.pzstorm.storm.core.StormClassTransformer;
+import io.pzstorm.storm.util.AsmUtils;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
+import java.util.Objects;
+
+public class DebugLogPatch implements ZomboidPatch {
+
+	@Override
+	public void applyPatch(StormClassTransformer transformer) {
+
+		// String formatStringVarArgs(
+		//	 	DebugType var0, LogSeverity var1, String var2, Object var3, String var4, Object... var5)
+		InsnList formatStringVarArgs = transformer.getInstructionsForMethod("formatStringVarArgs",
+				"(Lzombie/debug/DebugType;Lzombie/debug/LogSeverity;Ljava/lang/String;" +
+						"Ljava/lang/Object;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;");
+
+		// clear all instructions and rewrite method from scratch
+		formatStringVarArgs.clear();
+
+		// apply custom formatting that is compatible with log4j2 layout pattern
+		// example: [01:03:21] [INFO] [Zomboid/General]: log message printed here
+		LabelNode labelAfterIF = new LabelNode();
+		AsmUtils.addToInsnList(formatStringVarArgs,
+				new LabelNode(),
+				new VarInsnNode(Opcodes.ALOAD, 1),
+				new VarInsnNode(Opcodes.ALOAD, 0),
+				new MethodInsnNode(Opcodes.INVOKESTATIC, "zombie/debug/DebugLog",
+						"isLogEnabled", "(Lzombie/debug/LogSeverity;Lzombie/debug/DebugType;)Z"),
+				new JumpInsnNode(Opcodes.IFNE, labelAfterIF),
+				new LabelNode(),
+				new InsnNode(Opcodes.ACONST_NULL),
+				new InsnNode(Opcodes.ARETURN),
+				labelAfterIF,
+				new FrameNode(Opcodes.F_SAME, 0, null, 0, null),
+				new TypeInsnNode(Opcodes.NEW, "java/lang/StringBuilder"),
+				new InsnNode(Opcodes.DUP),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL, "java/lang/StringBuilder", "<init>", "()V"),
+				new VarInsnNode(Opcodes.ALOAD, 0),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder",
+						"append", "(Ljava/lang/Object;)Ljava/lang/StringBuilder;"),
+				new LdcInsnNode("]: "),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder",
+						"append", "(Ljava/lang/Object;)Ljava/lang/StringBuilder;"),
+				new VarInsnNode(Opcodes.ALOAD, 4),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder",
+						"append", "(Ljava/lang/Object;)Ljava/lang/StringBuilder;"),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "java/lang/StringBuilder",
+						"toString", "()Ljava/lang/String;"),
+				new VarInsnNode(Opcodes.ALOAD, 5),
+				new MethodInsnNode(Opcodes.INVOKESTATIC, "java/lang/String",
+						"format", "(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;"),
+				new InsnNode(Opcodes.ARETURN)
+		);
+		/* though most of the logging is handled by DebugLogStream
+		 * some logs are printed by DebugLog#log(String) method
+		 */
+		InsnList log = transformer.getInstructionsForMethod(
+				"log", "(Lzombie/debug/DebugType;Ljava/lang/String;)V"
+		);
+		LabelNode node = Objects.requireNonNull(AsmUtils.getNthLabelNode(log, 3));
+		AsmUtils.replaceFirstMatchingLabelNode(log, node, ImmutableList.of(
+				new VarInsnNode(Opcodes.ALOAD, 2), new MethodInsnNode(Opcodes.INVOKESTATIC,
+						"io/pzstorm/storm/logging/ZomboidLogger", "info", "(Ljava/lang/String;)V"))
+		);
+	}
+}
\ No newline at end of file

From 2d700778b2e4634b8e48b2e25de1c0f82f999f27 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 22:17:26 +0200
Subject: [PATCH 168/323] Create DebugLogStreamPatch code patch

---
 .../storm/patch/DebugLogStreamPatch.java      | 180 ++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java

diff --git a/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java b/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
new file mode 100644
index 0000000..a9e38be
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
@@ -0,0 +1,180 @@
+package io.pzstorm.storm.patch;
+
+import com.google.common.collect.ImmutableList;
+import io.pzstorm.storm.core.StormClassTransformer;
+import io.pzstorm.storm.util.AsmUtils;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
+import java.util.List;
+import java.util.Objects;
+
+public class DebugLogStreamPatch implements ZomboidPatch {
+
+	@Override
+	public void applyPatch(StormClassTransformer transformer) {
+
+		// private void write(PrintStream var1, String var2)
+		replaceMethodNode(transformer.getInstructionsForMethod("write",
+				"(Ljava/io/PrintStream;Ljava/lang/String;)V"), 3,
+				ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 3), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+		// private void writeln(PrintStream var1, LogSeverity var2, String var3, String var4)
+		replaceMethodNode(transformer.getInstructionsForMethod("writeln",
+				"(Ljava/io/PrintStream;Lzombie/debug/LogSeverity;Ljava/lang/String;Ljava/lang/String;)V"),
+				3, ImmutableList.of(
+						new VarInsnNode(Opcodes.ALOAD, 2),
+						new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/debug/LogSeverity",
+								"toString", "()Ljava/lang/String;"),
+						new VarInsnNode(Opcodes.ALOAD, 5),
+						new MethodInsnNode(Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"printf", "(Ljava/lang/String;Ljava/lang/String;)V"))
+		);
+		// private void writeln(PrintStream var1, LogSeverity var2, String var3, String var4, Object var5)
+		replaceMethodNode(transformer.getInstructionsForMethod("writeln",
+				"(Ljava/io/PrintStream;Lzombie/debug/LogSeverity;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Object;)V"),
+				3, ImmutableList.of(
+						new VarInsnNode(Opcodes.ALOAD, 2),
+						new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/debug/LogSeverity",
+								"toString", "()Ljava/lang/String;"),
+						new VarInsnNode(Opcodes.ALOAD, 6),
+						new MethodInsnNode(Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+								"printf", "(Ljava/lang/String;Ljava/lang/String;)V"))
+		);
+		// public void debugln(String var1)
+		replaceMethodNode(transformer.getInstructionsForMethod("debugln",
+				"(Ljava/lang/String;)V"),
+				4, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 3), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"debug", "(Ljava/lang/String;)V"))
+		);
+		// public void debugln(String var1, Object var2)
+		replaceMethodNode(transformer.getInstructionsForMethod("debugln",
+				"(Ljava/lang/String;Ljava/lang/Object;)V"),
+				4, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 4), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"debug", "(Ljava/lang/String;)V"))
+		);
+		// public void debugln(String var1, Object var2, Object var3)
+		replaceMethodNode(transformer.getInstructionsForMethod("debugln",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"),
+				4, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 5), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"debug", "(Ljava/lang/String;)V"))
+		);
+		// public void debugln(String var1, Object var2, Object var3, Object var4)
+		replaceMethodNode(transformer.getInstructionsForMethod("debugln",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"),
+				4, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 6), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"debug", "(Ljava/lang/String;)V"))
+		);
+		// public void debugln(String var1, Object var2, Object var3, Object var4, Object var5)
+		replaceMethodNode(transformer.getInstructionsForMethod("debugln",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;)V"),
+				4, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 7), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"debug", "(Ljava/lang/String;)V"))
+		);
+		// public void debugln(String var1, Object var2, Object var3, Object var4, Object var5, Object var6)
+		replaceMethodNode(transformer.getInstructionsForMethod("debugln",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;)V"),
+				4, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 8), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"debug", "(Ljava/lang/String;)V"))
+		);
+		// public void debugln(String var1, Object var2, Object var3, Object var4, Object var5, Object var6, Object var7)
+		replaceMethodNode(transformer.getInstructionsForMethod("debugln",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"),
+				4, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 9), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"debug", "(Ljava/lang/String;)V"))
+		);
+		// public void println(String var1, Object var2)
+		replaceMethodNode(transformer.getInstructionsForMethod("println",
+				"(Ljava/lang/String;Ljava/lang/Object;)V"),
+				3, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 3), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+		// public void println(String var1, Object var2, Object var3)
+		replaceMethodNode(transformer.getInstructionsForMethod("println",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"),
+				3, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 4), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+		// public void println(String var1, Object var2, Object var3, Object var4)
+		replaceMethodNode(transformer.getInstructionsForMethod("println",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"),
+				3, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 5), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+		// public void println(String var1, Object var2, Object var3, Object var4, Object var5)
+		replaceMethodNode(transformer.getInstructionsForMethod("println",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;)V"),
+				3, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 6), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+		// public void println(String var1, Object var2, Object var3, Object var4, Object var5, Object var6)
+		replaceMethodNode(transformer.getInstructionsForMethod("println",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;)V"),
+				3, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 7), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+		// public void println(String var1, Object var2, Object var3, Object var4, Object var5, Object var6,
+		// 						Object var7)
+		replaceMethodNode(transformer.getInstructionsForMethod("println",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"),
+				3, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 8), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+		// public void println(String var1, Object var2, Object var3, Object var4, Object var5, Object var6,
+		// 						Object var7, Object var8)
+		replaceMethodNode(transformer.getInstructionsForMethod("println",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"),
+				3, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 9), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+		// public void println(String var1, Object var2, Object var3, Object var4, Object var5, Object var6,
+		// 						Object var7, Object var8, Object var9)
+		replaceMethodNode(transformer.getInstructionsForMethod("println",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;)V"),
+				3, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 10), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+		// public void println(String var1, Object var2, Object var3, Object var4, Object var5, Object var6,
+		// 						Object var7, Object var8, Object var9, Object var10)
+		replaceMethodNode(transformer.getInstructionsForMethod("println",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;)V"),
+				3, ImmutableList.of(new VarInsnNode(Opcodes.ALOAD, 11), new MethodInsnNode(
+						Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
+						"info", "(Ljava/lang/String;)V"))
+		);
+	}
+
+	private void replaceMethodNode(InsnList instructions, int labelIndex, List<AbstractInsnNode> content) {
+
+		LabelNode node = Objects.requireNonNull(AsmUtils.getNthLabelNode(instructions, labelIndex));
+		AsmUtils.replaceFirstMatchingLabelNode(instructions, node, content);
+	}
+}

From 3bb5d70ce7f94b375e03966804ae390aa7e39f99 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 22:17:46 +0200
Subject: [PATCH 169/323] Register patching transformers

---
 .../storm/core/StormClassTransformers.java    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index 6ebdbf5..ce82007 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -3,6 +3,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import io.pzstorm.storm.patch.DebugLogPatch;
+import io.pzstorm.storm.patch.DebugLogStreamPatch;
+import io.pzstorm.storm.patch.ZomboidPatch;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
@@ -26,8 +29,19 @@ public class StormClassTransformers {
 
 	static
 	{
+		 /////////////////////
+		 // REGISTER HOOKS //
+		///////////////////
+
 		registerTransformer("zombie.gameStates.MainScreenState", new OnMainScreenRenderHook());
 		registerTransformer("zombie.ui.UIElement", new OnUIElementPreRenderHook());
+
+		///////////////////////
+		// REGISTER PATCHES //
+		/////////////////////
+
+		registerTransformer("zombie.debug.DebugLog", new DebugLogPatch());
+		registerTransformer("zombie.debug.DebugLogStream", new DebugLogStreamPatch());
 	}
 
 	/**
@@ -40,6 +54,26 @@ private static void registerTransformer(String className, StormClassTransformer
 		TRANSFORMERS.put(className, transformer);
 	}
 
+	/**
+	 * Create and register a new {@link StormClassTransformer} with given name
+	 * that applies a {@link ZomboidPatch} designated by method parameter.
+	 *
+	 * @param className name of the target class to transform.
+	 * @param patch {@code ZomboidPatch} to apply with transformation.
+	 */
+	private static void registerTransformer(String className, ZomboidPatch patch) {
+
+		TRANSFORMERS.put(className, new StormClassTransformer(className) {
+
+			@Override
+			StormClassTransformer transform() {
+
+				patch.applyPatch(this);
+				return this;
+			}
+		});
+	}
+
 	/**
 	 * Create and register a new {@link StormClassTransformer} with given name
 	 * that installs a {@link StormHook} designated by method parameter.

From cbcf4cc673f64fd0664b8f5c04e9d5e9da42c8f7 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 22:40:37 +0200
Subject: [PATCH 170/323] Add zomboid dummy classes

---
 src/zombie/java/zombie/core/Core.java         |  2 ++
 src/zombie/java/zombie/debug/LogSeverity.java |  9 +++++++++
 src/zombie/java/zombie/ui/UIDebugConsole.java | 10 ++++++++++
 3 files changed, 21 insertions(+)
 create mode 100644 src/zombie/java/zombie/debug/LogSeverity.java
 create mode 100644 src/zombie/java/zombie/ui/UIDebugConsole.java

diff --git a/src/zombie/java/zombie/core/Core.java b/src/zombie/java/zombie/core/Core.java
index 50d1f9a..2d53ec2 100644
--- a/src/zombie/java/zombie/core/Core.java
+++ b/src/zombie/java/zombie/core/Core.java
@@ -6,6 +6,8 @@
 @SuppressWarnings("ALL")
 public class Core {
 
+	public static boolean bDebug = false;
+
 	public static int width = 0;
 	public static int height = 0;
 }
diff --git a/src/zombie/java/zombie/debug/LogSeverity.java b/src/zombie/java/zombie/debug/LogSeverity.java
new file mode 100644
index 0000000..0c8687a
--- /dev/null
+++ b/src/zombie/java/zombie/debug/LogSeverity.java
@@ -0,0 +1,9 @@
+package zombie.debug;
+
+public enum LogSeverity {
+	Trace,
+	General,
+	Warning,
+	Error;
+}
+
diff --git a/src/zombie/java/zombie/ui/UIDebugConsole.java b/src/zombie/java/zombie/ui/UIDebugConsole.java
new file mode 100644
index 0000000..5ad5d0c
--- /dev/null
+++ b/src/zombie/java/zombie/ui/UIDebugConsole.java
@@ -0,0 +1,10 @@
+package zombie.ui;
+
+@SuppressWarnings("ALL")
+public class UIDebugConsole {
+
+	public static UIDebugConsole instance;
+
+	public void addOutput(byte[] var1, int var2, int var3) {
+	}
+}

From 876d175cb0482863a72b71184d7bd1b7b19cd586 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 23:01:01 +0200
Subject: [PATCH 171/323] Fix media module not available on CI

---
 build.gradle | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 49063cb..dfcca1e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,9 @@ apply from: "https://gist.githubusercontent.com/yooksi/${spotlessGistID}/raw/spo
 
 version '0.1.0'
 
+// is gradle executing on CI server
+def isCI = System.getenv("CI")?: 'false'
+
 capsid {
 	isModProject = false
 	setProjectRepository('pzstorm', 'storm')
@@ -30,7 +33,7 @@ sourceSets {
 	}
 	main {
 		// add dummy zomboid classes to classpath when compiling on CI
-		if (System.getenv("CI") != null) {
+		if (isCI) {
 			compileClasspath += sourceSets.zombie.output
 		}
 	}
@@ -40,7 +43,9 @@ sourceSets {
 		compileClasspath += sourceSets.zombie.output
 	}
 	// remove media sourceSet created by capsid
-	remove(sourceSets.media)
+	if (!isCI) {
+		remove(sourceSets.media)
+	}
 }
 configurations {
 	zombieImplementation.extendsFrom(compileOnly, implementation, zomboidImplementation)

From 950bc35dde5d8740178bb9a1576ac6094e640344 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 10 May 2021 23:13:55 +0200
Subject: [PATCH 172/323] Resolve module circular dependency

---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dfcca1e..82cbf29 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,8 @@ sourceSets {
 	// module containing zomboid dummy classes and classes used in testing
 	// this module is only required by tests and CI compiler
 	zombie {
-		compileClasspath += sourceSets.main.output
+		// module should not depend on main module to avoid circular dependency
+		//compileClasspath += sourceSets.main.output
 	}
 	main {
 		// add dummy zomboid classes to classpath when compiling on CI

From daa36ab7a07e2f9157a5ae2210312aba288a4727 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 11 May 2021 21:16:10 +0200
Subject: [PATCH 173/323] Remove redundant ASM dependencies

---
 build.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 82cbf29..2fd94b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,17 +80,12 @@ dependencies {
 	// https://mvnrepository.com/artifact/org.ow2.asm/asm
 	implementation 'org.ow2.asm:asm:9.1'
 
-	// https://mvnrepository.com/artifact/org.ow2.asm/asm-commons
-	implementation 'org.ow2.asm:asm-commons:9.1'
 
 	// https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
 	implementation 'org.ow2.asm:asm-tree:9.1'
 
 	// https://mvnrepository.com/artifact/org.ow2.asm/asm-util
 	implementation 'org.ow2.asm:asm-util:9.1'
-
-	// https://mvnrepository.com/artifact/org.ow2.asm/asm-analysis
-	implementation 'org.ow2.asm:asm-analysis:9.1'
 }
 
 test {

From dbc817efff0d5347b4bddff3f06535d912091ffe Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 11 May 2021 21:17:23 +0200
Subject: [PATCH 174/323] Create API project module

---
 build.gradle | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2fd94b0..f0a8f16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,17 @@ sourceSets {
 		// module should not depend on main module to avoid circular dependency
 		//compileClasspath += sourceSets.main.output
 	}
+	api {
+		// add dummy zomboid classes to classpath when compiling on CI
+		if (isCI) {
+			compileClasspath += sourceSets.zombie.output
+		}
+	}
 	main {
+		// include api classes on compile and runtime classpath
+		compileClasspath += sourceSets.api.output
+		runtimeClasspath += sourceSets.api.output
+
 		// add dummy zomboid classes to classpath when compiling on CI
 		if (isCI) {
 			compileClasspath += sourceSets.zombie.output
@@ -40,8 +50,8 @@ sourceSets {
 	}
 	test {
 		// tests need to see classes used in class transformation tests
-		runtimeClasspath += sourceSets.zombie.output
-		compileClasspath += sourceSets.zombie.output
+		runtimeClasspath += sourceSets.zombie.output + sourceSets.api.output
+		compileClasspath += sourceSets.zombie.output + sourceSets.api.output
 	}
 	// remove media sourceSet created by capsid
 	if (!isCI) {

From 254e7b92b77d0e261d48d6b1d59055ca8b054fb4 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 11 May 2021 21:19:00 +0200
Subject: [PATCH 175/323] Migrate classes to API module

---
 .../java/io/pzstorm/storm/NonNullPackage.java              | 0
 .../io/pzstorm/storm/event/OnMainScreenRenderEvent.java    | 0
 .../io/pzstorm/storm/event/OnUIElementPreRenderEvent.java  | 0
 .../java/io/pzstorm/storm/event/StormEventDispatcher.java  | 7 +++----
 .../java/io/pzstorm/storm/event/StormEventHandler.java     | 0
 .../java/io/pzstorm/storm/event/SubscribeEvent.java        | 0
 .../java/io/pzstorm/storm/event/ZomboidEvent.java          | 4 +---
 .../java/io/pzstorm/storm/event/package-info.java          | 0
 .../java/io/pzstorm/storm/logging/StormLogger.java         | 0
 9 files changed, 4 insertions(+), 7 deletions(-)
 rename src/{main => api}/java/io/pzstorm/storm/NonNullPackage.java (100%)
 rename src/{main => api}/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java (100%)
 rename src/{main => api}/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java (100%)
 rename src/{main => api}/java/io/pzstorm/storm/event/StormEventDispatcher.java (97%)
 rename src/{main => api}/java/io/pzstorm/storm/event/StormEventHandler.java (100%)
 rename src/{main => api}/java/io/pzstorm/storm/event/SubscribeEvent.java (100%)
 rename src/{main => api}/java/io/pzstorm/storm/event/ZomboidEvent.java (79%)
 rename src/{main => api}/java/io/pzstorm/storm/event/package-info.java (100%)
 rename src/{main => api}/java/io/pzstorm/storm/logging/StormLogger.java (100%)

diff --git a/src/main/java/io/pzstorm/storm/NonNullPackage.java b/src/api/java/io/pzstorm/storm/NonNullPackage.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/NonNullPackage.java
rename to src/api/java/io/pzstorm/storm/NonNullPackage.java
diff --git a/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java b/src/api/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
rename to src/api/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
diff --git a/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java b/src/api/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
rename to src/api/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
diff --git a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java b/src/api/java/io/pzstorm/storm/event/StormEventDispatcher.java
similarity index 97%
rename from src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
rename to src/api/java/io/pzstorm/storm/event/StormEventDispatcher.java
index 6a46287..adc5f5e 100644
--- a/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
+++ b/src/api/java/io/pzstorm/storm/event/StormEventDispatcher.java
@@ -17,7 +17,6 @@
 import com.google.common.collect.Sets;
 
 import io.pzstorm.storm.logging.StormLogger;
-import io.pzstorm.storm.hook.StormHook;
 
 /**
  * This class is responsible for registering event handlers and dispatching {@link ZomboidEvent} instances.
@@ -29,7 +28,7 @@
  * </ul>
  * All methods in registered event handlers annotated with {@link SubscribeEvent} will be called
  * by {@link #dispatchEvent(ZomboidEvent)} method when an appropriate event is created by installed
- * {@link StormHook}. Each subscribed method has to have exactly one parameter that matches the type
+ * {@code StormHook}. Each subscribed method has to have exactly one parameter that matches the type
  * of event it wants to subscribe to. For example if a method wanted to subscribe to {@code OnRenderEvent}
  * it would define itself in one of two ways depending on the handler registration method used:
  * <br><br><pre>
@@ -169,7 +168,7 @@ public static void registerEventHandler(Object handler) {
 
 	/**
 	 * Create and return a list of instructions that calls {@link #dispatchEvent(ZomboidEvent)} method.
-	 * This is a convenience method intended to be used <b>only</b> by {@link StormHook} implementations to
+	 * This is a convenience method intended to be used <b>only</b> by {@code StormHook} implementations to
 	 * get a list of instructions that represents a dispatch call for given event.
 	 *
 	 * @param eventConstructorInsn list of instructions that represent constructing a new
@@ -196,7 +195,7 @@ public static InsnList callDispatchEvent(List<AbstractInsnNode> eventConstructor
 
 	/**
 	 * Dispatch the given event to all methods registered in dispatch registry. This is an internal
-	 * method <b>only</b> called by {@link StormHook} implementations installed in game code.
+	 * method <b>only</b> called by {@code StormHook} implementations installed in game code.
 	 *
 	 * @param event {@link ZomboidEvent} to dispatch.
 	 * @see #callDispatchEvent(List)
diff --git a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/src/api/java/io/pzstorm/storm/event/StormEventHandler.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/event/StormEventHandler.java
rename to src/api/java/io/pzstorm/storm/event/StormEventHandler.java
diff --git a/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java b/src/api/java/io/pzstorm/storm/event/SubscribeEvent.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
rename to src/api/java/io/pzstorm/storm/event/SubscribeEvent.java
diff --git a/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java b/src/api/java/io/pzstorm/storm/event/ZomboidEvent.java
similarity index 79%
rename from src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
rename to src/api/java/io/pzstorm/storm/event/ZomboidEvent.java
index dec63bd..bf61117 100644
--- a/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
+++ b/src/api/java/io/pzstorm/storm/event/ZomboidEvent.java
@@ -1,10 +1,8 @@
 package io.pzstorm.storm.event;
 
-import io.pzstorm.storm.hook.StormHook;
-
 /**
  * This class represents game events recognized by Storm. These events are created by installed
- * {@link StormHook}s and included as a method parameter in a callback to {@link StormEventDispatcher}.
+ * {@code StormHook}s and included as a method parameter in a callback to {@link StormEventDispatcher}.
  * They are then dispatched to all methods that subscribe to those specific events.
  */
 @SuppressWarnings("WeakerAccess")
diff --git a/src/main/java/io/pzstorm/storm/event/package-info.java b/src/api/java/io/pzstorm/storm/event/package-info.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/event/package-info.java
rename to src/api/java/io/pzstorm/storm/event/package-info.java
diff --git a/src/main/java/io/pzstorm/storm/logging/StormLogger.java b/src/api/java/io/pzstorm/storm/logging/StormLogger.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/logging/StormLogger.java
rename to src/api/java/io/pzstorm/storm/logging/StormLogger.java

From d8cc80ed5f35c16a8f4e5c49103f45d991ff2209 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 11 May 2021 21:32:42 +0200
Subject: [PATCH 176/323] Update build configurations

---
 build.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f0a8f16..7749f51 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,7 +59,10 @@ sourceSets {
 	}
 }
 configurations {
-	zombieImplementation.extendsFrom(compileOnly, implementation, zomboidImplementation)
+	implementation.extendsFrom(api)
+	testImplementation.extendsFrom(api)
+	zombieImplementation.extendsFrom(compileOnly, zomboidImplementation)
+	apiImplementation.extendsFrom(api, errorprone, zombieImplementation)
 }
 
 dependencies {

From cd3ec61d1d7205994b7dba6f6d29e68d15f5464f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 11 May 2021 21:33:12 +0200
Subject: [PATCH 177/323] Update build dependencies

---
 build.gradle | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7749f51..718a750 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,27 +75,29 @@ dependencies {
 	// https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils
 	testImplementation 'io.github.java-diff-utils:java-diff-utils:4.10'
 
-	// https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
-	implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
-
 	// https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
 	errorprone 'com.google.errorprone:error_prone_core:2.6.0'
 
 	// https://mvnrepository.com/artifact/com.google.errorprone/javac
 	errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
 
-	// https://mvnrepository.com/artifact/org.jetbrains/annotations
-	compileOnly 'org.jetbrains:annotations:20.1.0'
+	// https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
+	api 'org.apache.logging.log4j:log4j-core:2.14.0'
+
+	// https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
+	api 'org.ow2.asm:asm-tree:9.1'
 
 	// https://mvnrepository.com/artifact/com.google.guava/guava
-	implementation 'com.google.guava:guava:30.1.1-jre'
+	api 'com.google.guava:guava:30.1.1-jre'
 
-	// https://mvnrepository.com/artifact/org.ow2.asm/asm
-	implementation 'org.ow2.asm:asm:9.1'
+	// https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
+	compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
+	// https://mvnrepository.com/artifact/org.jetbrains/annotations
+	compileOnly 'org.jetbrains:annotations:20.1.0'
 
-	// https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
-	implementation 'org.ow2.asm:asm-tree:9.1'
+	// https://mvnrepository.com/artifact/org.ow2.asm/asm
+	implementation 'org.ow2.asm:asm:9.1'
 
 	// https://mvnrepository.com/artifact/org.ow2.asm/asm-util
 	implementation 'org.ow2.asm:asm-util:9.1'

From f4511b82d8361f83057c19bb74689a0631470e1d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 11 May 2021 21:41:15 +0200
Subject: [PATCH 178/323] Annotate package as NonNull

---
 src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java | 2 ++
 src/main/java/io/pzstorm/storm/package-info.java          | 2 --
 src/main/java/io/pzstorm/storm/patch/package-info.java    | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 src/main/java/io/pzstorm/storm/package-info.java
 create mode 100644 src/main/java/io/pzstorm/storm/patch/package-info.java

diff --git a/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java b/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
index 6fbd398..f46facb 100644
--- a/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
+++ b/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
@@ -11,6 +11,7 @@
 import zombie.core.Core;
 import zombie.ui.UIDebugConsole;
 
+import javax.annotation.Nonnull;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.util.Arrays;
@@ -18,6 +19,7 @@
 /**
  * Wrapper class for printing Project Zomboid logs with Log4j 2 logger.
  */
+@Nonnull
 @SuppressWarnings({ "unused", "WeakerAccess" })
 public class ZomboidLogger {
 
diff --git a/src/main/java/io/pzstorm/storm/package-info.java b/src/main/java/io/pzstorm/storm/package-info.java
deleted file mode 100644
index 7693995..0000000
--- a/src/main/java/io/pzstorm/storm/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@NonNullPackage
-package io.pzstorm.storm;
diff --git a/src/main/java/io/pzstorm/storm/patch/package-info.java b/src/main/java/io/pzstorm/storm/patch/package-info.java
new file mode 100644
index 0000000..938ed5c
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/patch/package-info.java
@@ -0,0 +1,4 @@
+@NonNullPackage
+package io.pzstorm.storm.patch;
+
+import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file

From cd9820cbdb2d03be53d81075373e585e12f9706b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 12 May 2021 21:03:56 +0200
Subject: [PATCH 179/323] Stop ignoring resource jar files

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 66f3b69..1988e02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,9 @@ out/
 *.tar.gz
 *.rar
 
+# Exclude jar files used as resources
+!**/resources/**/*.jar
+
 ### Windows ###
 # Windows thumbnail cache files
 Thumbs.db

From 3233f03ec0148226c4b1d08189a64dd1f165f48a Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 12 May 2021 21:06:47 +0200
Subject: [PATCH 180/323] Create ModMetadata api class

---
 .../io/pzstorm/storm/mod/ModMetadata.java     | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 src/api/java/io/pzstorm/storm/mod/ModMetadata.java

diff --git a/src/api/java/io/pzstorm/storm/mod/ModMetadata.java b/src/api/java/io/pzstorm/storm/mod/ModMetadata.java
new file mode 100644
index 0000000..537e54f
--- /dev/null
+++ b/src/api/java/io/pzstorm/storm/mod/ModMetadata.java
@@ -0,0 +1,48 @@
+package io.pzstorm.storm.mod;
+
+import java.util.Objects;
+
+/**
+ * This class represents mod metadata stored in {@code mod.info} file in mod project root directory.
+ */
+public class ModMetadata {
+
+	/**
+	 * Mod name as defined in {@code mod.info} file with {@code name} property.
+	 */
+	public final String name;
+
+	/**
+	 * Mod version as defined in {@code mod.info} file with {@code modversion} property.
+	 */
+	public final ModVersion version;
+
+	public ModMetadata(String name, ModVersion version) {
+
+		this.name = name;
+		this.version = version;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof ModMetadata)) {
+			return false;
+		}
+		ModMetadata that = (ModMetadata) o;
+		return name.equals(that.name) && version.equals(that.version);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(name, version);
+	}
+
+	@Override
+	public String toString() {
+		return name + " (" + version + ')';
+	}
+}

From 49fe37de5d8241114b0ff905040b799531021a9b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 12 May 2021 21:08:26 +0200
Subject: [PATCH 181/323] Create ModVersion api class

---
 .../java/io/pzstorm/storm/mod/ModVersion.java | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/api/java/io/pzstorm/storm/mod/ModVersion.java

diff --git a/src/api/java/io/pzstorm/storm/mod/ModVersion.java b/src/api/java/io/pzstorm/storm/mod/ModVersion.java
new file mode 100644
index 0000000..53e879a
--- /dev/null
+++ b/src/api/java/io/pzstorm/storm/mod/ModVersion.java
@@ -0,0 +1,38 @@
+package io.pzstorm.storm.mod;
+
+import java.util.Objects;
+
+/**
+ * This class represents mod version that adheres to standard mod version scheme.
+ */
+public class ModVersion {
+
+	// TODO: implement semantic versioning
+	private final String version;
+
+	public ModVersion(String version) {
+		this.version = version;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof ModVersion)) {
+			return false;
+		}
+		return version.equals(((ModVersion) o).version);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(version);
+	}
+
+	@Override
+	public String toString() {
+		return version;
+	}
+}

From be0ae7fb0e4e859e23b1145c045b28ec7a4ae34e Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 12 May 2021 21:10:22 +0200
Subject: [PATCH 182/323] Add isClassLoaded class loader method

---
 .../java/io/pzstorm/storm/core/StormClassLoader.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 276bc8d..f3ef0f0 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -111,6 +111,16 @@ static boolean isBlacklistedClass(String name) {
 		return null;
 	}
 
+	/**
+	 * Returns {@code true} if this loader has been recorded by the Java virtual machine as an
+	 * initiating loader of a class with the given binary name. Otherwise {@code null} is returned.
+	 *
+	 * @return {@code true} if class with given name has been loaded, {@code false} otherwise.
+	 */
+	boolean isClassLoaded(String name) {
+		return findLoadedClass(name) != null;
+	}
+
 	@Override
 	public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
 

From 2f868b288111cd1f49f308525d5f738ef66fc741 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 12 May 2021 21:17:19 +0200
Subject: [PATCH 183/323] Add ModJar core class

---
 .../java/io/pzstorm/storm/mod/ModJar.java     | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/mod/ModJar.java

diff --git a/src/main/java/io/pzstorm/storm/mod/ModJar.java b/src/main/java/io/pzstorm/storm/mod/ModJar.java
new file mode 100644
index 0000000..ef19f53
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/mod/ModJar.java
@@ -0,0 +1,59 @@
+package io.pzstorm.storm.mod;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Objects;
+import java.util.jar.JarFile;
+
+/**
+ * This class represents an accessible and readable mod {@code jar} file.
+ * Unlike {@link JarFile} it preserves the {@link File} instance pointing to jar file location.
+ */
+public class ModJar extends JarFile {
+
+	/**
+	 * {@code File} instance pointing to {@code jar} file location.
+	 */
+	private final File jarFile;
+
+	public ModJar(File file) throws IOException {
+		super(file, true);
+		jarFile = file;
+	}
+
+	/**
+	 * Returns {@code jar} file location in {@link URL} format so that it can be
+	 * read by class loaders and other systems that read from resources. Passing the
+	 * return value of this method to {@link URLClassLoader} constructor would allow that
+	 * class loader to discover all classes contained in this {@code jar} file.
+	 */
+	public URL getResourcePath() {
+
+		try {
+			return new URL("jar:file:" + jarFile.getPath() + "!/");
+		}
+		catch (MalformedURLException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof ModJar)) {
+			return false;
+		}
+		return jarFile.equals(((ModJar) o).jarFile);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(jarFile);
+	}
+}

From 4d6d10fa71003c4beeb379aff6deba4e827972a4 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 07:22:19 +0200
Subject: [PATCH 184/323] Create StormModLoader core class

---
 .../java/io/pzstorm/storm/core/StormModLoader.java    | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/core/StormModLoader.java

diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
new file mode 100644
index 0000000..6f15f97
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -0,0 +1,11 @@
+/**
+ * This class is responsible for registering and loading mod components:
+ * <ul>
+ * <li>Catalog mod jars by mapping them to mod directory name.</li>
+ * <li>Catalog mod metadata by mapping them to mod directory name.</li>
+ * <li>Catalog mod classes by mapping them to mod directory name.</li>
+ * <li>Load mod classes with {@link StormClassLoader}.</li>
+ * </ul>
+ */
+class StormModLoader {
+}

From 4547a4dfba9a021d948bc07392ea89628d9160ac Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 07:25:36 +0200
Subject: [PATCH 185/323] Implement loading mod jars

---
 .../io/pzstorm/storm/core/StormModLoader.java | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index 6f15f97..d7e1c79 100644
--- a/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -1,3 +1,21 @@
+package io.pzstorm.storm.core;
+
+import com.google.common.collect.ImmutableSet;
+import io.pzstorm.storm.mod.ModJar;
+import io.pzstorm.storm.mod.ModMetadata;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * This class is responsible for registering and loading mod components:
  * <ul>
@@ -8,4 +26,96 @@
  * </ul>
  */
 class StormModLoader {
+	 * This catalog stores {@link ModJar} instances mapped to directory names.
+	 *
+	 * @see #catalogModJars()
+	 */
+	private static final Map<String, ImmutableSet<ModJar>> JAR_CATALOG = new HashMap<>();
+
+	/**
+	 * Find and catalog {@code jar} files found in {@code $HOME/Zomboid/mods/} subdirectories.
+	 * The found jars will be mapped to the name of directory in which they were discovered.
+	 * Note that directories that do not contain a {@code mod.info} file will be excluded
+	 * even if they contain {@code jar} files.
+	 *
+	 * @throws IOException if unable to create {@code Zomboid/mods} directory structure,
+	 * 		an I/O error occurred while walking file tree or constructing {@link ModJar} instance.
+	 */
+	static void catalogModJars() throws IOException {
+
+		File zomboidLocalDir = getUserHomePath().resolve("Zomboid").toFile();
+
+		if (!zomboidLocalDir.exists() && !zomboidLocalDir.mkdir()) {
+			throw new IOException("Unable to create 'Zomboid' directory in '" + getUserHomePath() + '\'');
+		}
+		File zomboidModsDir = new File(zomboidLocalDir, "mods");
+		if (!zomboidModsDir.exists() && !zomboidModsDir.mkdir()) {
+			throw new IOException("Unable to create 'mods' directory in '" + zomboidModsDir.toPath() + '\'');
+		}
+		// clear map before entering new data
+		JAR_CATALOG.clear();
+
+		for (Path modDir : listModDirectories(zomboidModsDir))
+		{
+			Set<ModJar> modJars = new HashSet<>();
+			try (Stream<Path> stream = Files.walk(modDir, 1))
+			{
+				Set<Path> files = stream.filter(Files::isRegularFile).collect(Collectors.toSet());
+
+				// mod directory has to contain mod metadata file
+				if (files.contains(modDir.resolve("mod.info")))
+				{
+					for (Path modJar : listJarsInDirectory(modDir)) {
+						modJars.add(new ModJar(modJar.toFile()));
+					}
+					JAR_CATALOG.put(modDir.toFile().getName(), ImmutableSet.copyOf(modJars));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns a {@code Set} of paths that denote subdirectories in the given directory {@code File}.
+	 * This method will not employ recursion when searching for files. Search depth is one
+	 * directory which means that only immediate subdirectories will be included.
+	 *
+	 * @param zomboidDir directory to search for subdirectories.
+	 *
+	 * @throws RuntimeException if an I/O error occurs when opening the directory.
+	 */
+	private static Set<Path> listModDirectories(File zomboidDir) {
+
+		try (Stream<Path> stream = Files.list(zomboidDir.toPath())) {
+			return stream.filter(Files::isDirectory).collect(Collectors.toSet());
+		}
+		catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * Returns a {@code Set} of paths that denote jar files in given directory. This method will
+	 * not employ recursion when searching for files. Search depth is one directory which
+	 * means that only immediate jar files will be included.
+	 *
+	 * @param modDir {@code Path} that points to directory to search for jar files.
+	 *
+	 * @throws RuntimeException if an I/O error occurs when opening the directory.
+	 */
+	private static Set<Path> listJarsInDirectory(Path modDir) {
+
+		try (Stream<Path> stream = Files.walk(modDir, 1)) {
+			return stream.filter(p -> p.getFileName().toString().endsWith(".jar")).collect(Collectors.toSet());
+		}
+		catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * Returns {@code Path} that denotes {@code user.home} system property.
+	 */
+	private static Path getUserHomePath() {
+		return Paths.get(System.getProperty("user.home"));
+	}
 }

From b9d7309b32e970a4bfdaa641d84969086442e3bd Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 07:32:38 +0200
Subject: [PATCH 186/323] Test loading mod jars

---
 .../storm/core/StormModLoaderTest.java        | 106 ++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java

diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
new file mode 100644
index 0000000..4847b8b
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
@@ -0,0 +1,106 @@
+package io.pzstorm.storm.core;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.io.CharSink;
+import io.pzstorm.storm.UnitTest;
+import io.pzstorm.storm.mod.ModJar;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.*;
+
+class StormModLoaderTest implements UnitTest {
+
+	@SuppressWarnings({ "WeakerAccess", "ConstantConditions" })
+	@TempDir File tempDir = null;
+	private File zomboidModsDir;
+
+	@BeforeEach
+	void prepareStormModLoaderTest() {
+
+		zomboidModsDir = new File(tempDir, "Zomboid/mods");
+		Assertions.assertTrue(zomboidModsDir.mkdirs());
+
+		System.setProperty("user.home", tempDir.getPath());
+	}
+
+	@Test
+	void shouldCatalogAllModJarsFoundInModsDir() throws Throwable {
+		testCatalogingModJarsInModsDir(true);
+	}
+
+	@Test
+	void shouldExcludeModJarsFromCatalogWhenMissingModMetadata() throws Throwable {
+		testCatalogingModJarsInModsDir(false);
+	}
+
+	private void testCatalogingModJarsInModsDir(boolean createMetadata) throws Throwable {
+
+		ClassLoader CL = getClass().getClassLoader();
+		Map<String, String[]> modJarData = ImmutableMap.of(
+				"A", new String[] { "modA.jar" },
+				"B", new String[] { "modA.jar", "modB.jar" },
+				"C", new String[] { "modA.jar", "modB.jar", "modC.jar" }
+		);
+		Map<String, ImmutableSet<ModJar>> expectedJarRegistry = new HashMap<>();
+		for (Map.Entry<String, String[]> entry : modJarData.entrySet())
+		{
+			String modDirName = entry.getKey();
+			File modDir = new File(zomboidModsDir, modDirName);
+
+			// create temporary mod directory
+			if (!modDir.exists()) {
+				Assertions.assertTrue(modDir.mkdir());
+			}
+			// create metadata file in mod directory
+			if (createMetadata) {
+				writeToModMetadataFile(modDir, ImmutableList.of("name=" + modDirName, "modversion=1.1.0"));
+			}
+			Set<ModJar> modJars = new HashSet<>();
+			for (String modJarName : entry.getValue())
+			{
+				URL jarResource = Objects.requireNonNull(CL.getResource("./jars/" + modJarName));
+				File destination = new File(modDir, modJarName);
+
+				// copy resource mod jars to temporary directory
+				Files.copy(Paths.get(jarResource.toURI()), destination.toPath());
+				Assertions.assertTrue(destination.exists());
+
+				modJars.add(new ModJar(destination));
+			}
+			expectedJarRegistry.put(entry.getKey(), ImmutableSet.copyOf(modJars));
+		}
+		StormModLoader.catalogModJars();
+		if (createMetadata)
+		{
+			for (Map.Entry<String, ImmutableSet<ModJar>> entry : expectedJarRegistry.entrySet()) {
+				Assertions.assertEquals(StormModLoader.getJarCatalogEntry(entry.getKey()), entry.getValue());
+			}
+		}
+	}
+
+	private void writeToModMetadataFile(File modDir, List<String> lines) throws IOException {
+
+		File metadataFile = new File(modDir, "mod.info");
+		if (!metadataFile.exists()) {
+			Assertions.assertTrue(metadataFile.createNewFile());
+		}
+		CharSink sink = com.google.common.io.Files.asCharSink(metadataFile, StandardCharsets.UTF_8);
+		try {
+			sink.writeLines(lines, "\n");
+		}
+		catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+}

From 427aaa0a2f8c5a5ca72b2364e6d4721a8d45e3e3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 07:50:24 +0200
Subject: [PATCH 187/323] Implement loading mod metadata

---
 .../io/pzstorm/storm/core/StormModLoader.java | 72 +++++++++++++++++--
 1 file changed, 68 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index d7e1c79..e6ceda5 100644
--- a/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -1,18 +1,23 @@
 package io.pzstorm.storm.core;
 
 import com.google.common.collect.ImmutableSet;
+import io.pzstorm.storm.logging.StormLogger;
 import io.pzstorm.storm.mod.ModJar;
+import io.pzstorm.storm.mod.ModVersion;
 import io.pzstorm.storm.mod.ModMetadata;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
+import zombie.util.StringUtils;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
+import java.util.jar.JarEntry;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -26,6 +31,15 @@
  * </ul>
  */
 class StormModLoader {
+
+	/**
+	 * This catalog contains {@link ModMetadata} instances mapped to directory names.
+	 *
+	 * @see #loadModMetadata()
+	 */
+	private static final Map<String, ModMetadata> METADATA_CATALOG = new HashMap<>();
+
+	/**
 	 * This catalog stores {@link ModJar} instances mapped to directory names.
 	 *
 	 * @see #catalogModJars()
@@ -112,6 +126,56 @@ private static Set<Path> listJarsInDirectory(Path modDir) {
 		}
 	}
 
+	/**
+	 * Load mod metadata for each entry in jar catalog. Before loading mod metadata it is
+	 * important to populate the jar catalog by calling {@link #catalogModJars()} method,
+	 * otherwise this method will only clear the metadata catalog. Metadata is read from
+	 * {@code mod.info} file located in mod root directory. Directories which do not
+	 * contain a metadata file will be excluded from this operation.
+	 *
+	 * @throws IOException if an error occurred when reading from input stream.
+	 */
+	static void loadModMetadata() throws IOException {
+
+		// clear map before entering new data
+		METADATA_CATALOG.clear();
+
+		Path zomboidModsDir = getUserHomePath().resolve("Zomboid/mods");
+		for (String modEntry : JAR_CATALOG.keySet())
+		{
+			File modInfoFile = Paths.get(zomboidModsDir.toString(), modEntry, "mod.info").toFile();
+			if (!modInfoFile.exists() || modInfoFile.isDirectory())
+			{
+				String message = "Unable to register mod in directory '%s' missing 'mod.info' file";
+				StormLogger.error(message, modEntry);
+				continue;
+			}
+			Properties modInfo = new Properties();
+			modInfo.load(new FileInputStream(modInfoFile));
+
+			String modName = modInfo.getProperty("name");
+			if (StringUtils.isNullOrEmpty(modName))
+			{
+				String message = "Unable to register mod in directory '%s' with missing name, check mod.info file";
+				StormLogger.error(String.format(message, modEntry));
+				continue;
+			}
+			String modVersion = modInfo.getProperty("modversion");
+			if (modVersion == null)
+			{
+				String message = "Unable to register mod '%s' with missing version, check mod.info file";
+				StormLogger.error(String.format(message, modName));
+				continue;
+			}
+			else if (modVersion.isEmpty())
+			{
+				String message = "Mod '%s' has empty version property, using 0.1.0 version instead";
+				StormLogger.warn(message, modName);
+				modVersion = "0.1.0";
+			}
+			METADATA_CATALOG.put(modName, new ModMetadata(modName, new ModVersion(modVersion)));
+		}
+	}
 	/**
 	 * Returns {@code Path} that denotes {@code user.home} system property.
 	 */

From e2f285b7a3115c3bb49f86ab7a37d37c13e5258c Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 07:51:03 +0200
Subject: [PATCH 188/323] Test loading mod metadata

---
 .../storm/core/StormModLoaderTest.java        | 89 +++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
index 4847b8b..e96fe5f 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
@@ -6,6 +6,8 @@
 import com.google.common.io.CharSink;
 import io.pzstorm.storm.UnitTest;
 import io.pzstorm.storm.mod.ModJar;
+import io.pzstorm.storm.mod.ModVersion;
+import io.pzstorm.storm.mod.ModMetadata;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -44,6 +46,93 @@ void shouldExcludeModJarsFromCatalogWhenMissingModMetadata() throws Throwable {
 		testCatalogingModJarsInModsDir(false);
 	}
 
+	@Test
+	void shouldCorrectlyLoadAllModMetadata() throws Throwable {
+
+		Map<String, ModMetadata> expectedModEntries = ImmutableMap.of(
+				"A", new ModMetadata("A", new ModVersion("1.7.0")),
+				"B", new ModMetadata("B", new ModVersion("0.3.0")),
+				"C", new ModMetadata("C", new ModVersion("2.0.0"))
+		);
+		for (Map.Entry<String, ModMetadata> entry : expectedModEntries.entrySet())
+		{
+			String modDirName = entry.getKey();
+			File modDir = new File(zomboidModsDir, modDirName);
+			Assertions.assertTrue(modDir.mkdirs());
+
+			writeToModMetadataFile(modDir, ImmutableList.of(
+					"name=" + modDirName, "modversion=" + entry.getValue().version));
+		}
+		testCatalogingModJarsInModsDir(false);
+		StormModLoader.loadModMetadata();
+
+		for (Map.Entry<String, ModMetadata> entry : expectedModEntries.entrySet())
+		{
+			ModMetadata expectedModMetadata = entry.getValue();
+			ModMetadata actualModMetadata = StormModLoader.getMetadataCatalogEntry(entry.getKey());
+			Assertions.assertEquals(expectedModMetadata, actualModMetadata);
+		}
+	}
+
+	@Test
+	void shouldNotLoadModMetadataWhenModInfoFileMissing() throws Throwable {
+
+		Map<String, ModMetadata> expectedModEntries = ImmutableMap.of(
+				"A", new ModMetadata("A", new ModVersion("1.1.0")),
+				"B", new ModMetadata("B", new ModVersion("1.1.0")),
+				"C", new ModMetadata("C", new ModVersion("1.1.0"))
+		);
+		testCatalogingModJarsInModsDir(false);
+		StormModLoader.loadModMetadata();
+
+		for (Map.Entry<String, ModMetadata> entry : expectedModEntries.entrySet()) {
+			Assertions.assertNull(StormModLoader.getMetadataCatalogEntry(entry.getKey()));
+		}
+	}
+
+	@Test
+	void shouldNotLoadModMetadataWhenMissingProperties() throws Throwable {
+
+		Map<String, ModMetadata> modEntries = ImmutableMap.of(
+				"A", new ModMetadata("A", new ModVersion("1.0.0")),
+				"B", new ModMetadata(null, new ModVersion("2.4.0")),
+				"C", new ModMetadata("", new ModVersion("0.3.0")),
+				"D", new ModMetadata("D", null),
+				"E", new ModMetadata("E", new ModVersion(""))
+		);
+		for (Map.Entry<String, ModMetadata> entry : modEntries.entrySet())
+		{
+			String modDirName = entry.getKey();
+			File modDir = new File(zomboidModsDir, modDirName);
+			Assertions.assertTrue(modDir.mkdirs());
+
+			ModMetadata modMetadata = entry.getValue();
+			writeToModMetadataFile(modDir, ImmutableList.of(
+					modMetadata.name != null ? "name=" + modMetadata.name : "",
+					modMetadata.version != null ? "modversion=" + modMetadata.version : ""));
+		}
+		testCatalogingModJarsInModsDir(false);
+		StormModLoader.loadModMetadata();
+
+		// both name and version properties present
+		Assertions.assertNotNull(StormModLoader.getMetadataCatalogEntry("A"));
+
+		// missing name property
+		Assertions.assertNull(StormModLoader.getMetadataCatalogEntry("B"));
+
+		// name property is empty string
+		Assertions.assertNull(StormModLoader.getMetadataCatalogEntry("C"));
+
+		// missing version property
+		Assertions.assertNull(StormModLoader.getMetadataCatalogEntry("D"));
+
+		// version property is empty string
+		ModMetadata modE = StormModLoader.getMetadataCatalogEntry("E");
+		Assertions.assertNotNull(modE);
+
+		// assert using default version
+		Assertions.assertEquals(new ModVersion("0.1.0"), modE.version);
+	}
 	private void testCatalogingModJarsInModsDir(boolean createMetadata) throws Throwable {
 
 		ClassLoader CL = getClass().getClassLoader();

From e821c41157e1c6a61df69878e0e54e7b93b260a0 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 07:51:35 +0200
Subject: [PATCH 189/323] Add mod loader test jar resources

---
 src/test/resources/jars/modA.jar | Bin 0 -> 1163 bytes
 src/test/resources/jars/modB.jar | Bin 0 -> 767 bytes
 src/test/resources/jars/modC.jar | Bin 0 -> 766 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/test/resources/jars/modA.jar
 create mode 100644 src/test/resources/jars/modB.jar
 create mode 100644 src/test/resources/jars/modC.jar

diff --git a/src/test/resources/jars/modA.jar b/src/test/resources/jars/modA.jar
new file mode 100644
index 0000000000000000000000000000000000000000..268565dbbd696154060b93e7a1ef77d2e37085c5
GIT binary patch
literal 1163
zcmWIWW@Zs#U|`^2SlqlO=sxcUW_=*f7KlX{WEgy1LmYKI{oM3@9sNArT!TaOeBDAr
zI2o9Yp3P1G;nE6j21b?_%nS@*;<N9W(>~t1dKY=Ub+yi&Ilno`;EM5sr=QOHU;OHQ
z#&>HF!zLNUnjKuswi~44^cVtwmU98EVgOqXW<Uu}WXs_;7Rk&(w-ICn#QnL8)&!kq
zUH14K&<Jiu1_nu>5y|<v`o)R41v#nux%nyjzWFJRddWG7#l>JFb%Dk;VH%m+w>R&Q
zgFs9A#*NK}_DZLimvD>hY~yPYQ4E~9L}8KrZFP&3-xCb?gs<`tscf(jNje{}NxQeq
z?Y_tFddvTe5{u;zI39Pu?%w~vw{+oZ$%B>B>p0)tS<-c(yJVqVf90A}`I6~#c$6le
z$kFxA{cBsYdaa#6+@d2-9w~gTUFMP(w9(|{@fLwKXEyp=af;rSdieWXo09^1vs#|B
zt2*5mQks0!t>&op)Q}3-X8CQ-dty?*-srr=eD<RLi}rrDny~eJvNjvr%o%i9O83SF
zKNLj`pmewC(=P!7NE{eIvRDHsv?Md9m~bGKA_Y=%-4wM&OPIT2oTqE>3QhIwV)%R0
z?%=}B{5RF!Pt^+QvSHwFjj&#r;xF~~Or7%Gmw!HUC$u>-u*b^V%GWl1UsN2sS7^@1
z6z78HW}z*0ONzgiok<E^lagam*^#4k)=g~JxBm;H-<EhvxOJX&(cIh|sI+-y#I2Ip
z%wRj=CjM$2p{*B8@9&kH_w7?~Tfs#&n|m6<Y^JI`XSP4Gy|;SFAr9StHMU3kU$2p~
zzF4uq_AguQ$4gD;Uzsj!w!Zd(-+|pRcz^zi4@?2xj7)OOxblJoIAH=qjbTY6h>1OC
zutIVMTCRYYj4Po-OlDvZV0i0Ti)?ae2tMO*C3=`~3=CTu4*-qBlLdgrgR%ft*CLEZ
kO)|*FKLiE`rtv5V2$vPCY(S?mumE8;&=4+Q`N6;d0C$3N)&Kwi

literal 0
HcmV?d00001

diff --git a/src/test/resources/jars/modB.jar b/src/test/resources/jars/modB.jar
new file mode 100644
index 0000000000000000000000000000000000000000..735568f3e18cfa25e080f21c0e9c03ddb5cecdc0
GIT binary patch
literal 767
zcmWIWW@Zs#U|`^2_}IKAsAspVnLdzb3&bJ}G7P@1A&$D9es21{j((nQuE8OCzHXr*
zoD9szp3P1G;nE6j21b?_%nS@*;<N9W(>~t1dKY=Ub+yi&Ilno`;EM5sr=QOHU;OHQ
z#&>HF!=^b3H9NSNZ8u28=`jQVE$0GS#Q?S(%zzS{$d<!xoFX#^-A0fR5clUUS`+l~
zxSrHGpb^}R3=EP$Ba-uT^@|g83vyERbMsU5ee+YC^pbNDi;KZV>H>|Mg=u7N-`>1K
z4gxLd8#gu^+AE!6UcxQ1vyIP1P(^F9h|8Ds-z@Dp@<wgny+k{e_$RbGy^-`PTYB-_
z3+c@N`p@kdlD{xpy!i3r*9*ZtEA>iDl`ZlQn;x7yJ4CQ*qTZF~hW(*GbszUkc1#hP
zxi)p>+WqZ$Td%So@}4pyMkZz7`6(xSwWg{4ogvUP)pA;ARL1FTIY0JIR+l{FI{Cw&
z1uie5ol-X4=vZH|d=l6Cj1Py)I;O8)BWE30y}<Gp>)#I-8_vJFy0BUO+6T4;tqay|
z&(_+*6yVLsB*%;^iY36|4Gb-YC5<2^_6TQ%L^xVxLrlgMe-M)y7z7yJI@Tha92$bp
qI9zcFGme2_OXC5cad=`DXgnxpF<i^a2GqyE41^p&4?hHXngIY6t?L5-

literal 0
HcmV?d00001

diff --git a/src/test/resources/jars/modC.jar b/src/test/resources/jars/modC.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8142c8abda35c01ea83c73bce9182f0fabde07e7
GIT binary patch
literal 766
zcmWIWW@Zs#U|`^2_|d#3s7ZU;WPKpd7KlX{WEgy1LmYKI{oM3@9sNArT!TaOeBDAr
zI2o9)Je!>W!lf1542&!<m>C$r#An|#r+vJ2^)B*y>uQ}lbAEG>!4=~NPd}aYzxdVr
zjPKSUhD~!6Yj$uk+isAG(_;t#TFwQuiUDjnm;og?ku8VYxJ+gax{V+sAnwmyv?l0A
zb=&W=KqI&r85ksiMkMFw>K7;G7UZPr=jNyA`{t)O>m}zT78iq!)CC%M2GhvgzKwZ@
z90Xj_H*Rb;lo0&LSmN0gGg+^Lt@BhPlS}<J|C5p1^o`X1yS7eg;(xGMpxV!?Z0W^w
zFM793fBjzafV3N<3{MSDtqV*3GVQx(IL}@F-1k7wXBkJ}8ttuCQ#w~|H`26_JgzqN
zsNc0)zy4py-S=glL1%Dq*Iu3d+^SxaJNYN;-s3!YOy*UH?$*?5vzoI{`*|KN@~+qu
ztkk2U$Q4=JRXS<)mV+X)bvO7v7EQgHtRBT*67RP_Szh+XnmB2ziUi*O3||Dce690t
zH4pG+WRhdX6~hwX;06X3!;(f26MKBKLgE`Ot|2Dliav<R3=9GcZyjrqO%4sgXB@7m
ngc--cu%+<;&^SC13p5@Su^6spWdrJCU<N`CpobrTJk0<ARI%kT

literal 0
HcmV?d00001


From 8a08afc09f37db8a0b152f79eac93bdf691032e1 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 08:22:09 +0200
Subject: [PATCH 190/323] Implement mod class loading

---
 .../io/pzstorm/storm/core/StormModLoader.java | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index e6ceda5..4f741ba 100644
--- a/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -46,6 +46,13 @@ class StormModLoader {
 	 */
 	private static final Map<String, ImmutableSet<ModJar>> JAR_CATALOG = new HashMap<>();
 
+	/**
+	 * This catalog stores {@link Class} instances mapped to directory names.
+	 *
+	 * @see #loadModClasses()
+	 */
+	private static final Map<String, ImmutableSet<Class<?>>> CLASS_CATALOG = new HashMap<>();
+
 	/**
 	 * Find and catalog {@code jar} files found in {@code $HOME/Zomboid/mods/} subdirectories.
 	 * The found jars will be mapped to the name of directory in which they were discovered.
@@ -176,6 +183,45 @@ else if (modVersion.isEmpty())
 			METADATA_CATALOG.put(modName, new ModMetadata(modName, new ModVersion(modVersion)));
 		}
 	}
+
+	/**
+	 * Load classes from cataloged {@link ModJar} instances with {@link StormClassLoader}.
+	 * Once loaded the classes will also be cataloged by mapping them to directory name.
+	 * Before loading classes it is important to populate the jar catalog with
+	 * {@link #catalogModJars()} method, otherwise this method will only clear the class catalog.
+	 */
+	static void loadModClasses() {
+
+		// clear map before entering new data
+		CLASS_CATALOG.clear();
+
+		for (Map.Entry<String, ImmutableSet<ModJar>> entry : JAR_CATALOG.entrySet())
+		{
+			Set<Class<?>> modClasses = new HashSet<>();
+			for (ModJar modJar : entry.getValue())
+			{
+				Enumeration<JarEntry> jarEntries = modJar.entries();
+				while (jarEntries.hasMoreElements())
+				{
+					JarEntry jarEntry = jarEntries.nextElement();
+					if(jarEntry.isDirectory() || !jarEntry.getName().endsWith(".class")) {
+						continue;
+					}
+					String entryName = jarEntry.getName();
+					String className = entryName.substring(0, entryName.length() - 6);
+					try {
+						modClasses.add(StormBootstrap.CLASS_LOADER.loadClass(
+								className.replace('/', '.' ), true));
+					}
+					catch (ClassNotFoundException e) {
+						throw new RuntimeException(e);
+					}
+				}
+			}
+			CLASS_CATALOG.put(entry.getKey(), ImmutableSet.copyOf(modClasses));
+		}
+	}
+
 	/**
 	 * Returns {@code Path} that denotes {@code user.home} system property.
 	 */

From 90fc054a16c77a820def0b1b3d7a7e3b15231aff Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 08:22:19 +0200
Subject: [PATCH 191/323] Test mod class loading

---
 .../storm/core/StormModLoaderTest.java        | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
index e96fe5f..4293e58 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
@@ -133,6 +133,25 @@ void shouldNotLoadModMetadataWhenMissingProperties() throws Throwable {
 		// assert using default version
 		Assertions.assertEquals(new ModVersion("0.1.0"), modE.version);
 	}
+
+	@Test
+	void shouldLoadAllModClasses() throws Throwable {
+
+		String[] expectedLoadedClasses = new String[] {
+				"com.sample.mod.ModA", "com.sample.mod.ModUtils",
+				"com.sample.mod.ModB", "com.sample.mod.ModC"
+		};
+		for (String clazz : expectedLoadedClasses) {
+			Assertions.assertFalse(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
+		}
+		testCatalogingModJarsInModsDir(true);
+		StormModLoader.loadModClasses();
+
+		for (String clazz : expectedLoadedClasses) {
+			Assertions.assertTrue(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
+		}
+	}
+
 	private void testCatalogingModJarsInModsDir(boolean createMetadata) throws Throwable {
 
 		ClassLoader CL = getClass().getClassLoader();

From b314c90eb9a2b99d5fec2c6648915111ae82a790 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 08:22:50 +0200
Subject: [PATCH 192/323] Add missing mod loader test methods

---
 src/main/java/io/pzstorm/storm/core/StormModLoader.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index 4f741ba..a94cc43 100644
--- a/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -228,4 +228,13 @@ static void loadModClasses() {
 	private static Path getUserHomePath() {
 		return Paths.get(System.getProperty("user.home"));
 	}
+	@TestOnly
+	static @Nullable ModMetadata getMetadataCatalogEntry(String name) {
+		return METADATA_CATALOG.get(name);
+	}
+
+	@TestOnly
+	static @Nullable ImmutableSet<ModJar> getJarCatalogEntry(String name) {
+		return JAR_CATALOG.get(name);
+	}
 }

From 832c964350a1cdf09a762d256b2e9387cdfea3dc Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 08:25:57 +0200
Subject: [PATCH 193/323] Ignore temporary java files

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1988e02..15f9b1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@ out/
 # Compiled class file
 *.class
 
+# Temporary java file
+*.java~
+
 # Exclude class files used as resources
 !**/resources/**/*.class
 

From 5d7b32abb706310a0d15aef178b05a0873a0a419 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 08:31:25 +0200
Subject: [PATCH 194/323] Prepare StormClassLoader for loading jars

---
 .../java/io/pzstorm/storm/core/StormBootstrap.java |  9 +++++----
 .../java/io/pzstorm/storm/core/StormModLoader.java | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index 7531c51..a380ea5 100644
--- a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -11,11 +11,12 @@
 class StormBootstrap {
 
 	/**
-	 * {@code ClassLoader} used to transform and load all needed classes. Because class loaders
-	 * maintain their own set of class instances and native libraries you should always use
-	 * this loader to load classes that access or modify transformed class fields or methods.
+	 * {@code ClassLoader} used to transform and load all needed classes.
+	 * This includes both Project Zomboid and mod classes. Because class loaders maintain
+	 * their own set of class instances and native libraries this loader should always be
+	 * used to load classes that access or modify transformed class fields or methods.
 	 */
-	static final StormClassLoader CLASS_LOADER = new StormClassLoader();
+	static final StormClassLoader CLASS_LOADER = new StormClassLoader(StormModLoader.getJarResourcePaths());
 
 	/**
 	 * Loaded and initialized {@link StormClassTransformer} {@code Class}. To transform specific
diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index a94cc43..0f27bb5 100644
--- a/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -228,6 +228,20 @@ static void loadModClasses() {
 	private static Path getUserHomePath() {
 		return Paths.get(System.getProperty("user.home"));
 	}
+
+	/**
+	 * Returns an array of paths pointing to cataloged jars.
+	 * This method will return an empty array if no jars are cataloged.
+	 */
+	static URL[] getJarResourcePaths() {
+
+		List<URL> result = new ArrayList<>();
+		for (Set<ModJar> modJars : JAR_CATALOG.values()) {
+			modJars.forEach(j -> result.add(j.getResourcePath()));
+		}
+		return result.toArray(new URL[0]);
+	}
+
 	@TestOnly
 	static @Nullable ModMetadata getMetadataCatalogEntry(String name) {
 		return METADATA_CATALOG.get(name);

From d6f12a143763b618d560dbe6f7fb2fc2626518a2 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 08:35:26 +0200
Subject: [PATCH 195/323] Do code reformatting

---
 .../pzstorm/storm/core/StormClassLoader.java  |  3 +-
 .../storm/core/StormClassTransformer.java     |  3 +-
 .../storm/core/StormClassTransformers.java    | 10 +++----
 .../io/pzstorm/storm/core/StormLauncher.java  |  5 ++--
 .../io/pzstorm/storm/core/StormModLoader.java | 24 ++++++++-------
 .../pzstorm/storm/logging/ZomboidLogger.java  | 14 +++++----
 .../java/io/pzstorm/storm/mod/ModJar.java     |  1 +
 .../io/pzstorm/storm/patch/DebugLogPatch.java | 12 ++++----
 .../storm/patch/DebugLogStreamPatch.java      | 14 +++++----
 .../io/pzstorm/storm/patch/package-info.java  |  2 +-
 src/main/resources/log4j2.xml                 |  2 +-
 .../storm/core/StormClassTestTransformer.java |  3 +-
 .../storm/core/StormModLoaderTest.java        | 30 +++++++++++--------
 .../io/pzstorm/storm/util/AsmUtilsTest.java   |  2 +-
 src/zombie/java/zombie/debug/LogSeverity.java |  3 +-
 15 files changed, 71 insertions(+), 57 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index f3ef0f0..0648609 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -7,12 +7,13 @@
 import java.net.URLClassLoader;
 import java.util.Objects;
 
-import io.pzstorm.storm.logging.StormLogger;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
 import com.google.common.collect.ImmutableSet;
 
+import io.pzstorm.storm.logging.StormLogger;
+
 /**
  * This is a custom {@code ClassLoader} used to define, transform and load Project Zomboid classes.
  * It is initially invoked by {@link StormLauncher} when launching the game.
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index be5748c..089efae 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 
-import io.pzstorm.storm.logging.StormLogger;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.ClassReader;
@@ -12,6 +11,8 @@
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.MethodNode;
 
+import io.pzstorm.storm.logging.StormLogger;
+
 /**
  * This class represents a {@code Class} transformer used to alter {@code Class}
  * bytecode using ASM. The transformation process calls the following method in fixed order:
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index ce82007..805e7e8 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -3,15 +3,15 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import io.pzstorm.storm.patch.DebugLogPatch;
-import io.pzstorm.storm.patch.DebugLogStreamPatch;
-import io.pzstorm.storm.patch.ZomboidPatch;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
 import io.pzstorm.storm.hook.OnMainScreenRenderHook;
 import io.pzstorm.storm.hook.OnUIElementPreRenderHook;
 import io.pzstorm.storm.hook.StormHook;
+import io.pzstorm.storm.patch.DebugLogPatch;
+import io.pzstorm.storm.patch.DebugLogStreamPatch;
+import io.pzstorm.storm.patch.ZomboidPatch;
 
 /**
  * This class defines, initializes and stores {@link StormClassTransformer} instances.
@@ -29,8 +29,8 @@ public class StormClassTransformers {
 
 	static
 	{
-		 /////////////////////
-		 // REGISTER HOOKS //
+		/////////////////////
+		// REGISTER HOOKS //
 		///////////////////
 
 		registerTransformer("zombie.gameStates.MainScreenState", new OnMainScreenRenderHook());
diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 419327a..1316ee7 100644
--- a/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -1,10 +1,9 @@
 package io.pzstorm.storm.core;
 
-import io.pzstorm.storm.logging.StormLogger;
-import io.pzstorm.storm.logging.ZomboidLogger;
-
 import java.lang.reflect.Method;
 
+import io.pzstorm.storm.logging.StormLogger;
+
 class StormLauncher {
 
 	/**
diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index 0f27bb5..828aa9d 100644
--- a/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -1,14 +1,5 @@
 package io.pzstorm.storm.core;
 
-import com.google.common.collect.ImmutableSet;
-import io.pzstorm.storm.logging.StormLogger;
-import io.pzstorm.storm.mod.ModJar;
-import io.pzstorm.storm.mod.ModVersion;
-import io.pzstorm.storm.mod.ModMetadata;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.TestOnly;
-import zombie.util.StringUtils;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -21,6 +12,17 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
+
+import com.google.common.collect.ImmutableSet;
+
+import io.pzstorm.storm.logging.StormLogger;
+import io.pzstorm.storm.mod.ModJar;
+import io.pzstorm.storm.mod.ModMetadata;
+import io.pzstorm.storm.mod.ModVersion;
+import zombie.util.StringUtils;
+
 /**
  * This class is responsible for registering and loading mod components:
  * <ul>
@@ -204,14 +206,14 @@ static void loadModClasses() {
 				while (jarEntries.hasMoreElements())
 				{
 					JarEntry jarEntry = jarEntries.nextElement();
-					if(jarEntry.isDirectory() || !jarEntry.getName().endsWith(".class")) {
+					if (jarEntry.isDirectory() || !jarEntry.getName().endsWith(".class")) {
 						continue;
 					}
 					String entryName = jarEntry.getName();
 					String className = entryName.substring(0, entryName.length() - 6);
 					try {
 						modClasses.add(StormBootstrap.CLASS_LOADER.loadClass(
-								className.replace('/', '.' ), true));
+								className.replace('/', '.'), true));
 					}
 					catch (ClassNotFoundException e) {
 						throw new RuntimeException(e);
diff --git a/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java b/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
index f46facb..51e48c6 100644
--- a/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
+++ b/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
@@ -1,5 +1,11 @@
 package io.pzstorm.storm.logging;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.util.Arrays;
+
+import javax.annotation.Nonnull;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -8,14 +14,10 @@
 import org.apache.logging.log4j.core.appender.OutputStreamAppender;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.jetbrains.annotations.NotNull;
+
 import zombie.core.Core;
 import zombie.ui.UIDebugConsole;
 
-import javax.annotation.Nonnull;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.Arrays;
-
 /**
  * Wrapper class for printing Project Zomboid logs with Log4j 2 logger.
  */
@@ -225,7 +227,7 @@ private enum LogSeverity {
 		 * @param name name of the {@code LogSeverity} entry to get the level for.
 		 * @param def default {@code LogSeverity} entry to use if no entry was matched.
 		 *
- 		 * @return {@code Level} associated with matched entry or {@code Level} associated
+		 * @return {@code Level} associated with matched entry or {@code Level} associated
 		 * 		with default entry if no entry was matched for given name.
 		 */
 		private static Level getForName(String name, LogSeverity def) {
diff --git a/src/main/java/io/pzstorm/storm/mod/ModJar.java b/src/main/java/io/pzstorm/storm/mod/ModJar.java
index ef19f53..3433384 100644
--- a/src/main/java/io/pzstorm/storm/mod/ModJar.java
+++ b/src/main/java/io/pzstorm/storm/mod/ModJar.java
@@ -20,6 +20,7 @@ public class ModJar extends JarFile {
 	private final File jarFile;
 
 	public ModJar(File file) throws IOException {
+
 		super(file, true);
 		jarFile = file;
 	}
diff --git a/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java b/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
index 13d2125..109ec6b 100644
--- a/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
+++ b/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
@@ -1,12 +1,14 @@
 package io.pzstorm.storm.patch;
 
-import com.google.common.collect.ImmutableList;
-import io.pzstorm.storm.core.StormClassTransformer;
-import io.pzstorm.storm.util.AsmUtils;
+import java.util.Objects;
+
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.*;
 
-import java.util.Objects;
+import com.google.common.collect.ImmutableList;
+
+import io.pzstorm.storm.core.StormClassTransformer;
+import io.pzstorm.storm.util.AsmUtils;
 
 public class DebugLogPatch implements ZomboidPatch {
 
@@ -68,4 +70,4 @@ public void applyPatch(StormClassTransformer transformer) {
 						"io/pzstorm/storm/logging/ZomboidLogger", "info", "(Ljava/lang/String;)V"))
 		);
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java b/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
index a9e38be..dea333a 100644
--- a/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
+++ b/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
@@ -1,13 +1,15 @@
 package io.pzstorm.storm.patch;
 
-import com.google.common.collect.ImmutableList;
-import io.pzstorm.storm.core.StormClassTransformer;
-import io.pzstorm.storm.util.AsmUtils;
+import java.util.List;
+import java.util.Objects;
+
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.*;
 
-import java.util.List;
-import java.util.Objects;
+import com.google.common.collect.ImmutableList;
+
+import io.pzstorm.storm.core.StormClassTransformer;
+import io.pzstorm.storm.util.AsmUtils;
 
 public class DebugLogStreamPatch implements ZomboidPatch {
 
@@ -30,7 +32,7 @@ public void applyPatch(StormClassTransformer transformer) {
 								"toString", "()Ljava/lang/String;"),
 						new VarInsnNode(Opcodes.ALOAD, 5),
 						new MethodInsnNode(Opcodes.INVOKESTATIC, "io/pzstorm/storm/logging/ZomboidLogger",
-						"printf", "(Ljava/lang/String;Ljava/lang/String;)V"))
+								"printf", "(Ljava/lang/String;Ljava/lang/String;)V"))
 		);
 		// private void writeln(PrintStream var1, LogSeverity var2, String var3, String var4, Object var5)
 		replaceMethodNode(transformer.getInstructionsForMethod("writeln",
diff --git a/src/main/java/io/pzstorm/storm/patch/package-info.java b/src/main/java/io/pzstorm/storm/patch/package-info.java
index 938ed5c..bc06750 100644
--- a/src/main/java/io/pzstorm/storm/patch/package-info.java
+++ b/src/main/java/io/pzstorm/storm/patch/package-info.java
@@ -1,4 +1,4 @@
 @NonNullPackage
 package io.pzstorm.storm.patch;
 
-import io.pzstorm.storm.NonNullPackage;
\ No newline at end of file
+import io.pzstorm.storm.NonNullPackage;
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 2332ce5..ec662ae 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -62,7 +62,7 @@
         </Logger>
         <Root level="debug">
             <AppenderRef ref="StormConsole" level="verbose"/>
-            <AppenderRef ref="StormMainFile" level="verbose" />
+            <AppenderRef ref="StormMainFile" level="verbose"/>
             <AppenderRef ref="StormDebugFile"/>
         </Root>
     </Loggers>
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
index cc22d19..13f2b8f 100644
--- a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
+++ b/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
@@ -5,7 +5,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import io.pzstorm.storm.logging.StormLogger;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
@@ -17,6 +16,8 @@
 import com.github.difflib.UnifiedDiffUtils;
 import com.github.difflib.patch.Patch;
 
+import io.pzstorm.storm.logging.StormLogger;
+
 /**
  * This class represents a {@code Class} transformer used to alter {@code Class}
  * bytecode using ASM when running JUnit tests. When transforming it will print a
diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
index 4293e58..3e97746 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
@@ -1,18 +1,5 @@
 package io.pzstorm.storm.core;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.io.CharSink;
-import io.pzstorm.storm.UnitTest;
-import io.pzstorm.storm.mod.ModJar;
-import io.pzstorm.storm.mod.ModVersion;
-import io.pzstorm.storm.mod.ModMetadata;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -21,12 +8,29 @@
 import java.nio.file.Paths;
 import java.util.*;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.io.CharSink;
+
+import io.pzstorm.storm.UnitTest;
+import io.pzstorm.storm.mod.ModJar;
+import io.pzstorm.storm.mod.ModMetadata;
+import io.pzstorm.storm.mod.ModVersion;
+
+//@formatter:off
 class StormModLoaderTest implements UnitTest {
 
 	@SuppressWarnings({ "WeakerAccess", "ConstantConditions" })
 	@TempDir File tempDir = null;
 	private File zomboidModsDir;
 
+	//@formatter:on
 	@BeforeEach
 	void prepareStormModLoaderTest() {
 
diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
index 47fca93..29b0190 100644
--- a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
@@ -132,7 +132,7 @@ void shouldAddInstructionsToTheEndOfInsnList() {
 				new MethodInsnNode(Opcodes.INVOKESPECIAL,
 						"io.pzstorm.storm.util", "<init>", "()V"),
 				new InsnNode(Opcodes.RETURN)
-		);;
+		);
 
 		Assertions.assertEquals(expectedList.size(), actualList.size());
 
diff --git a/src/zombie/java/zombie/debug/LogSeverity.java b/src/zombie/java/zombie/debug/LogSeverity.java
index 0c8687a..3a81907 100644
--- a/src/zombie/java/zombie/debug/LogSeverity.java
+++ b/src/zombie/java/zombie/debug/LogSeverity.java
@@ -4,6 +4,5 @@ public enum LogSeverity {
 	Trace,
 	General,
 	Warning,
-	Error;
+	Error
 }
-

From 0c4a1ee49bf5dd3f8c8ac43d533ac07508d76ca1 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 09:36:40 +0200
Subject: [PATCH 196/323] Move utility method to test module

---
 .../io/pzstorm/storm/util/StormUtils.java     | 31 ----------------
 src/test/java/io/pzstorm/storm/TestUtils.java | 36 +++++++++++++++++++
 .../io/pzstorm/storm/util/StormUtilsTest.java |  5 +--
 3 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 src/test/java/io/pzstorm/storm/TestUtils.java

diff --git a/src/main/java/io/pzstorm/storm/util/StormUtils.java b/src/main/java/io/pzstorm/storm/util/StormUtils.java
index 2c04871..d8a535c 100644
--- a/src/main/java/io/pzstorm/storm/util/StormUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/StormUtils.java
@@ -1,9 +1,5 @@
 package io.pzstorm.storm.util;
 
-import java.lang.reflect.Method;
-
-import io.pzstorm.storm.logging.StormLogger;
-
 public class StormUtils {
 
 	/**
@@ -15,31 +11,4 @@ public class StormUtils {
 	public static String getClassAsPath(Class<?> clazz) {
 		return clazz.getName().replace('.', '/');
 	}
-
-	/**
-	 * Invokes the given inaccessible {@code Method} without leaving method accessible.
-	 * After the method was invoked the {@code accessible} flag will be set to it's original state.
-	 *
-	 * @param method inaccessible {@code Method} to invoke.
-	 * @param obj the object the underlying method is invoked from.
-	 * @param args the arguments used for the method call.
-	 *
-	 * @throws ReflectiveOperationException if an exception occurred while invoking method.
-	 */
-	public static void invokeRestrictedMethod(Method method, Object obj, Object... args) throws ReflectiveOperationException {
-
-		boolean wasAccessible = false;
-		if (method.isAccessible())
-		{
-			StormLogger.warn("Calling 'invokeRestrictedMethod' to invoker accessible method.");
-			wasAccessible = true;
-		}
-		else method.setAccessible(true);
-
-		method.invoke(obj, args);
-		// set accessibility state to original
-		if (!wasAccessible) {
-			method.setAccessible(false);
-		}
-	}
 }
diff --git a/src/test/java/io/pzstorm/storm/TestUtils.java b/src/test/java/io/pzstorm/storm/TestUtils.java
new file mode 100644
index 0000000..5a320ac
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/TestUtils.java
@@ -0,0 +1,36 @@
+package io.pzstorm.storm;
+
+import io.pzstorm.storm.logging.StormLogger;
+
+import java.lang.reflect.Method;
+
+public class TestUtils {
+
+	/**
+	 * Invokes the given inaccessible {@code Method} without leaving method accessible.
+	 * After the method was invoked the {@code accessible} flag will be set to it's original state.
+	 *
+	 * @param method inaccessible {@code Method} to invoke.
+	 * @param obj the object the underlying method is invoked from.
+	 * @param args the arguments used for the method call.
+	 *
+	 * @throws ReflectiveOperationException if an exception occurred while invoking method.
+	 */
+	public static void invokeRestrictedMethod(Method method, Object obj, Object... args) throws ReflectiveOperationException {
+
+		boolean wasAccessible = false;
+		if (method.isAccessible())
+		{
+			StormLogger.warn("Calling 'invokeRestrictedMethod' to invoker accessible method.");
+			wasAccessible = true;
+		}
+		else method.setAccessible(true);
+
+		method.invoke(obj, args);
+		// set accessibility state to original
+		if (!wasAccessible) {
+			method.setAccessible(false);
+		}
+	}
+
+}
diff --git a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
index 6fba0a1..4a329dd 100644
--- a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
+++ b/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
@@ -2,6 +2,7 @@
 
 import java.lang.reflect.Method;
 
+import io.pzstorm.storm.TestUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -25,7 +26,7 @@ void shouldResetAccessibilityAfterInvokingRestrictedMethod() throws ReflectiveOp
 		Method method = StormUtilsTest.class.getDeclaredMethod("inaccessibleMethod", String.class, Integer.class);
 
 		Assertions.assertFalse(method.isAccessible());
-		StormUtils.invokeRestrictedMethod(method, this, "sample", 0);
+		TestUtils.invokeRestrictedMethod(method, this, "sample", 0);
 		Assertions.assertFalse(method.isAccessible());
 	}
 
@@ -34,7 +35,7 @@ void shouldInvokeRestrictedMethod() throws ReflectiveOperationException {
 
 		Method method = StormUtilsTest.class.getDeclaredMethod("inaccessibleMethod", String.class, Integer.class);
 
-		StormUtils.invokeRestrictedMethod(method, this, "sample", 0);
+		TestUtils.invokeRestrictedMethod(method, this, "sample", 0);
 		Assertions.assertTrue(hasInvokedRestrictedMethod);
 	}
 

From 267cbfada4d5b1f1ac7941d66e3230597bc2e53a Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 09:41:00 +0200
Subject: [PATCH 197/323] Add test reflection utility method

---
 src/test/java/io/pzstorm/storm/TestUtils.java | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/TestUtils.java b/src/test/java/io/pzstorm/storm/TestUtils.java
index 5a320ac..305a282 100644
--- a/src/test/java/io/pzstorm/storm/TestUtils.java
+++ b/src/test/java/io/pzstorm/storm/TestUtils.java
@@ -2,7 +2,9 @@
 
 import io.pzstorm.storm.logging.StormLogger;
 
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 
 public class TestUtils {
 
@@ -33,4 +35,28 @@ public static void invokeRestrictedMethod(Method method, Object obj, Object... a
 		}
 	}
 
+	/**
+	 * Sets the given instance {@link Field} to value designated by method parameter.
+	 * This method will work for all modifiers but was primarily intended for
+	 * fields with {@code private} and {@code final} modifiers.
+	 *
+	 * @param field {@code Field} to set the value of.
+	 * @param instance the object whose field should be modified.
+	 * @param value the new value for the field of obj being modified.
+	 */
+	public static void setPrivateFinalFieldToValue(Field field, Object instance, Object value) {
+
+		try {
+			Field modifiersField = Field.class.getDeclaredField("modifiers");
+
+			modifiersField.setAccessible(true);
+			modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+
+			field.setAccessible(true);
+			field.set(instance, value);
+		}
+		catch (ReflectiveOperationException e) {
+			throw new RuntimeException(e);
+		}
+	}
 }

From ba8378ee243af1ef0d45b3267d3f540bbaf6be75 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 09:43:50 +0200
Subject: [PATCH 198/323] Fix mod loader test failing

---
 .../io/pzstorm/storm/core/StormModLoaderTest.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
index 3e97746..6572e01 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
@@ -3,11 +3,13 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
 
+import io.pzstorm.storm.TestUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -149,6 +151,15 @@ void shouldLoadAllModClasses() throws Throwable {
 			Assertions.assertFalse(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
 		}
 		testCatalogingModJarsInModsDir(true);
+
+		// StormClassLoader is constructed in static context by StormBootstrap
+		// with an initial set of resource paths, which could have been initialized
+		// by previous tests so use reflection to modify URLClassLoader
+		TestUtils.setPrivateFinalFieldToValue(
+				StormClassLoader.class.getDeclaredField("resourceClassLoader"),
+				StormBootstrap.CLASS_LOADER, new URLClassLoader(
+						StormModLoader.getJarResourcePaths(), StormBootstrap.CLASS_LOADER.getParent())
+		);
 		StormModLoader.loadModClasses();
 
 		for (String clazz : expectedLoadedClasses) {

From 35be91436932f6b2b4d588ee4e83f67f4469d5b2 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 13 May 2021 09:58:04 +0200
Subject: [PATCH 199/323] Convert unit to integration test

---
 ...rmModLoaderTest.java => StormModLoaderIntegrationTest.java} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename src/test/java/io/pzstorm/storm/core/{StormModLoaderTest.java => StormModLoaderIntegrationTest.java} (98%)

diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
similarity index 98%
rename from src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
rename to src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index 6572e01..06e538c 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -9,6 +9,7 @@
 import java.nio.file.Paths;
 import java.util.*;
 
+import io.pzstorm.storm.IntegrationTest;
 import io.pzstorm.storm.TestUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -26,7 +27,7 @@
 import io.pzstorm.storm.mod.ModVersion;
 
 //@formatter:off
-class StormModLoaderTest implements UnitTest {
+class StormModLoaderIntegrationTest implements IntegrationTest {
 
 	@SuppressWarnings({ "WeakerAccess", "ConstantConditions" })
 	@TempDir File tempDir = null;

From 22473cbeb77e75a4638a9a2c267358599b2356c2 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 14 May 2021 00:10:01 +0200
Subject: [PATCH 200/323] Move StormEventHandler to core module

---
 .../java/io/pzstorm/storm/event/StormEventHandler.java            | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/{api => main}/java/io/pzstorm/storm/event/StormEventHandler.java (100%)

diff --git a/src/api/java/io/pzstorm/storm/event/StormEventHandler.java b/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/event/StormEventHandler.java
rename to src/main/java/io/pzstorm/storm/event/StormEventHandler.java

From 2dabfe1447627282dc16c8bc4a480bc3a1813974 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 14 May 2021 00:59:52 +0200
Subject: [PATCH 201/323] Improve mod loading implementation

---
 .../io/pzstorm/storm/core/StormBootstrap.java |  2 +-
 .../pzstorm/storm/core/StormClassLoader.java  | 32 +++++++----
 .../io/pzstorm/storm/core/StormModLoader.java | 56 ++++++++++---------
 .../core/StormModLoaderIntegrationTest.java   | 40 +++++--------
 4 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index a380ea5..381abcd 100644
--- a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -16,7 +16,7 @@ class StormBootstrap {
 	 * their own set of class instances and native libraries this loader should always be
 	 * used to load classes that access or modify transformed class fields or methods.
 	 */
-	static final StormClassLoader CLASS_LOADER = new StormClassLoader(StormModLoader.getJarResourcePaths());
+	static final StormClassLoader CLASS_LOADER = new StormClassLoader();
 
 	/**
 	 * Loaded and initialized {@link StormClassTransformer} {@code Class}. To transform specific
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 0648609..5131c84 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.Objects;
 
 import org.jetbrains.annotations.Contract;
@@ -35,7 +34,12 @@ class StormClassLoader extends ClassLoader {
 			"javax.script.", "javax.management.", "javax.imageio.", "javax.xml.",
 			"io.pzstorm.storm.logging.StormLogger"
 	);
-	protected final URLClassLoader resourceClassLoader;
+
+	/**
+	 * {@code URLClassLoader} responsible for loading mod classes and assets.
+	 */
+	private StormModLoader modResourceLoader;
+
 	/**
 	 * {@code ClassLoader} that is the parent of this {@code ClassLoader}.
 	 * When loading classes, those classes not matching the whitelist pattern will have
@@ -51,16 +55,23 @@ class StormClassLoader extends ClassLoader {
 	StormClassLoader(URL[] resourceLocations) {
 
 		parentClassLoader = getClass().getClassLoader();
-		resourceClassLoader = new URLClassLoader(
-				Objects.requireNonNull(resourceLocations), getParent()
-		);
+		modResourceLoader = new StormModLoader(resourceLocations);
 	}
 
 	StormClassLoader() {
 
 		StormLogger.debug("Initialized StormClassLoader");
 		parentClassLoader = getClass().getClassLoader();
-		resourceClassLoader = (URLClassLoader) getParent();
+		modResourceLoader =  new StormModLoader();
+	}
+
+	/**
+	 * Reinitialize mod resource loader instance. This method should be called
+	 * after new mods have been loaded by {@link StormModLoader} since new
+	 * {@code URL}s have to be added to loader classpath.
+	 */
+	void updateModResourceLoader() {
+		modResourceLoader = new StormModLoader();
 	}
 
 	/**
@@ -76,16 +87,13 @@ static boolean isBlacklistedClass(String name) {
 	public @Nullable URL getResource(String name) {
 		Objects.requireNonNull(name);
 
-		URL url = resourceClassLoader.getResource(name);
-		if (url == null) {
-			url = parentClassLoader.getResource(name);
-		}
-		return url;
+		URL url = modResourceLoader.getResource(name);
+		return url == null ? parentClassLoader.getResource(name) : url;
 	}
 
 	@Override
 	protected @Nullable URL findResource(String name) {
-		return resourceClassLoader.findResource(name);
+		return modResourceLoader.findResource(name);
 	}
 
 	/**
diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index 828aa9d..be1404e 100644
--- a/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -4,6 +4,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -12,6 +13,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.google.common.collect.ObjectArrays;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
@@ -24,7 +26,7 @@
 import zombie.util.StringUtils;
 
 /**
- * This class is responsible for registering and loading mod components:
+ * This class is responsible for loading mod components:
  * <ul>
  * <li>Catalog mod jars by mapping them to mod directory name.</li>
  * <li>Catalog mod metadata by mapping them to mod directory name.</li>
@@ -32,28 +34,43 @@
  * <li>Load mod classes with {@link StormClassLoader}.</li>
  * </ul>
  */
-class StormModLoader {
+class StormModLoader extends URLClassLoader {
 
 	/**
-	 * This catalog contains {@link ModMetadata} instances mapped to directory names.
-	 *
-	 * @see #loadModMetadata()
+	 * This catalog stores {@link ModJar} instances mapped to directory names.
 	 */
-	private static final Map<String, ModMetadata> METADATA_CATALOG = new HashMap<>();
+	private static final Map<String, ImmutableSet<ModJar>> JAR_CATALOG = new HashMap<>();
 
 	/**
-	 * This catalog stores {@link ModJar} instances mapped to directory names.
-	 *
-	 * @see #catalogModJars()
+	 * This catalog contains {@link ModMetadata} instances mapped to directory names.
 	 */
-	private static final Map<String, ImmutableSet<ModJar>> JAR_CATALOG = new HashMap<>();
+	static final Map<String, ModMetadata> METADATA_CATALOG = new HashMap<>();
 
 	/**
 	 * This catalog stores {@link Class} instances mapped to directory names.
-	 *
-	 * @see #loadModClasses()
 	 */
-	private static final Map<String, ImmutableSet<Class<?>>> CLASS_CATALOG = new HashMap<>();
+	static final Map<String, ImmutableSet<Class<?>>> CLASS_CATALOG = new HashMap<>();
+
+	StormModLoader(URL[] urls) {
+		super(ObjectArrays.concat(urls, getJarResourcePaths(), URL.class));
+	}
+
+	StormModLoader() {
+		super(getJarResourcePaths());
+	}
+
+	/**
+	 * Returns an array of paths pointing to cataloged jars.
+	 * This method will return an empty array if no jars are cataloged.
+	 */
+	private static URL[] getJarResourcePaths() {
+
+		List<URL> result = new ArrayList<>();
+		for (Set<ModJar> modJars : JAR_CATALOG.values()) {
+			modJars.forEach(j -> result.add(j.getResourcePath()));
+		}
+		return result.toArray(new URL[0]);
+	}
 
 	/**
 	 * Find and catalog {@code jar} files found in {@code $HOME/Zomboid/mods/} subdirectories.
@@ -231,19 +248,6 @@ private static Path getUserHomePath() {
 		return Paths.get(System.getProperty("user.home"));
 	}
 
-	/**
-	 * Returns an array of paths pointing to cataloged jars.
-	 * This method will return an empty array if no jars are cataloged.
-	 */
-	static URL[] getJarResourcePaths() {
-
-		List<URL> result = new ArrayList<>();
-		for (Set<ModJar> modJars : JAR_CATALOG.values()) {
-			modJars.forEach(j -> result.add(j.getResourcePath()));
-		}
-		return result.toArray(new URL[0]);
-	}
-
 	@TestOnly
 	static @Nullable ModMetadata getMetadataCatalogEntry(String name) {
 		return METADATA_CATALOG.get(name);
diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index 06e538c..e7fee43 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -1,30 +1,25 @@
 package io.pzstorm.storm.core;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.*;
-
-import io.pzstorm.storm.IntegrationTest;
-import io.pzstorm.storm.TestUtils;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.CharSink;
-
-import io.pzstorm.storm.UnitTest;
+import io.pzstorm.storm.IntegrationTest;
 import io.pzstorm.storm.mod.ModJar;
 import io.pzstorm.storm.mod.ModMetadata;
 import io.pzstorm.storm.mod.ModVersion;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.*;
 
 //@formatter:off
 class StormModLoaderIntegrationTest implements IntegrationTest {
@@ -153,14 +148,7 @@ void shouldLoadAllModClasses() throws Throwable {
 		}
 		testCatalogingModJarsInModsDir(true);
 
-		// StormClassLoader is constructed in static context by StormBootstrap
-		// with an initial set of resource paths, which could have been initialized
-		// by previous tests so use reflection to modify URLClassLoader
-		TestUtils.setPrivateFinalFieldToValue(
-				StormClassLoader.class.getDeclaredField("resourceClassLoader"),
-				StormBootstrap.CLASS_LOADER, new URLClassLoader(
-						StormModLoader.getJarResourcePaths(), StormBootstrap.CLASS_LOADER.getParent())
-		);
+		StormBootstrap.CLASS_LOADER.updateModResourceLoader();
 		StormModLoader.loadModClasses();
 
 		for (String clazz : expectedLoadedClasses) {

From ab6d9fe3fae5507fa84a8dbc1918bf7bd668756d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 14 May 2021 01:00:39 +0200
Subject: [PATCH 202/323] Do minor code refactoring

---
 src/main/java/io/pzstorm/storm/core/StormClassLoader.java | 8 +++-----
 src/main/java/io/pzstorm/storm/util/StormUtils.java       | 3 +++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 5131c84..4aa1405 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -200,12 +200,10 @@ private Class<?> loadClassInternal(String name, boolean resolve) throws ClassNot
 
 	@Override
 	public @Nullable InputStream getResourceAsStream(String name) {
+		Objects.requireNonNull(name);
 
-		InputStream inputStream = resourceClassLoader.getResourceAsStream(name);
-		if (inputStream == null) {
-			inputStream = parentClassLoader.getResourceAsStream(name);
-		}
-		return inputStream;
+		InputStream inputStream = modResourceLoader.getResourceAsStream(name);
+		return inputStream == null ? parentClassLoader.getResourceAsStream(name) : inputStream;
 	}
 
 	/**
diff --git a/src/main/java/io/pzstorm/storm/util/StormUtils.java b/src/main/java/io/pzstorm/storm/util/StormUtils.java
index d8a535c..835e19d 100644
--- a/src/main/java/io/pzstorm/storm/util/StormUtils.java
+++ b/src/main/java/io/pzstorm/storm/util/StormUtils.java
@@ -1,5 +1,7 @@
 package io.pzstorm.storm.util;
 
+import org.jetbrains.annotations.Contract;
+
 public class StormUtils {
 
 	/**
@@ -8,6 +10,7 @@ public class StormUtils {
 	 * @param clazz {@code Class} whose name should be converted to path.
 	 * @return {@code String} representing a path.
 	 */
+	@Contract(pure = true)
 	public static String getClassAsPath(Class<?> clazz) {
 		return clazz.getName().replace('.', '/');
 	}

From 635afc6495f164bbd92115f17f034e4f2b1ae8c4 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 14 May 2021 01:12:40 +0200
Subject: [PATCH 203/323] Fix missing class on CI build

https://github.com/pzstorm/storm/runs/2579683516
---
 src/main/java/io/pzstorm/storm/core/StormModLoader.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index be1404e..c8c3924 100644
--- a/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -13,6 +13,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.ObjectArrays;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -23,7 +24,6 @@
 import io.pzstorm.storm.mod.ModJar;
 import io.pzstorm.storm.mod.ModMetadata;
 import io.pzstorm.storm.mod.ModVersion;
-import zombie.util.StringUtils;
 
 /**
  * This class is responsible for loading mod components:
@@ -180,7 +180,7 @@ static void loadModMetadata() throws IOException {
 			modInfo.load(new FileInputStream(modInfoFile));
 
 			String modName = modInfo.getProperty("name");
-			if (StringUtils.isNullOrEmpty(modName))
+			if (Strings.isNullOrEmpty(modName))
 			{
 				String message = "Unable to register mod in directory '%s' with missing name, check mod.info file";
 				StormLogger.error(String.format(message, modEntry));

From f9f177532b971497e00ab981571736faf6bea6b9 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 14 May 2021 18:57:42 +0200
Subject: [PATCH 204/323] Fix CI tests failing on Windows

Temporary directories can't be deleted due to jars used by process.
https://github.com/pzstorm/storm/runs/2579722591?check_suite_focus=true#step:6:134
---
 .../io/pzstorm/storm/IntegrationTest.java     |  5 +++
 .../core/StormModLoaderIntegrationTest.java   | 40 ++++++++++---------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/IntegrationTest.java b/src/test/java/io/pzstorm/storm/IntegrationTest.java
index ca8ba14..a7e7390 100644
--- a/src/test/java/io/pzstorm/storm/IntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/IntegrationTest.java
@@ -2,7 +2,12 @@
 
 import org.junit.jupiter.api.Tag;
 
+import java.io.File;
+
 @Tag("integration")
 public interface IntegrationTest {
 
+	static File getTemporaryBuildDir(Class<?> testClass) {
+		return new File("build/tmp/integrationTest/" + testClass.getSimpleName());
+	}
 }
diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index e7fee43..53eadab 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -4,14 +4,14 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.CharSink;
+import com.google.common.io.MoreFiles;
 import io.pzstorm.storm.IntegrationTest;
 import io.pzstorm.storm.mod.ModJar;
 import io.pzstorm.storm.mod.ModMetadata;
 import io.pzstorm.storm.mod.ModVersion;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,21 +21,21 @@
 import java.nio.file.Paths;
 import java.util.*;
 
-//@formatter:off
 class StormModLoaderIntegrationTest implements IntegrationTest {
 
-	@SuppressWarnings({ "WeakerAccess", "ConstantConditions" })
-	@TempDir File tempDir = null;
-	private File zomboidModsDir;
+	private static final File TEMP_DIR = IntegrationTest.getTemporaryBuildDir(StormModLoaderIntegrationTest.class);
+	private static final File ZOMBOID_MODS_DIR = new File(TEMP_DIR, "Zomboid/mods");
 
-	//@formatter:on
-	@BeforeEach
-	void prepareStormModLoaderTest() {
+	@BeforeAll
+	static void prepareStormModLoaderTest() throws IOException {
 
-		zomboidModsDir = new File(tempDir, "Zomboid/mods");
-		Assertions.assertTrue(zomboidModsDir.mkdirs());
-
-		System.setProperty("user.home", tempDir.getPath());
+		if (TEMP_DIR.exists())
+		{
+			MoreFiles.deleteDirectoryContents(TEMP_DIR.toPath());
+			Assertions.assertEquals(0, Objects.requireNonNull(TEMP_DIR.listFiles()).length);
+		}
+		else Assertions.assertTrue(ZOMBOID_MODS_DIR.mkdirs());
+		System.setProperty("user.home", TEMP_DIR.getPath());
 	}
 
 	@Test
@@ -59,7 +59,7 @@ void shouldCorrectlyLoadAllModMetadata() throws Throwable {
 		for (Map.Entry<String, ModMetadata> entry : expectedModEntries.entrySet())
 		{
 			String modDirName = entry.getKey();
-			File modDir = new File(zomboidModsDir, modDirName);
+			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
 			Assertions.assertTrue(modDir.mkdirs());
 
 			writeToModMetadataFile(modDir, ImmutableList.of(
@@ -105,7 +105,7 @@ void shouldNotLoadModMetadataWhenMissingProperties() throws Throwable {
 		for (Map.Entry<String, ModMetadata> entry : modEntries.entrySet())
 		{
 			String modDirName = entry.getKey();
-			File modDir = new File(zomboidModsDir, modDirName);
+			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
 			Assertions.assertTrue(modDir.mkdirs());
 
 			ModMetadata modMetadata = entry.getValue();
@@ -168,7 +168,7 @@ private void testCatalogingModJarsInModsDir(boolean createMetadata) throws Throw
 		for (Map.Entry<String, String[]> entry : modJarData.entrySet())
 		{
 			String modDirName = entry.getKey();
-			File modDir = new File(zomboidModsDir, modDirName);
+			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
 
 			// create temporary mod directory
 			if (!modDir.exists()) {
@@ -185,9 +185,11 @@ private void testCatalogingModJarsInModsDir(boolean createMetadata) throws Throw
 				File destination = new File(modDir, modJarName);
 
 				// copy resource mod jars to temporary directory
-				Files.copy(Paths.get(jarResource.toURI()), destination.toPath());
-				Assertions.assertTrue(destination.exists());
-
+				if (!destination.exists())
+				{
+					Files.copy(Paths.get(jarResource.toURI()), destination.toPath());
+					Assertions.assertTrue(destination.exists());
+				}
 				modJars.add(new ModJar(destination));
 			}
 			expectedJarRegistry.put(entry.getKey(), ImmutableSet.copyOf(modJars));

From ab6ac87469e547e0f829b005159f6736467612a1 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 14 May 2021 20:44:35 +0200
Subject: [PATCH 205/323] Improve mod loader integration tests

---
 .../core/StormModLoaderIntegrationTest.java   | 173 ++++++++++--------
 1 file changed, 96 insertions(+), 77 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index 53eadab..c3af660 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -9,12 +9,11 @@
 import io.pzstorm.storm.mod.ModJar;
 import io.pzstorm.storm.mod.ModMetadata;
 import io.pzstorm.storm.mod.ModVersion;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.*;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -23,29 +22,103 @@
 
 class StormModLoaderIntegrationTest implements IntegrationTest {
 
+	/* do not use TempDir annotation to create temporary directory
+	 * because Windows cannot delete these temporary directories due
+	 * to jar files in those directories being in use by JVM
+	 */
 	private static final File TEMP_DIR = IntegrationTest.getTemporaryBuildDir(StormModLoaderIntegrationTest.class);
 	private static final File ZOMBOID_MODS_DIR = new File(TEMP_DIR, "Zomboid/mods");
-
+	private static final Map<String, String[]> MOD_JAR_DATA = ImmutableMap.of(
+			"A", new String[] { "modA.jar" },
+			"B", new String[] { "modA.jar", "modB.jar" },
+			"C", new String[] { "modA.jar", "modB.jar", "modC.jar" }
+	);
 	@BeforeAll
-	static void prepareStormModLoaderTest() throws IOException {
+	static void prepareStormModLoaderTest() throws IOException, URISyntaxException {
 
 		if (TEMP_DIR.exists())
 		{
+			// clean temporary directory from last test run
 			MoreFiles.deleteDirectoryContents(TEMP_DIR.toPath());
 			Assertions.assertEquals(0, Objects.requireNonNull(TEMP_DIR.listFiles()).length);
 		}
-		else Assertions.assertTrue(ZOMBOID_MODS_DIR.mkdirs());
+		Assertions.assertTrue(ZOMBOID_MODS_DIR.mkdirs());
 		System.setProperty("user.home", TEMP_DIR.getPath());
+
+		ClassLoader CL = StormModLoaderIntegrationTest.class.getClassLoader();
+		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet())
+		{
+			String modDirName = entry.getKey();
+			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
+
+			// create temporary mod directory
+			Assertions.assertTrue(modDir.mkdir());
+
+			// write metadata files
+			writeToModMetadataFile(modDir, ImmutableList.of("name=" + modDirName, "modversion=1.1.0"));
+
+			for (String modJarName : entry.getValue())
+			{
+				URL jarResource = Objects.requireNonNull(CL.getResource("./jars/" + modJarName));
+				File destination = new File(modDir, modJarName);
+
+				// copy resource mod jars to temporary directory
+				if (!destination.exists())
+				{
+					Files.copy(Paths.get(jarResource.toURI()), destination.toPath());
+					Assertions.assertTrue(destination.exists());
+				}
+			}
+		}
 	}
 
 	@Test
 	void shouldCatalogAllModJarsFoundInModsDir() throws Throwable {
-		testCatalogingModJarsInModsDir(true);
+
+		Map<String, ImmutableSet<ModJar>> expectedJarRegistry = new HashMap<>();
+		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet())
+		{
+			File modDir = new File(ZOMBOID_MODS_DIR, entry.getKey());
+
+			Set<ModJar> modJars = new HashSet<>();
+			for (String modJarName : entry.getValue()) {
+				modJars.add(new ModJar(new File(modDir, modJarName)));
+			}
+			expectedJarRegistry.put(entry.getKey(), ImmutableSet.copyOf(modJars));
+		}
+		StormModLoader.catalogModJars();
+		for (Map.Entry<String, ImmutableSet<ModJar>> entry : expectedJarRegistry.entrySet()) {
+			Assertions.assertEquals(StormModLoader.getJarCatalogEntry(entry.getKey()), entry.getValue());
+		}
+	}
+
+	@Test
+	void shouldLoadAllModClasses() throws IOException {
+
+		String[] expectedLoadedClasses = new String[] {
+				"com.sample.mod.ModA", "com.sample.mod.ModUtils",
+				"com.sample.mod.ModB", "com.sample.mod.ModC"
+		};
+		for (String clazz : expectedLoadedClasses) {
+			Assertions.assertFalse(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
+		}
+		StormModLoader.catalogModJars();
+		StormBootstrap.CLASS_LOADER.updateModResourceLoader();
+		StormModLoader.loadModClasses();
+
+		for (String clazz : expectedLoadedClasses) {
+			Assertions.assertTrue(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
+		}
 	}
 
 	@Test
 	void shouldExcludeModJarsFromCatalogWhenMissingModMetadata() throws Throwable {
-		testCatalogingModJarsInModsDir(false);
+
+		removeMetadataFiles();
+		StormModLoader.catalogModJars();
+		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet()) {
+			Assertions.assertNull(StormModLoader.getJarCatalogEntry(entry.getKey()));
+		}
 	}
 
 	@Test
@@ -60,12 +133,13 @@ void shouldCorrectlyLoadAllModMetadata() throws Throwable {
 		{
 			String modDirName = entry.getKey();
 			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
-			Assertions.assertTrue(modDir.mkdirs());
-
+			if (!modDir.exists()) {
+				Assertions.assertTrue(modDir.mkdirs());
+			}
 			writeToModMetadataFile(modDir, ImmutableList.of(
 					"name=" + modDirName, "modversion=" + entry.getValue().version));
 		}
-		testCatalogingModJarsInModsDir(false);
+		StormModLoader.catalogModJars();
 		StormModLoader.loadModMetadata();
 
 		for (Map.Entry<String, ModMetadata> entry : expectedModEntries.entrySet())
@@ -84,7 +158,7 @@ void shouldNotLoadModMetadataWhenModInfoFileMissing() throws Throwable {
 				"B", new ModMetadata("B", new ModVersion("1.1.0")),
 				"C", new ModMetadata("C", new ModVersion("1.1.0"))
 		);
-		testCatalogingModJarsInModsDir(false);
+		removeMetadataFiles();
 		StormModLoader.loadModMetadata();
 
 		for (Map.Entry<String, ModMetadata> entry : expectedModEntries.entrySet()) {
@@ -106,14 +180,15 @@ void shouldNotLoadModMetadataWhenMissingProperties() throws Throwable {
 		{
 			String modDirName = entry.getKey();
 			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
-			Assertions.assertTrue(modDir.mkdirs());
-
+			if (!modDir.exists()) {
+				Assertions.assertTrue(modDir.mkdirs());
+			}
 			ModMetadata modMetadata = entry.getValue();
 			writeToModMetadataFile(modDir, ImmutableList.of(
 					modMetadata.name != null ? "name=" + modMetadata.name : "",
 					modMetadata.version != null ? "modversion=" + modMetadata.version : ""));
 		}
-		testCatalogingModJarsInModsDir(false);
+		StormModLoader.catalogModJars();
 		StormModLoader.loadModMetadata();
 
 		// both name and version properties present
@@ -136,74 +211,18 @@ void shouldNotLoadModMetadataWhenMissingProperties() throws Throwable {
 		Assertions.assertEquals(new ModVersion("0.1.0"), modE.version);
 	}
 
-	@Test
-	void shouldLoadAllModClasses() throws Throwable {
-
-		String[] expectedLoadedClasses = new String[] {
-				"com.sample.mod.ModA", "com.sample.mod.ModUtils",
-				"com.sample.mod.ModB", "com.sample.mod.ModC"
-		};
-		for (String clazz : expectedLoadedClasses) {
-			Assertions.assertFalse(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
-		}
-		testCatalogingModJarsInModsDir(true);
-
-		StormBootstrap.CLASS_LOADER.updateModResourceLoader();
-		StormModLoader.loadModClasses();
-
-		for (String clazz : expectedLoadedClasses) {
-			Assertions.assertTrue(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
-		}
-	}
-
-	private void testCatalogingModJarsInModsDir(boolean createMetadata) throws Throwable {
+	private void removeMetadataFiles() {
 
-		ClassLoader CL = getClass().getClassLoader();
-		Map<String, String[]> modJarData = ImmutableMap.of(
-				"A", new String[] { "modA.jar" },
-				"B", new String[] { "modA.jar", "modB.jar" },
-				"C", new String[] { "modA.jar", "modB.jar", "modC.jar" }
-		);
-		Map<String, ImmutableSet<ModJar>> expectedJarRegistry = new HashMap<>();
-		for (Map.Entry<String, String[]> entry : modJarData.entrySet())
-		{
-			String modDirName = entry.getKey();
-			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
-
-			// create temporary mod directory
-			if (!modDir.exists()) {
-				Assertions.assertTrue(modDir.mkdir());
-			}
-			// create metadata file in mod directory
-			if (createMetadata) {
-				writeToModMetadataFile(modDir, ImmutableList.of("name=" + modDirName, "modversion=1.1.0"));
-			}
-			Set<ModJar> modJars = new HashSet<>();
-			for (String modJarName : entry.getValue())
-			{
-				URL jarResource = Objects.requireNonNull(CL.getResource("./jars/" + modJarName));
-				File destination = new File(modDir, modJarName);
-
-				// copy resource mod jars to temporary directory
-				if (!destination.exists())
-				{
-					Files.copy(Paths.get(jarResource.toURI()), destination.toPath());
-					Assertions.assertTrue(destination.exists());
-				}
-				modJars.add(new ModJar(destination));
-			}
-			expectedJarRegistry.put(entry.getKey(), ImmutableSet.copyOf(modJars));
-		}
-		StormModLoader.catalogModJars();
-		if (createMetadata)
+		for (String modDirName : new String[] { "A", "B", "C" })
 		{
-			for (Map.Entry<String, ImmutableSet<ModJar>> entry : expectedJarRegistry.entrySet()) {
-				Assertions.assertEquals(StormModLoader.getJarCatalogEntry(entry.getKey()), entry.getValue());
+			File metadataFile = Paths.get(ZOMBOID_MODS_DIR.getPath(), modDirName, "mod.info").toFile();
+			if (metadataFile.exists()) {
+				Assertions.assertTrue(metadataFile.delete());
 			}
 		}
 	}
 
-	private void writeToModMetadataFile(File modDir, List<String> lines) throws IOException {
+	private static void writeToModMetadataFile(File modDir, List<String> lines) throws IOException {
 
 		File metadataFile = new File(modDir, "mod.info");
 		if (!metadataFile.exists()) {

From 4217b95479c183d4abb8b3bea37cfae9f434d063 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 14 May 2021 23:56:25 +0200
Subject: [PATCH 206/323] Fix CI tests failing on Windows

Metadata files cannot be removed once loaded on Windows.
https://github.com/pzstorm/storm/runs/2586449796?check_suite_focus=true#step:6:139
---
 .../core/StormModLoaderIntegrationTest.java   | 86 +++++++++++--------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index c3af660..61054c9 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -20,6 +20,12 @@
 import java.nio.file.Paths;
 import java.util.*;
 
+/**
+ * Run test methods in a certain order to ensure the tests pass on CI.
+ * This is only needed when running on Windows platform because resources like
+ * metadata and jar files cannot be removed once they have been loaded by JVM.
+ */
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 class StormModLoaderIntegrationTest implements IntegrationTest {
 
 	/* do not use TempDir annotation to create temporary directory
@@ -54,9 +60,6 @@ static void prepareStormModLoaderTest() throws IOException, URISyntaxException {
 			// create temporary mod directory
 			Assertions.assertTrue(modDir.mkdir());
 
-			// write metadata files
-			writeToModMetadataFile(modDir, ImmutableList.of("name=" + modDirName, "modversion=1.1.0"));
-
 			for (String modJarName : entry.getValue())
 			{
 				URL jarResource = Objects.requireNonNull(CL.getResource("./jars/" + modJarName));
@@ -72,9 +75,45 @@ static void prepareStormModLoaderTest() throws IOException, URISyntaxException {
 		}
 	}
 
+	/**
+	 * Run this method before others because it does not require metadata files present.
+	 */
+	@Test
+	@Order(1)
+	void shouldExcludeModJarsFromCatalogWhenMissingModMetadata() throws Throwable {
+
+		StormModLoader.catalogModJars();
+		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet()) {
+			Assertions.assertNull(StormModLoader.getJarCatalogEntry(entry.getKey()));
+		}
+	}
+
+	/**
+	 * Run this method before others because it does not require metadata files present.
+	 */
+	@Test
+	@Order(2)
+	void shouldNotLoadModMetadataWhenModInfoFileMissing() throws Throwable {
+
+		Map<String, ModMetadata> expectedModEntries = ImmutableMap.of(
+				"A", new ModMetadata("A", new ModVersion("1.1.0")),
+				"B", new ModMetadata("B", new ModVersion("1.1.0")),
+				"C", new ModMetadata("C", new ModVersion("1.1.0"))
+		);
+		StormModLoader.loadModMetadata();
+
+		for (Map.Entry<String, ModMetadata> entry : expectedModEntries.entrySet()) {
+			Assertions.assertNull(StormModLoader.getMetadataCatalogEntry(entry.getKey()));
+		}
+	}
+
 	@Test
+	@Order(3)
 	void shouldCatalogAllModJarsFoundInModsDir() throws Throwable {
 
+		// write metadata files
+		createAndWriteMetadataFiles();
+
 		Map<String, ImmutableSet<ModJar>> expectedJarRegistry = new HashMap<>();
 		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet())
 		{
@@ -93,6 +132,7 @@ void shouldCatalogAllModJarsFoundInModsDir() throws Throwable {
 	}
 
 	@Test
+	@Order(4)
 	void shouldLoadAllModClasses() throws IOException {
 
 		String[] expectedLoadedClasses = new String[] {
@@ -112,16 +152,7 @@ void shouldLoadAllModClasses() throws IOException {
 	}
 
 	@Test
-	void shouldExcludeModJarsFromCatalogWhenMissingModMetadata() throws Throwable {
-
-		removeMetadataFiles();
-		StormModLoader.catalogModJars();
-		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet()) {
-			Assertions.assertNull(StormModLoader.getJarCatalogEntry(entry.getKey()));
-		}
-	}
-
-	@Test
+	@Order(5)
 	void shouldCorrectlyLoadAllModMetadata() throws Throwable {
 
 		Map<String, ModMetadata> expectedModEntries = ImmutableMap.of(
@@ -151,22 +182,7 @@ void shouldCorrectlyLoadAllModMetadata() throws Throwable {
 	}
 
 	@Test
-	void shouldNotLoadModMetadataWhenModInfoFileMissing() throws Throwable {
-
-		Map<String, ModMetadata> expectedModEntries = ImmutableMap.of(
-				"A", new ModMetadata("A", new ModVersion("1.1.0")),
-				"B", new ModMetadata("B", new ModVersion("1.1.0")),
-				"C", new ModMetadata("C", new ModVersion("1.1.0"))
-		);
-		removeMetadataFiles();
-		StormModLoader.loadModMetadata();
-
-		for (Map.Entry<String, ModMetadata> entry : expectedModEntries.entrySet()) {
-			Assertions.assertNull(StormModLoader.getMetadataCatalogEntry(entry.getKey()));
-		}
-	}
-
-	@Test
+	@Order(6)
 	void shouldNotLoadModMetadataWhenMissingProperties() throws Throwable {
 
 		Map<String, ModMetadata> modEntries = ImmutableMap.of(
@@ -211,14 +227,14 @@ void shouldNotLoadModMetadataWhenMissingProperties() throws Throwable {
 		Assertions.assertEquals(new ModVersion("0.1.0"), modE.version);
 	}
 
-	private void removeMetadataFiles() {
+	private static void createAndWriteMetadataFiles() throws IOException {
 
-		for (String modDirName : new String[] { "A", "B", "C" })
+		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet())
 		{
-			File metadataFile = Paths.get(ZOMBOID_MODS_DIR.getPath(), modDirName, "mod.info").toFile();
-			if (metadataFile.exists()) {
-				Assertions.assertTrue(metadataFile.delete());
-			}
+			String modDirName = entry.getKey();
+			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
+
+			writeToModMetadataFile(modDir, ImmutableList.of("name=" + modDirName, "modversion=1.1.0"));
 		}
 	}
 

From 320181971b91dbcb3cbac84f5db29bf2cc8f9093 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 15 May 2021 21:12:05 +0200
Subject: [PATCH 207/323] Refactor mod loader integration test

---
 .../storm/core/ModLoaderTestFixture.java      | 97 +++++++++++++++++++
 .../core/StormModLoaderIntegrationTest.java   | 88 +++--------------
 2 files changed, 108 insertions(+), 77 deletions(-)
 create mode 100644 src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java

diff --git a/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java b/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java
new file mode 100644
index 0000000..e3f6e29
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java
@@ -0,0 +1,97 @@
+package io.pzstorm.storm.core;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.CharSink;
+import com.google.common.io.MoreFiles;
+import io.pzstorm.storm.IntegrationTest;
+import org.junit.jupiter.api.Assertions;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+class ModLoaderTestFixture implements IntegrationTest {
+
+	static final ImmutableMap<String, String[]> MOD_JAR_DATA = ImmutableMap.of(
+			"A", new String[] { "modA.jar" },
+			"B", new String[] { "modB.jar" },
+			"C", new String[] { "modB.jar", "modC.jar" }
+	);
+
+	static void prepareTestClass(File tempDir) throws IOException {
+
+		if (tempDir.exists())
+		{
+			// clean temporary directory from last test run
+			MoreFiles.deleteDirectoryContents(tempDir.toPath());
+			Assertions.assertEquals(0, Objects.requireNonNull(tempDir.listFiles()).length);
+		}
+		File zomboidModsDir = new File(tempDir, "Zomboid/mods");
+		Assertions.assertTrue(zomboidModsDir.mkdirs());
+		System.setProperty("user.home", tempDir.getPath());
+
+		ClassLoader CL = ClassLoader.getSystemClassLoader();
+		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet())
+		{
+			String modDirName = entry.getKey();
+			File modDir = new File(zomboidModsDir, modDirName);
+
+			// create temporary mod directory
+			Assertions.assertTrue(modDir.mkdir());
+
+			for (String modJarName : entry.getValue())
+			{
+				URI jarResource;
+				try {
+					jarResource = Objects.requireNonNull(CL.getResource("./jars/" + modJarName)).toURI();
+				}
+				catch (URISyntaxException e) {
+					throw new RuntimeException(e);
+				}
+				File destination = new File(modDir, modJarName);
+
+				// copy resource mod jars to temporary directory
+				if (!destination.exists())
+				{
+					Files.copy(Paths.get(jarResource), destination.toPath());
+					Assertions.assertTrue(destination.exists());
+				}
+			}
+		}
+	}
+
+	static void createAndWriteMetadataFiles(File tempDir) throws IOException {
+
+		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet())
+		{
+			String modDirName = entry.getKey();
+			File zomboidModsDir = new File(tempDir, "Zomboid/mods");
+
+			writeToModMetadataFile(new File(zomboidModsDir, modDirName),
+					ImmutableList.of("name=" + modDirName, "modversion=1.1.0"));
+		}
+	}
+
+	static void writeToModMetadataFile(File modDir, List<String> lines) throws IOException {
+
+		File metadataFile = new File(modDir, "mod.info");
+		if (!metadataFile.exists()) {
+			Assertions.assertTrue(metadataFile.createNewFile());
+		}
+		CharSink sink = com.google.common.io.Files.asCharSink(metadataFile, StandardCharsets.UTF_8);
+		try {
+			sink.writeLines(lines, "\n");
+		}
+		catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+}
diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index 61054c9..7b6e798 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -3,8 +3,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.io.CharSink;
-import com.google.common.io.MoreFiles;
 import io.pzstorm.storm.IntegrationTest;
 import io.pzstorm.storm.mod.ModJar;
 import io.pzstorm.storm.mod.ModMetadata;
@@ -13,12 +11,10 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Run test methods in a certain order to ensure the tests pass on CI.
@@ -26,7 +22,7 @@
  * metadata and jar files cannot be removed once they have been loaded by JVM.
  */
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-class StormModLoaderIntegrationTest implements IntegrationTest {
+class StormModLoaderIntegrationTest extends ModLoaderTestFixture {
 
 	/* do not use TempDir annotation to create temporary directory
 	 * because Windows cannot delete these temporary directories due
@@ -34,45 +30,10 @@ class StormModLoaderIntegrationTest implements IntegrationTest {
 	 */
 	private static final File TEMP_DIR = IntegrationTest.getTemporaryBuildDir(StormModLoaderIntegrationTest.class);
 	private static final File ZOMBOID_MODS_DIR = new File(TEMP_DIR, "Zomboid/mods");
-	private static final Map<String, String[]> MOD_JAR_DATA = ImmutableMap.of(
-			"A", new String[] { "modA.jar" },
-			"B", new String[] { "modA.jar", "modB.jar" },
-			"C", new String[] { "modA.jar", "modB.jar", "modC.jar" }
-	);
-	@BeforeAll
-	static void prepareStormModLoaderTest() throws IOException, URISyntaxException {
-
-		if (TEMP_DIR.exists())
-		{
-			// clean temporary directory from last test run
-			MoreFiles.deleteDirectoryContents(TEMP_DIR.toPath());
-			Assertions.assertEquals(0, Objects.requireNonNull(TEMP_DIR.listFiles()).length);
-		}
-		Assertions.assertTrue(ZOMBOID_MODS_DIR.mkdirs());
-		System.setProperty("user.home", TEMP_DIR.getPath());
 
-		ClassLoader CL = StormModLoaderIntegrationTest.class.getClassLoader();
-		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet())
-		{
-			String modDirName = entry.getKey();
-			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
-
-			// create temporary mod directory
-			Assertions.assertTrue(modDir.mkdir());
-
-			for (String modJarName : entry.getValue())
-			{
-				URL jarResource = Objects.requireNonNull(CL.getResource("./jars/" + modJarName));
-				File destination = new File(modDir, modJarName);
-
-				// copy resource mod jars to temporary directory
-				if (!destination.exists())
-				{
-					Files.copy(Paths.get(jarResource.toURI()), destination.toPath());
-					Assertions.assertTrue(destination.exists());
-				}
-			}
-		}
+	@BeforeAll
+	static void prepareStormModLoaderTest() throws IOException {
+		prepareTestClass(TEMP_DIR);
 	}
 
 	/**
@@ -112,7 +73,7 @@ void shouldNotLoadModMetadataWhenModInfoFileMissing() throws Throwable {
 	void shouldCatalogAllModJarsFoundInModsDir() throws Throwable {
 
 		// write metadata files
-		createAndWriteMetadataFiles();
+		createAndWriteMetadataFiles(TEMP_DIR);
 
 		Map<String, ImmutableSet<ModJar>> expectedJarRegistry = new HashMap<>();
 		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet())
@@ -136,14 +97,13 @@ void shouldCatalogAllModJarsFoundInModsDir() throws Throwable {
 	void shouldLoadAllModClasses() throws IOException {
 
 		String[] expectedLoadedClasses = new String[] {
-				"com.sample.mod.ModA", "com.sample.mod.ModUtils",
-				"com.sample.mod.ModB", "com.sample.mod.ModC"
+				"com.sample.mod.ModA", "com.sample.mod.ModB", "com.sample.mod.ModC"
 		};
 		for (String clazz : expectedLoadedClasses) {
 			Assertions.assertFalse(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
 		}
 		StormModLoader.catalogModJars();
-		StormBootstrap.CLASS_LOADER.updateModResourceLoader();
+		StormBootstrap.CLASS_LOADER.updateModResourcePaths();
 		StormModLoader.loadModClasses();
 
 		for (String clazz : expectedLoadedClasses) {
@@ -226,30 +186,4 @@ void shouldNotLoadModMetadataWhenMissingProperties() throws Throwable {
 		// assert using default version
 		Assertions.assertEquals(new ModVersion("0.1.0"), modE.version);
 	}
-
-	private static void createAndWriteMetadataFiles() throws IOException {
-
-		for (Map.Entry<String, String[]> entry : MOD_JAR_DATA.entrySet())
-		{
-			String modDirName = entry.getKey();
-			File modDir = new File(ZOMBOID_MODS_DIR, modDirName);
-
-			writeToModMetadataFile(modDir, ImmutableList.of("name=" + modDirName, "modversion=1.1.0"));
-		}
-	}
-
-	private static void writeToModMetadataFile(File modDir, List<String> lines) throws IOException {
-
-		File metadataFile = new File(modDir, "mod.info");
-		if (!metadataFile.exists()) {
-			Assertions.assertTrue(metadataFile.createNewFile());
-		}
-		CharSink sink = com.google.common.io.Files.asCharSink(metadataFile, StandardCharsets.UTF_8);
-		try {
-			sink.writeLines(lines, "\n");
-		}
-		catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
 }

From fc66c550475f94c9370e1f9abdfe49f45d24cb96 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 15 May 2021 21:34:14 +0200
Subject: [PATCH 208/323] Create mod entry point class

---
 src/api/java/io/pzstorm/storm/mod/ZomboidMod.java | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 src/api/java/io/pzstorm/storm/mod/ZomboidMod.java

diff --git a/src/api/java/io/pzstorm/storm/mod/ZomboidMod.java b/src/api/java/io/pzstorm/storm/mod/ZomboidMod.java
new file mode 100644
index 0000000..22a99aa
--- /dev/null
+++ b/src/api/java/io/pzstorm/storm/mod/ZomboidMod.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.mod;
+
+/**
+ * This class represents a Project Zomboid Java mod entry point. Every mod is expected to have
+ * a single class that implements this class. Mods that do not implement this class will not be
+ * registered and will not be eligible to subscribe to events.
+ */
+public interface ZomboidMod {
+
+	void registerEventHandlers();
+}

From eca12fe459265eb18a70e2a17770e9caf15a2e39 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 15 May 2021 21:24:01 +0200
Subject: [PATCH 209/323] Implement simple mod registry

---
 .../pzstorm/storm/core/StormModRegistry.java  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 src/main/java/io/pzstorm/storm/core/StormModRegistry.java

diff --git a/src/main/java/io/pzstorm/storm/core/StormModRegistry.java b/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
new file mode 100644
index 0000000..c7cb6f8
--- /dev/null
+++ b/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
@@ -0,0 +1,54 @@
+package io.pzstorm.storm.core;
+
+import com.google.common.collect.ImmutableSet;
+import io.pzstorm.storm.logging.StormLogger;
+import io.pzstorm.storm.mod.ModMetadata;
+import io.pzstorm.storm.mod.ZomboidMod;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * This class is responsible for creating and registering {@link ZomboidMod} instances.
+ */
+class StormModRegistry {
+
+	private static final Map<String, ZomboidMod> MOD_REGISTRY = new HashMap<>();
+
+	/**
+	 * Create and register {@link ZomboidMod} instances from cataloged classes.
+	 * This method searches for classes that implement {@code ZomboidMod} and then instantiates
+	 * and registers the implementation classes. Remember that the class catalogue has to be populated
+	 * before registering mods otherwise no mod instances will be created. Also note that only the first
+	 * implementation class for each catalog entry will be registered, the rest will be ignored.
+	 *
+	 * @throws ReflectiveOperationException if an exception was thrown while
+	 * 		instantiating {@code ZomboidMod} implementation class.
+	 */
+	static void registerMods() throws ReflectiveOperationException {
+
+		for (Map.Entry<String, ImmutableSet<Class<?>>> entry : StormModLoader.CLASS_CATALOG.entrySet())
+		{
+			// find the first class that implements ZomboidMod interface
+			Optional<Class<?>> modClass = entry.getValue().stream()
+					.filter(ZomboidMod.class::isAssignableFrom).findFirst();
+
+			if (!modClass.isPresent())
+			{
+				ModMetadata meta = StormModLoader.METADATA_CATALOG.get(entry.getKey());
+				String format = "Unable to find ZomboidMod class for mod '%s'";
+
+				StormLogger.warn(String.format(format, meta != null ? meta.name : "unknown"));
+			}
+			else MOD_REGISTRY.put(entry.getKey(), (ZomboidMod) modClass.get().newInstance());
+		}
+	}
+
+	@TestOnly
+	static @Nullable ZomboidMod getRegisteredMod(String name) {
+		return MOD_REGISTRY.get(name);
+	}
+}

From 39e205384b47b5db00d947c2e3426295cd64bb23 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 15 May 2021 21:24:28 +0200
Subject: [PATCH 210/323] Test registering mods from jar classes

---
 .../core/StormModRegistryIntegrationTest.java | 94 +++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java

diff --git a/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
new file mode 100644
index 0000000..91eb7af
--- /dev/null
+++ b/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
@@ -0,0 +1,94 @@
+package io.pzstorm.storm.core;
+
+import io.pzstorm.storm.IntegrationTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.URL;
+
+class StormModRegistryIntegrationTest extends ModLoaderTestFixture {
+
+	private static final File TEMP_DIR = IntegrationTest.getTemporaryBuildDir(StormModRegistryIntegrationTest.class);
+
+	private static final Class<?> STORM_MOD_LOADER_CLASS;
+	private static final Class<?> STORM_MOD_REGISTRY_CLASS;
+
+	private static final Method GET_JAR_RESOURCE_PATHS;
+	private static final Method CATALOG_MOD_JARS;
+	private static final Method LOAD_MOD_METADATA;
+	private static final Method LOAD_MOD_CLASSES;
+
+	private static final Method GET_REGISTERED_MOD;
+	private static final Method REGISTER_MODS;
+
+	static
+	{
+		try {
+			STORM_MOD_LOADER_CLASS = Class.forName(
+					"io.pzstorm.storm.core.StormModLoader", true, StormBootstrap.CLASS_LOADER
+			);
+			Constructor<?>[] constructors = STORM_MOD_LOADER_CLASS.getDeclaredConstructors();
+			STORM_MOD_REGISTRY_CLASS = Class.forName(
+					"io.pzstorm.storm.core.StormModRegistry", true, StormBootstrap.CLASS_LOADER
+			);
+			GET_JAR_RESOURCE_PATHS = STORM_MOD_LOADER_CLASS.getDeclaredMethod("getJarResourcePaths");
+			GET_JAR_RESOURCE_PATHS.setAccessible(true);
+
+			CATALOG_MOD_JARS = STORM_MOD_LOADER_CLASS.getDeclaredMethod("catalogModJars");
+			CATALOG_MOD_JARS.setAccessible(true);
+
+			LOAD_MOD_METADATA = STORM_MOD_LOADER_CLASS.getDeclaredMethod("loadModMetadata");
+			LOAD_MOD_METADATA.setAccessible(true);
+
+			LOAD_MOD_CLASSES = STORM_MOD_LOADER_CLASS.getDeclaredMethod("loadModClasses");
+			LOAD_MOD_CLASSES.setAccessible(true);
+
+			GET_REGISTERED_MOD = STORM_MOD_REGISTRY_CLASS.getDeclaredMethod("getRegisteredMod", String.class);
+			GET_REGISTERED_MOD.setAccessible(true);
+
+			REGISTER_MODS = STORM_MOD_REGISTRY_CLASS.getDeclaredMethod("registerMods");
+			REGISTER_MODS.setAccessible(true);
+		}
+		catch (ReflectiveOperationException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	@BeforeAll
+	static void prepareStormModLoaderTest() throws IOException {
+		prepareTestClass(TEMP_DIR);
+	}
+
+	@Test
+	void shouldRegisterModsThatHaveZomboidModClass() throws Throwable {
+
+		createAndWriteMetadataFiles(TEMP_DIR);
+
+		CATALOG_MOD_JARS.invoke(null);
+		LOAD_MOD_METADATA.invoke(null);
+
+		// assert that mod is not registered
+		Assertions.assertNull(GET_REGISTERED_MOD.invoke(null, "A"));
+
+		Constructor<?> constructor = STORM_MOD_LOADER_CLASS.getDeclaredConstructor();
+		constructor.setAccessible(true);
+
+		StormBootstrap.CLASS_LOADER.updateModResourcePaths();
+		LOAD_MOD_CLASSES.invoke(null);
+		REGISTER_MODS.invoke(null);
+
+		Object modA = GET_REGISTERED_MOD.invoke(null, "A");
+		Assertions.assertNotNull(modA);
+
+		// assert that no other mods were loaded
+		Assertions.assertNull(GET_REGISTERED_MOD.invoke(null, "B"));
+		Assertions.assertNull(GET_REGISTERED_MOD.invoke(null, "C"));
+
+		Assertions.assertEquals("com.sample.mod.ModA", modA.getClass().getName());
+	}
+}

From bdef14cb5366459744736bd91a95351246bfde03 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 15 May 2021 21:24:56 +0200
Subject: [PATCH 211/323] Add mod implementation to test jar

---
 src/test/resources/jars/modA.jar | Bin 1163 -> 1260 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/test/resources/jars/modA.jar b/src/test/resources/jars/modA.jar
index 268565dbbd696154060b93e7a1ef77d2e37085c5..e5e76e9cf3a51b13c740a6d626637e3ad9ed4d34 100644
GIT binary patch
delta 453
zcmeC?e8V~6+~)U;vW(KqEFugH3>*yGr>+gUpF2ZNpOJy#1Q1Iy$V`5~EK|?Pz`Qej
zZo=G%xe28e+zgB?FPIq^z(nqZvtEZCL|V_A7#e0?xfR7~{>X2)!E8MiSAoEo5Z0-B
zyJo96TdSU&;(4nz|EUv;xLpIk>b=f|9VLbT`JUH_zq|hZxO#)#x0)Ln)f+ApZhXAx
zb<*_2`a|9BhSOX%w|J}*SJKa~ubj8UNt`F=$b&hjW2TAoT)X&j!oht(oe4LjPQ=_f
zzuDtOy4=zwTiCUpy_}Gp`7CP7=}r~Da)H%4Iu&N#t}|Au><K>kRPyDneShAs`@iIw
zm6-V@1Dj;KnV(qsH}L5<Fi&5&x#`3OqiqIHe_GUZEK|~x<Xgg(uJ5|i<mc*~H_B7J
zUA@${v^xLl;B7PIN_+5SEn8_x_a^_#nWoHj?`7Ad?_KyYs&bawVy;_TGxZnf{U}Xh
zo*nWs(A#VOG7H;k)`gxu5BLv83PnvV{>?s_i+Sf{B^Ig4cbUZ|2eGJXF*3<9;|hHV
dV5~sEmd2NilkYPtfZ}0tDvJVJHZTSl7ywGnwZQ-Y

delta 284
zcmV+%0ptGc35yAk&I!u}rsK{4000Y;0wt0G7k_Pzy>7xl5QJy3v4b%`BFY1#3lzDA
z4uljTQJJJ5qCeXwIAr^fF}zo*NECU1JQQNjP_iqHc1GVw`+qtA0T`nnz(L1H*GG@w
zO?9EG8NqoQt_kkkq>9jsbfG?vd92EB8E2dfB9q8$ElX|vJ#?$BJ`i4_#N^^2^L?g7
zZckFNH0j5L5Uk9xOw>YKwq?Wjojl19E}Der2PHz^5+akuMtsFPl~i~|gCDj-yj*4V
z*ooQ$&CxIDhmQt)R<8~nJh6s104)S{y<Jn`6|ul80h4V5w++h$rsK{4000XC000@2
iF$5z4L6cboDw7}t9s=P3lRyMHlh_0f1_}cJ0000=uyt<$


From ebc84299d4b39d24d052628b64e0f80b1b576c97 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 15 May 2021 21:26:11 +0200
Subject: [PATCH 212/323] Relax core class encapsulation

This avoids IllegalAccessError exception when loading classes.
---
 src/main/java/io/pzstorm/storm/core/StormBootstrap.java   | 4 ++--
 src/main/java/io/pzstorm/storm/core/StormClassLoader.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index 381abcd..a234471 100644
--- a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -8,7 +8,7 @@
  * This class bootstraps everything needed to launch the game with static initialization.
  * It should be loaded from {@link StormLauncher} before Storm attempts to launch the game.
  */
-class StormBootstrap {
+public class StormBootstrap {
 
 	/**
 	 * {@code ClassLoader} used to transform and load all needed classes.
@@ -16,7 +16,7 @@ class StormBootstrap {
 	 * their own set of class instances and native libraries this loader should always be
 	 * used to load classes that access or modify transformed class fields or methods.
 	 */
-	static final StormClassLoader CLASS_LOADER = new StormClassLoader();
+	public static final StormClassLoader CLASS_LOADER = new StormClassLoader();
 
 	/**
 	 * Loaded and initialized {@link StormClassTransformer} {@code Class}. To transform specific
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 4aa1405..03d5fe3 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -18,7 +18,7 @@
  * It is initially invoked by {@link StormLauncher} when launching the game.
  */
 @SuppressWarnings("WeakerAccess")
-class StormClassLoader extends ClassLoader {
+public class StormClassLoader extends ClassLoader {
 
 	/**
 	 * <p>
@@ -58,7 +58,7 @@ class StormClassLoader extends ClassLoader {
 		modResourceLoader = new StormModLoader(resourceLocations);
 	}
 
-	StormClassLoader() {
+	public StormClassLoader() {
 
 		StormLogger.debug("Initialized StormClassLoader");
 		parentClassLoader = getClass().getClassLoader();

From c7d0baf63682f159808f38e7dc97d8088d591f9a Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 15 May 2021 21:27:26 +0200
Subject: [PATCH 213/323] Blacklist more storm core classes

These classes need to be loaded by AppClassLoader.
---
 src/main/java/io/pzstorm/storm/core/StormClassLoader.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 03d5fe3..011fa2c 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -32,7 +32,8 @@ public class StormClassLoader extends ClassLoader {
 	private static final ImmutableSet<String> CLASS_BLACKLIST = ImmutableSet.of(
 			"java.", "org.objectweb.asm.", "sun.", "com.sun.", "org.xml.", "org.w3c.",
 			"javax.script.", "javax.management.", "javax.imageio.", "javax.xml.",
-			"io.pzstorm.storm.logging.StormLogger"
+			"io.pzstorm.storm.logging.StormLogger", "io.pzstorm.storm.core.StormBootstrap",
+			"io.pzstorm.storm.core.StormClassLoader"
 	);
 
 	/**

From dba23c922d240d9409df2e208d106872691e84a4 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 15 May 2021 21:29:59 +0200
Subject: [PATCH 214/323] Update class loader method invocations

---
 .../io/pzstorm/storm/core/StormModLoaderIntegrationTest.java    | 2 +-
 .../io/pzstorm/storm/core/StormModRegistryIntegrationTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index 7b6e798..2759727 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -103,7 +103,7 @@ void shouldLoadAllModClasses() throws IOException {
 			Assertions.assertFalse(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
 		}
 		StormModLoader.catalogModJars();
-		StormBootstrap.CLASS_LOADER.updateModResourcePaths();
+		StormBootstrap.CLASS_LOADER.updateModResourceLoader();
 		StormModLoader.loadModClasses();
 
 		for (String clazz : expectedLoadedClasses) {
diff --git a/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
index 91eb7af..8c1b05d 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
@@ -78,7 +78,7 @@ void shouldRegisterModsThatHaveZomboidModClass() throws Throwable {
 		Constructor<?> constructor = STORM_MOD_LOADER_CLASS.getDeclaredConstructor();
 		constructor.setAccessible(true);
 
-		StormBootstrap.CLASS_LOADER.updateModResourcePaths();
+		StormBootstrap.CLASS_LOADER.updateModResourceLoader();
 		LOAD_MOD_CLASSES.invoke(null);
 		REGISTER_MODS.invoke(null);
 

From fb8f3f2ff725610ebef07b565fcf98fd65c8c959 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 15 May 2021 21:40:48 +0200
Subject: [PATCH 215/323] Apply IDEA inspection suggestions

---
 src/main/java/io/pzstorm/storm/core/StormBootstrap.java       | 1 +
 .../pzstorm/storm/core/StormModRegistryIntegrationTest.java   | 2 --
 .../storm/event/StormEventDispatcherIntegrationTest.java      | 2 +-
 .../pzstorm/storm/event/TestInstanceContextEventHandler.java  | 2 +-
 .../io/pzstorm/storm/event/TestStaticContextEventHandler.java | 4 ++--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index a234471..02a6d55 100644
--- a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -8,6 +8,7 @@
  * This class bootstraps everything needed to launch the game with static initialization.
  * It should be loaded from {@link StormLauncher} before Storm attempts to launch the game.
  */
+@SuppressWarnings("WeakerAccess")
 public class StormBootstrap {
 
 	/**
diff --git a/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
index 8c1b05d..3829aea 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
@@ -9,7 +9,6 @@
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.net.URL;
 
 class StormModRegistryIntegrationTest extends ModLoaderTestFixture {
 
@@ -32,7 +31,6 @@ class StormModRegistryIntegrationTest extends ModLoaderTestFixture {
 			STORM_MOD_LOADER_CLASS = Class.forName(
 					"io.pzstorm.storm.core.StormModLoader", true, StormBootstrap.CLASS_LOADER
 			);
-			Constructor<?>[] constructors = STORM_MOD_LOADER_CLASS.getDeclaredConstructors();
 			STORM_MOD_REGISTRY_CLASS = Class.forName(
 					"io.pzstorm.storm.core.StormModRegistry", true, StormBootstrap.CLASS_LOADER
 			);
diff --git a/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java b/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
index eceb345..bdb019b 100644
--- a/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
@@ -5,7 +5,7 @@
 
 import io.pzstorm.storm.IntegrationTest;
 
-@SuppressWarnings("unused")
+@SuppressWarnings({ "unused", "EmptyMethod" })
 class StormEventDispatcherIntegrationTest implements IntegrationTest {
 
 	@Test
diff --git a/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java b/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java
index 48cd950..29f1c51 100644
--- a/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java
+++ b/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java
@@ -3,7 +3,7 @@
 @SuppressWarnings("unused")
 public class TestInstanceContextEventHandler {
 
-	Boolean[] eventsCalled = new Boolean[] { false, false };
+	final Boolean[] eventsCalled = new Boolean[] { false, false };
 
 	@SubscribeEvent
 	public void handleTestZomboidEventA(TestZomboidEventA event) {
diff --git a/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java b/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java
index 24c57cf..c0b7f2d 100644
--- a/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java
+++ b/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java
@@ -1,9 +1,9 @@
 package io.pzstorm.storm.event;
 
 @SuppressWarnings("unused")
-public class TestStaticContextEventHandler {
+class TestStaticContextEventHandler {
 
-	static Boolean[] eventsCalled = new Boolean[] { false, false };
+	static final Boolean[] eventsCalled = new Boolean[] { false, false };
 
 	@SubscribeEvent
 	public static void handleTestZomboidEventA(TestZomboidEventA event) {

From cc0222b09fbf3761f268cb876c27f49759b0a930 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 22:46:44 +0200
Subject: [PATCH 216/323] Fix mod registry tests failing

StormModLoader class should be loaded by only one ClassLoader.
https://github.com/pzstorm/storm/actions/runs/847694244
---
 .../java/io/pzstorm/storm/core/StormClassLoader.java  | 11 ++++++-----
 .../storm/core/StormModLoaderIntegrationTest.java     |  2 +-
 .../storm/core/StormModRegistryIntegrationTest.java   | 10 +++++++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 011fa2c..0dd43b1 100644
--- a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.Objects;
 
 import org.jetbrains.annotations.Contract;
@@ -39,7 +40,7 @@ public class StormClassLoader extends ClassLoader {
 	/**
 	 * {@code URLClassLoader} responsible for loading mod classes and assets.
 	 */
-	private StormModLoader modResourceLoader;
+	private URLClassLoader modResourceLoader;
 
 	/**
 	 * {@code ClassLoader} that is the parent of this {@code ClassLoader}.
@@ -56,14 +57,14 @@ public class StormClassLoader extends ClassLoader {
 	StormClassLoader(URL[] resourceLocations) {
 
 		parentClassLoader = getClass().getClassLoader();
-		modResourceLoader = new StormModLoader(resourceLocations);
+		modResourceLoader = new URLClassLoader(resourceLocations);
 	}
 
 	public StormClassLoader() {
 
 		StormLogger.debug("Initialized StormClassLoader");
 		parentClassLoader = getClass().getClassLoader();
-		modResourceLoader =  new StormModLoader();
+		modResourceLoader = (URLClassLoader) getParent();
 	}
 
 	/**
@@ -71,8 +72,8 @@ public StormClassLoader() {
 	 * after new mods have been loaded by {@link StormModLoader} since new
 	 * {@code URL}s have to be added to loader classpath.
 	 */
-	void updateModResourceLoader() {
-		modResourceLoader = new StormModLoader();
+	void setModResourceLoader(URLClassLoader classLoader) {
+		modResourceLoader = classLoader;
 	}
 
 	/**
diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index 2759727..89a052a 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -103,7 +103,7 @@ void shouldLoadAllModClasses() throws IOException {
 			Assertions.assertFalse(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
 		}
 		StormModLoader.catalogModJars();
-		StormBootstrap.CLASS_LOADER.updateModResourceLoader();
+		StormBootstrap.CLASS_LOADER.setModResourceLoader(new StormModLoader());
 		StormModLoader.loadModClasses();
 
 		for (String clazz : expectedLoadedClasses) {
diff --git a/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
index 3829aea..b925997 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+import java.net.URLClassLoader;
 
 class StormModRegistryIntegrationTest extends ModLoaderTestFixture {
 
@@ -17,6 +18,8 @@ class StormModRegistryIntegrationTest extends ModLoaderTestFixture {
 	private static final Class<?> STORM_MOD_LOADER_CLASS;
 	private static final Class<?> STORM_MOD_REGISTRY_CLASS;
 
+	private static final Constructor<?> STORM_MOD_LOADER_CONSTRUCTOR;
+
 	private static final Method GET_JAR_RESOURCE_PATHS;
 	private static final Method CATALOG_MOD_JARS;
 	private static final Method LOAD_MOD_METADATA;
@@ -34,6 +37,9 @@ class StormModRegistryIntegrationTest extends ModLoaderTestFixture {
 			STORM_MOD_REGISTRY_CLASS = Class.forName(
 					"io.pzstorm.storm.core.StormModRegistry", true, StormBootstrap.CLASS_LOADER
 			);
+			STORM_MOD_LOADER_CONSTRUCTOR = STORM_MOD_LOADER_CLASS.getDeclaredConstructor();
+			STORM_MOD_LOADER_CONSTRUCTOR.setAccessible(true);
+
 			GET_JAR_RESOURCE_PATHS = STORM_MOD_LOADER_CLASS.getDeclaredMethod("getJarResourcePaths");
 			GET_JAR_RESOURCE_PATHS.setAccessible(true);
 
@@ -76,7 +82,9 @@ void shouldRegisterModsThatHaveZomboidModClass() throws Throwable {
 		Constructor<?> constructor = STORM_MOD_LOADER_CLASS.getDeclaredConstructor();
 		constructor.setAccessible(true);
 
-		StormBootstrap.CLASS_LOADER.updateModResourceLoader();
+		StormBootstrap.CLASS_LOADER.setModResourceLoader(
+				(URLClassLoader) STORM_MOD_LOADER_CONSTRUCTOR.newInstance()
+		);
 		LOAD_MOD_CLASSES.invoke(null);
 		REGISTER_MODS.invoke(null);
 

From 3fc924235cc5ca00f06ba5c88ffc661af3f86f6a Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 22:52:42 +0200
Subject: [PATCH 217/323] Fix mod loader test failing

Tests run in different order when executed via Gradle leading to some classes being loaded before expected.
https://github.com/pzstorm/storm/actions/runs/847726329
---
 .../io/pzstorm/storm/core/StormModLoaderIntegrationTest.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index 89a052a..a2ad3b0 100644
--- a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
+++ b/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -99,9 +99,6 @@ void shouldLoadAllModClasses() throws IOException {
 		String[] expectedLoadedClasses = new String[] {
 				"com.sample.mod.ModA", "com.sample.mod.ModB", "com.sample.mod.ModC"
 		};
-		for (String clazz : expectedLoadedClasses) {
-			Assertions.assertFalse(StormBootstrap.CLASS_LOADER.isClassLoaded(clazz));
-		}
 		StormModLoader.catalogModJars();
 		StormBootstrap.CLASS_LOADER.setModResourceLoader(new StormModLoader());
 		StormModLoader.loadModClasses();

From 312c4e63a41720b3e379eeed74d9a8a70a21fc7d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 17:26:00 +0200
Subject: [PATCH 218/323] Move API classes to dedicated project

---
 .../src/main}/java/io/pzstorm/storm/NonNullPackage.java           | 0
 .../java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java      | 0
 .../java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java    | 0
 .../main}/java/io/pzstorm/storm/event/StormEventDispatcher.java   | 0
 .../src/main}/java/io/pzstorm/storm/event/SubscribeEvent.java     | 0
 .../src/main}/java/io/pzstorm/storm/event/ZomboidEvent.java       | 0
 .../src/main}/java/io/pzstorm/storm/event/package-info.java       | 0
 .../src/main}/java/io/pzstorm/storm/logging/StormLogger.java      | 0
 .../src/main}/java/io/pzstorm/storm/mod/ModMetadata.java          | 0
 .../src/main}/java/io/pzstorm/storm/mod/ModVersion.java           | 0
 .../src/main}/java/io/pzstorm/storm/mod/ZomboidMod.java           | 0
 11 files changed, 0 insertions(+), 0 deletions(-)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/NonNullPackage.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/event/StormEventDispatcher.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/event/SubscribeEvent.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/event/ZomboidEvent.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/event/package-info.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/logging/StormLogger.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/mod/ModMetadata.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/mod/ModVersion.java (100%)
 rename {src/api => api/src/main}/java/io/pzstorm/storm/mod/ZomboidMod.java (100%)

diff --git a/src/api/java/io/pzstorm/storm/NonNullPackage.java b/api/src/main/java/io/pzstorm/storm/NonNullPackage.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/NonNullPackage.java
rename to api/src/main/java/io/pzstorm/storm/NonNullPackage.java
diff --git a/src/api/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java b/api/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
rename to api/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
diff --git a/src/api/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java b/api/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
rename to api/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
diff --git a/src/api/java/io/pzstorm/storm/event/StormEventDispatcher.java b/api/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/event/StormEventDispatcher.java
rename to api/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
diff --git a/src/api/java/io/pzstorm/storm/event/SubscribeEvent.java b/api/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/event/SubscribeEvent.java
rename to api/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
diff --git a/src/api/java/io/pzstorm/storm/event/ZomboidEvent.java b/api/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/event/ZomboidEvent.java
rename to api/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
diff --git a/src/api/java/io/pzstorm/storm/event/package-info.java b/api/src/main/java/io/pzstorm/storm/event/package-info.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/event/package-info.java
rename to api/src/main/java/io/pzstorm/storm/event/package-info.java
diff --git a/src/api/java/io/pzstorm/storm/logging/StormLogger.java b/api/src/main/java/io/pzstorm/storm/logging/StormLogger.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/logging/StormLogger.java
rename to api/src/main/java/io/pzstorm/storm/logging/StormLogger.java
diff --git a/src/api/java/io/pzstorm/storm/mod/ModMetadata.java b/api/src/main/java/io/pzstorm/storm/mod/ModMetadata.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/mod/ModMetadata.java
rename to api/src/main/java/io/pzstorm/storm/mod/ModMetadata.java
diff --git a/src/api/java/io/pzstorm/storm/mod/ModVersion.java b/api/src/main/java/io/pzstorm/storm/mod/ModVersion.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/mod/ModVersion.java
rename to api/src/main/java/io/pzstorm/storm/mod/ModVersion.java
diff --git a/src/api/java/io/pzstorm/storm/mod/ZomboidMod.java b/api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java
similarity index 100%
rename from src/api/java/io/pzstorm/storm/mod/ZomboidMod.java
rename to api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java

From 97f55058b1a1efebdfbdbdb74b98c966629febe7 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 17:26:44 +0200
Subject: [PATCH 219/323] Move core classes to dedicated project

---
 {src => core/src}/main/dist/.gitignore              |   0
 {src => core/src}/main/dist/.idea/.gitignore        |   0
 {src => core/src}/main/dist/build.gradle            |   0
 .../storm/core/ClassTransformationException.java    |   0
 .../java/io/pzstorm/storm/core/StormBootstrap.java  |   0
 .../io/pzstorm/storm/core/StormClassLoader.java     |   0
 .../pzstorm/storm/core/StormClassTransformer.java   |   0
 .../pzstorm/storm/core/StormClassTransformers.java  |   0
 .../java/io/pzstorm/storm/core/StormLauncher.java   |   0
 .../java/io/pzstorm/storm/core/StormModLoader.java  |   0
 .../io/pzstorm/storm/core/StormModRegistry.java     |   0
 .../java/io/pzstorm/storm/core/package-info.java    |   0
 .../io/pzstorm/storm/event/StormEventHandler.java   |   0
 .../pzstorm/storm/hook/OnMainScreenRenderHook.java  |   0
 .../storm/hook/OnUIElementPreRenderHook.java        |   0
 .../main/java/io/pzstorm/storm/hook/StormHook.java  |   0
 .../java/io/pzstorm/storm/hook/package-info.java    |   0
 .../io/pzstorm/storm/logging/ZomboidLogger.java     |   0
 .../src}/main/java/io/pzstorm/storm/mod/ModJar.java |   0
 .../java/io/pzstorm/storm/patch/DebugLogPatch.java  |   0
 .../io/pzstorm/storm/patch/DebugLogStreamPatch.java |   0
 .../java/io/pzstorm/storm/patch/ZomboidPatch.java   |   0
 .../java/io/pzstorm/storm/patch/package-info.java   |   0
 .../main/java/io/pzstorm/storm/util/AsmUtils.java   |   0
 .../main/java/io/pzstorm/storm/util/StormUtils.java |   0
 .../java/io/pzstorm/storm/util/package-info.java    |   0
 {src => core/src}/main/resources/log4j2.xml         |   0
 .../test/java/io/pzstorm/storm/IntegrationTest.java |   0
 .../src}/test/java/io/pzstorm/storm/TestUtils.java  |   0
 .../src}/test/java/io/pzstorm/storm/UnitTest.java   |   0
 .../io/pzstorm/storm/core/ModLoaderTestFixture.java |   0
 .../storm/core/StormClassLoaderIntegrationTest.java |   0
 .../storm/core/StormClassTestTransformer.java       |   0
 .../core/StormClassTransformerIntegrationTest.java  |   0
 .../storm/core/StormModLoaderIntegrationTest.java   |   0
 .../storm/core/StormModRegistryIntegrationTest.java |   0
 .../pzstorm/storm/core/ZombieHelloTransformer.java  |   0
 .../pzstorm/storm/core/ZombieUtilsTransformer.java  |   0
 .../event/StormEventDispatcherIntegrationTest.java  |   0
 .../event/TestInstanceContextEventHandler.java      |   0
 .../storm/event/TestStaticContextEventHandler.java  |   0
 .../io/pzstorm/storm/event/TestZomboidEventA.java   |   0
 .../io/pzstorm/storm/event/TestZomboidEventB.java   |   0
 .../io/pzstorm/storm/logging/StormLoggerTest.java   |   0
 .../java/io/pzstorm/storm/util/AsmUtilsTest.java    |   0
 .../java/io/pzstorm/storm/util/StormUtilsTest.java  |   0
 .../test/resources/classes/fmod/FmodClass.class     | Bin
 .../classes/io/pzstorm/storm/SampleClass.class      | Bin
 .../classes/jassimp/JassimpLibraryClass.class       | Bin
 .../resources/classes/javax/vecmath/MathClass.class | Bin
 .../classes/org/lwjgl/LwjglLibraryClass.class       | Bin
 .../test/resources/classes/zombie/ZombieClass.class | Bin
 .../src}/test/resources/delegate/delegate.resource  |   0
 {src => core/src}/test/resources/jars/modA.jar      | Bin
 {src => core/src}/test/resources/jars/modB.jar      | Bin
 {src => core/src}/test/resources/jars/modC.jar      | Bin
 56 files changed, 0 insertions(+), 0 deletions(-)
 rename {src => core/src}/main/dist/.gitignore (100%)
 rename {src => core/src}/main/dist/.idea/.gitignore (100%)
 rename {src => core/src}/main/dist/build.gradle (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/core/ClassTransformationException.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/core/StormBootstrap.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/core/StormClassLoader.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/core/StormClassTransformer.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/core/StormClassTransformers.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/core/StormLauncher.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/core/StormModLoader.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/core/StormModRegistry.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/core/package-info.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/event/StormEventHandler.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/hook/StormHook.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/hook/package-info.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/logging/ZomboidLogger.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/mod/ModJar.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/patch/DebugLogPatch.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/patch/ZomboidPatch.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/patch/package-info.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/util/AsmUtils.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/util/StormUtils.java (100%)
 rename {src => core/src}/main/java/io/pzstorm/storm/util/package-info.java (100%)
 rename {src => core/src}/main/resources/log4j2.xml (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/IntegrationTest.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/TestUtils.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/UnitTest.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/core/ZombieUtilsTransformer.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/event/TestZomboidEventA.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/event/TestZomboidEventB.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/logging/StormLoggerTest.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/util/AsmUtilsTest.java (100%)
 rename {src => core/src}/test/java/io/pzstorm/storm/util/StormUtilsTest.java (100%)
 rename {src => core/src}/test/resources/classes/fmod/FmodClass.class (100%)
 rename {src => core/src}/test/resources/classes/io/pzstorm/storm/SampleClass.class (100%)
 rename {src => core/src}/test/resources/classes/jassimp/JassimpLibraryClass.class (100%)
 rename {src => core/src}/test/resources/classes/javax/vecmath/MathClass.class (100%)
 rename {src => core/src}/test/resources/classes/org/lwjgl/LwjglLibraryClass.class (100%)
 rename {src => core/src}/test/resources/classes/zombie/ZombieClass.class (100%)
 rename {src => core/src}/test/resources/delegate/delegate.resource (100%)
 rename {src => core/src}/test/resources/jars/modA.jar (100%)
 rename {src => core/src}/test/resources/jars/modB.jar (100%)
 rename {src => core/src}/test/resources/jars/modC.jar (100%)

diff --git a/src/main/dist/.gitignore b/core/src/main/dist/.gitignore
similarity index 100%
rename from src/main/dist/.gitignore
rename to core/src/main/dist/.gitignore
diff --git a/src/main/dist/.idea/.gitignore b/core/src/main/dist/.idea/.gitignore
similarity index 100%
rename from src/main/dist/.idea/.gitignore
rename to core/src/main/dist/.idea/.gitignore
diff --git a/src/main/dist/build.gradle b/core/src/main/dist/build.gradle
similarity index 100%
rename from src/main/dist/build.gradle
rename to core/src/main/dist/build.gradle
diff --git a/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java b/core/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/core/ClassTransformationException.java
rename to core/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java
diff --git a/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/core/StormBootstrap.java
rename to core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/core/StormClassLoader.java
rename to core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
rename to core/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
diff --git a/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
rename to core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
diff --git a/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/core/StormLauncher.java
rename to core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
diff --git a/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/core/StormModLoader.java
rename to core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
diff --git a/src/main/java/io/pzstorm/storm/core/StormModRegistry.java b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/core/StormModRegistry.java
rename to core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
diff --git a/src/main/java/io/pzstorm/storm/core/package-info.java b/core/src/main/java/io/pzstorm/storm/core/package-info.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/core/package-info.java
rename to core/src/main/java/io/pzstorm/storm/core/package-info.java
diff --git a/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/event/StormEventHandler.java
rename to core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
diff --git a/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java b/core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
rename to core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
diff --git a/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java b/core/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
rename to core/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
diff --git a/src/main/java/io/pzstorm/storm/hook/StormHook.java b/core/src/main/java/io/pzstorm/storm/hook/StormHook.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/hook/StormHook.java
rename to core/src/main/java/io/pzstorm/storm/hook/StormHook.java
diff --git a/src/main/java/io/pzstorm/storm/hook/package-info.java b/core/src/main/java/io/pzstorm/storm/hook/package-info.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/hook/package-info.java
rename to core/src/main/java/io/pzstorm/storm/hook/package-info.java
diff --git a/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java b/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
rename to core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
diff --git a/src/main/java/io/pzstorm/storm/mod/ModJar.java b/core/src/main/java/io/pzstorm/storm/mod/ModJar.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/mod/ModJar.java
rename to core/src/main/java/io/pzstorm/storm/mod/ModJar.java
diff --git a/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java b/core/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
rename to core/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
diff --git a/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java b/core/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
rename to core/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
diff --git a/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java b/core/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java
rename to core/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java
diff --git a/src/main/java/io/pzstorm/storm/patch/package-info.java b/core/src/main/java/io/pzstorm/storm/patch/package-info.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/patch/package-info.java
rename to core/src/main/java/io/pzstorm/storm/patch/package-info.java
diff --git a/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/core/src/main/java/io/pzstorm/storm/util/AsmUtils.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/util/AsmUtils.java
rename to core/src/main/java/io/pzstorm/storm/util/AsmUtils.java
diff --git a/src/main/java/io/pzstorm/storm/util/StormUtils.java b/core/src/main/java/io/pzstorm/storm/util/StormUtils.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/util/StormUtils.java
rename to core/src/main/java/io/pzstorm/storm/util/StormUtils.java
diff --git a/src/main/java/io/pzstorm/storm/util/package-info.java b/core/src/main/java/io/pzstorm/storm/util/package-info.java
similarity index 100%
rename from src/main/java/io/pzstorm/storm/util/package-info.java
rename to core/src/main/java/io/pzstorm/storm/util/package-info.java
diff --git a/src/main/resources/log4j2.xml b/core/src/main/resources/log4j2.xml
similarity index 100%
rename from src/main/resources/log4j2.xml
rename to core/src/main/resources/log4j2.xml
diff --git a/src/test/java/io/pzstorm/storm/IntegrationTest.java b/core/src/test/java/io/pzstorm/storm/IntegrationTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/IntegrationTest.java
rename to core/src/test/java/io/pzstorm/storm/IntegrationTest.java
diff --git a/src/test/java/io/pzstorm/storm/TestUtils.java b/core/src/test/java/io/pzstorm/storm/TestUtils.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/TestUtils.java
rename to core/src/test/java/io/pzstorm/storm/TestUtils.java
diff --git a/src/test/java/io/pzstorm/storm/UnitTest.java b/core/src/test/java/io/pzstorm/storm/UnitTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/UnitTest.java
rename to core/src/test/java/io/pzstorm/storm/UnitTest.java
diff --git a/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java b/core/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java
rename to core/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java b/core/src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java
rename to core/src/test/java/io/pzstorm/storm/core/StormClassLoaderIntegrationTest.java
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java b/core/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
rename to core/src/test/java/io/pzstorm/storm/core/StormClassTestTransformer.java
diff --git a/src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java b/core/src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java
rename to core/src/test/java/io/pzstorm/storm/core/StormClassTransformerIntegrationTest.java
diff --git a/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/core/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
rename to core/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
diff --git a/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java b/core/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
rename to core/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
diff --git a/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java b/core/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
rename to core/src/test/java/io/pzstorm/storm/core/ZombieHelloTransformer.java
diff --git a/src/test/java/io/pzstorm/storm/core/ZombieUtilsTransformer.java b/core/src/test/java/io/pzstorm/storm/core/ZombieUtilsTransformer.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/core/ZombieUtilsTransformer.java
rename to core/src/test/java/io/pzstorm/storm/core/ZombieUtilsTransformer.java
diff --git a/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java b/core/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
rename to core/src/test/java/io/pzstorm/storm/event/StormEventDispatcherIntegrationTest.java
diff --git a/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java b/core/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java
rename to core/src/test/java/io/pzstorm/storm/event/TestInstanceContextEventHandler.java
diff --git a/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java b/core/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java
rename to core/src/test/java/io/pzstorm/storm/event/TestStaticContextEventHandler.java
diff --git a/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java b/core/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java
rename to core/src/test/java/io/pzstorm/storm/event/TestZomboidEventA.java
diff --git a/src/test/java/io/pzstorm/storm/event/TestZomboidEventB.java b/core/src/test/java/io/pzstorm/storm/event/TestZomboidEventB.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/event/TestZomboidEventB.java
rename to core/src/test/java/io/pzstorm/storm/event/TestZomboidEventB.java
diff --git a/src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java b/core/src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java
rename to core/src/test/java/io/pzstorm/storm/logging/StormLoggerTest.java
diff --git a/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java b/core/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
rename to core/src/test/java/io/pzstorm/storm/util/AsmUtilsTest.java
diff --git a/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java b/core/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
similarity index 100%
rename from src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
rename to core/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
diff --git a/src/test/resources/classes/fmod/FmodClass.class b/core/src/test/resources/classes/fmod/FmodClass.class
similarity index 100%
rename from src/test/resources/classes/fmod/FmodClass.class
rename to core/src/test/resources/classes/fmod/FmodClass.class
diff --git a/src/test/resources/classes/io/pzstorm/storm/SampleClass.class b/core/src/test/resources/classes/io/pzstorm/storm/SampleClass.class
similarity index 100%
rename from src/test/resources/classes/io/pzstorm/storm/SampleClass.class
rename to core/src/test/resources/classes/io/pzstorm/storm/SampleClass.class
diff --git a/src/test/resources/classes/jassimp/JassimpLibraryClass.class b/core/src/test/resources/classes/jassimp/JassimpLibraryClass.class
similarity index 100%
rename from src/test/resources/classes/jassimp/JassimpLibraryClass.class
rename to core/src/test/resources/classes/jassimp/JassimpLibraryClass.class
diff --git a/src/test/resources/classes/javax/vecmath/MathClass.class b/core/src/test/resources/classes/javax/vecmath/MathClass.class
similarity index 100%
rename from src/test/resources/classes/javax/vecmath/MathClass.class
rename to core/src/test/resources/classes/javax/vecmath/MathClass.class
diff --git a/src/test/resources/classes/org/lwjgl/LwjglLibraryClass.class b/core/src/test/resources/classes/org/lwjgl/LwjglLibraryClass.class
similarity index 100%
rename from src/test/resources/classes/org/lwjgl/LwjglLibraryClass.class
rename to core/src/test/resources/classes/org/lwjgl/LwjglLibraryClass.class
diff --git a/src/test/resources/classes/zombie/ZombieClass.class b/core/src/test/resources/classes/zombie/ZombieClass.class
similarity index 100%
rename from src/test/resources/classes/zombie/ZombieClass.class
rename to core/src/test/resources/classes/zombie/ZombieClass.class
diff --git a/src/test/resources/delegate/delegate.resource b/core/src/test/resources/delegate/delegate.resource
similarity index 100%
rename from src/test/resources/delegate/delegate.resource
rename to core/src/test/resources/delegate/delegate.resource
diff --git a/src/test/resources/jars/modA.jar b/core/src/test/resources/jars/modA.jar
similarity index 100%
rename from src/test/resources/jars/modA.jar
rename to core/src/test/resources/jars/modA.jar
diff --git a/src/test/resources/jars/modB.jar b/core/src/test/resources/jars/modB.jar
similarity index 100%
rename from src/test/resources/jars/modB.jar
rename to core/src/test/resources/jars/modB.jar
diff --git a/src/test/resources/jars/modC.jar b/core/src/test/resources/jars/modC.jar
similarity index 100%
rename from src/test/resources/jars/modC.jar
rename to core/src/test/resources/jars/modC.jar

From 3d2d2c1b5140e0842fa48e4be042b96de16aed47 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 17:26:58 +0200
Subject: [PATCH 220/323] Move zombie classes to dedicated project

---
 .../src/main}/java/se/krka/kahlua/j2se/KahluaTableImpl.java       | 0
 .../src/main}/java/se/krka/kahlua/vm/KahluaTable.java             | 0
 {src/zombie => zombie/src/main}/java/zombie/ZombieHello.java      | 0
 {src/zombie => zombie/src/main}/java/zombie/ZombieUtils.java      | 0
 {src/zombie => zombie/src/main}/java/zombie/ZomboidClass.java     | 0
 {src/zombie => zombie/src/main}/java/zombie/core/Core.java        | 0
 .../zombie => zombie/src/main}/java/zombie/debug/LogSeverity.java | 0
 .../src/main}/java/zombie/gameStates/MainScreenState.java         | 0
 {src/zombie => zombie/src/main}/java/zombie/ui/TextManager.java   | 0
 .../zombie => zombie/src/main}/java/zombie/ui/UIDebugConsole.java | 0
 {src/zombie => zombie/src/main}/java/zombie/ui/UIElement.java     | 0
 {src/zombie => zombie/src/main}/java/zombie/ui/UIFont.java        | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename {src/zombie => zombie/src/main}/java/se/krka/kahlua/j2se/KahluaTableImpl.java (100%)
 rename {src/zombie => zombie/src/main}/java/se/krka/kahlua/vm/KahluaTable.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/ZombieHello.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/ZombieUtils.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/ZomboidClass.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/core/Core.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/debug/LogSeverity.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/gameStates/MainScreenState.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/ui/TextManager.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/ui/UIDebugConsole.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/ui/UIElement.java (100%)
 rename {src/zombie => zombie/src/main}/java/zombie/ui/UIFont.java (100%)

diff --git a/src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java b/zombie/src/main/java/se/krka/kahlua/j2se/KahluaTableImpl.java
similarity index 100%
rename from src/zombie/java/se/krka/kahlua/j2se/KahluaTableImpl.java
rename to zombie/src/main/java/se/krka/kahlua/j2se/KahluaTableImpl.java
diff --git a/src/zombie/java/se/krka/kahlua/vm/KahluaTable.java b/zombie/src/main/java/se/krka/kahlua/vm/KahluaTable.java
similarity index 100%
rename from src/zombie/java/se/krka/kahlua/vm/KahluaTable.java
rename to zombie/src/main/java/se/krka/kahlua/vm/KahluaTable.java
diff --git a/src/zombie/java/zombie/ZombieHello.java b/zombie/src/main/java/zombie/ZombieHello.java
similarity index 100%
rename from src/zombie/java/zombie/ZombieHello.java
rename to zombie/src/main/java/zombie/ZombieHello.java
diff --git a/src/zombie/java/zombie/ZombieUtils.java b/zombie/src/main/java/zombie/ZombieUtils.java
similarity index 100%
rename from src/zombie/java/zombie/ZombieUtils.java
rename to zombie/src/main/java/zombie/ZombieUtils.java
diff --git a/src/zombie/java/zombie/ZomboidClass.java b/zombie/src/main/java/zombie/ZomboidClass.java
similarity index 100%
rename from src/zombie/java/zombie/ZomboidClass.java
rename to zombie/src/main/java/zombie/ZomboidClass.java
diff --git a/src/zombie/java/zombie/core/Core.java b/zombie/src/main/java/zombie/core/Core.java
similarity index 100%
rename from src/zombie/java/zombie/core/Core.java
rename to zombie/src/main/java/zombie/core/Core.java
diff --git a/src/zombie/java/zombie/debug/LogSeverity.java b/zombie/src/main/java/zombie/debug/LogSeverity.java
similarity index 100%
rename from src/zombie/java/zombie/debug/LogSeverity.java
rename to zombie/src/main/java/zombie/debug/LogSeverity.java
diff --git a/src/zombie/java/zombie/gameStates/MainScreenState.java b/zombie/src/main/java/zombie/gameStates/MainScreenState.java
similarity index 100%
rename from src/zombie/java/zombie/gameStates/MainScreenState.java
rename to zombie/src/main/java/zombie/gameStates/MainScreenState.java
diff --git a/src/zombie/java/zombie/ui/TextManager.java b/zombie/src/main/java/zombie/ui/TextManager.java
similarity index 100%
rename from src/zombie/java/zombie/ui/TextManager.java
rename to zombie/src/main/java/zombie/ui/TextManager.java
diff --git a/src/zombie/java/zombie/ui/UIDebugConsole.java b/zombie/src/main/java/zombie/ui/UIDebugConsole.java
similarity index 100%
rename from src/zombie/java/zombie/ui/UIDebugConsole.java
rename to zombie/src/main/java/zombie/ui/UIDebugConsole.java
diff --git a/src/zombie/java/zombie/ui/UIElement.java b/zombie/src/main/java/zombie/ui/UIElement.java
similarity index 100%
rename from src/zombie/java/zombie/ui/UIElement.java
rename to zombie/src/main/java/zombie/ui/UIElement.java
diff --git a/src/zombie/java/zombie/ui/UIFont.java b/zombie/src/main/java/zombie/ui/UIFont.java
similarity index 100%
rename from src/zombie/java/zombie/ui/UIFont.java
rename to zombie/src/main/java/zombie/ui/UIFont.java

From 10f5410c3c7b1a59df73a62deed5e5ac8356cc80 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 17:42:20 +0200
Subject: [PATCH 221/323] Rename root gradle project

---
 settings.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.gradle b/settings.gradle
index b41782d..3537fe4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,4 +4,4 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 }
-rootProject.name = 'pz-storm'
+rootProject.name = 'storm'

From 56521cff90dbe22b7d3390e5f108fad8e98c4707 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 17:42:44 +0200
Subject: [PATCH 222/323] Define gradle subprojects

---
 settings.gradle | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/settings.gradle b/settings.gradle
index 3537fe4..5325229 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,3 +5,15 @@ pluginManagement {
 	}
 }
 rootProject.name = 'storm'
+
+// module containing api classes that should be consumed
+// during compile and runtime in mod projects
+include 'api'
+
+// module containing internal implementation that should not be consumed
+// during compile time in mod projects (consume only during runtime)
+include 'core'
+
+// module containing zomboid dummy classes and classes used in testing
+// this module is only required when testing or building on CI server
+include 'zombie'

From 817594f0616a47a26d49a42f398d4e22a9e0b005 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 17:43:22 +0200
Subject: [PATCH 223/323] Reconfigure gradle projects

---
 api/build.gradle  |  22 +++++++
 build.gradle      | 165 ++++++++++++++++------------------------------
 core/build.gradle |  51 ++++++++++++++
 3 files changed, 129 insertions(+), 109 deletions(-)
 create mode 100644 api/build.gradle
 create mode 100644 core/build.gradle

diff --git a/api/build.gradle b/api/build.gradle
new file mode 100644
index 0000000..7fa49c2
--- /dev/null
+++ b/api/build.gradle
@@ -0,0 +1,22 @@
+apply plugin: 'java-library'
+
+def zombieProject = project(':zombie')
+sourceSets {
+    main {
+        // add dummy zomboid classes to classpath when compiling on CI
+        if (CI) {
+            compileClasspath += zombieProject.sourceSets.main.output
+        }
+    }
+}
+
+dependencies {
+    // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
+    api 'org.apache.logging.log4j:log4j-core:2.14.0'
+
+    // https://mvnrepository.com/artifact/com.google.guava/guava
+    api 'com.google.guava:guava:30.1.1-jre'
+
+    // https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
+    implementation 'org.ow2.asm:asm-tree:9.1'
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 718a750..f5add83 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,131 +1,78 @@
 //file:noinspection SpellCheckingInspection
-import io.pzstorm.capsid.setup.xml.LaunchRunConfig
+
 import io.pzstorm.capsid.setup.VmParameter
+import io.pzstorm.capsid.setup.xml.LaunchRunConfig
 
 plugins {
-	id 'io.pzstorm.capsid' version '0.4.0'
+    id 'io.pzstorm.capsid' version '0.4.0'
 
-	// Plugin that keeps your code spotless with Gradle
-	// https://plugins.gradle.org/plugin/com.diffplug.spotless
-	id "com.diffplug.spotless" version "5.12.1"
+    // Plugin that keeps your code spotless with Gradle
+    // https://plugins.gradle.org/plugin/com.diffplug.spotless
+    id "com.diffplug.spotless" version "5.12.1"
 
-	// https://plugins.gradle.org/plugin/net.ltgt.errorprone
-	id 'net.ltgt.errorprone' version '2.0.1'
+    // https://plugins.gradle.org/plugin/net.ltgt.errorprone
+    id 'net.ltgt.errorprone' version '2.0.1'
 }
-apply plugin: 'com.diffplug.spotless'
-apply from: "https://gist.githubusercontent.com/yooksi/${spotlessGistID}/raw/spotless.gradle"
-
-version '0.1.0'
-
-// is gradle executing on CI server
-def isCI = System.getenv("CI")?: 'false'
+// is gradle executing on CI server?
+def isCI = System.getenv("CI") ?: 'false'
 
-capsid {
-	isModProject = false
-	setProjectRepository('pzstorm', 'storm')
+allprojects {
+    repositories { mavenCentral() }
+    project.ext.set('CI', isCI)
 }
 
-sourceSets {
-	// module containing zomboid dummy classes and classes used in testing
-	// this module is only required by tests and CI compiler
-	zombie {
-		// module should not depend on main module to avoid circular dependency
-		//compileClasspath += sourceSets.main.output
-	}
-	api {
-		// add dummy zomboid classes to classpath when compiling on CI
-		if (isCI) {
-			compileClasspath += sourceSets.zombie.output
-		}
-	}
-	main {
-		// include api classes on compile and runtime classpath
-		compileClasspath += sourceSets.api.output
-		runtimeClasspath += sourceSets.api.output
-
-		// add dummy zomboid classes to classpath when compiling on CI
-		if (isCI) {
-			compileClasspath += sourceSets.zombie.output
-		}
-	}
-	test {
-		// tests need to see classes used in class transformation tests
-		runtimeClasspath += sourceSets.zombie.output + sourceSets.api.output
-		compileClasspath += sourceSets.zombie.output + sourceSets.api.output
-	}
-	// remove media sourceSet created by capsid
-	if (!isCI) {
-		remove(sourceSets.media)
-	}
-}
-configurations {
-	implementation.extendsFrom(api)
-	testImplementation.extendsFrom(api)
-	zombieImplementation.extendsFrom(compileOnly, zomboidImplementation)
-	apiImplementation.extendsFrom(api, errorprone, zombieImplementation)
-}
+subprojects {
+    group 'io.github.pzstorm'
+    version '0.1.0'
 
-dependencies {
-	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
-	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
+    apply plugin: 'java'
+    apply plugin: 'net.ltgt.errorprone'
+    apply plugin: 'com.diffplug.spotless'
+    apply from: "https://gist.githubusercontent.com/yooksi/${spotlessGistID}/raw/spotless.gradle"
 
-	// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
-	testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
+    dependencies {
+        // https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
+        errorprone 'com.google.errorprone:error_prone_core:2.6.0'
 
-	// https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils
-	testImplementation 'io.github.java-diff-utils:java-diff-utils:4.10'
+        // https://mvnrepository.com/artifact/com.google.errorprone/javac
+        errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
 
-	// https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
-	errorprone 'com.google.errorprone:error_prone_core:2.6.0'
+        // https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
+        compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
-	// https://mvnrepository.com/artifact/com.google.errorprone/javac
-	errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
-
-	// https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
-	api 'org.apache.logging.log4j:log4j-core:2.14.0'
-
-	// https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
-	api 'org.ow2.asm:asm-tree:9.1'
-
-	// https://mvnrepository.com/artifact/com.google.guava/guava
-	api 'com.google.guava:guava:30.1.1-jre'
-
-	// https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305
-	compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
-
-	// https://mvnrepository.com/artifact/org.jetbrains/annotations
-	compileOnly 'org.jetbrains:annotations:20.1.0'
-
-	// https://mvnrepository.com/artifact/org.ow2.asm/asm
-	implementation 'org.ow2.asm:asm:9.1'
+        // https://mvnrepository.com/artifact/org.jetbrains/annotations
+        compileOnly 'org.jetbrains:annotations:20.1.0'
+    }
+}
 
-	// https://mvnrepository.com/artifact/org.ow2.asm/asm-util
-	implementation 'org.ow2.asm:asm-util:9.1'
+capsid {
+    isModProject = false
+    setProjectRepository('pzstorm', 'storm')
 }
 
-test {
-	useJUnitPlatform()
-	testLogging.events "passed", "skipped", "failed"
+sourceSets {
+    // remove media sourceSet created by capsid
+    remove(sourceSets.media)
 }
 
 tasks.createRunConfigurations.configure {
-	actions.clear()
-	doLast {
-		def vmParameterBuilder = new VmParameter.Builder()
-		def os = org.gradle.internal.os.OperatingSystem.current()
-		if (os == org.gradle.internal.os.OperatingSystem.LINUX) {
-			vmParameterBuilder = vmParameterBuilder
-					.withJavaLibraryPaths(gameDir as String, "${gameDir}/linux64" as String, "${gameDir}/jre64/lib/amd64" as String)
-					.withLwjglLibraryPaths(gameDir)
-		}
-		//@formatter:off
-		LaunchRunConfig launchStorm = new LaunchRunConfig(
-				"Launch Storm", "io.pzstorm.storm.core.StormLauncher",
-				vmParameterBuilder, [
-						Main: new File(file(gameDir), "logs/storm/main.log").toPath() ,
-						Debug: new File(file(gameDir), "logs/storm/debug.log").toPath()] as Map
-		)//@formatter:on
-		launchStorm.vmParamBuilder.build()
-		launchStorm.configure(getProject()).writeToFile()
-	}
+    actions.clear()
+    doLast {
+        def vmParameterBuilder = new VmParameter.Builder()
+        def os = org.gradle.internal.os.OperatingSystem.current()
+        if (os == org.gradle.internal.os.OperatingSystem.LINUX) {
+            vmParameterBuilder = vmParameterBuilder
+                    .withJavaLibraryPaths(gameDir as String, "${gameDir}/linux64" as String, "${gameDir}/jre64/lib/amd64" as String)
+                    .withLwjglLibraryPaths(gameDir)
+        }
+        //@formatter:off
+        LaunchRunConfig launchStorm = new LaunchRunConfig(
+                "Launch Storm", "io.pzstorm.storm.core.StormLauncher",
+                vmParameterBuilder, [
+                Main: new File(file(gameDir), "logs/storm/main.log").toPath() ,
+                Debug: new File(file(gameDir), "logs/storm/debug.log").toPath()] as Map
+        )//@formatter:on
+        launchStorm.vmParamBuilder.build()
+        launchStorm.configure(getProject()).writeToFile()
+    }
 }
diff --git a/core/build.gradle b/core/build.gradle
new file mode 100644
index 0000000..9f9a77f
--- /dev/null
+++ b/core/build.gradle
@@ -0,0 +1,51 @@
+def apiProject = project(':api')
+def zombieProject = project(':zombie')
+
+dependencies {
+    // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
+
+    // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
+
+    // https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils
+    testImplementation 'io.github.java-diff-utils:java-diff-utils:4.10'
+
+    // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
+    implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
+
+    // https://mvnrepository.com/artifact/com.google.guava/guava
+    implementation 'com.google.guava:guava:30.1.1-jre'
+
+    // https://mvnrepository.com/artifact/org.ow2.asm/asm
+    implementation 'org.ow2.asm:asm:9.1'
+
+    // https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
+    implementation 'org.ow2.asm:asm-tree:9.1'
+
+    // https://mvnrepository.com/artifact/org.ow2.asm/asm-util
+    implementation 'org.ow2.asm:asm-util:9.1'
+}
+
+test {
+    useJUnitPlatform()
+    testLogging.events "passed", "skipped", "failed"
+}
+
+sourceSets {
+    main {
+        // include api classes on compile and runtime classpath
+        compileClasspath += apiProject.sourceSets.main.output
+        runtimeClasspath += apiProject.sourceSets.main.output
+
+        // add dummy zomboid classes to classpath when compiling on CI
+        if (CI) {
+            compileClasspath += zombieProject.sourceSets.main.output
+        }
+    }
+    test {
+        // tests need to see classes used in class transformation tests
+        runtimeClasspath += zombieProject.sourceSets.main.output + apiProject.sourceSets.main.output
+        compileClasspath += zombieProject.sourceSets.main.output + apiProject.sourceSets.main.output
+    }
+}

From 00b49b68cf6af05ce9214c050d51ea90cb20c786 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 17:43:39 +0200
Subject: [PATCH 224/323] Do minor script formatting

---
 settings.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 5325229..7c3a4ba 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,8 @@
 pluginManagement {
-	repositories {
-		mavenLocal()
-		gradlePluginPortal()
-	}
+    repositories {
+        mavenLocal()
+        gradlePluginPortal()
+    }
 }
 rootProject.name = 'storm'
 

From 20ab28b64f06b21cb7751bde6999c7580cb9f3c3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 18:07:50 +0200
Subject: [PATCH 225/323] Refactor gradle build scripts

---
 api/build.gradle  | 12 +-----------
 build.gradle      | 26 ++++++++++++++++++--------
 core/build.gradle | 26 +++++---------------------
 3 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/api/build.gradle b/api/build.gradle
index 7fa49c2..773e58d 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,15 +1,5 @@
 apply plugin: 'java-library'
 
-def zombieProject = project(':zombie')
-sourceSets {
-    main {
-        // add dummy zomboid classes to classpath when compiling on CI
-        if (CI) {
-            compileClasspath += zombieProject.sourceSets.main.output
-        }
-    }
-}
-
 dependencies {
     // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
     api 'org.apache.logging.log4j:log4j-core:2.14.0'
@@ -19,4 +9,4 @@ dependencies {
 
     // https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
     implementation 'org.ow2.asm:asm-tree:9.1'
-}
\ No newline at end of file
+}
diff --git a/build.gradle b/build.gradle
index f5add83..f0e360a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,16 +21,26 @@ allprojects {
     project.ext.set('CI', isCI)
 }
 
-subprojects {
-    group 'io.github.pzstorm'
-    version '0.1.0'
+// make sure to configure zombie subproject first because other
+// subprojects depend on including it's sourceset output
+def zombieProject = project(':zombie')
+subprojects.sort {
+    return it.name.equals('zombie') ? 0 : 1
+}.each {
+    it.group 'io.github.pzstorm'
+    it.version '0.1.0'
 
-    apply plugin: 'java'
-    apply plugin: 'net.ltgt.errorprone'
-    apply plugin: 'com.diffplug.spotless'
-    apply from: "https://gist.githubusercontent.com/yooksi/${spotlessGistID}/raw/spotless.gradle"
+    it.apply plugin: 'java'
+    it.apply plugin: 'net.ltgt.errorprone'
+    it.apply plugin: 'com.diffplug.spotless'
+    it.apply from: "https://gist.githubusercontent.com/yooksi/${spotlessGistID}/raw/spotless.gradle"
 
-    dependencies {
+    // add dummy zomboid classes to classpath when compiling on CI
+    if (isCI && !it.name.equals('zombie')) {
+        it.sourceSets.main.compileClasspath += zombieProject.sourceSets.main.output
+    }
+
+    it.dependencies {
         // https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
         errorprone 'com.google.errorprone:error_prone_core:2.6.0'
 
diff --git a/core/build.gradle b/core/build.gradle
index 9f9a77f..58f75b1 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -11,20 +11,14 @@ dependencies {
     // https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils
     testImplementation 'io.github.java-diff-utils:java-diff-utils:4.10'
 
-    // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
-    implementation 'org.apache.logging.log4j:log4j-core:2.14.0'
-
-    // https://mvnrepository.com/artifact/com.google.guava/guava
-    implementation 'com.google.guava:guava:30.1.1-jre'
-
     // https://mvnrepository.com/artifact/org.ow2.asm/asm
     implementation 'org.ow2.asm:asm:9.1'
 
-    // https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
-    implementation 'org.ow2.asm:asm-tree:9.1'
-
     // https://mvnrepository.com/artifact/org.ow2.asm/asm-util
     implementation 'org.ow2.asm:asm-util:9.1'
+
+    implementation apiProject
+    testImplementation apiProject, zombieProject
 }
 
 test {
@@ -33,19 +27,9 @@ test {
 }
 
 sourceSets {
-    main {
-        // include api classes on compile and runtime classpath
-        compileClasspath += apiProject.sourceSets.main.output
-        runtimeClasspath += apiProject.sourceSets.main.output
-
-        // add dummy zomboid classes to classpath when compiling on CI
-        if (CI) {
-            compileClasspath += zombieProject.sourceSets.main.output
-        }
-    }
     test {
         // tests need to see classes used in class transformation tests
-        runtimeClasspath += zombieProject.sourceSets.main.output + apiProject.sourceSets.main.output
-        compileClasspath += zombieProject.sourceSets.main.output + apiProject.sourceSets.main.output
+        runtimeClasspath += zombieProject.sourceSets.main.output
+        compileClasspath += zombieProject.sourceSets.main.output
     }
 }

From cbe2fbdde68864391db2f362cb8bd6cfcabc7bba Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 18:08:05 +0200
Subject: [PATCH 226/323] Update test run configurations

---
 .idea/runConfigurations/Run_All_Tests.xml         | 4 ++--
 .idea/runConfigurations/Run_Integration_Tests.xml | 2 +-
 .idea/runConfigurations/Run_Unit_Tests.xml        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.idea/runConfigurations/Run_All_Tests.xml b/.idea/runConfigurations/Run_All_Tests.xml
index 28c8c2a..bc59005 100644
--- a/.idea/runConfigurations/Run_All_Tests.xml
+++ b/.idea/runConfigurations/Run_All_Tests.xml
@@ -1,10 +1,10 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run All Tests" type="JUnit" factoryName="JUnit">
-    <module name="pz-storm.test" />
+    <module name="storm.core.test" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="directory" />
-    <dir value="$PROJECT_DIR$/src/test" />
+    <dir value="$PROJECT_DIR$/core/src/test" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Run_Integration_Tests.xml b/.idea/runConfigurations/Run_Integration_Tests.xml
index 6a6f75c..9fb7826 100644
--- a/.idea/runConfigurations/Run_Integration_Tests.xml
+++ b/.idea/runConfigurations/Run_Integration_Tests.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Integration Tests" type="JUnit" factoryName="JUnit">
-    <module name="pz-storm.test" />
+    <module name="storm.core.test" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="tags" />
diff --git a/.idea/runConfigurations/Run_Unit_Tests.xml b/.idea/runConfigurations/Run_Unit_Tests.xml
index 1fc729b..abd6c28 100644
--- a/.idea/runConfigurations/Run_Unit_Tests.xml
+++ b/.idea/runConfigurations/Run_Unit_Tests.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Unit Tests" type="JUnit" factoryName="JUnit">
-    <module name="pz-storm.test" />
+    <module name="storm.core.test" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="tags" />

From b2f1288fb0df94141f9cd5b4ddb2c99180ef2317 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 19:02:06 +0200
Subject: [PATCH 227/323] Add missing zomboid dependencies

---
 build.gradle      | 2 +-
 core/build.gradle | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f0e360a..246d6b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ subprojects.sort {
     if (isCI && !it.name.equals('zombie')) {
         it.sourceSets.main.compileClasspath += zombieProject.sourceSets.main.output
     }
-
+    // declare dependencies common to all subprojects
     it.dependencies {
         // https://mvnrepository.com/artifact/com.google.errorprone/error_prone_core
         errorprone 'com.google.errorprone:error_prone_core:2.6.0'
diff --git a/core/build.gradle b/core/build.gradle
index 58f75b1..c9d0b4b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,6 +1,7 @@
 def apiProject = project(':api')
 def zombieProject = project(':zombie')
 
+def rootConfigurations = rootProject.configurations;
 dependencies {
     // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
@@ -19,6 +20,9 @@ dependencies {
 
     implementation apiProject
     testImplementation apiProject, zombieProject
+
+    implementation files(rootConfigurations.zomboidImplementation.files)
+    runtimeOnly files(rootConfigurations.zomboidRuntimeOnly.files)
 }
 
 test {

From 60fb2ea0ef2b63e865d0e134a049b52a6ccdc2f1 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 21:21:08 +0200
Subject: [PATCH 228/323] Stop generating root project jar

---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 246d6b2..5b4adbe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -86,3 +86,7 @@ tasks.createRunConfigurations.configure {
         launchStorm.configure(getProject()).writeToFile()
     }
 }
+
+// root project does not produce any artifacts on it's own,
+// it is just an aggregate task for subproject jar tasks
+jar.actions.clear()

From 63eb0914c563dda1ad135c0a7ad718e535612351 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 21:21:40 +0200
Subject: [PATCH 229/323] Add and apply maven-publish plugin

---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 5b4adbe..f7bd4df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,9 @@ plugins {
 
     // https://plugins.gradle.org/plugin/net.ltgt.errorprone
     id 'net.ltgt.errorprone' version '2.0.1'
+
+    // https://docs.gradle.org/current/userguide/publishing_maven.html
+    id 'maven-publish'
 }
 // is gradle executing on CI server?
 def isCI = System.getenv("CI") ?: 'false'
@@ -31,6 +34,7 @@ subprojects.sort {
     it.version '0.1.0'
 
     it.apply plugin: 'java'
+    it.apply plugin: 'maven-publish'
     it.apply plugin: 'net.ltgt.errorprone'
     it.apply plugin: 'com.diffplug.spotless'
     it.apply from: "https://gist.githubusercontent.com/yooksi/${spotlessGistID}/raw/spotless.gradle"

From f4221436e8b777c814aea521e5d73f7893e17b6d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 21:23:00 +0200
Subject: [PATCH 230/323] Set jar task archiveBaseName

---
 api/build.gradle  | 3 +++
 core/build.gradle | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/api/build.gradle b/api/build.gradle
index 773e58d..dd5ccd4 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -10,3 +10,6 @@ dependencies {
     // https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
     implementation 'org.ow2.asm:asm-tree:9.1'
 }
+
+jar.archiveBaseName.set('storm-api')
+
diff --git a/core/build.gradle b/core/build.gradle
index c9d0b4b..3b694e4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -37,3 +37,6 @@ sourceSets {
         compileClasspath += zombieProject.sourceSets.main.output
     }
 }
+
+jar.archiveBaseName.set('storm-core')
+

From c21c3eef2083e7fe3fd653049a28c35c62c08dba Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 21:28:28 +0200
Subject: [PATCH 231/323] Define project maven publications

---
 api/build.gradle  | 8 ++++++++
 core/build.gradle | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/api/build.gradle b/api/build.gradle
index dd5ccd4..dccdc89 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -13,3 +13,11 @@ dependencies {
 
 jar.archiveBaseName.set('storm-api')
 
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifactId 'storm-api'
+        }
+    }
+}
diff --git a/core/build.gradle b/core/build.gradle
index 3b694e4..ebf135c 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -40,3 +40,11 @@ sourceSets {
 
 jar.archiveBaseName.set('storm-core')
 
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifactId 'storm-core'
+        }
+    }
+}

From 1dcefd67bc70e734b21549495a374c1267349972 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 21:28:43 +0200
Subject: [PATCH 232/323] Enable publishing to mavenLocal

---
 build.gradle | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index f7bd4df..71b1353 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,9 +39,16 @@ subprojects.sort {
     it.apply plugin: 'com.diffplug.spotless'
     it.apply from: "https://gist.githubusercontent.com/yooksi/${spotlessGistID}/raw/spotless.gradle"
 
-    // add dummy zomboid classes to classpath when compiling on CI
-    if (isCI && !it.name.equals('zombie')) {
-        it.sourceSets.main.compileClasspath += zombieProject.sourceSets.main.output
+    if (!it.name.equals('zombie'))
+    {
+        // add dummy zomboid classes to classpath when compiling on CI
+        if (isCI) {
+            it.sourceSets.main.compileClasspath += zombieProject.sourceSets.main.output
+        }
+        it.publishing {
+            // enable publishing to mavenLocal repository
+            repositories { mavenLocal() }
+        }
     }
     // declare dependencies common to all subprojects
     it.dependencies {

From 0789db781ba8e58da31bb5f2372e7cc2ce041a97 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 21:29:05 +0200
Subject: [PATCH 233/323] Assemble jars in root build directory

---
 build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.gradle b/build.gradle
index 71b1353..153f59c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,6 +45,9 @@ subprojects.sort {
         if (isCI) {
             it.sourceSets.main.compileClasspath += zombieProject.sourceSets.main.output
         }
+        // assemble project jars in root build directory
+        it.jar.getDestinationDirectory().set(new File(buildDir, 'libs'))
+
         it.publishing {
             // enable publishing to mavenLocal repository
             repositories { mavenLocal() }

From 1a9f43f185c339c984efb9d9fff65440dfb49d28 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 22:25:01 +0200
Subject: [PATCH 234/323] Do minor script code cleaning

---
 core/build.gradle | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index ebf135c..3e10fc4 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -1,7 +1,7 @@
 def apiProject = project(':api')
 def zombieProject = project(':zombie')
 
-def rootConfigurations = rootProject.configurations;
+def rootConfigurations = rootProject.configurations
 dependencies {
     // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
@@ -30,14 +30,6 @@ test {
     testLogging.events "passed", "skipped", "failed"
 }
 
-sourceSets {
-    test {
-        // tests need to see classes used in class transformation tests
-        runtimeClasspath += zombieProject.sourceSets.main.output
-        compileClasspath += zombieProject.sourceSets.main.output
-    }
-}
-
 jar.archiveBaseName.set('storm-core')
 
 publishing {

From 872773e51925f99170187851940b22521bf3cd1d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 22:25:23 +0200
Subject: [PATCH 235/323] Apply filter to core dependencies

---
 core/build.gradle | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 3e10fc4..8ad15d3 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -21,8 +21,12 @@ dependencies {
     implementation apiProject
     testImplementation apiProject, zombieProject
 
-    implementation files(rootConfigurations.zomboidImplementation.files)
-    runtimeOnly files(rootConfigurations.zomboidRuntimeOnly.files)
+    implementation files(rootConfigurations.zomboidImplementation.files).filter {
+        return !(it.name.equals('media'))
+    }
+    runtimeOnly files(rootConfigurations.zomboidRuntimeOnly.files).filter {
+        return !(it.name.contains('test') || it.name.contains('junit'))
+    }
 }
 
 test {

From b5d27af3fcc740c603a41ef2b9412307329e22dd Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 23:03:00 +0200
Subject: [PATCH 236/323] Fix media sourceSet not found on CI

https://github.com/pzstorm/storm/runs/2595804632?check_suite_focus=true#step:5:204
---
 build.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 153f59c..e7c001c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,10 @@ capsid {
 
 sourceSets {
     // remove media sourceSet created by capsid
-    remove(sourceSets.media)
+    def mediaSourceSet = sourceSets.findByName('media')
+    if (mediaSourceSet != null) {
+        remove(mediaSourceSet)
+    }
 }
 
 tasks.createRunConfigurations.configure {

From 54ad187bfa5578f367b593c68b99b1081decf55c Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 16 May 2021 23:06:44 +0200
Subject: [PATCH 237/323] Fix configuration not found on CI

https://github.com/pzstorm/storm/runs/2595826607?check_suite_focus=true#step:5:200
---
 core/build.gradle | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index 8ad15d3..34eae3b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -21,11 +21,13 @@ dependencies {
     implementation apiProject
     testImplementation apiProject, zombieProject
 
-    implementation files(rootConfigurations.zomboidImplementation.files).filter {
-        return !(it.name.equals('media'))
-    }
-    runtimeOnly files(rootConfigurations.zomboidRuntimeOnly.files).filter {
-        return !(it.name.contains('test') || it.name.contains('junit'))
+    if (!CI) {
+        implementation files(rootConfigurations.zomboidImplementation.files).filter {
+            return !(it.name.equals('media'))
+        }
+        runtimeOnly files(rootConfigurations.zomboidRuntimeOnly.files).filter {
+            return !(it.name.contains('test') || it.name.contains('junit'))
+        }
     }
 }
 

From 1cf0538751abd0297416d48b839a20e62f7b08ee Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 17 May 2021 18:49:51 +0200
Subject: [PATCH 238/323] Fix incorrectly set CI ext property

---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e7c001c..1c94125 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,8 @@ plugins {
     id 'maven-publish'
 }
 // is gradle executing on CI server?
-def isCI = System.getenv("CI") ?: 'false'
+String sIsCI = System.getenv("CI")
+boolean isCI = sIsCI != null ? Boolean.parseBoolean(sIsCI) : false
 
 allprojects {
     repositories { mavenCentral() }

From 27fbf1b1f5886370e193b3087d12b711ff2422af Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 17 May 2021 18:50:21 +0200
Subject: [PATCH 239/323] Fix API module missing dependencies

---
 api/build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/api/build.gradle b/api/build.gradle
index dccdc89..73bb5c8 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'java-library'
 
+def rootConfigurations = rootProject.configurations
 dependencies {
     // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
     api 'org.apache.logging.log4j:log4j-core:2.14.0'
@@ -9,6 +10,12 @@ dependencies {
 
     // https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
     implementation 'org.ow2.asm:asm-tree:9.1'
+
+    if (!CI) {
+        compileOnly files(rootConfigurations.zomboidImplementation.files).filter {
+            return !(it.name.equals('media'))
+        }
+    }
 }
 
 jar.archiveBaseName.set('storm-api')

From aca13739bca46801a163e96ef000c9ca9b136217 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 17 May 2021 19:58:47 +0200
Subject: [PATCH 240/323] Set module Java language version

---
 build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.gradle b/build.gradle
index 1c94125..b07d8c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,6 +40,11 @@ subprojects.sort {
     it.apply plugin: 'com.diffplug.spotless'
     it.apply from: "https://gist.githubusercontent.com/yooksi/${spotlessGistID}/raw/spotless.gradle"
 
+    it.java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(8))
+        }
+    }
     if (!it.name.equals('zombie'))
     {
         // add dummy zomboid classes to classpath when compiling on CI

From 665fe10aed2718d587bebc9825f4d6a3c6a930a1 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 17 May 2021 20:15:11 +0200
Subject: [PATCH 241/323] Relax core class encapsulation

These classes need to have public access so they can be accessed easier with reflection.
---
 .../java/io/pzstorm/storm/core/StormModLoader.java     | 10 +++++-----
 .../java/io/pzstorm/storm/core/StormModRegistry.java   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index c8c3924..c6b5378 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -34,7 +34,7 @@
  * <li>Load mod classes with {@link StormClassLoader}.</li>
  * </ul>
  */
-class StormModLoader extends URLClassLoader {
+public class StormModLoader extends URLClassLoader {
 
 	/**
 	 * This catalog stores {@link ModJar} instances mapped to directory names.
@@ -55,7 +55,7 @@ class StormModLoader extends URLClassLoader {
 		super(ObjectArrays.concat(urls, getJarResourcePaths(), URL.class));
 	}
 
-	StormModLoader() {
+	public StormModLoader() {
 		super(getJarResourcePaths());
 	}
 
@@ -81,7 +81,7 @@ private static URL[] getJarResourcePaths() {
 	 * @throws IOException if unable to create {@code Zomboid/mods} directory structure,
 	 * 		an I/O error occurred while walking file tree or constructing {@link ModJar} instance.
 	 */
-	static void catalogModJars() throws IOException {
+	public static void catalogModJars() throws IOException {
 
 		File zomboidLocalDir = getUserHomePath().resolve("Zomboid").toFile();
 
@@ -161,7 +161,7 @@ private static Set<Path> listJarsInDirectory(Path modDir) {
 	 *
 	 * @throws IOException if an error occurred when reading from input stream.
 	 */
-	static void loadModMetadata() throws IOException {
+	public static void loadModMetadata() throws IOException {
 
 		// clear map before entering new data
 		METADATA_CATALOG.clear();
@@ -209,7 +209,7 @@ else if (modVersion.isEmpty())
 	 * Before loading classes it is important to populate the jar catalog with
 	 * {@link #catalogModJars()} method, otherwise this method will only clear the class catalog.
 	 */
-	static void loadModClasses() {
+	public static void loadModClasses() {
 
 		// clear map before entering new data
 		CLASS_CATALOG.clear();
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
index c7cb6f8..d83efb1 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
@@ -14,7 +14,7 @@
 /**
  * This class is responsible for creating and registering {@link ZomboidMod} instances.
  */
-class StormModRegistry {
+public class StormModRegistry {
 
 	private static final Map<String, ZomboidMod> MOD_REGISTRY = new HashMap<>();
 
@@ -28,7 +28,7 @@ class StormModRegistry {
 	 * @throws ReflectiveOperationException if an exception was thrown while
 	 * 		instantiating {@code ZomboidMod} implementation class.
 	 */
-	static void registerMods() throws ReflectiveOperationException {
+	public static void registerMods() throws ReflectiveOperationException {
 
 		for (Map.Entry<String, ImmutableSet<Class<?>>> entry : StormModLoader.CLASS_CATALOG.entrySet())
 		{

From 36ba6119f0513162545a7e4394763e4be1b385e0 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 17 May 2021 20:25:56 +0200
Subject: [PATCH 242/323] Add logging to StormModLoader class

---
 .../io/pzstorm/storm/core/StormModLoader.java | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index c6b5378..c69bc47 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -83,12 +83,15 @@ private static URL[] getJarResourcePaths() {
 	 */
 	public static void catalogModJars() throws IOException {
 
+		StormLogger.info(String.format("%s mod jar catalog", JAR_CATALOG.isEmpty() ? "Building" : "Rebuilding"));
 		File zomboidLocalDir = getUserHomePath().resolve("Zomboid").toFile();
 
 		if (!zomboidLocalDir.exists() && !zomboidLocalDir.mkdir()) {
 			throw new IOException("Unable to create 'Zomboid' directory in '" + getUserHomePath() + '\'');
 		}
 		File zomboidModsDir = new File(zomboidLocalDir, "mods");
+		StormLogger.debug("Cataloging mod jars in '" + zomboidModsDir.getPath() + '\'');
+
 		if (!zomboidModsDir.exists() && !zomboidModsDir.mkdir()) {
 			throw new IOException("Unable to create 'mods' directory in '" + zomboidModsDir.toPath() + '\'');
 		}
@@ -98,6 +101,7 @@ public static void catalogModJars() throws IOException {
 		for (Path modDir : listModDirectories(zomboidModsDir))
 		{
 			Set<ModJar> modJars = new HashSet<>();
+			String modFileName = modDir.getFileName().toString();
 			try (Stream<Path> stream = Files.walk(modDir, 1))
 			{
 				Set<Path> files = stream.filter(Files::isRegularFile).collect(Collectors.toSet());
@@ -109,7 +113,11 @@ public static void catalogModJars() throws IOException {
 						modJars.add(new ModJar(modJar.toFile()));
 					}
 					JAR_CATALOG.put(modDir.toFile().getName(), ImmutableSet.copyOf(modJars));
+
+					StormLogger.debug("Created new jar catalog entry:");
+					StormLogger.debug(String.format("Found %d jars in mod directory '%s'", modJars.size(), modFileName));
 				}
+				else StormLogger.warn("Skipped jar catalog entry for mod directory '" + modFileName + '\'');
 			}
 		}
 	}
@@ -163,6 +171,8 @@ private static Set<Path> listJarsInDirectory(Path modDir) {
 	 */
 	public static void loadModMetadata() throws IOException {
 
+		StormLogger.info(String.format("%s mod metadata catalog", JAR_CATALOG.isEmpty() ? "Building" : "Rebuilding"));
+
 		// clear map before entering new data
 		METADATA_CATALOG.clear();
 
@@ -178,6 +188,7 @@ public static void loadModMetadata() throws IOException {
 			}
 			Properties modInfo = new Properties();
 			modInfo.load(new FileInputStream(modInfoFile));
+			StormLogger.debug("Found metadata file for entry '" + modEntry + '\'');
 
 			String modName = modInfo.getProperty("name");
 			if (Strings.isNullOrEmpty(modName))
@@ -199,7 +210,10 @@ else if (modVersion.isEmpty())
 				StormLogger.warn(message, modName);
 				modVersion = "0.1.0";
 			}
-			METADATA_CATALOG.put(modName, new ModMetadata(modName, new ModVersion(modVersion)));
+			ModMetadata metadata = new ModMetadata(modName, new ModVersion(modVersion));
+			METADATA_CATALOG.put(modName, metadata);
+
+			StormLogger.debug("Created new metadata catalog entry: " + metadata);
 		}
 	}
 
@@ -211,6 +225,8 @@ else if (modVersion.isEmpty())
 	 */
 	public static void loadModClasses() {
 
+		StormLogger.info(String.format("%s mod class catalog", JAR_CATALOG.isEmpty() ? "Building" : "Rebuilding"));
+
 		// clear map before entering new data
 		CLASS_CATALOG.clear();
 
@@ -238,6 +254,9 @@ public static void loadModClasses() {
 				}
 			}
 			CLASS_CATALOG.put(entry.getKey(), ImmutableSet.copyOf(modClasses));
+
+			StormLogger.debug("Created new metadata catalog entry:");
+			StormLogger.debug(String.format("Found %d classes in mod directory '%s'", modClasses.size(), entry.getKey()));
 		}
 	}
 

From 9b159bb8dcdb8feac071d78edf64e79e6e74186e Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 17 May 2021 20:26:52 +0200
Subject: [PATCH 243/323] Initialize logger before printing first log

---
 .../main/java/io/pzstorm/storm/core/StormLauncher.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 1316ee7..d372c5b 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -27,16 +27,15 @@ class StormLauncher {
 	 */
 	public static void main(String[] args) throws ReflectiveOperationException {
 
-		StormLogger.debug("Preparing to launch Project Zomboid");
+		// initialize logging system
+		StormLogger.initialize();
 
+		StormLogger.debug("Preparing to launch Project Zomboid...");
 		StormClassLoader classLoader = StormBootstrap.CLASS_LOADER;
-		Class.forName("io.pzstorm.storm.core.StormClassTransformers", true, classLoader);
 
-		// load ZomboidLogger with StormClassLoader
+		Class.forName("io.pzstorm.storm.core.StormClassTransformers", true, classLoader);
 		Class.forName("io.pzstorm.storm.logging.ZomboidLogger", true, classLoader);
 
-		// initialize logging system
-		StormLogger.initialize();
 
 		// initialize dispatcher system
 		Class<?> eventHandler = classLoader.loadClass("io.pzstorm.storm.event.StormEventHandler");

From 71df59b9e89f06c2a6bd2a25cf067259edb4fd4b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 17 May 2021 23:08:36 +0200
Subject: [PATCH 244/323] Start loading and registering mods

---
 .../io/pzstorm/storm/core/StormBootstrap.java | 40 +++++++++++++++++++
 .../io/pzstorm/storm/core/StormLauncher.java  |  6 ++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index 02a6d55..57cae38 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -1,6 +1,8 @@
 package io.pzstorm.storm.core;
 
 import java.lang.reflect.Method;
+import java.net.URLClassLoader;
+import java.util.Set;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -19,6 +21,11 @@ public class StormBootstrap {
 	 */
 	public static final StormClassLoader CLASS_LOADER = new StormClassLoader();
 
+	/**
+	 * Loaded and initialized {@link StormModLoader} {@code Class}.
+	 */
+	public static final Class<?> MOD_LOADER_CLASS;
+
 	/**
 	 * Loaded and initialized {@link StormClassTransformer} {@code Class}. To transform specific
 	 * classes during load time (<i>on-fly</i>) {@link StormClassLoader} has to read and invoke
@@ -58,6 +65,9 @@ public class StormBootstrap {
 	static
 	{
 		try {
+			MOD_LOADER_CLASS = Class.forName(
+					"io.pzstorm.storm.core.StormModLoader", true, CLASS_LOADER
+			);
 			TRANSFORMER_CLASS = Class.forName(
 					"io.pzstorm.storm.core.StormClassTransformer", true, CLASS_LOADER
 			);
@@ -104,4 +114,34 @@ static byte[] invokeTransformer(Object transformer, byte[] rawClass) throws Refl
 	static boolean hasLoaded() {
 		return hasLoaded;
 	}
+
+	/**
+	 * Use {@link StormModLoader} to catalog mod components and {@link StormModRegistry}
+	 * to register mod instances from cataloged classes. This method can be called multiple
+	 * times, for example when Storm wants to load new mods from local directory.
+	 *
+	 * @throws ReflectiveOperationException if an error occurred while retrieving or invoking methods.
+	 */
+	@SuppressWarnings("unchecked")
+	static void loadAndRegisterMods() throws ReflectiveOperationException {
+
+		MOD_LOADER_CLASS.getDeclaredMethod("catalogModJars").invoke(null);
+		MOD_LOADER_CLASS.getDeclaredMethod("loadModMetadata").invoke(null);
+
+		// catalogs were updated so update resource paths for StormClassLoader
+		StormBootstrap.CLASS_LOADER.setModResourceLoader(
+				(URLClassLoader) MOD_LOADER_CLASS.getConstructor().newInstance()
+		);
+		MOD_LOADER_CLASS.getDeclaredMethod("loadModClasses").invoke(null);
+
+		Class<?> modRegistry = Class.forName("io.pzstorm.storm.core.StormModRegistry", true, CLASS_LOADER);
+		modRegistry.getDeclaredMethod("registerMods").invoke(null);
+
+		// this class should have already been initialized, so just get the reference
+		Class<?> zomboidModClass = Class.forName("io.pzstorm.storm.mod.ZomboidMod", false, CLASS_LOADER);
+
+		for (Object mod : (Set<Object>) modRegistry.getDeclaredMethod("getRegisteredMods").invoke(null)) {
+			zomboidModClass.getDeclaredMethod("registerEventHandlers").invoke(mod);
+		}
+	}
 }
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index d372c5b..b0dde05 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -1,9 +1,9 @@
 package io.pzstorm.storm.core;
 
-import java.lang.reflect.Method;
-
 import io.pzstorm.storm.logging.StormLogger;
 
+import java.lang.reflect.Method;
+
 class StormLauncher {
 
 	/**
@@ -36,6 +36,8 @@ public static void main(String[] args) throws ReflectiveOperationException {
 		Class.forName("io.pzstorm.storm.core.StormClassTransformers", true, classLoader);
 		Class.forName("io.pzstorm.storm.logging.ZomboidLogger", true, classLoader);
 
+		// load and register all local mods found in user.home
+		StormBootstrap.loadAndRegisterMods();
 
 		// initialize dispatcher system
 		Class<?> eventHandler = classLoader.loadClass("io.pzstorm.storm.event.StormEventHandler");

From cbb14d6df8f4b483ca74657f2a492d34ea268bae Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:13:31 +0200
Subject: [PATCH 245/323] Fix logger formatting formatted message

Error was thrown when formatting messages that contain '%' characters.
---
 core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java b/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
index 51e48c6..db6d8fd 100644
--- a/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
+++ b/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
@@ -188,7 +188,7 @@ public static void printf(Level level, String format, Object... params) {
 	 * @param message the message to log.
 	 */
 	public static void printf(String level, String message) {
-		LOGGER.printf(LogSeverity.getForName(level, LogSeverity.GENERAL), message);
+		LOGGER.log(LogSeverity.getForName(level, LogSeverity.GENERAL), message);
 	}
 
 	/**

From 25517eda720a715beba89417a4049e5a0d5f58f1 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:16:14 +0200
Subject: [PATCH 246/323] Support expanding method max stack

---
 .../storm/core/StormClassTransformers.java    | 65 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index 805e7e8..dbc3d27 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -3,15 +3,17 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import io.pzstorm.storm.hook.*;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
 
-import io.pzstorm.storm.hook.OnMainScreenRenderHook;
-import io.pzstorm.storm.hook.OnUIElementPreRenderHook;
-import io.pzstorm.storm.hook.StormHook;
 import io.pzstorm.storm.patch.DebugLogPatch;
 import io.pzstorm.storm.patch.DebugLogStreamPatch;
 import io.pzstorm.storm.patch.ZomboidPatch;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.MethodNode;
 
 /**
  * This class defines, initializes and stores {@link StormClassTransformer} instances.
@@ -74,6 +76,52 @@ StormClassTransformer transform() {
 		});
 	}
 
+	/**
+	 * Create and register a new {@link StormClassTransformer} with given name that
+	 * installs a {@link StormHook} designated by method parameter. Additionally this
+	 * method also defines the maximum stack size of methods in visited class.
+	 *
+	 * @param className name of the target class to transform.
+	 * @param hook {@link StormHook} to install with transformation.
+	 * @param maxStacks maximum stack size mapped to method data.
+	 */
+	private static void registerTransformer(String className, StormHook hook, Map<MethodData, Integer> maxStacks) {
+
+		ClassNode visitor = new ClassNode(Opcodes.ASM9) {
+
+			@Override
+			public MethodVisitor visitMethod(int access, String name, String descriptor,
+											 String signature, String[] exceptions) {
+
+				for (Map.Entry<MethodData, Integer> entry : maxStacks.entrySet())
+				{
+					MethodData data = entry.getKey();
+					if (name.equals(data.name) && descriptor.equals(data.descriptor))
+					{
+						MethodNode method = new MethodNode(Opcodes.ASM9, access, name, descriptor, signature, exceptions) {
+							@Override
+							public void visitMaxs(int maxStack, int maxLocals) {
+								super.visitMaxs(entry.getValue(), maxLocals);
+							}
+						};
+						methods.add(method);
+						return method;
+					}
+				}
+				return super.visitMethod(access, name, descriptor, signature, exceptions);
+			}
+		};
+		TRANSFORMERS.put(className, new StormClassTransformer(className, visitor) {
+
+			@Override
+			StormClassTransformer transform() {
+
+				hook.installHook(this);
+				return this;
+			}
+		});
+	}
+
 	/**
 	 * Create and register a new {@link StormClassTransformer} with given name
 	 * that installs a {@link StormHook} designated by method parameter.
@@ -103,4 +151,15 @@ StormClassTransformer transform() {
 	public static @Nullable StormClassTransformer getRegistered(String className) {
 		return TRANSFORMERS.getOrDefault(className, null);
 	}
+
+	private static class MethodData {
+
+		private final String name;
+		private final String descriptor;
+
+		private MethodData(String name, String descriptor) {
+			this.name = name;
+			this.descriptor = descriptor;
+		}
+	}
 }

From 3988ed2cbb8e2d0406f39992ebd004085e71dbf5 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:23:27 +0200
Subject: [PATCH 247/323] Add OnTriggerLuaEvent Zomboid event

---
 .../storm/event/OnTriggerLuaEvent.java        | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java

diff --git a/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java b/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java
new file mode 100644
index 0000000..ebece95
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java
@@ -0,0 +1,33 @@
+package io.pzstorm.storm.event;
+
+import io.pzstorm.storm.event.lua.LuaEvent;
+import org.jetbrains.annotations.Unmodifiable;
+import zombie.Lua.Event;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * This event fires when an in-game Lua event has been triggered. This event is only used
+ * internally to catch <i>most</i>  triggered Lua events, after which they are used to
+ * dispatched {@link LuaEvent} instances. For performance and usability reasons it is
+ * recommended to subscribe to specific {@link LuaEvent LuaEvents} rather then this event.
+ */
+@SuppressWarnings("WeakerAccess")
+public class OnTriggerLuaEvent implements ZomboidEvent {
+
+	public final Event luaEvent;
+	public final @Unmodifiable List<Object> args;
+
+	public OnTriggerLuaEvent(Event luaEvent, Object... args) {
+
+		this.luaEvent = luaEvent;
+		this.args = Collections.unmodifiableList(Arrays.asList(args));
+	}
+
+	@Override
+	public String getName() {
+		return "onTriggerLuaEvent";
+	}
+}

From 028de461c571cda522e361cf12b7ef1404a4e75d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:24:08 +0200
Subject: [PATCH 248/323] Create Lua event trigger hooks

---
 .../storm/core/StormClassTransformers.java    |  21 ++
 .../storm/hook/OnTriggerLuaEventHook.java     | 301 ++++++++++++++++++
 2 files changed, 322 insertions(+)
 create mode 100644 core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java

diff --git a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index dbc3d27..d12b62a 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.google.common.collect.ImmutableMap;
 import io.pzstorm.storm.hook.*;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
@@ -37,6 +38,26 @@ public class StormClassTransformers {
 
 		registerTransformer("zombie.gameStates.MainScreenState", new OnMainScreenRenderHook());
 		registerTransformer("zombie.ui.UIElement", new OnUIElementPreRenderHook());
+		registerTransformer("zombie.Lua.LuaEventManager",
+				new OnTriggerLuaEventHook(), ImmutableMap.<MethodData, Integer>builder()
+						.put(new MethodData("triggerEvent",
+						"(Ljava/lang/String;Ljava/lang/Object;)V"), 7)
+						.put(new MethodData("triggerEvent",
+						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
+						.put(new MethodData("triggerEvent",
+						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
+								"Ljava/lang/Object;)V"), 7)
+						.put(new MethodData("triggerEvent",
+						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
+								"Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
+						.put(new MethodData("triggerEvent",
+						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
+								"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
+						.put(new MethodData("triggerEvent",
+						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
+								"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
+						.build()
+		);
 
 		///////////////////////
 		// REGISTER PATCHES //
diff --git a/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java b/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java
new file mode 100644
index 0000000..eff98f4
--- /dev/null
+++ b/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java
@@ -0,0 +1,301 @@
+package io.pzstorm.storm.hook;
+
+import com.google.common.collect.ImmutableList;
+import io.pzstorm.storm.core.StormClassTransformer;
+import io.pzstorm.storm.event.OnTriggerLuaEvent;
+import io.pzstorm.storm.event.StormEventDispatcher;
+import io.pzstorm.storm.util.AsmUtils;
+import io.pzstorm.storm.util.StormUtils;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
+public class OnTriggerLuaEventHook implements StormHook {
+
+	@Override
+	public void installHook(StormClassTransformer transformer) {
+
+		String eventDescriptor = StormUtils.getClassAsPath(OnTriggerLuaEvent.class);
+
+		// new OnTriggerLuaEvent(Event)
+		InsnList onTriggerLuaEvent1 = StormEventDispatcher.callDispatchEvent(ImmutableList.of(
+				new TypeInsnNode(Opcodes.NEW, eventDescriptor),
+				new InsnNode(Opcodes.DUP),
+				new VarInsnNode(Opcodes.ALOAD, 2),
+				new InsnNode(Opcodes.ICONST_0),
+				new TypeInsnNode(Opcodes.ANEWARRAY, "java/lang/Object"),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL, eventDescriptor, "<init>",
+						"(Lzombie/Lua/Event;[Ljava/lang/Object;)V")
+		));
+		// public static void triggerEvent(String)
+		InsnList triggerEvent1 = transformer.getInstructionsForMethod("triggerEvent",
+				"(Ljava/lang/String;)V"
+		);
+		LabelNode target1 = AsmUtils.getFirstMatchingLabelNode(triggerEvent1, ImmutableList.of(
+				new VarInsnNode(Opcodes.ALOAD, 2),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "env",
+						"Lse/krka/kahlua/vm/KahluaTable;"),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "caller",
+						"Lse/krka/kahlua/integration/LuaCaller;"),
+				new InsnNode(Opcodes.ACONST_NULL),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/Lua/Event", "trigger",
+						"(Lse/krka/kahlua/vm/KahluaTable;" +
+								"Lse/krka/kahlua/integration/LuaCaller;[Ljava/lang/Object;)Z"))
+		);
+		triggerEvent1.insertBefore(target1, onTriggerLuaEvent1);
+
+		// new OnTriggerLuaEvent(Event,Object)
+		InsnList onTriggerLuaEvent2 = StormEventDispatcher.callDispatchEvent(ImmutableList.of(
+				new TypeInsnNode(Opcodes.NEW, eventDescriptor),
+				new InsnNode(Opcodes.DUP),
+				new VarInsnNode(Opcodes.ALOAD, 3),
+				new InsnNode(Opcodes.ICONST_1),
+				new TypeInsnNode(Opcodes.ANEWARRAY, "java/lang/Object"),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_0),
+				new VarInsnNode(Opcodes.ALOAD, 1),
+				new InsnNode(Opcodes.AASTORE),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL, eventDescriptor, "<init>",
+						"(Lzombie/Lua/Event;[Ljava/lang/Object;)V")
+		));
+		// public static void triggerEvent(String,Object)
+		InsnList triggerEvent2 = transformer.getInstructionsForMethod("triggerEvent",
+				"(Ljava/lang/String;Ljava/lang/Object;)V"
+		);
+		LabelNode trigger2 = AsmUtils.getFirstMatchingLabelNode(triggerEvent2, ImmutableList.of(
+				new VarInsnNode(Opcodes.ALOAD, 3),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "env",
+						"Lse/krka/kahlua/vm/KahluaTable;"),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "caller",
+						"Lse/krka/kahlua/integration/LuaCaller;"),
+				new VarInsnNode(Opcodes.ALOAD, 4),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/Lua/Event", "trigger",
+						"(Lse/krka/kahlua/vm/KahluaTable;" +
+								"Lse/krka/kahlua/integration/LuaCaller;[Ljava/lang/Object;)Z"))
+		);
+		// this operation will expand MAXSTACK by 3
+		triggerEvent2.insertBefore(trigger2, onTriggerLuaEvent2);
+
+		// new OnTriggerLuaEvent(Event,Object,Object)
+		InsnList onTriggerLuaEvent3 = StormEventDispatcher.callDispatchEvent(ImmutableList.of(
+				new TypeInsnNode(Opcodes.NEW, eventDescriptor),
+				new InsnNode(Opcodes.DUP),
+				new VarInsnNode(Opcodes.ALOAD, 4),
+				new InsnNode(Opcodes.ICONST_2),
+				new TypeInsnNode(Opcodes.ANEWARRAY, "java/lang/Object"),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_0),
+				new VarInsnNode(Opcodes.ALOAD, 1),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_1),
+				new VarInsnNode(Opcodes.ALOAD, 2),
+				new InsnNode(Opcodes.AASTORE),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL, eventDescriptor, "<init>",
+						"(Lzombie/Lua/Event;[Ljava/lang/Object;)V")
+		));
+		// public static void triggerEvent(String,Object,Object)
+		InsnList triggerEvent3 = transformer.getInstructionsForMethod("triggerEvent",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"
+		);
+		LabelNode trigger3 = AsmUtils.getFirstMatchingLabelNode(triggerEvent3, ImmutableList.of(
+				new VarInsnNode(Opcodes.ALOAD, 4),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "env",
+						"Lse/krka/kahlua/vm/KahluaTable;"),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "caller",
+						"Lse/krka/kahlua/integration/LuaCaller;"),
+				new VarInsnNode(Opcodes.ALOAD, 5),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/Lua/Event", "trigger",
+						"(Lse/krka/kahlua/vm/KahluaTable;" +
+								"Lse/krka/kahlua/integration/LuaCaller;[Ljava/lang/Object;)Z"))
+		);
+		// this operation will expand MAXSTACK by 3
+		triggerEvent3.insertBefore(trigger3, onTriggerLuaEvent3);
+
+		// new OnTriggerLuaEvent(Event,Object,Object,Object)
+		InsnList onTriggerLuaEvent4 = StormEventDispatcher.callDispatchEvent(ImmutableList.of(
+				new TypeInsnNode(Opcodes.NEW, eventDescriptor),
+				new InsnNode(Opcodes.DUP),
+				new VarInsnNode(Opcodes.ALOAD, 5),
+				new InsnNode(Opcodes.ICONST_3),
+				new TypeInsnNode(Opcodes.ANEWARRAY, "java/lang/Object"),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_0),
+				new VarInsnNode(Opcodes.ALOAD, 1),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_1),
+				new VarInsnNode(Opcodes.ALOAD, 2),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_2),
+				new VarInsnNode(Opcodes.ALOAD, 3),
+				new InsnNode(Opcodes.AASTORE),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL, eventDescriptor, "<init>",
+						"(Lzombie/Lua/Event;[Ljava/lang/Object;)V")
+		));
+		// public static void triggerEvent(String,Object,Object,Object)
+		InsnList triggerEvent4 = transformer.getInstructionsForMethod("triggerEvent",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"
+		);
+		LabelNode trigger4 = AsmUtils.getFirstMatchingLabelNode(triggerEvent4, ImmutableList.of(
+				new VarInsnNode(Opcodes.ALOAD, 5),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "env",
+						"Lse/krka/kahlua/vm/KahluaTable;"),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "caller",
+						"Lse/krka/kahlua/integration/LuaCaller;"),
+				new VarInsnNode(Opcodes.ALOAD, 6),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/Lua/Event", "trigger",
+						"(Lse/krka/kahlua/vm/KahluaTable;" +
+								"Lse/krka/kahlua/integration/LuaCaller;[Ljava/lang/Object;)Z"))
+		);
+		// this operation will expand MAXSTACK by 3
+		triggerEvent4.insertBefore(trigger4, onTriggerLuaEvent4);
+
+		// new OnTriggerLuaEvent(Event,Object,Object,Object,Object)
+		InsnList onTriggerLuaEvent5 = StormEventDispatcher.callDispatchEvent(ImmutableList.of(
+				new TypeInsnNode(Opcodes.NEW, eventDescriptor),
+				new InsnNode(Opcodes.DUP),
+				new VarInsnNode(Opcodes.ALOAD, 6),
+				new InsnNode(Opcodes.ICONST_4),
+				new TypeInsnNode(Opcodes.ANEWARRAY, "java/lang/Object"),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_0),
+				new VarInsnNode(Opcodes.ALOAD, 1),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_1),
+				new VarInsnNode(Opcodes.ALOAD, 2),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_2),
+				new VarInsnNode(Opcodes.ALOAD, 3),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_3),
+				new VarInsnNode(Opcodes.ALOAD, 4),
+				new InsnNode(Opcodes.AASTORE),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL, eventDescriptor, "<init>",
+						"(Lzombie/Lua/Event;[Ljava/lang/Object;)V")
+		));
+		// public static void triggerEvent(String,Object,Object,Object,Object)
+		InsnList triggerEvent5 = transformer.getInstructionsForMethod("triggerEvent",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;)V"
+		);
+		LabelNode trigger5 = AsmUtils.getFirstMatchingLabelNode(triggerEvent5, ImmutableList.of(
+				new VarInsnNode(Opcodes.ALOAD, 6),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "env",
+						"Lse/krka/kahlua/vm/KahluaTable;"),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "caller",
+						"Lse/krka/kahlua/integration/LuaCaller;"),
+				new VarInsnNode(Opcodes.ALOAD, 7),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/Lua/Event", "trigger",
+						"(Lse/krka/kahlua/vm/KahluaTable;" +
+								"Lse/krka/kahlua/integration/LuaCaller;[Ljava/lang/Object;)Z"))
+		);
+		// this operation will expand MAXSTACK by 3
+		triggerEvent5.insertBefore(trigger5, onTriggerLuaEvent5);
+
+		// new OnTriggerLuaEvent(Event,Object,Object,Object,Object,Object)
+		InsnList onTriggerLuaEvent6 = StormEventDispatcher.callDispatchEvent(ImmutableList.of(
+				new TypeInsnNode(Opcodes.NEW, eventDescriptor),
+				new InsnNode(Opcodes.DUP),
+				new VarInsnNode(Opcodes.ALOAD, 7),
+				new InsnNode(Opcodes.ICONST_4),
+				new TypeInsnNode(Opcodes.ANEWARRAY, "java/lang/Object"),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_0),
+				new VarInsnNode(Opcodes.ALOAD, 1),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_1),
+				new VarInsnNode(Opcodes.ALOAD, 2),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_2),
+				new VarInsnNode(Opcodes.ALOAD, 3),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_3),
+				new VarInsnNode(Opcodes.ALOAD, 4),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_3),
+				new VarInsnNode(Opcodes.ALOAD, 5),
+				new InsnNode(Opcodes.AASTORE),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL, eventDescriptor, "<init>",
+						"(Lzombie/Lua/Event;[Ljava/lang/Object;)V")
+		));
+		// public static void triggerEvent(String,Object,Object,Object,Object,Object)
+		InsnList triggerEvent6 = transformer.getInstructionsForMethod("triggerEvent",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;)V"
+		);
+		LabelNode trigger6 = AsmUtils.getFirstMatchingLabelNode(triggerEvent6, ImmutableList.of(
+				new VarInsnNode(Opcodes.ALOAD, 7),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "env",
+						"Lse/krka/kahlua/vm/KahluaTable;"),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "caller",
+						"Lse/krka/kahlua/integration/LuaCaller;"),
+				new VarInsnNode(Opcodes.ALOAD, 8),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/Lua/Event", "trigger",
+						"(Lse/krka/kahlua/vm/KahluaTable;" +
+								"Lse/krka/kahlua/integration/LuaCaller;[Ljava/lang/Object;)Z"))
+		);
+		// this operation will expand MAXSTACK by 3
+		triggerEvent6.insertBefore(trigger6, onTriggerLuaEvent6);
+
+		// new OnTriggerLuaEvent(Event,Object,Object,Object,Object,Object,Object)
+		InsnList onTriggerLuaEvent7 = StormEventDispatcher.callDispatchEvent(ImmutableList.of(
+				new TypeInsnNode(Opcodes.NEW, eventDescriptor),
+				new InsnNode(Opcodes.DUP),
+				new VarInsnNode(Opcodes.ALOAD, 8),
+				new InsnNode(Opcodes.ICONST_4),
+				new TypeInsnNode(Opcodes.ANEWARRAY, "java/lang/Object"),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_0),
+				new VarInsnNode(Opcodes.ALOAD, 1),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_1),
+				new VarInsnNode(Opcodes.ALOAD, 2),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_2),
+				new VarInsnNode(Opcodes.ALOAD, 3),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_3),
+				new VarInsnNode(Opcodes.ALOAD, 4),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_3),
+				new VarInsnNode(Opcodes.ALOAD, 5),
+				new InsnNode(Opcodes.AASTORE),
+				new InsnNode(Opcodes.DUP),
+				new InsnNode(Opcodes.ICONST_3),
+				new VarInsnNode(Opcodes.ALOAD, 6),
+				new InsnNode(Opcodes.AASTORE),
+				new MethodInsnNode(Opcodes.INVOKESPECIAL, eventDescriptor, "<init>",
+						"(Lzombie/Lua/Event;[Ljava/lang/Object;)V")
+		));
+		// public static void triggerEvent(String,Object,Object,Object,Object,Object,Object)
+		InsnList triggerEvent7 = transformer.getInstructionsForMethod("triggerEvent",
+				"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;" +
+						"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"
+		);
+		LabelNode trigger7 = AsmUtils.getFirstMatchingLabelNode(triggerEvent7, ImmutableList.of(
+				new VarInsnNode(Opcodes.ALOAD, 8),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "env",
+						"Lse/krka/kahlua/vm/KahluaTable;"),
+				new FieldInsnNode(Opcodes.GETSTATIC, "zombie/Lua/LuaManager", "caller",
+						"Lse/krka/kahlua/integration/LuaCaller;"),
+				new VarInsnNode(Opcodes.ALOAD, 9),
+				new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "zombie/Lua/Event", "trigger",
+						"(Lse/krka/kahlua/vm/KahluaTable;" +
+								"Lse/krka/kahlua/integration/LuaCaller;[Ljava/lang/Object;)Z"))
+		);
+		// this operation will expand MAXSTACK by 3
+		triggerEvent7.insertBefore(trigger7, onTriggerLuaEvent7);
+	}
+}

From c9affa318535591359093f3ecbe3b89e5d0273b3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:27:57 +0200
Subject: [PATCH 249/323] Add registered mods getter method

---
 .../io/pzstorm/storm/core/StormModRegistry.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
index d83efb1..c122ef7 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
@@ -6,10 +6,9 @@
 import io.pzstorm.storm.mod.ZomboidMod;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
+import org.jetbrains.annotations.UnmodifiableView;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * This class is responsible for creating and registering {@link ZomboidMod} instances.
@@ -47,6 +46,15 @@ public static void registerMods() throws ReflectiveOperationException {
 		}
 	}
 
+	/**
+	 * Retrieve a {@code Set} of registered mods. Note that the returned
+	 * {@code Set} is <b>unmodifiable</b> and modifying it in any way
+	 * will result in an {@code UnsupportedOperationException}.
+	 */
+	public static @UnmodifiableView Set<ZomboidMod> getRegisteredMods() {
+		return Collections.unmodifiableSet(new HashSet<>(MOD_REGISTRY.values()));
+	}
+
 	@TestOnly
 	static @Nullable ZomboidMod getRegisteredMod(String name) {
 		return MOD_REGISTRY.get(name);

From d95bb919be2e68a3cd248c33c309756aaf636993 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:33:38 +0200
Subject: [PATCH 250/323] Declare Lua event trigger handler method

---
 .../java/io/pzstorm/storm/event/StormEventHandler.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
index b610827..8267ab2 100644
--- a/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
+++ b/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
@@ -33,4 +33,11 @@ public static void handleUIElementRenderEvent(OnUIElementPreRenderEvent event) {
 			}
 		}
 	}
+
+	@SubscribeEvent
+	public static void handleLuaEventTrigger(OnTriggerLuaEvent event) {
+
+		// TODO: handle lua event triggers here
+		// StormLogger.info("Triggered lua event '" + event.luaEvent.name + '\'');
+	}
 }

From 510ff76ad2057f1c8d69e68aa643815a3c526d28 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:45:18 +0200
Subject: [PATCH 251/323] Create LuaEvent interface class

---
 .../io/pzstorm/storm/event/lua/LuaEvent.java  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
new file mode 100644
index 0000000..762f316
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
@@ -0,0 +1,24 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.ZomboidEvent;
+import zombie.Lua.LuaEventManager;
+
+/**
+ * This class represents an in-game event dispatched to Lua mods.
+ * Lua events are handled by {@link LuaEventManager}. Storm intercepts these
+ * events and dispatches them as {@link LuaEvent} implementation instances.
+ * Subscribing to events being defined as Java classes offers much easier
+ * and safer interaction to subscribers then when subscribing from Lua.
+ */
+public interface LuaEvent extends ZomboidEvent {
+
+	@Override
+	default String getName() {
+
+		String className = getClass().getSimpleName();
+		if (className.endsWith("Event")) {
+			return className.substring(className.length() - 4);
+		}
+		else return className;
+	}
+}

From 3cd54921d4ae6b145bba011833ece2615b08d234 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:45:50 +0200
Subject: [PATCH 252/323] Annotate lua package as NonNull

---
 .../main/java/io/pzstorm/storm/event/lua/package-info.java    | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/package-info.java

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/package-info.java b/api/src/main/java/io/pzstorm/storm/event/lua/package-info.java
new file mode 100644
index 0000000..9ab9cb0
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/package-info.java
@@ -0,0 +1,4 @@
+@NonNullPackage
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.NonNullPackage;

From 7640a78cd409e3e0068bf6b0686291843dccd0db Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:47:07 +0200
Subject: [PATCH 253/323] Clean redundant comment from hook

---
 .../main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java b/core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
index 44546d8..816c075 100644
--- a/core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
+++ b/core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
@@ -30,7 +30,6 @@ public void installHook(StormClassTransformer transformer) {
 		// Core.getInstance().EndFrameUI();
 		// ...
 		LabelNode target = AsmUtils.getFirstMatchingLabelNode(instructions, ImmutableList.of(
-				// INVOKESTATIC zombie/core/Core.getInstance ()Lzombie/core/Core;
 				new MethodInsnNode(Opcodes.INVOKESTATIC,
 						"zombie/core/Core", "getInstance", "()Lzombie/core/Core;"
 				),

From bf9cc0a7857c46b8f7da9730b6f8aa1368b2aa18 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Tue, 18 May 2021 20:53:58 +0200
Subject: [PATCH 254/323] Add first LuaEvent implementations

---
 .../event/lua/OnChallengeQueryEvent.java      | 10 +++++++
 .../event/lua/OnCharacterCollideEvent.java    | 23 +++++++++++++++
 .../lua/OnCreateLivingCharacterEvent.java     | 20 +++++++++++++
 .../storm/event/lua/OnFETickEvent.java        | 14 +++++++++
 ...OnFillInventoryObjectContextMenuEvent.java |  9 ++++++
 .../OnFillWorldObjectContextMenuEvent.java    |  6 ++++
 .../storm/event/lua/OnGameBootEvent.java      | 11 +++++++
 .../storm/event/lua/OnGameStartEvent.java     |  8 +++++
 .../event/lua/OnJoypadActivateEvent.java      | 17 +++++++++++
 .../storm/event/lua/OnKeyPressedEvent.java    | 16 ++++++++++
 .../event/lua/OnKeyStartPressedEvent.java     | 16 ++++++++++
 .../storm/event/lua/OnLoadMapZonesEvent.java  | 11 +++++++
 .../event/lua/OnMultiTriggerNPCEvent.java     | 29 +++++++++++++++++++
 .../storm/event/lua/OnObjectCollideEvent.java | 22 ++++++++++++++
 .../storm/event/lua/OnPlayerUpdateEvent.java  | 18 ++++++++++++
 .../storm/event/lua/OnPostUIDrawEvent.java    | 10 +++++++
 ...reFillInventoryObjectContextMenuEvent.java |  6 ++++
 .../OnPreFillWorldObjectContextMenuEvent.java |  6 ++++
 .../storm/event/lua/OnPreUIDrawEvent.java     | 10 +++++++
 ...RefreshInventoryWindowContainersEvent.java |  6 ++++
 .../event/lua/OnTickEvenPausedEvent.java      | 14 +++++++++
 .../pzstorm/storm/event/lua/OnTickEvent.java  | 17 +++++++++++
 .../storm/event/lua/OnTriggerNPCEvent.java    | 29 +++++++++++++++++++
 .../event/lua/OnWeaponHitCharacterEvent.java  | 26 +++++++++++++++++
 .../storm/event/lua/OnWeaponSwingEvent.java   | 21 ++++++++++++++
 .../storm/event/lua/OnZombieUpdateEvent.java  | 18 ++++++++++++
 26 files changed, 393 insertions(+)
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCollideEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnLoadMapZonesEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnMultiTriggerNPCEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnObjectCollideEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerUpdateEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnTriggerNPCEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnZombieUpdateEvent.java

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java
new file mode 100644
index 0000000..9de38f4
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java
@@ -0,0 +1,10 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called when the challenge options get populated.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnChallengeQueryEvent implements LuaEvent {
+
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCollideEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCollideEvent.java
new file mode 100644
index 0000000..03a9484
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCollideEvent.java
@@ -0,0 +1,23 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.iso.IsoMovingObject;
+import zombie.iso.IsoObject;
+
+/**
+ * Called when an object collides with {@link IsoGameCharacter}.
+ *
+ * @see OnObjectCollideEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCharacterCollideEvent implements LuaEvent {
+
+	public final IsoMovingObject object;
+	public final IsoObject character;
+
+	public OnCharacterCollideEvent(IsoMovingObject object, IsoObject character) {
+
+		this.object = object;
+		this.character = character;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
new file mode 100644
index 0000000..80d7422
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+import zombie.characters.IsoSurvivor;
+import zombie.characters.SurvivorDesc;
+
+/**
+ * Called when {@link IsoPlayer} or {@link IsoSurvivor} is being created.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCreateLivingCharacterEvent implements LuaEvent {
+
+	public final IsoPlayer player;
+	public final SurvivorDesc descriptor;
+
+	public OnCreateLivingCharacterEvent(IsoPlayer player, SurvivorDesc descriptor) {
+		this.player = player;
+		this.descriptor = descriptor;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java
new file mode 100644
index 0000000..46d4209
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java
@@ -0,0 +1,14 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Same as {@link OnTickEvent}, except is only called while on the main menu.
+ */
+@SuppressWarnings("unused")
+public class OnFETickEvent implements LuaEvent {
+
+	/**
+	 * @param ticks always {@code 0}.
+	 */
+	public OnFETickEvent(int ticks) {
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java
new file mode 100644
index 0000000..ab04de1
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Use this event to add items to context menu without mod conflicts.
+ */
+public class OnFillInventoryObjectContextMenuEvent implements LuaEvent {
+
+	// TODO: finish writing this event
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java
new file mode 100644
index 0000000..a0ebb89
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java
@@ -0,0 +1,6 @@
+package io.pzstorm.storm.event.lua;
+
+public class OnFillWorldObjectContextMenuEvent implements LuaEvent {
+
+	// TODO: finish writing this event
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java
new file mode 100644
index 0000000..e94082a
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Lua event is called when the game/server is started or when
+ * mods are reloaded while the game is started.
+ *
+ * @see OnGameStartEvent
+ */
+@SuppressWarnings("unused")
+public class OnGameBootEvent implements LuaEvent {
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
new file mode 100644
index 0000000..48e81ae
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
@@ -0,0 +1,8 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called when a new game is started, or loading of a save is finished.
+ */
+@SuppressWarnings("unused")
+public class OnGameStartEvent {
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java
new file mode 100644
index 0000000..eaeec39
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java
@@ -0,0 +1,17 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when a controller is activated.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnJoypadActivateEvent implements LuaEvent {
+
+	/**
+	 * The ID of the activated controller.
+	 */
+	public final int joypadID;
+
+	public OnJoypadActivateEvent(int joypadID) {
+		this.joypadID = joypadID;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
new file mode 100644
index 0000000..3b2ac3a
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
@@ -0,0 +1,16 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called when key is pressed.
+ *
+ * @see OnKeyStartPressedEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnKeyPressedEvent implements LuaEvent {
+
+	public final int key;
+
+	public OnKeyPressedEvent(int key) {
+		this.key = key;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
new file mode 100644
index 0000000..afa0fc3
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
@@ -0,0 +1,16 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called when key is initially pressed.
+ *
+ * @see OnKeyPressedEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnKeyStartPressedEvent implements LuaEvent {
+
+	public final int key;
+
+	public OnKeyStartPressedEvent(int key) {
+		this.key = key;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadMapZonesEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadMapZonesEvent.java
new file mode 100644
index 0000000..625631a
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadMapZonesEvent.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoWorld;
+
+/**
+ * Called when {@link IsoWorld} initialises and is registering the zones for the map.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnLoadMapZonesEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMultiTriggerNPCEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMultiTriggerNPCEvent.java
new file mode 100644
index 0000000..678dd4d
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMultiTriggerNPCEvent.java
@@ -0,0 +1,29 @@
+package io.pzstorm.storm.event.lua;
+
+import se.krka.kahlua.vm.KahluaTable;
+import zombie.iso.BuildingDef;
+
+/**
+ * Currently unknown use.
+ *
+ * @see OnTriggerNPCEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnMultiTriggerNPCEvent implements LuaEvent {
+
+	public final String type;
+	public final KahluaTable data;
+	public final BuildingDef def;
+
+	public OnMultiTriggerNPCEvent(String type, KahluaTable data, BuildingDef def) {
+
+		this.type = type;
+		this.data = data;
+		this.def = def;
+	}
+
+	@Override
+	public String getName() {
+		return "OnTriggerNPCEvent";
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectCollideEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectCollideEvent.java
new file mode 100644
index 0000000..996b091
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectCollideEvent.java
@@ -0,0 +1,22 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoMovingObject;
+import zombie.iso.IsoObject;
+
+/**
+ * Called when {@link IsoMovingObject} collides with another {@link IsoObject}.
+ *
+ * @see OnCharacterCollideEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnObjectCollideEvent implements LuaEvent {
+
+	public final IsoMovingObject collider;
+	public final IsoObject target;
+
+	public OnObjectCollideEvent(IsoMovingObject collider, IsoObject target) {
+
+		this.collider = collider;
+		this.target = target;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerUpdateEvent.java
new file mode 100644
index 0000000..d256cdc
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerUpdateEvent.java
@@ -0,0 +1,18 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+
+/**
+ * Called when {@link IsoPlayer} updates.
+ *
+ * @see OnZombieUpdateEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPlayerUpdateEvent implements LuaEvent {
+
+	public final IsoPlayer player;
+
+	public OnPlayerUpdateEvent(IsoPlayer player) {
+		this.player = player;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java
new file mode 100644
index 0000000..d4b27e5
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java
@@ -0,0 +1,10 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called by UI Manager in its render function after the UI has been drawn.
+ *
+ * @see OnPreUIDrawEvent
+ */
+@SuppressWarnings("WeakerAccess")
+public class OnPostUIDrawEvent implements LuaEvent {
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java
new file mode 100644
index 0000000..f199a63
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java
@@ -0,0 +1,6 @@
+package io.pzstorm.storm.event.lua;
+
+public class OnPreFillInventoryObjectContextMenuEvent implements LuaEvent {
+
+	// TODO: finish writing this event
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java
new file mode 100644
index 0000000..4ad5711
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java
@@ -0,0 +1,6 @@
+package io.pzstorm.storm.event.lua;
+
+public class OnPreFillWorldObjectContextMenuEvent implements LuaEvent {
+
+	// TODO: finish writing this event
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java
new file mode 100644
index 0000000..4339e0c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java
@@ -0,0 +1,10 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called by UI Manager in its render function before the UI gets drawn.
+ *
+ * @see OnPostUIDrawEvent
+ */
+@SuppressWarnings("WeakerAccess")
+public class OnPreUIDrawEvent implements LuaEvent {
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
new file mode 100644
index 0000000..0a9062f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
@@ -0,0 +1,6 @@
+package io.pzstorm.storm.event.lua;
+
+public class OnRefreshInventoryWindowContainersEvent implements LuaEvent {
+
+	// TODO: finish writing this event
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java
new file mode 100644
index 0000000..290072c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java
@@ -0,0 +1,14 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Same as {@link OnTickEvent}, but triggered when the game is paused as well.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnTickEvenPausedEvent implements LuaEvent {
+
+	public final double ticksElapsed;
+
+	public OnTickEvenPausedEvent(double ticksElapsed) {
+		this.ticksElapsed = ticksElapsed;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java
new file mode 100644
index 0000000..cb21c5f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java
@@ -0,0 +1,17 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called every tick, try to not use this one, use {@link EveryTenMinutesEvent}
+ * instead because it can create a lot of frame loss/garbage collection.
+ *
+ * @see OnTickEvenPausedEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnTickEvent implements LuaEvent {
+
+	public final double ticksElapsed;
+
+	public OnTickEvent(double ticksElapsed) {
+		this.ticksElapsed = ticksElapsed;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTriggerNPCEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTriggerNPCEvent.java
new file mode 100644
index 0000000..4e70b3c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTriggerNPCEvent.java
@@ -0,0 +1,29 @@
+package io.pzstorm.storm.event.lua;
+
+import se.krka.kahlua.vm.KahluaTable;
+import zombie.iso.BuildingDef;
+
+/**
+ * Currently unknown use.
+ *
+ * @see OnMultiTriggerNPCEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnTriggerNPCEvent implements LuaEvent {
+
+	public final String type;
+	public final KahluaTable data;
+	public final BuildingDef def;
+
+	public OnTriggerNPCEvent(String type, KahluaTable data, BuildingDef def) {
+
+		this.type = type;
+		this.data = data;
+		this.def = def;
+	}
+
+	@Override
+	public String getName() {
+		return "OnTriggerNPCEvent";
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java
new file mode 100644
index 0000000..82e6210
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.inventory.types.HandWeapon;
+
+/**
+ * Triggered when a {@link IsoGameCharacter} has been hit by a {@link HandWeapon}.
+ *
+ * @see OnWeaponSwingEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnWeaponHitCharacterEvent implements LuaEvent {
+
+	public final IsoGameCharacter attacker;
+	public final IsoGameCharacter target;
+	public final HandWeapon weapon;
+	public final float damage;
+
+	public OnWeaponHitCharacterEvent(IsoGameCharacter attacker, IsoGameCharacter target, HandWeapon weapon, float damage) {
+
+		this.attacker = attacker;
+		this.target = target;
+		this.weapon = weapon;
+		this.damage = damage;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java
new file mode 100644
index 0000000..9aca358
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java
@@ -0,0 +1,21 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.inventory.types.HandWeapon;
+
+/**
+ * Triggered when a {@link IsoGameCharacter} swings {@link HandWeapon}.
+ *
+ * @see OnWeaponHitCharacterEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnWeaponSwingEvent implements LuaEvent {
+
+	public final IsoGameCharacter player;
+	public final HandWeapon weapon;
+
+	public OnWeaponSwingEvent(IsoGameCharacter player, HandWeapon weapon) {
+		this.player = player;
+		this.weapon = weapon;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieUpdateEvent.java
new file mode 100644
index 0000000..57f56e6
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieUpdateEvent.java
@@ -0,0 +1,18 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoZombie;
+
+/**
+ * Called when {@link IsoZombie} updates.
+ *
+ * @see OnPlayerUpdateEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnZombieUpdateEvent implements LuaEvent {
+
+	public final IsoZombie zombie;
+
+	public OnZombieUpdateEvent(IsoZombie zombie) {
+		this.zombie = zombie;
+	}
+}

From 4940eec800d87359c5982c0b5b1ce61dbd1bbcd3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 19 May 2021 21:48:32 +0200
Subject: [PATCH 255/323] Make CI property more configurable

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index b07d8c6..a2f93b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,12 +17,12 @@ plugins {
     id 'maven-publish'
 }
 // is gradle executing on CI server?
-String sIsCI = System.getenv("CI")
+String sIsCI = System.getenv("CI") ?: project.ext.has('CI') ? project.ext.get('CI') : null
 boolean isCI = sIsCI != null ? Boolean.parseBoolean(sIsCI) : false
+project.ext.set('CI', isCI)
 
 allprojects {
     repositories { mavenCentral() }
-    project.ext.set('CI', isCI)
 }
 
 // make sure to configure zombie subproject first because other

From bb5b6e7a3724135aff101ec573ace33024137a62 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 19 May 2021 21:55:34 +0200
Subject: [PATCH 256/323] Fix not using zombie module on CI

---
 core/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/build.gradle b/core/build.gradle
index 34eae3b..73d30d5 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -29,6 +29,8 @@ dependencies {
             return !(it.name.contains('test') || it.name.contains('junit'))
         }
     }
+    // depend on dummy zombie classes when building on CI
+    else implementation zombieProject
 }
 
 test {

From 9f7f6e05a3d90f7ba830ec96d15d095f6a1e465b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 19 May 2021 21:56:08 +0200
Subject: [PATCH 257/323] Fix invalid LuaEvent implementation

---
 .../main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
index 48e81ae..2d1e929 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
@@ -4,5 +4,5 @@
  * Called when a new game is started, or loading of a save is finished.
  */
 @SuppressWarnings("unused")
-public class OnGameStartEvent {
+public class OnGameStartEvent implements LuaEvent {
 }

From 68fc25ff5bb95a23f80806ff44fdaeeda45f037c Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 19 May 2021 21:56:38 +0200
Subject: [PATCH 258/323] Add CI gradle project property

---
 gradle.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a924002..0b6b8a2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
-spotlessGistID=8ace33e409f9b9e6d0dab05fec3f8188
\ No newline at end of file
+spotlessGistID=8ace33e409f9b9e6d0dab05fec3f8188
+CI=false
\ No newline at end of file

From 36b8f6e6c98acde18896226c010e3ad1ed254901 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 19 May 2021 22:27:20 +0200
Subject: [PATCH 259/323] Add more dummy zombie classes

---
 zombie/src/main/java/zombie/characters/IsoGameCharacter.java | 5 +++++
 zombie/src/main/java/zombie/characters/IsoPlayer.java        | 5 +++++
 zombie/src/main/java/zombie/characters/IsoZombie.java        | 5 +++++
 zombie/src/main/java/zombie/characters/SurvivorDesc.java     | 5 +++++
 zombie/src/main/java/zombie/inventory/types/HandWeapon.java  | 5 +++++
 zombie/src/main/java/zombie/iso/BuildingDef.java             | 5 +++++
 zombie/src/main/java/zombie/iso/IsoMovingObject.java         | 5 +++++
 zombie/src/main/java/zombie/iso/IsoObject.java               | 5 +++++
 8 files changed, 40 insertions(+)
 create mode 100644 zombie/src/main/java/zombie/characters/IsoGameCharacter.java
 create mode 100644 zombie/src/main/java/zombie/characters/IsoPlayer.java
 create mode 100644 zombie/src/main/java/zombie/characters/IsoZombie.java
 create mode 100644 zombie/src/main/java/zombie/characters/SurvivorDesc.java
 create mode 100644 zombie/src/main/java/zombie/inventory/types/HandWeapon.java
 create mode 100644 zombie/src/main/java/zombie/iso/BuildingDef.java
 create mode 100644 zombie/src/main/java/zombie/iso/IsoMovingObject.java
 create mode 100644 zombie/src/main/java/zombie/iso/IsoObject.java

diff --git a/zombie/src/main/java/zombie/characters/IsoGameCharacter.java b/zombie/src/main/java/zombie/characters/IsoGameCharacter.java
new file mode 100644
index 0000000..6799c70
--- /dev/null
+++ b/zombie/src/main/java/zombie/characters/IsoGameCharacter.java
@@ -0,0 +1,5 @@
+package zombie.characters;
+
+public class IsoGameCharacter {
+
+}
diff --git a/zombie/src/main/java/zombie/characters/IsoPlayer.java b/zombie/src/main/java/zombie/characters/IsoPlayer.java
new file mode 100644
index 0000000..c0836fa
--- /dev/null
+++ b/zombie/src/main/java/zombie/characters/IsoPlayer.java
@@ -0,0 +1,5 @@
+package zombie.characters;
+
+public class IsoPlayer {
+
+}
diff --git a/zombie/src/main/java/zombie/characters/IsoZombie.java b/zombie/src/main/java/zombie/characters/IsoZombie.java
new file mode 100644
index 0000000..02ec630
--- /dev/null
+++ b/zombie/src/main/java/zombie/characters/IsoZombie.java
@@ -0,0 +1,5 @@
+package zombie.characters;
+
+public class IsoZombie {
+
+}
diff --git a/zombie/src/main/java/zombie/characters/SurvivorDesc.java b/zombie/src/main/java/zombie/characters/SurvivorDesc.java
new file mode 100644
index 0000000..3c8aa02
--- /dev/null
+++ b/zombie/src/main/java/zombie/characters/SurvivorDesc.java
@@ -0,0 +1,5 @@
+package zombie.characters;
+
+public class SurvivorDesc {
+
+}
diff --git a/zombie/src/main/java/zombie/inventory/types/HandWeapon.java b/zombie/src/main/java/zombie/inventory/types/HandWeapon.java
new file mode 100644
index 0000000..f19536c
--- /dev/null
+++ b/zombie/src/main/java/zombie/inventory/types/HandWeapon.java
@@ -0,0 +1,5 @@
+package zombie.inventory.types;
+
+public class HandWeapon {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/BuildingDef.java b/zombie/src/main/java/zombie/iso/BuildingDef.java
new file mode 100644
index 0000000..38d433a
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/BuildingDef.java
@@ -0,0 +1,5 @@
+package zombie.iso;
+
+public class BuildingDef {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/IsoMovingObject.java b/zombie/src/main/java/zombie/iso/IsoMovingObject.java
new file mode 100644
index 0000000..8947f2d
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/IsoMovingObject.java
@@ -0,0 +1,5 @@
+package zombie.iso;
+
+public class IsoMovingObject {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/IsoObject.java b/zombie/src/main/java/zombie/iso/IsoObject.java
new file mode 100644
index 0000000..5933047
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/IsoObject.java
@@ -0,0 +1,5 @@
+package zombie.iso;
+
+public class IsoObject {
+
+}

From ad3f8f7cf7e292673873d9092586383b7eca7c96 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 19 May 2021 22:31:06 +0200
Subject: [PATCH 260/323] Fix modules missing CI property

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a2f93b3..6bf55cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,10 +19,10 @@ plugins {
 // is gradle executing on CI server?
 String sIsCI = System.getenv("CI") ?: project.ext.has('CI') ? project.ext.get('CI') : null
 boolean isCI = sIsCI != null ? Boolean.parseBoolean(sIsCI) : false
-project.ext.set('CI', isCI)
 
 allprojects {
     repositories { mavenCentral() }
+    project.ext.set('CI', isCI)
 }
 
 // make sure to configure zombie subproject first because other

From bc597ed41c5adeaf83d9cf5a4a1e269ce22cadab Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 19 May 2021 22:37:49 +0200
Subject: [PATCH 261/323] Add more dummy zombie classes

---
 zombie/src/main/java/zombie/Lua/Event.java              | 5 +++++
 zombie/src/main/java/zombie/Lua/LuaEventManager.java    | 5 +++++
 zombie/src/main/java/zombie/characters/IsoSurvivor.java | 5 +++++
 zombie/src/main/java/zombie/iso/IsoWorld.java           | 5 +++++
 4 files changed, 20 insertions(+)
 create mode 100644 zombie/src/main/java/zombie/Lua/Event.java
 create mode 100644 zombie/src/main/java/zombie/Lua/LuaEventManager.java
 create mode 100644 zombie/src/main/java/zombie/characters/IsoSurvivor.java
 create mode 100644 zombie/src/main/java/zombie/iso/IsoWorld.java

diff --git a/zombie/src/main/java/zombie/Lua/Event.java b/zombie/src/main/java/zombie/Lua/Event.java
new file mode 100644
index 0000000..426a35c
--- /dev/null
+++ b/zombie/src/main/java/zombie/Lua/Event.java
@@ -0,0 +1,5 @@
+package zombie.Lua;
+
+public class Event {
+
+}
diff --git a/zombie/src/main/java/zombie/Lua/LuaEventManager.java b/zombie/src/main/java/zombie/Lua/LuaEventManager.java
new file mode 100644
index 0000000..53568ba
--- /dev/null
+++ b/zombie/src/main/java/zombie/Lua/LuaEventManager.java
@@ -0,0 +1,5 @@
+package zombie.Lua;
+
+public class LuaEventManager {
+
+}
diff --git a/zombie/src/main/java/zombie/characters/IsoSurvivor.java b/zombie/src/main/java/zombie/characters/IsoSurvivor.java
new file mode 100644
index 0000000..6644478
--- /dev/null
+++ b/zombie/src/main/java/zombie/characters/IsoSurvivor.java
@@ -0,0 +1,5 @@
+package zombie.characters;
+
+public class IsoSurvivor {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/IsoWorld.java b/zombie/src/main/java/zombie/iso/IsoWorld.java
new file mode 100644
index 0000000..e8e5348
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/IsoWorld.java
@@ -0,0 +1,5 @@
+package zombie.iso;
+
+public class IsoWorld {
+
+}

From edce5668733bef761f1b4ceb8f0c6195819e9d09 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 01:02:18 +0200
Subject: [PATCH 262/323] Implement LuaEvent factory

---
 .../storm/event/lua/LuaEventFactory.java      | 141 ++++++++++++++++++
 1 file changed, 141 insertions(+)
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/LuaEventFactory.java

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEventFactory.java b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEventFactory.java
new file mode 100644
index 0000000..bf41014
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEventFactory.java
@@ -0,0 +1,141 @@
+package io.pzstorm.storm.event.lua;
+
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class is used to creates new {@link LuaEvent} instances on demand.
+ * The factory uses reflection to invoke the event class constructor to instantiate events.
+ * Note that class and constructor instances are statically mapped and ready for access
+ * which reduces overhead when using reflection to instantiate event objects.
+ */
+@SuppressWarnings("unchecked")
+public class LuaEventFactory {
+
+	/**
+	 * This map contains {@link LuaEvent} constructors mapped to implementation classes.
+	 * Constructors are mapped in this way to increase performance when instantiating {@code LuaEvent}s.
+	 */
+	@Unmodifiable
+	private static final Map<Class<? extends LuaEvent>, Constructor<? extends LuaEvent>> EVENT_CONSTRUCTORS;
+
+	/**
+	 * This map contains {@link LuaEvent} classes mapped to their respected names.
+	 * Classes are mapped in this way to increase performance when instantiating {@code LuaEvent}s.
+	 */
+	@Unmodifiable
+	private static final Map<String, Class<? extends LuaEvent>> EVENT_CLASSES;
+
+	static
+	{
+		Map<Class<? extends LuaEvent>, Constructor<LuaEvent>> eventConstructors = new HashMap<>();
+		Map<String, Class<? extends LuaEvent>> eventClassesMap = new HashMap<>();
+		/*
+		 * this is a complete list of all event classes,
+		 * if a class is not listed here it will NOT be possible
+		 * to instantiate the related event instance with this factory
+		 */
+		Class<? extends LuaEvent>[] eventClasses = (Class<? extends LuaEvent>[]) new Class[] {
+				OnChallengeQueryEvent.class,
+				OnCharacterCollideEvent.class,
+				OnCreateLivingCharacterEvent.class,
+				OnFETickEvent.class,
+				OnFillInventoryObjectContextMenuEvent.class,
+				OnFillWorldObjectContextMenuEvent.class,
+				OnGameBootEvent.class,
+				OnGameStartEvent.class,
+				OnJoypadActivateEvent.class,
+				OnKeyPressedEvent.class,
+				OnKeyStartPressedEvent.class,
+				OnLoadMapZonesEvent.class,
+				OnMultiTriggerNPCEvent.class,
+				OnObjectCollideEvent.class,
+				OnPlayerUpdateEvent.class,
+				OnPostUIDrawEvent.class,
+				OnPreFillInventoryObjectContextMenuEvent.class,
+				OnPreFillWorldObjectContextMenuEvent.class,
+				OnPreUIDrawEvent.class,
+				OnRefreshInventoryWindowContainersEvent.class,
+				OnTickEvenPausedEvent.class,
+				OnTickEvent.class,
+				OnTriggerNPCEvent.class,
+				OnWeaponHitCharacterEvent.class,
+				OnWeaponSwingEvent.class,
+				OnZombieUpdateEvent.class
+		};
+		for (Class<? extends LuaEvent> eventClass : eventClasses)
+		{
+			Constructor<?>[] constructors = eventClass.getConstructors();
+			if (constructors.length != 1) {
+				throw new IllegalStateException("Unexpected number of constructors found for class '" + eventClass + '\'');
+			}
+			Constructor<?> constructor = constructors[0];
+
+			if (!Modifier.isPublic(constructor.getModifiers())) {
+				throw new IllegalStateException("Found inaccessible constructor for class '" + eventClass + '\'');
+			}
+			eventConstructors.put(eventClass, (Constructor<LuaEvent>) constructors[0]);
+
+			String className = getEventName(eventClass);
+			eventClassesMap.put(className, eventClass);
+		}
+		EVENT_CONSTRUCTORS = Collections.unmodifiableMap(eventConstructors);
+		EVENT_CLASSES = Collections.unmodifiableMap(eventClassesMap);
+	}
+
+	/**
+	 * Construct a new instance of {@link LuaEvent} with given array of arguments.
+	 *
+	 * @param eventClass {@code Class} denoting the {@code LuaEvent} to construct.
+	 * @param args array of arguments to use when instantiating {@code LuaEvent}.
+	 *
+	 * @throws IllegalStateException if an error occurred while instantiating {@code LuaEvent}.
+	 * @throws IllegalArgumentException if array of arguments differs from declared
+	 * 		{@code LuaEvent} constructor parameters in any way.
+	 *
+	 * @return new instance of {@code LuaEvent} for given class.
+	 */
+	public static @Nullable LuaEvent constructLuaEvent(Class<? extends LuaEvent> eventClass, Object... args) {
+
+		Constructor<?> constructor = EVENT_CONSTRUCTORS.get(eventClass);
+		try {
+			return constructor != null ? (LuaEvent) constructor.newInstance(args) : null;
+		}
+		catch (ReflectiveOperationException e) {
+			throw new IllegalStateException(e);
+		}
+	}
+
+	/**
+	 * Construct a new instance of {@link LuaEvent} with given array of arguments.
+	 *
+	 * @param eventName name of the {@code Class} denoting the {@code LuaEvent} to construct.
+	 * @param args array of arguments to use when instantiating {@code LuaEvent}.
+	 *
+	 * @throws IllegalStateException if an error occurred while instantiating {@code LuaEvent}.
+	 * @throws IllegalArgumentException if array of arguments differs from declared
+	 * 		{@code LuaEvent} constructor parameters in any way.
+	 *
+	 * @return new instance of {@code LuaEvent} for class of given name.
+	 */
+	public static @Nullable LuaEvent constructLuaEvent(String eventName, Object... args) {
+
+		Class<? extends LuaEvent> eventClass = EVENT_CLASSES.get(eventName);
+		return eventClass != null ? constructLuaEvent(eventClass, args) : null;
+	}
+
+	/**
+	 * Resolve and return name of the event denoted by given {@code Class}.
+	 */
+	static String getEventName(Class<? extends LuaEvent> eventClass) {
+
+		String className = eventClass.getSimpleName();
+		return className.endsWith("Event") ? className.substring(0, className.length() - 5) : className;
+	}
+}

From 30536c0a83d4cc95b43aa2582d657f9210dcce47 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 01:03:05 +0200
Subject: [PATCH 263/323] Test factory construction of LuaEvents

---
 .../storm/event/lua/LuaEventFactoryTest.java  | 150 ++++++++++++++++++
 1 file changed, 150 insertions(+)
 create mode 100644 core/src/test/java/io/pzstorm/storm/event/lua/LuaEventFactoryTest.java

diff --git a/core/src/test/java/io/pzstorm/storm/event/lua/LuaEventFactoryTest.java b/core/src/test/java/io/pzstorm/storm/event/lua/LuaEventFactoryTest.java
new file mode 100644
index 0000000..bda8be1
--- /dev/null
+++ b/core/src/test/java/io/pzstorm/storm/event/lua/LuaEventFactoryTest.java
@@ -0,0 +1,150 @@
+package io.pzstorm.storm.event.lua;
+
+import com.google.common.collect.ImmutableMap;
+import io.pzstorm.storm.UnitTest;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import se.krka.kahlua.vm.KahluaTable;
+import zombie.characters.IsoGameCharacter;
+import zombie.characters.IsoPlayer;
+import zombie.characters.IsoZombie;
+import zombie.characters.SurvivorDesc;
+import zombie.inventory.types.HandWeapon;
+import zombie.iso.BuildingDef;
+import zombie.iso.IsoMovingObject;
+import zombie.iso.IsoObject;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+class LuaEventFactoryTest implements UnitTest {
+
+	private static final Map<Class<? extends LuaEvent>, Class<?>[]> EVENT_CLASS_CONSTRUCTOR_DATA =
+			ImmutableMap.<Class<? extends LuaEvent>, Class<?>[]>builder()
+					.put(OnChallengeQueryEvent.class, new Class<?>[]{})
+					.put(OnCharacterCollideEvent.class, new Class<?>[] {
+							IsoMovingObject.class, IsoObject.class
+					})
+					.put(OnCreateLivingCharacterEvent.class, new Class<?>[] {
+							IsoPlayer.class, SurvivorDesc.class
+					})
+					.put(OnFETickEvent.class, new Class<?>[] {
+							int.class
+					})
+					.put(OnFillInventoryObjectContextMenuEvent.class, new Class<?>[] {})
+					.put(OnFillWorldObjectContextMenuEvent.class, new Class<?>[] {})
+					.put(OnGameBootEvent.class, new Class<?>[] {})
+					.put(OnGameStartEvent.class, new Class<?>[] {})
+					.put(OnJoypadActivateEvent.class, new Class<?>[] {
+							int.class
+					})
+					.put(OnKeyPressedEvent.class, new Class<?>[] {
+							int.class
+					})
+					.put(OnKeyStartPressedEvent.class, new Class<?>[] {
+							int.class
+					})
+					.put(OnLoadMapZonesEvent.class, new Class<?>[] {})
+					.put(OnMultiTriggerNPCEvent.class, new Class<?>[] {
+							String.class, KahluaTable.class, BuildingDef.class
+					})
+					.put(OnObjectCollideEvent.class, new Class<?>[] {
+							IsoMovingObject.class, IsoObject.class
+					})
+					.put(OnPlayerUpdateEvent.class, new Class<?>[] {
+							IsoPlayer.class
+					})
+					.put(OnPostUIDrawEvent.class, new Class<?>[] {})
+					.put(OnPreFillInventoryObjectContextMenuEvent.class, new Class<?>[] {})
+					.put(OnPreUIDrawEvent.class, new Class<?>[] {})
+					.put(OnRefreshInventoryWindowContainersEvent.class, new Class<?>[] {})
+					.put(OnTickEvenPausedEvent.class, new Class<?>[] {
+							double.class
+					})
+					.put(OnTickEvent.class, new Class<?>[] {
+							double.class
+					})
+					.put(OnTriggerNPCEvent.class, new Class<?>[] {
+							String.class, KahluaTable.class, BuildingDef.class
+					})
+					.put(OnWeaponHitCharacterEvent.class, new Class<?>[] {
+							IsoGameCharacter.class, IsoGameCharacter.class, HandWeapon.class, float.class
+					})
+					.put(OnWeaponSwingEvent.class, new Class<?>[] {
+							IsoGameCharacter.class, HandWeapon.class
+					})
+					.put(OnZombieUpdateEvent.class, new Class<?>[] {
+							IsoZombie.class
+					})
+					.build();
+
+	@Test
+	void shouldConstructLuaEventFromClassInstance() {
+
+		for (Map.Entry<Class<? extends LuaEvent>, Class<?>[]> entry : EVENT_CLASS_CONSTRUCTOR_DATA.entrySet())
+		{
+			Class<? extends LuaEvent> eventClass = entry.getKey();
+			List<Object> constructorArgs = getDummyConstructorArgList(entry.getValue());
+			LuaEvent event = LuaEventFactory.constructLuaEvent(eventClass, constructorArgs.toArray());
+
+			Assertions.assertNotNull(event);
+			Assertions.assertTrue(eventClass.isAssignableFrom(event.getClass()));
+		}
+	}
+
+	@Test
+	void shouldConstructLuaEventFromClassName() {
+
+		for (Map.Entry<Class<? extends LuaEvent>, Class<?>[]> entry : EVENT_CLASS_CONSTRUCTOR_DATA.entrySet())
+		{
+			Class<? extends LuaEvent> eventClass = entry.getKey();
+			List<Object> constructorArgs = getDummyConstructorArgList(entry.getValue());
+			String eventName = LuaEventFactory.getEventName(eventClass);
+			LuaEvent event = LuaEventFactory.constructLuaEvent(eventName, constructorArgs.toArray());
+
+			Assertions.assertNotNull(event);
+			Assertions.assertTrue(eventClass.isAssignableFrom(event.getClass()));
+		}
+	}
+
+	private List<Object> getDummyConstructorArgList(Class<?>[] constructorArgTypes) {
+
+		List<Object> result = new ArrayList<>();
+		for (Class<?> argType : constructorArgTypes)
+		{
+			Object object;
+			if (argType.isPrimitive())
+			{
+				if (argType == int.class) {
+					object = 0;
+				}
+				else if (argType == double.class) {
+					object = 0.0D;
+				}
+				else if (argType == float.class) {
+					object = 0.0f;
+				}
+				else if (argType == short.class) {
+					object = (short) 0;
+				}
+				else if (argType == long.class) {
+					object = (long) 0;
+				}
+				else if (argType == byte.class) {
+					object = (byte) 0;
+				}
+				else if (argType == char.class) {
+					object = 'a';
+				}
+				else if (argType == boolean.class) {
+					object = false;
+				}
+				else throw new UnsupportedOperationException();
+			}
+			else object = argType.cast(null);
+			result.add(object);
+		}
+		return result;
+	}
+}

From 451cbf3737fb49ff723fbd0d830d324e90433302 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 01:03:42 +0200
Subject: [PATCH 264/323] Load LuaEvent factory and classes

---
 core/src/main/java/io/pzstorm/storm/core/StormLauncher.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index b0dde05..94e9654 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -39,6 +39,9 @@ public static void main(String[] args) throws ReflectiveOperationException {
 		// load and register all local mods found in user.home
 		StormBootstrap.loadAndRegisterMods();
 
+		// load LuaEvent factory and classes
+		classLoader.loadClass("io.pzstorm.storm.event.lua.LuaEventFactory");
+
 		// initialize dispatcher system
 		Class<?> eventHandler = classLoader.loadClass("io.pzstorm.storm.event.StormEventHandler");
 		Class<?> eventDispatcher = classLoader.loadClass("io.pzstorm.storm.event.StormEventDispatcher");

From 07038b15efbaa93e5b96f395d2d3b97c9d78ad8d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 01:04:02 +0200
Subject: [PATCH 265/323] Write note about creating LuaEvents

---
 .../java/io/pzstorm/storm/event/lua/LuaEvent.java  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
index 762f316..c459160 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
@@ -4,11 +4,15 @@
 import zombie.Lua.LuaEventManager;
 
 /**
- * This class represents an in-game event dispatched to Lua mods.
- * Lua events are handled by {@link LuaEventManager}. Storm intercepts these
- * events and dispatches them as {@link LuaEvent} implementation instances.
- * Subscribing to events being defined as Java classes offers much easier
- * and safer interaction to subscribers then when subscribing from Lua.
+ * <p>This class represents an in-game event dispatched to Lua mods. Lua events are handled by
+ * {@link LuaEventManager}. Storm intercepts these events and dispatches them as {@link LuaEvent}
+ * implementation instances. Subscribing to events being defined as Java classes offers much
+ * easier and safer interaction to subscribers then when subscribing from Lua.</p>
+ * <h3>Note for developers</h3>
+ * <p>When writing new event implementation classes do not forget to add the class
+ * references to {@link LuaEventFactory} static block so that the references are
+ * properly mapped and recognized by factory. If the references are not added the
+ * factory will not be able create new instances of those event.</p>
  */
 public interface LuaEvent extends ZomboidEvent {
 

From 171c2c65b82a45ebb2bb1e4fa27ce44d2e5be37f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 04:21:07 +0200
Subject: [PATCH 266/323] Move LuaEventFactory class

---
 api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java    | 2 +-
 core/src/main/java/io/pzstorm/storm/core/StormLauncher.java   | 2 +-
 .../main/java/io/pzstorm/storm/event}/LuaEventFactory.java    | 3 ++-
 .../io/pzstorm/storm/event/{lua => }/LuaEventFactoryTest.java | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)
 rename {api/src/main/java/io/pzstorm/storm/event/lua => core/src/main/java/io/pzstorm/storm/event}/LuaEventFactory.java (98%)
 rename core/src/test/java/io/pzstorm/storm/event/{lua => }/LuaEventFactoryTest.java (97%)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
index c459160..29a31fe 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
@@ -10,7 +10,7 @@
  * easier and safer interaction to subscribers then when subscribing from Lua.</p>
  * <h3>Note for developers</h3>
  * <p>When writing new event implementation classes do not forget to add the class
- * references to {@link LuaEventFactory} static block so that the references are
+ * references to {@code LuaEventFactory} static block so that the references are
  * properly mapped and recognized by factory. If the references are not added the
  * factory will not be able create new instances of those event.</p>
  */
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 94e9654..40265aa 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -40,7 +40,7 @@ public static void main(String[] args) throws ReflectiveOperationException {
 		StormBootstrap.loadAndRegisterMods();
 
 		// load LuaEvent factory and classes
-		classLoader.loadClass("io.pzstorm.storm.event.lua.LuaEventFactory");
+		classLoader.loadClass("io.pzstorm.storm.event.LuaEventFactory");
 
 		// initialize dispatcher system
 		Class<?> eventHandler = classLoader.loadClass("io.pzstorm.storm.event.StormEventHandler");
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEventFactory.java b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
similarity index 98%
rename from api/src/main/java/io/pzstorm/storm/event/lua/LuaEventFactory.java
rename to core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
index bf41014..2ef9050 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEventFactory.java
+++ b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
@@ -1,5 +1,6 @@
-package io.pzstorm.storm.event.lua;
+package io.pzstorm.storm.event;
 
+import io.pzstorm.storm.event.lua.*;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
 
diff --git a/core/src/test/java/io/pzstorm/storm/event/lua/LuaEventFactoryTest.java b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
similarity index 97%
rename from core/src/test/java/io/pzstorm/storm/event/lua/LuaEventFactoryTest.java
rename to core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
index bda8be1..2c9f1e6 100644
--- a/core/src/test/java/io/pzstorm/storm/event/lua/LuaEventFactoryTest.java
+++ b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
@@ -1,7 +1,9 @@
-package io.pzstorm.storm.event.lua;
+package io.pzstorm.storm.event;
 
 import com.google.common.collect.ImmutableMap;
 import io.pzstorm.storm.UnitTest;
+import io.pzstorm.storm.event.LuaEventFactory;
+import io.pzstorm.storm.event.lua.*;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import se.krka.kahlua.vm.KahluaTable;

From b04660313bc42922153c3ccaa019357f790646ed Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 04:54:27 +0200
Subject: [PATCH 267/323] Add more LuaEvent implementations

---
 .../event/lua/AcceptedFactionInviteEvent.java | 15 ++++++++
 .../storm/event/lua/AcceptedTradeEvent.java   | 16 ++++++++
 .../pzstorm/storm/event/lua/AddXPEvent.java   | 32 ++++++++++++++++
 .../event/lua/DoSpecialTooltipEvent.java      | 27 +++++++++++++
 .../storm/event/lua/EveryDaysEvent.java       |  9 +++++
 .../storm/event/lua/EveryHoursEvent.java      |  9 +++++
 .../storm/event/lua/EveryOneMinuteEvent.java  |  9 +++++
 .../storm/event/lua/EveryTenMinutesEvent.java |  9 +++++
 .../storm/event/lua/LevelPerkEvent.java       | 38 +++++++++++++++++++
 .../storm/event/lua/LoadGridsquareEvent.java  | 19 ++++++++++
 .../event/lua/MngInvReceiveItemsEvent.java    | 14 +++++++
 .../storm/event/lua/OnAIStateChangeEvent.java | 32 ++++++++++++++++
 .../storm/event/lua/OnAIStateEnterEvent.java  | 19 ++++++++++
 .../event/lua/OnAIStateExecuteEvent.java      | 19 ++++++++++
 .../storm/event/lua/OnAIStateExitEvent.java   | 19 ++++++++++
 .../storm/event/lua/OnAcceptInviteEvent.java  | 14 +++++++
 .../storm/event/lua/OnAddBuildingEvent.java   |  9 +++++
 .../storm/event/lua/OnAddMessageEvent.java    | 25 ++++++++++++
 .../storm/event/lua/OnAdminMessageEvent.java  | 18 +++++++++
 .../storm/event/lua/OnAmbientSoundEvent.java  | 29 ++++++++++++++
 .../event/lua/OnBeingHitByZombieEvent.java    |  9 +++++
 .../lua/OnCGlobalObjectSystemInitEvent.java   |  7 ++++
 .../storm/event/lua/OnChangeWeatherEvent.java |  9 +++++
 .../lua/OnCharacterCreateStatsEvent.java      |  9 +++++
 .../event/lua/OnCharacterDeathEvent.java      | 19 ++++++++++
 .../storm/event/lua/OnCharacterMeetEvent.java |  9 +++++
 .../event/lua/OnChatWindowInitEvent.java      |  9 +++++
 .../storm/event/lua/OnClientCommandEvent.java | 23 +++++++++++
 .../event/lua/OnClimateManagerInitEvent.java  | 19 ++++++++++
 .../event/lua/OnClimateTickDebugEvent.java    | 19 ++++++++++
 .../storm/event/lua/OnClimateTickEvent.java   | 19 ++++++++++
 .../event/lua/OnClothingUpdatedEvent.java     | 19 ++++++++++
 .../storm/event/lua/OnConnectFailedEvent.java | 21 ++++++++++
 .../storm/event/lua/OnConnectedEvent.java     |  9 +++++
 .../lua/OnConnectionStateChangedEvent.java    | 20 ++++++++++
 .../pzstorm/storm/event/LuaEventFactory.java  | 35 +++++++++++++++++
 36 files changed, 636 insertions(+)
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/EveryDaysEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/EveryHoursEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/EveryOneMinuteEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/EveryTenMinutesEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/LoadGridsquareEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/MngInvReceiveItemsEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateEnterEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExecuteEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExitEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnAcceptInviteEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCGlobalObjectSystemInitEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterDeathEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnChatWindowInitEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnClimateManagerInitEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickDebugEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnClothingUpdatedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnConnectFailedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnConnectedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
new file mode 100644
index 0000000..e523856
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
@@ -0,0 +1,15 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * This event is currently not used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class AcceptedFactionInviteEvent implements LuaEvent {
+
+	public final String var1, var2;
+
+	public AcceptedFactionInviteEvent(String var1, String var2) {
+		this.var1 = var1;
+		this.var2 = var2;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java
new file mode 100644
index 0000000..a1a98a8
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java
@@ -0,0 +1,16 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+
+/**
+ * This event is currently not used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class AcceptedTradeEvent implements LuaEvent {
+
+	public final IsoPlayer player;
+
+	public AcceptedTradeEvent(IsoPlayer player) {
+		this.player = player;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
new file mode 100644
index 0000000..6e9ef6e
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
@@ -0,0 +1,32 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.characters.skills.PerkFactory;
+
+/**
+ * Triggered when {@link IsoGameCharacter} earns skill experience.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class AddXPEvent implements LuaEvent {
+
+	/**
+	 * Game character earning experience.
+	 */
+	public final IsoGameCharacter player;
+
+	/**
+	 * Perk to earn experience for.
+	 */
+	public final PerkFactory.Perks perk;
+
+	/**
+	 * Amount of experience to earn.
+	 */
+	public final float xpAmount;
+
+	public AddXPEvent(IsoGameCharacter player, PerkFactory.Perks perk, float xpAmount) {
+		this.player = player;
+		this.perk = perk;
+		this.xpAmount = xpAmount;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java
new file mode 100644
index 0000000..b16937d
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java
@@ -0,0 +1,27 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoGridSquare;
+import zombie.iso.IsoObject;
+import zombie.ui.ObjectTooltip;
+
+/**
+ * This event triggers when {@link IsoObject} renders special tooltip.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class DoSpecialTooltipEvent implements LuaEvent {
+
+	/**
+	 * The tooltip being rendered.
+	 */
+	public final ObjectTooltip tooltip;
+
+	/**
+	 * Location of {@link IsoObject} being rendered.
+	 */
+	public final IsoGridSquare square;
+
+	public DoSpecialTooltipEvent(ObjectTooltip tooltip, IsoGridSquare square) {
+		this.tooltip = tooltip;
+		this.square = square;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/EveryDaysEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/EveryDaysEvent.java
new file mode 100644
index 0000000..88d2fba
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/EveryDaysEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called every in game day at midnight.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class EveryDaysEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/EveryHoursEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/EveryHoursEvent.java
new file mode 100644
index 0000000..f33578d
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/EveryHoursEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called every in game hour on the hour.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class EveryHoursEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/EveryOneMinuteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/EveryOneMinuteEvent.java
new file mode 100644
index 0000000..63411af
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/EveryOneMinuteEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called every in game minute.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class EveryOneMinuteEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/EveryTenMinutesEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/EveryTenMinutesEvent.java
new file mode 100644
index 0000000..bd70d9f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/EveryTenMinutesEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called every ten in game minutes.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class EveryTenMinutesEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
new file mode 100644
index 0000000..d0474c7
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
@@ -0,0 +1,38 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.characters.skills.PerkFactory;
+
+/**
+ * Triggered when a perk is leveled up or down.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class LevelPerkEvent implements LuaEvent {
+
+	/**
+	 * The character whose perk is being leveled up or down.
+	 */
+	public final IsoGameCharacter player;
+
+	/**
+	 * The perk being leveled up.
+	 */
+	public final PerkFactory.Perks perk;
+
+	/**
+	 * Perk level after leveling up or down.
+	 */
+	public final int level;
+
+	/**
+	 * {@code true} if leveling perk up or {@code false} if leveling down.
+	 */
+	public final boolean levelingUp;
+
+	public LevelPerkEvent(IsoGameCharacter player, PerkFactory.Perks perk, int level, boolean levelingUp) {
+		this.player = player;
+		this.perk = perk;
+		this.level = level;
+		this.levelingUp = levelingUp;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LoadGridsquareEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LoadGridsquareEvent.java
new file mode 100644
index 0000000..508c04f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LoadGridsquareEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoGridSquare;
+
+/**
+ * Triggered when {@link IsoGridSquare} is loaded.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class LoadGridsquareEvent implements LuaEvent {
+
+	/**
+	 * {@link IsoGridSquare} being loaded.
+	 */
+	public final IsoGridSquare gridSquare;
+
+	public LoadGridsquareEvent(IsoGridSquare gridSquare) {
+		this.gridSquare = gridSquare;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/MngInvReceiveItemsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/MngInvReceiveItemsEvent.java
new file mode 100644
index 0000000..6c65bce
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/MngInvReceiveItemsEvent.java
@@ -0,0 +1,14 @@
+package io.pzstorm.storm.event.lua;
+
+import se.krka.kahlua.vm.KahluaTable;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class MngInvReceiveItemsEvent implements LuaEvent {
+
+	// TODO: document this event
+	public final KahluaTable table;
+
+	public MngInvReceiveItemsEvent(KahluaTable table) {
+		this.table = table;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java
new file mode 100644
index 0000000..fe4106e
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java
@@ -0,0 +1,32 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.ai.State;
+import zombie.characters.IsoGameCharacter;
+
+/**
+ * Triggered before an AI state changes.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnAIStateChangeEvent implements LuaEvent {
+
+	/**
+	 * Character that owns the state machine.
+	 */
+	public final IsoGameCharacter character;
+
+	/**
+	 * The new AI state.
+	 */
+	public final State newState;
+
+	/**
+	 * The previous AI state.
+	 */
+	public final State prevState;
+
+	public OnAIStateChangeEvent(IsoGameCharacter character, State newState, State prevState) {
+		this.character = character;
+		this.newState = newState;
+		this.prevState = prevState;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateEnterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateEnterEvent.java
new file mode 100644
index 0000000..d0e7a8d
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateEnterEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+
+/**
+ * Triggered when an AI state is entered.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnAIStateEnterEvent implements LuaEvent {
+
+	/**
+	 * The character the state will execute on.
+	 */
+	public final IsoGameCharacter character;
+
+	public OnAIStateEnterEvent(IsoGameCharacter character) {
+		this.character = character;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExecuteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExecuteEvent.java
new file mode 100644
index 0000000..e4a0c44
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExecuteEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+
+/**
+ * Triggered when an AI state executes.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnAIStateExecuteEvent implements LuaEvent {
+
+	/**
+	 * The character the state executed on.
+	 */
+	public final IsoGameCharacter character;
+
+	public OnAIStateExecuteEvent(IsoGameCharacter character) {
+		this.character = character;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExitEvent.java
new file mode 100644
index 0000000..5a30744
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExitEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+
+/**
+ * Triggered when an AI state is exited.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnAIStateExitEvent implements LuaEvent {
+
+	/**
+	 * The character the state was executed on.
+	 */
+	public final IsoGameCharacter character;
+
+	public OnAIStateExitEvent(IsoGameCharacter character) {
+		this.character = character;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAcceptInviteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAcceptInviteEvent.java
new file mode 100644
index 0000000..672229d
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAcceptInviteEvent.java
@@ -0,0 +1,14 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggers when a player accepts invite for co-op play on Steam.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnAcceptInviteEvent implements LuaEvent {
+
+	public final String var1;
+
+	public OnAcceptInviteEvent(String var1) {
+		this.var1 = var1;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java
new file mode 100644
index 0000000..73b8173
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * This event is currently not used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnAddBuildingEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
new file mode 100644
index 0000000..cf8f57a
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
@@ -0,0 +1,25 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.chat.ChatMessage;
+
+/**
+ * Triggers when a message is added to chat.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnAddMessageEvent implements LuaEvent {
+
+	/**
+	 * Message being added to chat.
+	 */
+	public final ChatMessage message;
+
+	/**
+	 * Chat tab ID the message is being added to.
+	 */
+	public final short tabID;
+
+	public OnAddMessageEvent(ChatMessage message, short tabID) {
+		this.message = message;
+		this.tabID = tabID;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
new file mode 100644
index 0000000..5269112
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
@@ -0,0 +1,18 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggers when a player receives an admin message.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnAdminMessageEvent implements LuaEvent {
+
+	public final String message;
+	public final int var1, var2, var3;
+
+	public OnAdminMessageEvent(String message, int var1, int var2, int var3) {
+		this.message = message;
+		this.var1 = var1;
+		this.var2 = var2;
+		this.var3 = var3;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
new file mode 100644
index 0000000..7a1924b
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
@@ -0,0 +1,29 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggers when an ambient sound is constructed.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnAmbientSoundEvent implements LuaEvent {
+
+	/**
+	 * Name of the ambient sound being constructed.
+	 */
+	public final String soundName;
+
+	/**
+	 * Position of ambient sound along x-axis.
+	 */
+	public final float x;
+
+	/**
+	 * Position of ambient sound along y-axis.
+	 */
+	public final float y;
+
+	public OnAmbientSoundEvent(String soundName, float x, float y) {
+		this.soundName = soundName;
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java
new file mode 100644
index 0000000..13fa9a6
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * This event is currently not being used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnBeingHitByZombieEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCGlobalObjectSystemInitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCGlobalObjectSystemInitEvent.java
new file mode 100644
index 0000000..ab32f71
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCGlobalObjectSystemInitEvent.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm.event.lua;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCGlobalObjectSystemInitEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java
new file mode 100644
index 0000000..accdf01
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * This event is currently not used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnChangeWeatherEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java
new file mode 100644
index 0000000..5f09aca
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * This event is currently not used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCharacterCreateStatsEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterDeathEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterDeathEvent.java
new file mode 100644
index 0000000..941f301
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterDeathEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+
+/**
+ * Triggered when {@link IsoGameCharacter} dies.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCharacterDeathEvent implements LuaEvent {
+
+	/**
+	 * Character that just died.
+	 */
+	public final IsoGameCharacter character;
+
+	public OnCharacterDeathEvent(IsoGameCharacter character) {
+		this.character = character;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java
new file mode 100644
index 0000000..46308fd
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * This event is currently not used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCharacterMeetEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnChatWindowInitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnChatWindowInitEvent.java
new file mode 100644
index 0000000..83ff12b
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnChatWindowInitEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when chat window is initialized.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnChatWindowInitEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java
new file mode 100644
index 0000000..6d9ecba
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java
@@ -0,0 +1,23 @@
+package io.pzstorm.storm.event.lua;
+
+import se.krka.kahlua.vm.KahluaTable;
+import zombie.characters.IsoPlayer;
+
+/**
+ * Triggered when server receives a command from client.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnClientCommandEvent implements LuaEvent {
+
+	public final String var1;
+	public final String var2;
+	public final IsoPlayer player;
+	public final KahluaTable table;
+
+	public OnClientCommandEvent(String var1, String var2, IsoPlayer player, KahluaTable table) {
+		this.var1 = var1;
+		this.var2 = var2;
+		this.player = player;
+		this.table = table;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateManagerInitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateManagerInitEvent.java
new file mode 100644
index 0000000..f39ac04
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateManagerInitEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.weather.ClimateManager;
+
+/**
+ * Triggered after {@link ClimateManager} has been initialized.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnClimateManagerInitEvent implements LuaEvent {
+
+	/**
+	 * {@link ClimateManager} that has just initialized.
+	 */
+	public final ClimateManager manager;
+
+	public OnClimateManagerInitEvent(ClimateManager manager) {
+		this.manager = manager;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickDebugEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickDebugEvent.java
new file mode 100644
index 0000000..56c1095
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickDebugEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.weather.ClimateManager;
+
+/**
+ * Triggered every time {@link ClimateManager} is updated in debug mode.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnClimateTickDebugEvent implements LuaEvent {
+
+	/**
+	 * {@link ClimateManager} that is being updated.
+	 */
+	public final ClimateManager manager;
+
+	public OnClimateTickDebugEvent(ClimateManager manager) {
+		this.manager = manager;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java
new file mode 100644
index 0000000..bbf110d
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.weather.ClimateManager;
+
+/**
+ * Triggered every time {@link ClimateManager} is updated.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnClimateTickEvent implements LuaEvent {
+
+	/**
+	 * {@link ClimateManager} that is being updated.
+	 */
+	public final ClimateManager manager;
+
+	public OnClimateTickEvent(ClimateManager manager) {
+		this.manager = manager;
+	}
+}
\ No newline at end of file
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClothingUpdatedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClothingUpdatedEvent.java
new file mode 100644
index 0000000..6097186
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClothingUpdatedEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+
+/**
+ * Triggered when a character's clothing items are updated.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnClothingUpdatedEvent implements LuaEvent {
+
+	/**
+	 * The character whose clothing was updated.
+	 */
+	public final IsoGameCharacter character;
+
+	public OnClothingUpdatedEvent(IsoGameCharacter character) {
+		this.character = character;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectFailedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectFailedEvent.java
new file mode 100644
index 0000000..4315999
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectFailedEvent.java
@@ -0,0 +1,21 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when connection to server has failed.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnConnectFailedEvent implements LuaEvent {
+
+	/**
+	 * Connection failure reason.
+	 */
+	public final String reason;
+
+	public OnConnectFailedEvent(String reason) {
+		this.reason = reason;
+	}
+
+	public OnConnectFailedEvent() {
+		this.reason = "";
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectedEvent.java
new file mode 100644
index 0000000..38eac6c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectedEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called when player successfully connects to server.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnConnectedEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java
new file mode 100644
index 0000000..9601c44
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called at the different stages that a players connection
+ * state changes to the server when initially connecting.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnConnectionStateChangedEvent implements LuaEvent {
+
+	public final String state, message;
+
+	public OnConnectionStateChangedEvent(String state, String message) {
+		this.state = state;
+		this.message = message;
+	}
+
+	public OnConnectionStateChangedEvent(String state) {
+		this(state, "");
+	}
+}
diff --git a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
index 2ef9050..ffa030f 100644
--- a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
+++ b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
@@ -43,7 +43,42 @@ public class LuaEventFactory {
 		 * to instantiate the related event instance with this factory
 		 */
 		Class<? extends LuaEvent>[] eventClasses = (Class<? extends LuaEvent>[]) new Class[] {
+				AcceptedFactionInviteEvent.class,
+				AcceptedTradeEvent.class,
+				AddXPEvent.class,
+				DoSpecialTooltipEvent.class,
+				EveryDaysEvent.class,
+				EveryHoursEvent.class,
+				EveryOneMinuteEvent.class,
+				EveryTenMinutesEvent.class,
+				LevelPerkEvent.class,
+				LoadGridsquareEvent.class,
+				MngInvReceiveItemsEvent.class,
+				OnAcceptInviteEvent.class,
+				OnAddBuildingEvent.class,
+				OnAddMessageEvent.class,
+				OnAdminMessageEvent.class,
+				OnAIStateChangeEvent.class,
+				OnAIStateEnterEvent.class,
+				OnAIStateExecuteEvent.class,
+				OnAIStateExitEvent.class,
+				OnAmbientSoundEvent.class,
+				OnBeingHitByZombieEvent.class,
+				OnCGlobalObjectSystemInitEvent.class,
 				OnChallengeQueryEvent.class,
+				OnChangeWeatherEvent.class,
+				OnCharacterCreateStatsEvent.class,
+				OnCharacterDeathEvent.class,
+				OnCharacterMeetEvent.class,
+				OnChatWindowInitEvent.class,
+				OnClientCommandEvent.class,
+				OnClimateManagerInitEvent.class,
+				OnClimateTickDebugEvent.class,
+				OnClimateTickEvent.class,
+				OnClothingUpdatedEvent.class,
+				OnConnectionStateChangedEvent.class,
+				OnConnectedEvent.class,
+				OnConnectFailedEvent.class,
 				OnCharacterCollideEvent.class,
 				OnCreateLivingCharacterEvent.class,
 				OnFETickEvent.class,

From 078c0c5f7b9b99c90308cce35672f9962c99dc97 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 05:32:49 +0200
Subject: [PATCH 268/323] Expand support for event multi-constructors

---
 .../pzstorm/storm/event/LuaEventFactory.java  | 81 +++++++++++++------
 1 file changed, 55 insertions(+), 26 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
index ffa030f..2be2379 100644
--- a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
+++ b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
@@ -1,11 +1,11 @@
 package io.pzstorm.storm.event;
 
 import io.pzstorm.storm.event.lua.*;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,7 +24,7 @@ public class LuaEventFactory {
 	 * Constructors are mapped in this way to increase performance when instantiating {@code LuaEvent}s.
 	 */
 	@Unmodifiable
-	private static final Map<Class<? extends LuaEvent>, Constructor<? extends LuaEvent>> EVENT_CONSTRUCTORS;
+	private static final Map<Class<? extends LuaEvent>, Constructor<? extends LuaEvent>[]> EVENT_CONSTRUCTORS;
 
 	/**
 	 * This map contains {@link LuaEvent} classes mapped to their respected names.
@@ -35,7 +35,7 @@ public class LuaEventFactory {
 
 	static
 	{
-		Map<Class<? extends LuaEvent>, Constructor<LuaEvent>> eventConstructors = new HashMap<>();
+		Map<Class<? extends LuaEvent>, Constructor<LuaEvent>[]> eventConstructors = new HashMap<>();
 		Map<String, Class<? extends LuaEvent>> eventClassesMap = new HashMap<>();
 		/*
 		 * this is a complete list of all event classes,
@@ -108,15 +108,13 @@ public class LuaEventFactory {
 		for (Class<? extends LuaEvent> eventClass : eventClasses)
 		{
 			Constructor<?>[] constructors = eventClass.getConstructors();
-			if (constructors.length != 1) {
-				throw new IllegalStateException("Unexpected number of constructors found for class '" + eventClass + '\'');
+			for (Constructor<?> constructor : constructors)
+			{
+				if (!Modifier.isPublic(constructor.getModifiers())) {
+					throw new IllegalStateException("Found inaccessible constructor for class '" + eventClass + '\'');
+				}
 			}
-			Constructor<?> constructor = constructors[0];
-
-			if (!Modifier.isPublic(constructor.getModifiers())) {
-				throw new IllegalStateException("Found inaccessible constructor for class '" + eventClass + '\'');
-			}
-			eventConstructors.put(eventClass, (Constructor<LuaEvent>) constructors[0]);
+			eventConstructors.put(eventClass, (Constructor<LuaEvent>[]) constructors);
 
 			String className = getEventName(eventClass);
 			eventClassesMap.put(className, eventClass);
@@ -131,21 +129,47 @@ public class LuaEventFactory {
 	 * @param eventClass {@code Class} denoting the {@code LuaEvent} to construct.
 	 * @param args array of arguments to use when instantiating {@code LuaEvent}.
 	 *
-	 * @throws IllegalStateException if an error occurred while instantiating {@code LuaEvent}.
-	 * @throws IllegalArgumentException if array of arguments differs from declared
-	 * 		{@code LuaEvent} constructor parameters in any way.
+	 * @throws IllegalStateException if an error occurred while instantiating {@code LuaEvent}
+	 * 		or no registered constructors found for given event class.
+	 * @throws IllegalArgumentException if no constructor with parameters matching specified array of
+	 * 		arguments was found for given {@code LuaEvent} class.
 	 *
 	 * @return new instance of {@code LuaEvent} for given class.
 	 */
-	public static @Nullable LuaEvent constructLuaEvent(Class<? extends LuaEvent> eventClass, Object... args) {
+	public static LuaEvent constructLuaEvent(Class<? extends LuaEvent> eventClass, Object... args) {
 
-		Constructor<?> constructor = EVENT_CONSTRUCTORS.get(eventClass);
-		try {
-			return constructor != null ? (LuaEvent) constructor.newInstance(args) : null;
-		}
-		catch (ReflectiveOperationException e) {
-			throw new IllegalStateException(e);
+		Constructor<?>[] constructors = EVENT_CONSTRUCTORS.get(eventClass);
+		if (constructors != null)
+		{
+			Class<?>[] argTypes = new Class<?>[args.length];
+			for (int i = 0; i < args.length; i++) {
+				argTypes[i] = args[i] != null ? args[i].getClass() : null;
+			}
+			for (Constructor<?> constructor : constructors)
+			{
+				if (constructor.getParameterCount() == args.length)
+				{
+					Class<?>[] paramTypes = constructor.getParameterTypes();
+					for (int i = 0; i < paramTypes.length; i++)
+					{
+						// on parameter type mismatch skip to next constructor
+						if (paramTypes[i] != argTypes[i]) {
+							break;
+						}
+					}
+					try {
+						// if all parameter types match return this constructor
+						return (LuaEvent) constructor.newInstance(args);
+					}
+					catch (ReflectiveOperationException e) {
+						throw new IllegalStateException(e);
+					}
+				}
+			}
+			String message = "Unable to find constructor for class '%s' that matches arguments %s";
+			throw new IllegalArgumentException(String.format(message, eventClass, Arrays.toString(args)));
 		}
+		throw new IllegalStateException("No registered constructors found for event '" + eventClass + '\'');
 	}
 
 	/**
@@ -154,16 +178,21 @@ public class LuaEventFactory {
 	 * @param eventName name of the {@code Class} denoting the {@code LuaEvent} to construct.
 	 * @param args array of arguments to use when instantiating {@code LuaEvent}.
 	 *
-	 * @throws IllegalStateException if an error occurred while instantiating {@code LuaEvent}.
-	 * @throws IllegalArgumentException if array of arguments differs from declared
-	 * 		{@code LuaEvent} constructor parameters in any way.
+	 * @throws IllegalStateException if no registered {@code LuaEvent} class found for given name
+	 * 		or an error occurred while instantiating {@code LuaEvent} or no registered
+	 * 		constructors found for event class resolved from given name.
+	 * @throws IllegalArgumentException if no constructor with parameters matching specified array of
+	 * 		arguments was found for {@code LuaEvent} class resolved from given name.
 	 *
 	 * @return new instance of {@code LuaEvent} for class of given name.
 	 */
-	public static @Nullable LuaEvent constructLuaEvent(String eventName, Object... args) {
+	public static LuaEvent constructLuaEvent(String eventName, Object... args) {
 
 		Class<? extends LuaEvent> eventClass = EVENT_CLASSES.get(eventName);
-		return eventClass != null ? constructLuaEvent(eventClass, args) : null;
+		if (eventClass == null) {
+			throw new IllegalStateException("No registered LuaEvent class found for name '" + eventName + '\'');
+		}
+		return constructLuaEvent(eventClass, args);
 	}
 
 	/**

From d79c3254139190b833d5f2d3d0a91de69d11cd0c Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 05:33:31 +0200
Subject: [PATCH 269/323] Test creating events with multi-constructors

---
 .../pzstorm/storm/event/LuaEventFactoryTest.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
index 2c9f1e6..041ed1a 100644
--- a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
+++ b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
@@ -88,9 +88,8 @@ void shouldConstructLuaEventFromClassInstance() {
 		{
 			Class<? extends LuaEvent> eventClass = entry.getKey();
 			List<Object> constructorArgs = getDummyConstructorArgList(entry.getValue());
-			LuaEvent event = LuaEventFactory.constructLuaEvent(eventClass, constructorArgs.toArray());
 
-			Assertions.assertNotNull(event);
+			LuaEvent event = LuaEventFactory.constructLuaEvent(eventClass, constructorArgs.toArray());
 			Assertions.assertTrue(eventClass.isAssignableFrom(event.getClass()));
 		}
 	}
@@ -103,13 +102,22 @@ void shouldConstructLuaEventFromClassName() {
 			Class<? extends LuaEvent> eventClass = entry.getKey();
 			List<Object> constructorArgs = getDummyConstructorArgList(entry.getValue());
 			String eventName = LuaEventFactory.getEventName(eventClass);
-			LuaEvent event = LuaEventFactory.constructLuaEvent(eventName, constructorArgs.toArray());
 
-			Assertions.assertNotNull(event);
+			LuaEvent event = LuaEventFactory.constructLuaEvent(eventName, constructorArgs.toArray());
 			Assertions.assertTrue(eventClass.isAssignableFrom(event.getClass()));
 		}
 	}
 
+	@Test
+	void shouldConstructLuaEventWithMultipleConstructors() {
+
+		LuaEvent event = LuaEventFactory.constructLuaEvent(OnConnectFailedEvent.class, "");
+		Assertions.assertTrue(OnConnectFailedEvent.class.isAssignableFrom(event.getClass()));
+
+		event = LuaEventFactory.constructLuaEvent(OnConnectFailedEvent.class);
+		Assertions.assertTrue(OnConnectFailedEvent.class.isAssignableFrom(event.getClass()));
+	}
+
 	private List<Object> getDummyConstructorArgList(Class<?>[] constructorArgTypes) {
 
 		List<Object> result = new ArrayList<>();

From b158860f7682aaeb8368dc01b70977ef98e06717 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 07:11:30 +0200
Subject: [PATCH 270/323] Add more LuaEvent implementations

---
 .../event/lua/OnContainerUpdateEvent.java     | 24 +++++++++++
 .../event/lua/OnCoopJoinFailedEvent.java      | 17 ++++++++
 .../event/lua/OnCoopServerMessageEvent.java   | 14 +++++++
 .../storm/event/lua/OnCreatePlayerEvent.java  | 25 ++++++++++++
 .../event/lua/OnCreateSurvivorEvent.java      | 19 +++++++++
 .../storm/event/lua/OnCreateUIEvent.java      |  9 +++++
 .../storm/event/lua/OnCustomUIKeyEvent.java   | 19 +++++++++
 .../event/lua/OnCustomUIKeyPressedEvent.java  | 20 ++++++++++
 .../event/lua/OnCustomUIKeyReleasedEvent.java | 21 ++++++++++
 .../pzstorm/storm/event/lua/OnDawnEvent.java  |  9 +++++
 .../event/lua/OnDestroyIsoThumpableEvent.java | 26 ++++++++++++
 .../storm/event/lua/OnDeviceTextEvent.java    | 21 ++++++++++
 .../storm/event/lua/OnDisconnectEvent.java    |  9 +++++
 .../event/lua/OnDistributionMergeEvent.java   |  7 ++++
 .../event/lua/OnDoTileBuilding2Event.java     | 23 +++++++++++
 .../event/lua/OnDoTileBuilding3Event.java     | 21 ++++++++++
 .../event/lua/OnDoTileBuildingEvent.java      |  9 +++++
 .../pzstorm/storm/event/lua/OnDuskEvent.java  |  9 +++++
 .../storm/event/lua/OnEnterVehicleEvent.java  | 20 ++++++++++
 .../storm/event/lua/OnEquipPrimaryEvent.java  | 26 ++++++++++++
 .../event/lua/OnEquipSecondaryEvent.java      | 26 ++++++++++++
 .../storm/event/lua/OnFillContainerEvent.java | 31 ++++++++++++++
 .../event/lua/OnGameTimeLoadedEvent.java      | 11 +++++
 .../storm/event/lua/OnGetDBSchemaEvent.java   | 14 +++++++
 .../event/lua/OnGetTableResultEvent.java      | 19 +++++++++
 .../storm/event/lua/OnGridBurntEvent.java     | 19 +++++++++
 .../storm/event/lua/OnHitZombieEvent.java     | 40 +++++++++++++++++++
 .../lua/OnInitModdedWeatherStageEvent.java    | 21 ++++++++++
 28 files changed, 529 insertions(+)
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCreateSurvivorEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCreateUIEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnDisconnectEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnDistributionMergeEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnEnterVehicleEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnGameTimeLoadedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnGetDBSchemaEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnGridBurntEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
new file mode 100644
index 0000000..dc945b6
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
@@ -0,0 +1,24 @@
+package io.pzstorm.storm.event.lua;
+
+import org.jetbrains.annotations.Nullable;
+import zombie.iso.IsoGridSquare;
+
+/**
+ * Triggered when an inventory container is being updated.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnContainerUpdateEvent implements LuaEvent {
+
+	/**
+	 * Position of the inventory container being updated.
+	 */
+	public final @Nullable IsoGridSquare gridSquare;
+
+	public OnContainerUpdateEvent(@Nullable IsoGridSquare gridSquare) {
+		this.gridSquare = gridSquare;
+	}
+
+	public OnContainerUpdateEvent() {
+		this(null);
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java
new file mode 100644
index 0000000..570a735
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java
@@ -0,0 +1,17 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when access to co-op session was denied to player.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCoopJoinFailedEvent implements LuaEvent {
+
+	/**
+	 * Index of player who was denied access.
+	 */
+	public final int playerIndex;
+
+	public OnCoopJoinFailedEvent(int playerIndex) {
+		this.playerIndex = playerIndex;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java
new file mode 100644
index 0000000..4e2bd7a
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java
@@ -0,0 +1,14 @@
+package io.pzstorm.storm.event.lua;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCoopServerMessageEvent implements LuaEvent {
+
+	// TODO: document this event
+	public final String var1, var2, var3;
+
+	public OnCoopServerMessageEvent(String var1, String var2, String var3) {
+		this.var1 = var1;
+		this.var2 = var2;
+		this.var3 = var3;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
new file mode 100644
index 0000000..6800574
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
@@ -0,0 +1,25 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+
+/**
+ * Triggered when a player is created.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCreatePlayerEvent implements LuaEvent {
+
+	/**
+	 * Index of player being created.
+	 */
+	public final int playerIndex;
+
+	/**
+	 * The player which was created.
+	 */
+	public final IsoPlayer player;
+
+	public OnCreatePlayerEvent(int playerIndex, IsoPlayer player) {
+		this.playerIndex = playerIndex;
+		this.player = player;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateSurvivorEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateSurvivorEvent.java
new file mode 100644
index 0000000..36fc2fa
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateSurvivorEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoSurvivor;
+
+/**
+ * Triggered when a survivor is created.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCreateSurvivorEvent implements LuaEvent {
+
+	/**
+	 * The survivor which was created.
+	 */
+	public final IsoSurvivor survivor;
+
+	public OnCreateSurvivorEvent(IsoSurvivor survivor) {
+		this.survivor = survivor;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateUIEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateUIEvent.java
new file mode 100644
index 0000000..523b767
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateUIEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered after UI initialization.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCreateUIEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java
new file mode 100644
index 0000000..b2d4ef7
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * <p>Triggers when a unmapped keyboard key is releases.</p>
+ * This event is exactly the same as {@link OnCustomUIKeyReleasedEvent}.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCustomUIKeyEvent implements LuaEvent {
+
+	/**
+	 * <p>Integer denoting the key being released.</p>
+	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
+	 */
+	public final int key;
+
+	public OnCustomUIKeyEvent(int key) {
+		this.key = key;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java
new file mode 100644
index 0000000..e109c7c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggers when an unmapped keyboard key is pressed.
+ *
+ * @see OnCustomUIKeyReleasedEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCustomUIKeyPressedEvent implements LuaEvent {
+
+	/**
+	 * <p>Integer denoting the key being pressed.</p>
+	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
+	 */
+	public final int key;
+
+	public OnCustomUIKeyPressedEvent(int key) {
+		this.key = key;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java
new file mode 100644
index 0000000..420aa84
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java
@@ -0,0 +1,21 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * <p>Triggers when a unmapped keyboard key is releases.</p>
+ * This event is exactly the same as {@link OnCustomUIKeyEvent}.
+ *
+ * @see OnCustomUIKeyPressedEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnCustomUIKeyReleasedEvent implements LuaEvent {
+
+	/**
+	 * <p>Integer denoting the key being released.</p>
+	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
+	 */
+	public final int key;
+
+	public OnCustomUIKeyReleasedEvent(int key) {
+		this.key = key;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java
new file mode 100644
index 0000000..a871a1b
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * This event is currently not used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnDawnEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java
new file mode 100644
index 0000000..3e561e4
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.event.lua;
+
+import org.jetbrains.annotations.Nullable;
+import zombie.iso.objects.IsoThumpable;
+
+/**
+ * Triggered when {@link IsoThumpable} object gets destroyed.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnDestroyIsoThumpableEvent implements LuaEvent {
+
+	/**
+	 * Object being destroyed.
+	 */
+	public final IsoThumpable thumpableObject;
+
+	/**
+	 * This object is always {@code null}.
+	 */
+	public final @Nullable Object object;
+
+	public OnDestroyIsoThumpableEvent(IsoThumpable thumpableObject, @Nullable Object object) {
+		this.thumpableObject = thumpableObject;
+		this.object = object;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
new file mode 100644
index 0000000..805cd67
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
@@ -0,0 +1,21 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.radio.devices.WaveSignalDevice;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnDeviceTextEvent implements LuaEvent {
+
+	// TODO: document this event
+	public final WaveSignalDevice device;
+	public final String text1, text2;
+	public final int x, y, z;
+
+	public OnDeviceTextEvent(String text1, int x, int y, int z, String text2, WaveSignalDevice device) {
+		this.text1 = text1;
+		this.x = x;
+		this.y = y;
+		this.z = z;
+		this.text2 = text2;
+		this.device = device;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDisconnectEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDisconnectEvent.java
new file mode 100644
index 0000000..f5a69d1
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDisconnectEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when player disconnects from server.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnDisconnectEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDistributionMergeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDistributionMergeEvent.java
new file mode 100644
index 0000000..5394800
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDistributionMergeEvent.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm.event.lua;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnDistributionMergeEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java
new file mode 100644
index 0000000..a79f692
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java
@@ -0,0 +1,23 @@
+package io.pzstorm.storm.event.lua;
+
+import se.krka.kahlua.vm.KahluaTable;
+import zombie.iso.IsoGridSquare;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnDoTileBuilding2Event implements LuaEvent {
+
+	// TODO: document this event
+	public final IsoGridSquare gridSquare;
+	public final KahluaTable table;
+	public final boolean render;
+	public final int x, y, z;
+
+	public OnDoTileBuilding2Event(KahluaTable table, boolean render, int x, int y, int z, IsoGridSquare gridSquare) {
+		this.gridSquare = gridSquare;
+		this.table = table;
+		this.render = render;
+		this.x = x;
+		this.y = y;
+		this.z = z;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
new file mode 100644
index 0000000..a1aa73d
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
@@ -0,0 +1,21 @@
+package io.pzstorm.storm.event.lua;
+
+import se.krka.kahlua.vm.KahluaTable;
+import zombie.iso.IsoGridSquare;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnDoTileBuilding3Event implements LuaEvent {
+
+	// TODO: document this event
+	public final KahluaTable table;
+	public final boolean render;
+	public final int x, y, z;
+
+	public OnDoTileBuilding3Event(KahluaTable table, boolean render, int x, int y, int z) {
+		this.table = table;
+		this.render = render;
+		this.x = x;
+		this.y = y;
+		this.z = z;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java
new file mode 100644
index 0000000..68ee5df
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * This event is currently not used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnDoTileBuildingEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java
new file mode 100644
index 0000000..d906a85
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * This event is currently not used.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnDuskEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnEnterVehicleEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnEnterVehicleEvent.java
new file mode 100644
index 0000000..c717664
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnEnterVehicleEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.characters.IsoPlayer;
+
+/**
+ * Called when {@link IsoPlayer} successfully enters a vehicle.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnEnterVehicleEvent implements LuaEvent {
+
+	/**
+	 * The player that entered the vehicle.
+	 */
+	public final IsoGameCharacter player;
+
+	public OnEnterVehicleEvent(IsoGameCharacter player) {
+		this.player = player;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java
new file mode 100644
index 0000000..f75dc49
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.inventory.InventoryItem;
+
+/**
+ * Triggered when a character equips an item in its primary slot.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnEquipPrimaryEvent implements LuaEvent {
+
+	/**
+	 * The character which equipped the item.
+	 */
+	public final IsoGameCharacter player;
+
+	/**
+	 * The item which was equipped.
+	 */
+	public final InventoryItem item;
+
+	public OnEquipPrimaryEvent(IsoGameCharacter player, InventoryItem item) {
+		this.player = player;
+		this.item = item;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java
new file mode 100644
index 0000000..ac64ea7
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.inventory.InventoryItem;
+
+/**
+ * Triggered when a character equips an item in its secondary slot.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnEquipSecondaryEvent implements LuaEvent {
+
+	/**
+	 * The character which equipped the item.
+	 */
+	public final IsoGameCharacter player;
+
+	/**
+	 * The item which was equipped.
+	 */
+	public final InventoryItem item;
+
+	public OnEquipSecondaryEvent(IsoGameCharacter player, InventoryItem item) {
+		this.player = player;
+		this.item = item;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java
new file mode 100644
index 0000000..a8e3041
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java
@@ -0,0 +1,31 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.inventory.ItemContainer;
+
+/**
+ * Triggered after {@link ItemContainer} has being filled.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnFillContainerEvent implements LuaEvent {
+
+	/**
+	 * Name of the room in which the container is located in.
+	 */
+	public final String roomName;
+
+	/**
+	 * Type of container being filled.
+	 */
+	public final String containerType;
+
+	/**
+	 * Instance of container being filled.
+	 */
+	public final ItemContainer container;
+
+	public OnFillContainerEvent(String roomName, String containerType, ItemContainer container) {
+		this.roomName = roomName;
+		this.containerType = containerType;
+		this.container = container;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameTimeLoadedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameTimeLoadedEvent.java
new file mode 100644
index 0000000..470b9e5
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameTimeLoadedEvent.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.GameTime;
+
+/**
+ * Triggered on both client and server after {@link GameTime} has been loaded.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnGameTimeLoadedEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetDBSchemaEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetDBSchemaEvent.java
new file mode 100644
index 0000000..cefc480
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetDBSchemaEvent.java
@@ -0,0 +1,14 @@
+package io.pzstorm.storm.event.lua;
+
+import se.krka.kahlua.vm.KahluaTable;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnGetDBSchemaEvent implements LuaEvent {
+
+	// TODO: document this event
+	public final KahluaTable dbSchema;
+
+	public OnGetDBSchemaEvent(KahluaTable dbSchema) {
+		this.dbSchema = dbSchema;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
new file mode 100644
index 0000000..1f75341
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnGetTableResultEvent implements LuaEvent {
+
+	// TODO: document this event
+	public final ArrayList<?> var1;
+	public final int var2;
+	public final String var3;
+
+	public OnGetTableResultEvent(ArrayList<?> var1, int var2, String var3) {
+		this.var1 = var1;
+		this.var2 = var2;
+		this.var3 = var3;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGridBurntEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGridBurntEvent.java
new file mode 100644
index 0000000..03afc20
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGridBurntEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoGridSquare;
+
+/**
+ * Triggered when {@link IsoGridSquare} is burned by fire.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnGridBurntEvent implements LuaEvent {
+
+	/**
+	 * {@link IsoGridSquare} being burned by fire.
+	 */
+	public final IsoGridSquare gridSquare;
+
+	public OnGridBurntEvent(IsoGridSquare gridSquare) {
+		this.gridSquare = gridSquare;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java
new file mode 100644
index 0000000..67cc5ca
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java
@@ -0,0 +1,40 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.BodyDamage.BodyPartType;
+import zombie.characters.IsoGameCharacter;
+import zombie.characters.IsoZombie;
+import zombie.inventory.types.HandWeapon;
+
+/**
+ * Triggered when {@link IsoZombie} was hit by {@link IsoGameCharacter}.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnHitZombieEvent implements LuaEvent {
+
+	/**
+	 * Instance of zombie being attacked.
+	 */
+	public final IsoZombie zombie;
+
+	/**
+	 * Instance of character attacking zombie.
+	 */
+	public final IsoGameCharacter attacker;
+
+	/**
+	 * Body part that has been hit.
+	 */
+	public final BodyPartType target;
+
+	/**
+	 * Weapon used to hit zombie.
+	 */
+	public final HandWeapon weapon;
+
+	public OnHitZombieEvent(IsoZombie zombie, IsoGameCharacter attacker, BodyPartType target, HandWeapon weapon) {
+		this.zombie = zombie;
+		this.attacker = attacker;
+		this.target = target;
+		this.weapon = weapon;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
new file mode 100644
index 0000000..ada2e2e
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
@@ -0,0 +1,21 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.weather.WeatherPeriod;
+
+/**
+ * Triggered when creating <b>modded</b> {@link WeatherPeriod} stage.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnInitModdedWeatherStageEvent implements LuaEvent {
+
+	// TODO: finish documenting this event
+	public final WeatherPeriod period;
+	public final WeatherPeriod.WeatherStage stage;
+	public final float airFrontStrength;
+
+	public OnInitModdedWeatherStageEvent(WeatherPeriod period, WeatherPeriod.WeatherStage stage, float airFrontStrength) {
+		this.period = period;
+		this.stage = stage;
+		this.airFrontStrength = airFrontStrength;
+	}
+}

From 473e14c559f7acf6b5c372551ddd3ce55063496e Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 07:20:16 +0200
Subject: [PATCH 271/323] Register all event classes

---
 .../pzstorm/storm/event/LuaEventFactory.java  | 228 ++++++++++++++----
 1 file changed, 177 insertions(+), 51 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
index 2be2379..55d7f88 100644
--- a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
+++ b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
@@ -43,67 +43,193 @@ public class LuaEventFactory {
 		 * to instantiate the related event instance with this factory
 		 */
 		Class<? extends LuaEvent>[] eventClasses = (Class<? extends LuaEvent>[]) new Class[] {
-				AcceptedFactionInviteEvent.class,
-				AcceptedTradeEvent.class,
-				AddXPEvent.class,
-				DoSpecialTooltipEvent.class,
-				EveryDaysEvent.class,
-				EveryHoursEvent.class,
-				EveryOneMinuteEvent.class,
-				EveryTenMinutesEvent.class,
-				LevelPerkEvent.class,
-				LoadGridsquareEvent.class,
-				MngInvReceiveItemsEvent.class,
-				OnAcceptInviteEvent.class,
-				OnAddBuildingEvent.class,
-				OnAddMessageEvent.class,
-				OnAdminMessageEvent.class,
-				OnAIStateChangeEvent.class,
-				OnAIStateEnterEvent.class,
-				OnAIStateExecuteEvent.class,
-				OnAIStateExitEvent.class,
-				OnAmbientSoundEvent.class,
-				OnBeingHitByZombieEvent.class,
-				OnCGlobalObjectSystemInitEvent.class,
-				OnChallengeQueryEvent.class,
-				OnChangeWeatherEvent.class,
-				OnCharacterCreateStatsEvent.class,
-				OnCharacterDeathEvent.class,
-				OnCharacterMeetEvent.class,
-				OnChatWindowInitEvent.class,
-				OnClientCommandEvent.class,
-				OnClimateManagerInitEvent.class,
-				OnClimateTickDebugEvent.class,
-				OnClimateTickEvent.class,
-				OnClothingUpdatedEvent.class,
-				OnConnectionStateChangedEvent.class,
-				OnConnectedEvent.class,
-				OnConnectFailedEvent.class,
-				OnCharacterCollideEvent.class,
-				OnCreateLivingCharacterEvent.class,
-				OnFETickEvent.class,
-				OnFillInventoryObjectContextMenuEvent.class,
-				OnFillWorldObjectContextMenuEvent.class,
 				OnGameBootEvent.class,
+				OnPreGameStartEvent.class,
+				OnTickEvent.class,
+				OnTickEvenPausedEvent.class,
+				OnRenderUpdateEvent.class,
+				OnFETickEvent.class,
 				OnGameStartEvent.class,
-				OnJoypadActivateEvent.class,
-				OnKeyPressedEvent.class,
+				OnPreUIDrawEvent.class,
+				OnPostUIDrawEvent.class,
+				OnCharacterCollideEvent.class,
 				OnKeyStartPressedEvent.class,
-				OnLoadMapZonesEvent.class,
-				OnMultiTriggerNPCEvent.class,
+				OnKeyPressedEvent.class,
 				OnObjectCollideEvent.class,
+				OnNPCSurvivorUpdateEvent.class,
 				OnPlayerUpdateEvent.class,
-				OnPostUIDrawEvent.class,
+				OnZombieUpdateEvent.class,
+				OnTriggerNPCEvent.class,
+				OnMultiTriggerNPCEvent.class,
+				OnLoadMapZonesEvent.class,
+				OnAddBuildingEvent.class,
+				OnCreateLivingCharacterEvent.class,
+				OnChallengeQueryEvent.class,
+				OnFillInventoryObjectContextMenuEvent.class,
 				OnPreFillInventoryObjectContextMenuEvent.class,
+				OnFillWorldObjectContextMenuEvent.class,
 				OnPreFillWorldObjectContextMenuEvent.class,
-				OnPreUIDrawEvent.class,
 				OnRefreshInventoryWindowContainersEvent.class,
-				OnTickEvenPausedEvent.class,
-				OnTickEvent.class,
-				OnTriggerNPCEvent.class,
+				OnMakeItemEvent.class,
+				OnJoypadActivateEvent.class,
 				OnWeaponHitCharacterEvent.class,
 				OnWeaponSwingEvent.class,
-				OnZombieUpdateEvent.class
+				OnWeaponHitTreeEvent.class,
+				OnWeaponHitXpEvent.class,
+				OnWeaponSwingHitPointEvent.class,
+				OnPlayerAttackFinishedEvent.class,
+				OnLoginStateEvent.class,
+				OnLoginStateSuccessEvent.class,
+				OnCharacterCreateStatsEvent.class,
+				OnLoadSoundBanksEvent.class,
+				OnObjectLeftMouseButtonDownEvent.class,
+				OnObjectLeftMouseButtonUpEvent.class,
+				OnObjectRightMouseButtonDownEvent.class,
+				OnObjectRightMouseButtonUpEvent.class,
+				OnDoTileBuildingEvent.class,
+				OnDoTileBuilding2Event.class,
+				OnDoTileBuilding3Event.class,
+				OnConnectFailedEvent.class,
+				OnConnectedEvent.class,
+				OnDisconnectEvent.class,
+				OnConnectionStateChangedEvent.class,
+				OnScoreboardUpdateEvent.class,
+				OnMouseMoveEvent.class,
+				OnMouseDownEvent.class,
+				OnMouseUpEvent.class,
+				OnRightMouseDownEvent.class,
+				OnRightMouseUpEvent.class,
+				OnNewSurvivorGroupEvent.class,
+				OnPlayerSetSafehouseEvent.class,
+				OnLoadEvent.class,
+				AddXPEvent.class,
+				LevelPerkEvent.class,
+				OnSaveEvent.class,
+				OnMainMenuEnterEvent.class,
+				OnPreMapLoadEvent.class,
+				OnPostFloorSquareDrawEvent.class,
+				OnPostFloorLayerDrawEvent.class,
+				OnPostTilesSquareDrawEvent.class,
+				OnPostTileDrawEvent.class,
+				OnPostWallSquareDrawEvent.class,
+				OnPostCharactersSquareDrawEvent.class,
+				OnCreateUIEvent.class,
+				OnMapLoadCreateIsoObjectEvent.class,
+				OnCreateSurvivorEvent.class,
+				OnCreatePlayerEvent.class,
+				OnPlayerDeathEvent.class,
+				OnZombieDeadEvent.class,
+				OnCharacterDeathEvent.class,
+				OnCharacterMeetEvent.class,
+				OnSpawnRegionsLoadedEvent.class,
+				OnPostMapLoadEvent.class,
+				OnAIStateExecuteEvent.class,
+				OnAIStateEnterEvent.class,
+				OnAIStateExitEvent.class,
+				OnAIStateChangeEvent.class,
+				OnPlayerMoveEvent.class,
+				OnInitWorldEvent.class,
+				OnNewGameEvent.class,
+				OnIsoThumpableLoadEvent.class,
+				OnIsoThumpableSaveEvent.class,
+				ReuseGridsquareEvent.class,
+				LoadGridsquareEvent.class,
+				EveryOneMinuteEvent.class,
+				EveryTenMinutesEvent.class,
+				EveryDaysEvent.class,
+				EveryHoursEvent.class,
+				OnDuskEvent.class,
+				OnDawnEvent.class,
+				OnEquipPrimaryEvent.class,
+				OnEquipSecondaryEvent.class,
+				OnClothingUpdatedEvent.class,
+				OnRainStartEvent.class,
+				OnRainStopEvent.class,
+				OnAmbientSoundEvent.class,
+				OnResetLuaEvent.class,
+				OnModsModifiedEvent.class,
+				OnSeeNewRoomEvent.class,
+				OnNewFireEvent.class,
+				OnFillContainerEvent.class,
+				OnChangeWeatherEvent.class,
+				OnRenderTickEvent.class,
+				OnJoypadActivateUIEvent.class,
+				OnDestroyIsoThumpableEvent.class,
+				OnPostSaveEvent.class,
+				OnResolutionChangeEvent.class,
+				OnWaterAmountChangeEvent.class,
+				OnClientCommandEvent.class,
+				OnServerCommandEvent.class,
+				OnContainerUpdateEvent.class,
+				OnObjectAddedEvent.class,
+				OnObjectAboutToBeRemovedEvent.class,
+				onLoadModDataFromServerEvent.class,
+				OnGameTimeLoadedEvent.class,
+				OnCGlobalObjectSystemInitEvent.class,
+				OnSGlobalObjectSystemInitEvent.class,
+				OnWorldMessageEvent.class,
+				OnKeyKeepPressedEvent.class,
+				SendCustomModDataEvent.class,
+				ServerPingedEvent.class,
+				OnServerStartedEvent.class,
+				OnLoadedTileDefinitionsEvent.class,
+				OnPostRenderEvent.class,
+				DoSpecialTooltipEvent.class,
+				OnCoopJoinFailedEvent.class,
+				OnServerWorkshopItemsEvent.class,
+				OnVehicleDamageTextureEvent.class,
+				OnCustomUIKeyEvent.class,
+				OnCustomUIKeyPressedEvent.class,
+				OnCustomUIKeyReleasedEvent.class,
+				OnDeviceTextEvent.class,
+				OnRadioInteractionEvent.class,
+				OnLoadRadioScriptsEvent.class,
+				OnAcceptInviteEvent.class,
+				OnCoopServerMessageEvent.class,
+				OnReceiveUserlogEvent.class,
+				OnAdminMessageEvent.class,
+				OnGetDBSchemaEvent.class,
+				OnGetTableResultEvent.class,
+				ReceiveFactionInviteEvent.class,
+				AcceptedFactionInviteEvent.class,
+				ViewTicketsEvent.class,
+				SyncFactionEvent.class,
+				OnReceiveItemListNetEvent.class,
+				OnMiniScoreboardUpdateEvent.class,
+				OnSafehousesChangedEvent.class,
+				RequestTradeEvent.class,
+				AcceptedTradeEvent.class,
+				TradingUIAddItemEvent.class,
+				TradingUIRemoveItemEvent.class,
+				TradingUIUpdateStateEvent.class,
+				OnGridBurntEvent.class,
+				OnPreDistributionMergeEvent.class,
+				OnDistributionMergeEvent.class,
+				OnPostDistributionMergeEvent.class,
+				MngInvReceiveItemsEvent.class,
+				OnTileRemovedEvent.class,
+				OnServerStartSavingEvent.class,
+				OnServerFinishSavingEvent.class,
+				OnMechanicActionDoneEvent.class,
+				OnClimateTickEvent.class,
+				OnThunderEvent.class,
+				OnEnterVehicleEvent.class,
+				OnSteamGameJoinEvent.class,
+				OnTabAddedEvent.class,
+				OnSetDefaultTabEvent.class,
+				OnTabRemovedEvent.class,
+				OnAddMessageEvent.class,
+				SwitchChatStreamEvent.class,
+				OnChatWindowInitEvent.class,
+				OnInitSeasonsEvent.class,
+				OnClimateTickDebugEvent.class,
+				OnInitModdedWeatherStageEvent.class,
+				OnUpdateModdedWeatherStageEvent.class,
+				OnClimateManagerInitEvent.class,
+				OnPressReloadButtonEvent.class,
+				OnPressRackButtonEvent.class,
+				OnHitZombieEvent.class,
+				OnBeingHitByZombieEvent.class
 		};
 		for (Class<? extends LuaEvent> eventClass : eventClasses)
 		{

From 6170080fc94402c44a7a34f069cb5092f4cb6769 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 07:37:58 +0200
Subject: [PATCH 272/323] Create InertEvent annotation

---
 .../io/pzstorm/storm/event/InertEvent.java    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/InertEvent.java

diff --git a/api/src/main/java/io/pzstorm/storm/event/InertEvent.java b/api/src/main/java/io/pzstorm/storm/event/InertEvent.java
new file mode 100644
index 0000000..cb86cca
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/InertEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event;
+
+import io.pzstorm.storm.event.lua.LuaEvent;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * This annotation indicates that the annotated {@link LuaEvent} is never triggered
+ * from game code. Note that this annotation is only used to document classes and
+ * has no effect other then documenting source code.
+ */
+@Retention(RetentionPolicy.SOURCE)
+@Target(ElementType.TYPE)
+public @interface InertEvent {
+
+}

From 9a6e155767b040bbea0a0e119007aa853a953956 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 07:39:06 +0200
Subject: [PATCH 273/323] Correct Lua event documentation

---
 .../pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java   | 4 +---
 .../java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java   | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
index e523856..487edb0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
@@ -1,11 +1,9 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * This event is currently not used.
- */
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class AcceptedFactionInviteEvent implements LuaEvent {
 
+	// TODO: document this event
 	public final String var1, var2;
 
 	public AcceptedFactionInviteEvent(String var1, String var2) {
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java
index a1a98a8..6a7ce76 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java
@@ -2,12 +2,10 @@
 
 import zombie.characters.IsoPlayer;
 
-/**
- * This event is currently not used.
- */
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class AcceptedTradeEvent implements LuaEvent {
 
+	// TODO: document this event
 	public final IsoPlayer player;
 
 	public AcceptedTradeEvent(IsoPlayer player) {

From f0f020d7829118d1709133ca3ada9468b489242f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Thu, 20 May 2021 07:39:41 +0200
Subject: [PATCH 274/323] Annotate Lua events as InertEvents

---
 .../java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java | 6 +++---
 .../io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java | 6 +++---
 .../io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java    | 6 +++---
 .../storm/event/lua/OnCharacterCreateStatsEvent.java        | 6 +++---
 .../io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java    | 6 +++---
 .../main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java   | 6 +++---
 .../io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java   | 6 +++---
 .../main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java   | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java
index 73b8173..5aae3c4 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java
@@ -1,8 +1,8 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * This event is currently not used.
- */
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnAddBuildingEvent implements LuaEvent {
 
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java
index 13fa9a6..bcc8c0d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java
@@ -1,8 +1,8 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * This event is currently not being used.
- */
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnBeingHitByZombieEvent implements LuaEvent {
 
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java
index accdf01..9830c5d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java
@@ -1,8 +1,8 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * This event is currently not used.
- */
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnChangeWeatherEvent implements LuaEvent {
 
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java
index 5f09aca..2889c61 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java
@@ -1,8 +1,8 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * This event is currently not used.
- */
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnCharacterCreateStatsEvent implements LuaEvent {
 
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java
index 46308fd..d8403b3 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java
@@ -1,8 +1,8 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * This event is currently not used.
- */
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnCharacterMeetEvent implements LuaEvent {
 
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java
index a871a1b..6d99f52 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java
@@ -1,8 +1,8 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * This event is currently not used.
- */
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnDawnEvent implements LuaEvent {
 
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java
index 68ee5df..cc38f69 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java
@@ -1,8 +1,8 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * This event is currently not used.
- */
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnDoTileBuildingEvent implements LuaEvent {
 
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java
index d906a85..8c85e6c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java
@@ -1,8 +1,8 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * This event is currently not used.
- */
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnDuskEvent implements LuaEvent {
 

From 859d0553bf13586e08606853b751013bca31dbbe Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 00:24:49 +0200
Subject: [PATCH 275/323] Add more event documentation

---
 .../java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java    | 4 ++++
 .../io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
index 3b2ac3a..69f1a3c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
@@ -8,6 +8,10 @@
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnKeyPressedEvent implements LuaEvent {
 
+	/**
+	 * <p>Integer denoting the key being pressed.</p>
+	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
+	 */
 	public final int key;
 
 	public OnKeyPressedEvent(int key) {
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
index afa0fc3..8e7f35e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
@@ -8,6 +8,10 @@
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnKeyStartPressedEvent implements LuaEvent {
 
+	/**
+	 * <p>Integer denoting the key being pressed.</p>
+	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
+	 */
 	public final int key;
 
 	public OnKeyStartPressedEvent(int key) {

From 8a528cae4df06f0fa493f81daa025eeed9afdaef Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 00:25:17 +0200
Subject: [PATCH 276/323] Update LuaEvent class names

---
 .../src/main/java/io/pzstorm/storm/event/LuaEventFactory.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
index 55d7f88..cf6fe5e 100644
--- a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
+++ b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
@@ -208,8 +208,8 @@ public class LuaEventFactory {
 				OnPostDistributionMergeEvent.class,
 				MngInvReceiveItemsEvent.class,
 				OnTileRemovedEvent.class,
-				OnServerStartSavingEvent.class,
-				OnServerFinishSavingEvent.class,
+				OnPauseGameEvent.class,
+				OnUnpauseGameEvent.class,
 				OnMechanicActionDoneEvent.class,
 				OnClimateTickEvent.class,
 				OnThunderEvent.class,

From 350aaa5261db4a56580c69bb0dbd066fbcbbc755 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 02:59:46 +0200
Subject: [PATCH 277/323] Make LuaEvent method args non-primitive types

---
 .../io/pzstorm/storm/event/lua/AddXPEvent.java  |  4 ++--
 .../pzstorm/storm/event/lua/LevelPerkEvent.java |  6 +++---
 .../storm/event/lua/OnAddMessageEvent.java      |  4 ++--
 .../storm/event/lua/OnAdminMessageEvent.java    |  4 ++--
 .../storm/event/lua/OnAmbientSoundEvent.java    |  6 +++---
 .../storm/event/lua/OnCoopJoinFailedEvent.java  |  4 ++--
 .../storm/event/lua/OnCreatePlayerEvent.java    |  4 ++--
 .../storm/event/lua/OnCustomUIKeyEvent.java     |  4 ++--
 .../event/lua/OnCustomUIKeyPressedEvent.java    |  4 ++--
 .../event/lua/OnCustomUIKeyReleasedEvent.java   |  4 ++--
 .../storm/event/lua/OnDeviceTextEvent.java      | 17 +++++++++++++----
 .../storm/event/lua/OnDoTileBuilding2Event.java |  8 +++++---
 .../storm/event/lua/OnDoTileBuilding3Event.java |  6 +++---
 .../pzstorm/storm/event/lua/OnFETickEvent.java  |  2 +-
 .../storm/event/lua/OnGetTableResultEvent.java  |  4 ++--
 .../lua/OnInitModdedWeatherStageEvent.java      |  4 ++--
 .../storm/event/lua/OnJoypadActivateEvent.java  |  4 ++--
 .../storm/event/lua/OnKeyPressedEvent.java      |  4 ++--
 .../storm/event/lua/OnKeyStartPressedEvent.java |  4 ++--
 .../storm/event/lua/OnTickEvenPausedEvent.java  |  4 ++--
 .../io/pzstorm/storm/event/lua/OnTickEvent.java |  4 ++--
 .../event/lua/OnWeaponHitCharacterEvent.java    |  4 ++--
 22 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
index 6e9ef6e..a916285 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
@@ -22,9 +22,9 @@ public class AddXPEvent implements LuaEvent {
 	/**
 	 * Amount of experience to earn.
 	 */
-	public final float xpAmount;
+	public final Float xpAmount;
 
-	public AddXPEvent(IsoGameCharacter player, PerkFactory.Perks perk, float xpAmount) {
+	public AddXPEvent(IsoGameCharacter player, PerkFactory.Perks perk, Float xpAmount) {
 		this.player = player;
 		this.perk = perk;
 		this.xpAmount = xpAmount;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
index d0474c7..9c8968f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
@@ -22,14 +22,14 @@ public class LevelPerkEvent implements LuaEvent {
 	/**
 	 * Perk level after leveling up or down.
 	 */
-	public final int level;
+	public final Integer level;
 
 	/**
 	 * {@code true} if leveling perk up or {@code false} if leveling down.
 	 */
-	public final boolean levelingUp;
+	public final Boolean levelingUp;
 
-	public LevelPerkEvent(IsoGameCharacter player, PerkFactory.Perks perk, int level, boolean levelingUp) {
+	public LevelPerkEvent(IsoGameCharacter player, PerkFactory.Perks perk, Integer level, Boolean levelingUp) {
 		this.player = player;
 		this.perk = perk;
 		this.level = level;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
index cf8f57a..59637ee 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
@@ -16,9 +16,9 @@ public class OnAddMessageEvent implements LuaEvent {
 	/**
 	 * Chat tab ID the message is being added to.
 	 */
-	public final short tabID;
+	public final Short tabID;
 
-	public OnAddMessageEvent(ChatMessage message, short tabID) {
+	public OnAddMessageEvent(ChatMessage message, Short tabID) {
 		this.message = message;
 		this.tabID = tabID;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
index 5269112..07e63c5 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
@@ -7,9 +7,9 @@
 public class OnAdminMessageEvent implements LuaEvent {
 
 	public final String message;
-	public final int var1, var2, var3;
+	public final Integer var1, var2, var3;
 
-	public OnAdminMessageEvent(String message, int var1, int var2, int var3) {
+	public OnAdminMessageEvent(String message, Integer var1, Integer var2, Integer var3) {
 		this.message = message;
 		this.var1 = var1;
 		this.var2 = var2;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
index 7a1924b..b194911 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
@@ -14,14 +14,14 @@ public class OnAmbientSoundEvent implements LuaEvent {
 	/**
 	 * Position of ambient sound along x-axis.
 	 */
-	public final float x;
+	public final Float x;
 
 	/**
 	 * Position of ambient sound along y-axis.
 	 */
-	public final float y;
+	public final Float y;
 
-	public OnAmbientSoundEvent(String soundName, float x, float y) {
+	public OnAmbientSoundEvent(String soundName, Float x, Float y) {
 		this.soundName = soundName;
 		this.x = x;
 		this.y = y;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java
index 570a735..e77db5d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java
@@ -9,9 +9,9 @@ public class OnCoopJoinFailedEvent implements LuaEvent {
 	/**
 	 * Index of player who was denied access.
 	 */
-	public final int playerIndex;
+	public final Integer playerIndex;
 
-	public OnCoopJoinFailedEvent(int playerIndex) {
+	public OnCoopJoinFailedEvent(Integer playerIndex) {
 		this.playerIndex = playerIndex;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
index 6800574..a0ca298 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
@@ -11,14 +11,14 @@ public class OnCreatePlayerEvent implements LuaEvent {
 	/**
 	 * Index of player being created.
 	 */
-	public final int playerIndex;
+	public final Integer playerIndex;
 
 	/**
 	 * The player which was created.
 	 */
 	public final IsoPlayer player;
 
-	public OnCreatePlayerEvent(int playerIndex, IsoPlayer player) {
+	public OnCreatePlayerEvent(Integer playerIndex, IsoPlayer player) {
 		this.playerIndex = playerIndex;
 		this.player = player;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java
index b2d4ef7..bf6cc2a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java
@@ -11,9 +11,9 @@ public class OnCustomUIKeyEvent implements LuaEvent {
 	 * <p>Integer denoting the key being released.</p>
 	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
 	 */
-	public final int key;
+	public final Integer key;
 
-	public OnCustomUIKeyEvent(int key) {
+	public OnCustomUIKeyEvent(Integer key) {
 		this.key = key;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java
index e109c7c..66acabf 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java
@@ -12,9 +12,9 @@ public class OnCustomUIKeyPressedEvent implements LuaEvent {
 	 * <p>Integer denoting the key being pressed.</p>
 	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
 	 */
-	public final int key;
+	public final Integer key;
 
-	public OnCustomUIKeyPressedEvent(int key) {
+	public OnCustomUIKeyPressedEvent(Integer key) {
 		this.key = key;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java
index 420aa84..e6eb19a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java
@@ -13,9 +13,9 @@ public class OnCustomUIKeyReleasedEvent implements LuaEvent {
 	 * <p>Integer denoting the key being released.</p>
 	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
 	 */
-	public final int key;
+	public final Integer key;
 
-	public OnCustomUIKeyReleasedEvent(int key) {
+	public OnCustomUIKeyReleasedEvent(Integer key) {
 		this.key = key;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
index 805cd67..c350168 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
@@ -8,14 +8,23 @@ public class OnDeviceTextEvent implements LuaEvent {
 	// TODO: document this event
 	public final WaveSignalDevice device;
 	public final String text1, text2;
-	public final int x, y, z;
+	public final Float x, y, z;
 
-	public OnDeviceTextEvent(String text1, int x, int y, int z, String text2, WaveSignalDevice device) {
+	public OnDeviceTextEvent(String text1, Integer x, Integer y, Integer z, String text2, WaveSignalDevice device) {
+		this.text1 = text1;
+		this.x = (float)x;
+		this.y = (float)y;
+		this.z = (float)z;
+		this.text2 = text2;
+		this.device = device;
+	}
+
+	public OnDeviceTextEvent(String text1, Float x, Float y, WaveSignalDevice device) {
 		this.text1 = text1;
 		this.x = x;
 		this.y = y;
-		this.z = z;
-		this.text2 = text2;
+		this.z = -1f;
+		this.text2 = "";
 		this.device = device;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java
index a79f692..a624530 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java
@@ -9,10 +9,12 @@ public class OnDoTileBuilding2Event implements LuaEvent {
 	// TODO: document this event
 	public final IsoGridSquare gridSquare;
 	public final KahluaTable table;
-	public final boolean render;
-	public final int x, y, z;
+	public final Boolean render;
+	public final Integer x, y, z;
+
+	public OnDoTileBuilding2Event(KahluaTable table, Boolean render, Integer x,
+								  Integer y, Integer z, IsoGridSquare gridSquare) {
 
-	public OnDoTileBuilding2Event(KahluaTable table, boolean render, int x, int y, int z, IsoGridSquare gridSquare) {
 		this.gridSquare = gridSquare;
 		this.table = table;
 		this.render = render;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
index a1aa73d..fd9e3ae 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
@@ -8,10 +8,10 @@ public class OnDoTileBuilding3Event implements LuaEvent {
 
 	// TODO: document this event
 	public final KahluaTable table;
-	public final boolean render;
-	public final int x, y, z;
+	public final Boolean render;
+	public final Integer x, y, z;
 
-	public OnDoTileBuilding3Event(KahluaTable table, boolean render, int x, int y, int z) {
+	public OnDoTileBuilding3Event(KahluaTable table, Boolean render, Integer x, Integer y, Integer z) {
 		this.table = table;
 		this.render = render;
 		this.x = x;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java
index 46d4209..1461368 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java
@@ -9,6 +9,6 @@ public class OnFETickEvent implements LuaEvent {
 	/**
 	 * @param ticks always {@code 0}.
 	 */
-	public OnFETickEvent(int ticks) {
+	public OnFETickEvent(Integer ticks) {
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
index 1f75341..c8b3077 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
@@ -8,10 +8,10 @@ public class OnGetTableResultEvent implements LuaEvent {
 
 	// TODO: document this event
 	public final ArrayList<?> var1;
-	public final int var2;
+	public final Integer var2;
 	public final String var3;
 
-	public OnGetTableResultEvent(ArrayList<?> var1, int var2, String var3) {
+	public OnGetTableResultEvent(ArrayList<?> var1, Integer var2, String var3) {
 		this.var1 = var1;
 		this.var2 = var2;
 		this.var3 = var3;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
index ada2e2e..1a36be8 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
@@ -11,9 +11,9 @@ public class OnInitModdedWeatherStageEvent implements LuaEvent {
 	// TODO: finish documenting this event
 	public final WeatherPeriod period;
 	public final WeatherPeriod.WeatherStage stage;
-	public final float airFrontStrength;
+	public final Float airFrontStrength;
 
-	public OnInitModdedWeatherStageEvent(WeatherPeriod period, WeatherPeriod.WeatherStage stage, float airFrontStrength) {
+	public OnInitModdedWeatherStageEvent(WeatherPeriod period, WeatherPeriod.WeatherStage stage, Float airFrontStrength) {
 		this.period = period;
 		this.stage = stage;
 		this.airFrontStrength = airFrontStrength;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java
index eaeec39..59a29b2 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java
@@ -9,9 +9,9 @@ public class OnJoypadActivateEvent implements LuaEvent {
 	/**
 	 * The ID of the activated controller.
 	 */
-	public final int joypadID;
+	public final Integer joypadID;
 
-	public OnJoypadActivateEvent(int joypadID) {
+	public OnJoypadActivateEvent(Integer joypadID) {
 		this.joypadID = joypadID;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
index 69f1a3c..88d8aa0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
@@ -12,9 +12,9 @@ public class OnKeyPressedEvent implements LuaEvent {
 	 * <p>Integer denoting the key being pressed.</p>
 	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
 	 */
-	public final int key;
+	public final Integer key;
 
-	public OnKeyPressedEvent(int key) {
+	public OnKeyPressedEvent(Integer key) {
 		this.key = key;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
index 8e7f35e..3640328 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
@@ -12,9 +12,9 @@ public class OnKeyStartPressedEvent implements LuaEvent {
 	 * <p>Integer denoting the key being pressed.</p>
 	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
 	 */
-	public final int key;
+	public final Integer key;
 
-	public OnKeyStartPressedEvent(int key) {
+	public OnKeyStartPressedEvent(Integer key) {
 		this.key = key;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java
index 290072c..6f57611 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java
@@ -6,9 +6,9 @@
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnTickEvenPausedEvent implements LuaEvent {
 
-	public final double ticksElapsed;
+	public final Double ticksElapsed;
 
-	public OnTickEvenPausedEvent(double ticksElapsed) {
+	public OnTickEvenPausedEvent(Double ticksElapsed) {
 		this.ticksElapsed = ticksElapsed;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java
index cb21c5f..c576d1f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java
@@ -9,9 +9,9 @@
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnTickEvent implements LuaEvent {
 
-	public final double ticksElapsed;
+	public final Double ticksElapsed;
 
-	public OnTickEvent(double ticksElapsed) {
+	public OnTickEvent(Double ticksElapsed) {
 		this.ticksElapsed = ticksElapsed;
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java
index 82e6210..3d220a7 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java
@@ -14,9 +14,9 @@ public class OnWeaponHitCharacterEvent implements LuaEvent {
 	public final IsoGameCharacter attacker;
 	public final IsoGameCharacter target;
 	public final HandWeapon weapon;
-	public final float damage;
+	public final Float damage;
 
-	public OnWeaponHitCharacterEvent(IsoGameCharacter attacker, IsoGameCharacter target, HandWeapon weapon, float damage) {
+	public OnWeaponHitCharacterEvent(IsoGameCharacter attacker, IsoGameCharacter target, HandWeapon weapon, Float damage) {
 
 		this.attacker = attacker;
 		this.target = target;

From a3c22a551c3bb62eced07e7b60638469ea9fae17 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:09:12 +0200
Subject: [PATCH 278/323] Update LuaEventFactory tests

---
 .../pzstorm/storm/event/LuaEventFactoryTest.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
index 041ed1a..200d9e1 100644
--- a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
+++ b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
@@ -32,20 +32,20 @@ class LuaEventFactoryTest implements UnitTest {
 							IsoPlayer.class, SurvivorDesc.class
 					})
 					.put(OnFETickEvent.class, new Class<?>[] {
-							int.class
+							Integer.class
 					})
 					.put(OnFillInventoryObjectContextMenuEvent.class, new Class<?>[] {})
 					.put(OnFillWorldObjectContextMenuEvent.class, new Class<?>[] {})
 					.put(OnGameBootEvent.class, new Class<?>[] {})
 					.put(OnGameStartEvent.class, new Class<?>[] {})
 					.put(OnJoypadActivateEvent.class, new Class<?>[] {
-							int.class
+							Integer.class
 					})
 					.put(OnKeyPressedEvent.class, new Class<?>[] {
-							int.class
+							Integer.class
 					})
 					.put(OnKeyStartPressedEvent.class, new Class<?>[] {
-							int.class
+							Integer.class
 					})
 					.put(OnLoadMapZonesEvent.class, new Class<?>[] {})
 					.put(OnMultiTriggerNPCEvent.class, new Class<?>[] {
@@ -62,16 +62,16 @@ class LuaEventFactoryTest implements UnitTest {
 					.put(OnPreUIDrawEvent.class, new Class<?>[] {})
 					.put(OnRefreshInventoryWindowContainersEvent.class, new Class<?>[] {})
 					.put(OnTickEvenPausedEvent.class, new Class<?>[] {
-							double.class
+							Double.class
 					})
 					.put(OnTickEvent.class, new Class<?>[] {
-							double.class
+							Double.class
 					})
 					.put(OnTriggerNPCEvent.class, new Class<?>[] {
 							String.class, KahluaTable.class, BuildingDef.class
 					})
 					.put(OnWeaponHitCharacterEvent.class, new Class<?>[] {
-							IsoGameCharacter.class, IsoGameCharacter.class, HandWeapon.class, float.class
+							IsoGameCharacter.class, IsoGameCharacter.class, HandWeapon.class, Float.class
 					})
 					.put(OnWeaponSwingEvent.class, new Class<?>[] {
 							IsoGameCharacter.class, HandWeapon.class

From 662f65b0473946303a01444b9c095273f697d1f3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:10:14 +0200
Subject: [PATCH 279/323] Define stub LuaEvent class

---
 ...RefreshInventoryWindowContainersEvent.java | 21 ++++++++++++++++++-
 .../storm/event/LuaEventFactoryTest.java      |  4 +++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
index 0a9062f..545332f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
@@ -1,6 +1,25 @@
 package io.pzstorm.storm.event.lua;
 
+import se.krka.kahlua.vm.KahluaTable;
+
+/**
+ * Triggered when inventory container windows are being refreshed.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnRefreshInventoryWindowContainersEvent implements LuaEvent {
 
-	// TODO: finish writing this event
+	/**
+	 * Inventory window being refreshed.
+	 */
+	public final KahluaTable inventoryPage;
+
+	/**
+	 * Refresh action being preformed.
+	 */
+	public final String action;
+
+	public OnRefreshInventoryWindowContainersEvent(KahluaTable inventoryPage, String action) {
+		this.inventoryPage = inventoryPage;
+		this.action = action;
+	}
 }
diff --git a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
index 200d9e1..4def701 100644
--- a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
+++ b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
@@ -60,7 +60,9 @@ class LuaEventFactoryTest implements UnitTest {
 					.put(OnPostUIDrawEvent.class, new Class<?>[] {})
 					.put(OnPreFillInventoryObjectContextMenuEvent.class, new Class<?>[] {})
 					.put(OnPreUIDrawEvent.class, new Class<?>[] {})
-					.put(OnRefreshInventoryWindowContainersEvent.class, new Class<?>[] {})
+					.put(OnRefreshInventoryWindowContainersEvent.class, new Class<?>[] {
+							KahluaTable.class, String.class
+					})
 					.put(OnTickEvenPausedEvent.class, new Class<?>[] {
 							Double.class
 					})

From 5ae4c1d6e593803bdeb8ad5485500dcac8cd7ebf Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:14:27 +0200
Subject: [PATCH 280/323] Fix LuaEventFactory not matching args

---
 .../pzstorm/storm/event/LuaEventFactory.java  | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
index cf6fe5e..716e9e2 100644
--- a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
+++ b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
@@ -255,10 +255,9 @@ public class LuaEventFactory {
 	 * @param eventClass {@code Class} denoting the {@code LuaEvent} to construct.
 	 * @param args array of arguments to use when instantiating {@code LuaEvent}.
 	 *
-	 * @throws IllegalStateException if an error occurred while instantiating {@code LuaEvent}
-	 * 		or no registered constructors found for given event class.
 	 * @throws IllegalArgumentException if no constructor with parameters matching specified array of
-	 * 		arguments was found for given {@code LuaEvent} class.
+	 * 		arguments was found for given {@code LuaEvent} class, an error occurred while instantiating
+	 * 		{@code LuaEvent} or no registered constructors found for given event class.
 	 *
 	 * @return new instance of {@code LuaEvent} for given class.
 	 */
@@ -275,19 +274,15 @@ public static LuaEvent constructLuaEvent(Class<? extends LuaEvent> eventClass, O
 			{
 				if (constructor.getParameterCount() == args.length)
 				{
-					Class<?>[] paramTypes = constructor.getParameterTypes();
-					for (int i = 0; i < paramTypes.length; i++)
-					{
-						// on parameter type mismatch skip to next constructor
-						if (paramTypes[i] != argTypes[i]) {
-							break;
-						}
+					// on parameter type mismatch skip to next constructor
+					if (!doesConstructorMatchArgTypes(constructor, argTypes)) {
+						continue;
 					}
 					try {
 						// if all parameter types match return this constructor
 						return (LuaEvent) constructor.newInstance(args);
 					}
-					catch (ReflectiveOperationException e) {
+					catch (ReflectiveOperationException | IllegalArgumentException e) {
 						throw new IllegalStateException(e);
 					}
 				}
@@ -298,17 +293,37 @@ public static LuaEvent constructLuaEvent(Class<? extends LuaEvent> eventClass, O
 		throw new IllegalStateException("No registered constructors found for event '" + eventClass + '\'');
 	}
 
+	/**
+	 * Returns {@code true} if given constructor parameter types match specified
+	 * array of classes exactly, or {@code false} otherwise.
+	 * 
+	 * @param constructor {@code Constructor} to match types for.
+	 * @param argTypes array of classes to match against constructor parameters.
+	 */
+	private static boolean doesConstructorMatchArgTypes(Constructor<?> constructor, Class<?>[] argTypes) {
+
+		Class<?>[] paramTypes = constructor.getParameterTypes();
+		for (int i = 0; i < paramTypes.length; i++)
+		{
+			Class<?> argType = argTypes[i];
+			// on parameter type mismatch skip to next constructor
+			if (argType != null && !paramTypes[i].isAssignableFrom(argType)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	/**
 	 * Construct a new instance of {@link LuaEvent} with given array of arguments.
 	 *
 	 * @param eventName name of the {@code Class} denoting the {@code LuaEvent} to construct.
 	 * @param args array of arguments to use when instantiating {@code LuaEvent}.
 	 *
-	 * @throws IllegalStateException if no registered {@code LuaEvent} class found for given name
-	 * 		or an error occurred while instantiating {@code LuaEvent} or no registered
-	 * 		constructors found for event class resolved from given name.
-	 * @throws IllegalArgumentException if no constructor with parameters matching specified array of
-	 * 		arguments was found for {@code LuaEvent} class resolved from given name.
+	 * @throws IllegalStateException if no constructor with parameters matching specified array of
+	 * 	 	arguments was found for {@code LuaEvent} class resolved from given name, no registered
+	 * 	 	{@code LuaEvent} class found for given name, an error occurred while instantiating
+	 * 	 	{@code LuaEvent} or no registered constructors found for event class resolved from given name.
 	 *
 	 * @return new instance of {@code LuaEvent} for class of given name.
 	 */

From ef3a4ab585fe07c3a9b17224d37d933b8a6e4bcf Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:15:57 +0200
Subject: [PATCH 281/323] Define missing LuaEvent fields

---
 .../event/lua/OnContainerUpdateEvent.java     | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
index dc945b6..094f39c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
@@ -1,7 +1,9 @@
 package io.pzstorm.storm.event.lua;
 
 import org.jetbrains.annotations.Nullable;
+import zombie.inventory.InventoryItem;
 import zombie.iso.IsoGridSquare;
+import zombie.iso.objects.IsoDeadBody;
 
 /**
  * Triggered when an inventory container is being updated.
@@ -14,11 +16,37 @@ public class OnContainerUpdateEvent implements LuaEvent {
 	 */
 	public final @Nullable IsoGridSquare gridSquare;
 
-	public OnContainerUpdateEvent(@Nullable IsoGridSquare gridSquare) {
+	/**
+	 * Item that triggered the container update.
+	 */
+	public final @Nullable InventoryItem item;
+
+	/**
+	 * Dead body that triggered the container update.
+	 */
+	public final @Nullable IsoDeadBody deadBody;
+
+	private OnContainerUpdateEvent(@Nullable IsoGridSquare gridSquare,
+								  @Nullable InventoryItem item, @Nullable IsoDeadBody deadBody) {
+
 		this.gridSquare = gridSquare;
+		this.item = item;
+		this.deadBody = deadBody;
+	}
+
+	public OnContainerUpdateEvent(@Nullable IsoDeadBody deadBody) {
+		this(null, null, deadBody);
+	}
+
+	public OnContainerUpdateEvent(@Nullable InventoryItem item) {
+		this(null, item, null);
+	}
+
+	public OnContainerUpdateEvent(@Nullable IsoGridSquare gridSquare) {
+		this(gridSquare, null, null);
 	}
 
 	public OnContainerUpdateEvent() {
-		this(null);
+		this(null, null, null);
 	}
 }

From 267f30d33db2b902a09d90e364924af1f8a23826 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:16:52 +0200
Subject: [PATCH 282/323] Make LuaEvent fields more inclusive

---
 .../storm/event/lua/OnCreateLivingCharacterEvent.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
index 80d7422..1bcba6d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
@@ -1,5 +1,6 @@
 package io.pzstorm.storm.event.lua;
 
+import zombie.characters.IsoGameCharacter;
 import zombie.characters.IsoPlayer;
 import zombie.characters.IsoSurvivor;
 import zombie.characters.SurvivorDesc;
@@ -10,11 +11,11 @@
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnCreateLivingCharacterEvent implements LuaEvent {
 
-	public final IsoPlayer player;
+	public final IsoGameCharacter character;
 	public final SurvivorDesc descriptor;
 
-	public OnCreateLivingCharacterEvent(IsoPlayer player, SurvivorDesc descriptor) {
-		this.player = player;
+	public OnCreateLivingCharacterEvent(IsoGameCharacter character, SurvivorDesc descriptor) {
+		this.character = character;
 		this.descriptor = descriptor;
 	}
 }

From df23ecb8ccd910c2161889afc557767ec36fe62c Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:18:00 +0200
Subject: [PATCH 283/323] Add more LuaEvent implementations

---
 .../storm/event/lua/OnInitSeasonsEvent.java   | 20 ++++++++
 .../storm/event/lua/OnInitWorldEvent.java     |  9 ++++
 .../event/lua/OnIsoThumpableLoadEvent.java    |  9 ++++
 .../event/lua/OnIsoThumpableSaveEvent.java    |  9 ++++
 .../event/lua/OnJoypadActivateUIEvent.java    | 19 ++++++++
 .../event/lua/OnKeyKeepPressedEvent.java      | 20 ++++++++
 .../pzstorm/storm/event/lua/OnLoadEvent.java  |  9 ++++
 .../event/lua/OnLoadRadioScriptsEvent.java    | 27 +++++++++++
 .../event/lua/OnLoadSoundBanksEvent.java      | 12 +++++
 .../lua/OnLoadedTileDefinitionsEvent.java     | 20 ++++++++
 .../storm/event/lua/OnLoginStateEvent.java    |  9 ++++
 .../event/lua/OnLoginStateSuccessEvent.java   |  9 ++++
 .../storm/event/lua/OnMainMenuEnterEvent.java | 10 ++++
 .../storm/event/lua/OnMakeItemEvent.java      | 11 +++++
 .../lua/OnMapLoadCreateIsoObjectEvent.java    | 11 +++++
 .../event/lua/OnMechanicActionDoneEvent.java  | 29 ++++++++++++
 .../lua/OnMiniScoreboardUpdateEvent.java      |  7 +++
 .../storm/event/lua/OnModsModifiedEvent.java  |  9 ++++
 .../storm/event/lua/OnMouseDownEvent.java     | 25 ++++++++++
 .../storm/event/lua/OnMouseMoveEvent.java     | 21 +++++++++
 .../storm/event/lua/OnMouseUpEvent.java       | 25 ++++++++++
 .../event/lua/OnNPCSurvivorUpdateEvent.java   | 11 +++++
 .../storm/event/lua/OnNewFireEvent.java       | 19 ++++++++
 .../storm/event/lua/OnNewGameEvent.java       | 26 +++++++++++
 .../event/lua/OnNewSurvivorGroupEvent.java    |  9 ++++
 .../lua/OnObjectAboutToBeRemovedEvent.java    | 19 ++++++++
 .../storm/event/lua/OnObjectAddedEvent.java   | 19 ++++++++
 .../lua/OnObjectLeftMouseButtonDownEvent.java | 33 +++++++++++++
 .../lua/OnObjectLeftMouseButtonUpEvent.java   | 33 +++++++++++++
 .../OnObjectRightMouseButtonDownEvent.java    | 33 +++++++++++++
 .../lua/OnObjectRightMouseButtonUpEvent.java  | 33 +++++++++++++
 .../storm/event/lua/OnPauseGameEvent.java     | 13 ++++++
 .../lua/OnPlayerAttackFinishedEvent.java      | 26 +++++++++++
 .../storm/event/lua/OnPlayerDeathEvent.java   | 19 ++++++++
 .../storm/event/lua/OnPlayerMoveEvent.java    | 19 ++++++++
 .../event/lua/OnPlayerSetSafehouseEvent.java  |  9 ++++
 .../lua/OnPostCharactersSquareDrawEvent.java  |  9 ++++
 .../lua/OnPostDistributionMergeEvent.java     |  7 +++
 .../event/lua/OnPostFloorLayerDrawEvent.java  | 17 +++++++
 .../event/lua/OnPostFloorSquareDrawEvent.java |  9 ++++
 .../storm/event/lua/OnPostMapLoadEvent.java   | 31 +++++++++++++
 .../storm/event/lua/OnPostRenderEvent.java    |  7 +++
 .../storm/event/lua/OnPostSaveEvent.java      | 11 +++++
 .../storm/event/lua/OnPostTileDrawEvent.java  |  9 ++++
 .../event/lua/OnPostTilesSquareDrawEvent.java |  9 ++++
 .../event/lua/OnPostWallSquareDrawEvent.java  |  9 ++++
 .../lua/OnPreDistributionMergeEvent.java      |  7 +++
 .../storm/event/lua/OnPreGameStartEvent.java  |  9 ++++
 .../storm/event/lua/OnPreMapLoadEvent.java    |  9 ++++
 .../event/lua/OnPressRackButtonEvent.java     | 26 +++++++++++
 .../event/lua/OnPressReloadButtonEvent.java   | 26 +++++++++++
 .../event/lua/OnRadioInteractionEvent.java    |  9 ++++
 .../storm/event/lua/OnRainStartEvent.java     |  9 ++++
 .../storm/event/lua/OnRainStopEvent.java      |  9 ++++
 .../event/lua/OnReceiveItemListNetEvent.java  | 22 +++++++++
 .../event/lua/OnReceiveUserlogEvent.java      | 20 ++++++++
 .../storm/event/lua/OnRenderTickEvent.java    |  9 ++++
 .../storm/event/lua/OnRenderUpdateEvent.java  |  9 ++++
 .../storm/event/lua/OnResetLuaEvent.java      | 15 ++++++
 .../event/lua/OnResolutionChangeEvent.java    | 35 ++++++++++++++
 .../event/lua/OnRightMouseDownEvent.java      | 23 ++++++++++
 .../storm/event/lua/OnRightMouseUpEvent.java  | 23 ++++++++++
 .../lua/OnSGlobalObjectSystemInitEvent.java   |  7 +++
 .../event/lua/OnSafehousesChangedEvent.java   |  9 ++++
 .../pzstorm/storm/event/lua/OnSaveEvent.java  | 11 +++++
 .../event/lua/OnScoreboardUpdateEvent.java    | 19 ++++++++
 .../storm/event/lua/OnSeeNewRoomEvent.java    | 19 ++++++++
 .../storm/event/lua/OnServerCommandEvent.java | 20 ++++++++
 .../storm/event/lua/OnServerStartedEvent.java |  9 ++++
 .../event/lua/OnServerWorkshopItemsEvent.java | 46 +++++++++++++++++++
 .../storm/event/lua/OnSetDefaultTabEvent.java | 12 +++++
 .../event/lua/OnSpawnRegionsLoadedEvent.java  | 19 ++++++++
 .../storm/event/lua/OnSteamGameJoinEvent.java |  9 ++++
 .../storm/event/lua/OnTabAddedEvent.java      | 23 ++++++++++
 .../storm/event/lua/OnTabRemovedEvent.java    | 22 +++++++++
 .../storm/event/lua/OnThunderEvent.java       | 25 ++++++++++
 .../storm/event/lua/OnTileRemovedEvent.java   | 19 ++++++++
 .../storm/event/lua/OnUnpauseGameEvent.java   | 13 ++++++
 .../lua/OnUpdateModdedWeatherStageEvent.java  | 18 ++++++++
 .../lua/OnVehicleDamageTextureEvent.java      | 20 ++++++++
 .../event/lua/OnWaterAmountChangeEvent.java   | 25 ++++++++++
 .../storm/event/lua/OnWeaponHitTreeEvent.java | 27 +++++++++++
 .../storm/event/lua/OnWeaponHitXpEvent.java   | 39 ++++++++++++++++
 .../event/lua/OnWeaponSwingHitPointEvent.java | 26 +++++++++++
 .../storm/event/lua/OnWorldMessageEvent.java  |  9 ++++
 .../storm/event/lua/OnZombieDeadEvent.java    | 17 +++++++
 .../event/lua/ReceiveFactionInviteEvent.java  | 13 ++++++
 .../storm/event/lua/RequestTradeEvent.java    | 14 ++++++
 .../storm/event/lua/ReuseGridsquareEvent.java | 14 ++++++
 .../event/lua/SendCustomModDataEvent.java     |  7 +++
 .../storm/event/lua/ServerPingedEvent.java    | 16 +++++++
 .../event/lua/SwitchChatStreamEvent.java      |  7 +++
 .../storm/event/lua/SyncFactionEvent.java     | 12 +++++
 .../event/lua/TradingUIAddItemEvent.java      | 17 +++++++
 .../event/lua/TradingUIRemoveItemEvent.java   | 16 +++++++
 .../event/lua/TradingUIUpdateStateEvent.java  | 16 +++++++
 .../storm/event/lua/ViewTicketsEvent.java     | 15 ++++++
 .../lua/onLoadModDataFromServerEvent.java     | 19 ++++++++
 98 files changed, 1648 insertions(+)
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnInitWorldEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableLoadEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableSaveEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateUIEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnKeyKeepPressedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnLoadEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnLoadedTileDefinitionsEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateSuccessEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnMainMenuEnterEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnMechanicActionDoneEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnModsModifiedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnNewFireEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnNewSurvivorGroupEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAboutToBeRemovedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAddedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPauseGameEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerDeathEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerMoveEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerSetSafehouseEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostCharactersSquareDrawEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostDistributionMergeEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorLayerDrawEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorSquareDrawEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostRenderEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostSaveEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostTileDrawEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostTilesSquareDrawEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPostWallSquareDrawEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPreDistributionMergeEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPreGameStartEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPreMapLoadEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnRadioInteractionEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnRainStartEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnRainStopEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnRenderTickEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnRenderUpdateEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnResetLuaEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnSGlobalObjectSystemInitEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnSafehousesChangedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnSaveEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnSeeNewRoomEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnServerWorkshopItemsEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnSetDefaultTabEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnSpawnRegionsLoadedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnSteamGameJoinEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnTileRemovedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnUnpauseGameEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnVehicleDamageTextureEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnWorldMessageEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/OnZombieDeadEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/RequestTradeEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/ReuseGridsquareEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/SendCustomModDataEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/SwitchChatStreamEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/SyncFactionEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java
 create mode 100644 api/src/main/java/io/pzstorm/storm/event/lua/onLoadModDataFromServerEvent.java

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java
new file mode 100644
index 0000000..312391f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.erosion.ErosionMain;
+import zombie.erosion.season.ErosionSeason;
+
+/**
+ * Triggered after seasons have been initialized.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnInitSeasonsEvent implements LuaEvent {
+
+	/**
+	 * Instance of season that was just initialized.
+	 */
+	public final ErosionSeason season;
+
+	public OnInitSeasonsEvent(ErosionSeason season) {
+		this.season = season;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitWorldEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitWorldEvent.java
new file mode 100644
index 0000000..a34cd55
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitWorldEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered during the process of initializing the world.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnInitWorldEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableLoadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableLoadEvent.java
new file mode 100644
index 0000000..8172705
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableLoadEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnIsoThumpableLoadEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableSaveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableSaveEvent.java
new file mode 100644
index 0000000..1f810ac
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableSaveEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnIsoThumpableSaveEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateUIEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateUIEvent.java
new file mode 100644
index 0000000..ffc53cd
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateUIEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when a controller is activated in main menu.
+ *
+ * @see OnJoypadActivateEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnJoypadActivateUIEvent implements LuaEvent {
+
+	/**
+	 * The ID of the activated controller.
+	 */
+	public final Integer joypadID;
+
+	public OnJoypadActivateUIEvent(Integer joypadID) {
+		this.joypadID = joypadID;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyKeepPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyKeepPressedEvent.java
new file mode 100644
index 0000000..ed0c6b7
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyKeepPressedEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called when key is held down.
+ *
+ * @see OnKeyPressedEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnKeyKeepPressedEvent implements LuaEvent {
+
+	/**
+	 * <p>Integer denoting the key being held down.</p>
+	 * See {@code org.lwjgl.input.Keyboard} for list of key codes.
+	 */
+	public final Integer key;
+
+	public OnKeyKeepPressedEvent(Integer key) {
+		this.key = key;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadEvent.java
new file mode 100644
index 0000000..ca15100
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called when game is loading.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnLoadEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java
new file mode 100644
index 0000000..583b3bc
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java
@@ -0,0 +1,27 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoWorld;
+import zombie.radio.ZomboidRadio;
+import zombie.radio.scripting.RadioScriptManager;
+
+/**
+ * Triggered after radio scripts have been loaded in {@link ZomboidRadio}.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnLoadRadioScriptsEvent implements LuaEvent {
+
+	/**
+	 * Script manager that loaded the scripts.
+	 */
+	public final RadioScriptManager scriptManager;
+
+	/**
+	 * {@code true} if {@link IsoWorld#SavedWorldVersion} is {@code -1}, {@code false} otherwise.
+	 */
+	public final Boolean noSaveWorldVersion;
+
+	public OnLoadRadioScriptsEvent(RadioScriptManager scriptManager, Boolean noSaveWorldVersion) {
+		this.scriptManager = scriptManager;
+		this.noSaveWorldVersion = noSaveWorldVersion;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java
new file mode 100644
index 0000000..8a0e25f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java
@@ -0,0 +1,12 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered after sound banks have been loaded.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnLoadSoundBanksEvent implements LuaEvent {
+
+	// TODO: this event is not actually triggered directly after sound banks have been loaded,
+	//  	so move this event to be triggered directly after sound banks have been loaded
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadedTileDefinitionsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadedTileDefinitionsEvent.java
new file mode 100644
index 0000000..5fb871b
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadedTileDefinitionsEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoWorld;
+import zombie.iso.sprite.IsoSpriteManager;
+
+/**
+ * Triggered after tile definitions for {@link IsoWorld} have been loaded.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnLoadedTileDefinitionsEvent implements LuaEvent {
+
+	/**
+	 * Manager used to load tile definitions.
+	 */
+	public final IsoSpriteManager spriteManager;
+
+	public OnLoadedTileDefinitionsEvent(IsoSpriteManager spriteManager) {
+		this.spriteManager = spriteManager;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateEvent.java
new file mode 100644
index 0000000..60dce3f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnLoginStateEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateSuccessEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateSuccessEvent.java
new file mode 100644
index 0000000..d654325
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateSuccessEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnLoginStateSuccessEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMainMenuEnterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMainMenuEnterEvent.java
new file mode 100644
index 0000000..68269cb
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMainMenuEnterEvent.java
@@ -0,0 +1,10 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Called when player sees the main menu.
+ * This will occur when they launch the game or if they quit a running game.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnMainMenuEnterEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java
new file mode 100644
index 0000000..829b9bd
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnMakeItemEvent implements LuaEvent {
+
+	public OnMakeItemEvent() {
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java
new file mode 100644
index 0000000..329946d
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnMapLoadCreateIsoObjectEvent implements LuaEvent {
+
+	public OnMapLoadCreateIsoObjectEvent() {
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMechanicActionDoneEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMechanicActionDoneEvent.java
new file mode 100644
index 0000000..c3b997a
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMechanicActionDoneEvent.java
@@ -0,0 +1,29 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+
+/**
+ * Triggers when a vehicle mechanic action has been completed.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnMechanicActionDoneEvent implements LuaEvent {
+
+	// TODO: finish documenting this event
+	public final IsoGameCharacter player;
+	public final Boolean var1;
+	public final Integer var2;
+	public final String var3;
+	public final Long var4;
+	public final Boolean var5;
+
+	public OnMechanicActionDoneEvent(IsoGameCharacter player, Boolean var1,
+									 Integer var2, String var3, Long var4, Boolean var5) {
+
+		this.player = player;
+		this.var1 = var1;
+		this.var2 = var2;
+		this.var3 = var3;
+		this.var4 = var4;
+		this.var5 = var5;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java
new file mode 100644
index 0000000..a8b9e63
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm.event.lua;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnMiniScoreboardUpdateEvent implements LuaEvent {
+
+	// TODO: document this event
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnModsModifiedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnModsModifiedEvent.java
new file mode 100644
index 0000000..f773bb9
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnModsModifiedEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when a mod file has been changed.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnModsModifiedEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java
new file mode 100644
index 0000000..ab65571
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java
@@ -0,0 +1,25 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when mouse button is down.
+ *
+ * @see OnMouseMoveEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnMouseDownEvent implements LuaEvent {
+
+	/**
+	 * Position of the mouse along x-axis.
+	 */
+	public final Integer x;
+
+	/**
+	 * Position of the mouse along y-axis.
+	 */
+	public final Integer y;
+
+	public OnMouseDownEvent(Integer x, Integer y) {
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java
new file mode 100644
index 0000000..674690c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java
@@ -0,0 +1,21 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when mouse is moved.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnMouseMoveEvent implements LuaEvent {
+
+	// TODO: finish documenting this event
+	public final Double xA;
+	public final Double yA;
+	public final Double x;
+	public final Double y;
+
+	public OnMouseMoveEvent(Double xA, Double yA, Double x, Double y) {
+		this.xA = xA;
+		this.yA = yA;
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java
new file mode 100644
index 0000000..a312c65
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java
@@ -0,0 +1,25 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when mouse button is released.
+ *
+ * @see OnMouseMoveEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnMouseUpEvent implements LuaEvent {
+
+	/**
+	 * Position of the mouse along x-axis.
+	 */
+	public final Integer x;
+
+	/**
+	 * Position of the mouse along y-axis.
+	 */
+	public final Integer y;
+
+	public OnMouseUpEvent(Integer x, Integer y) {
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java
new file mode 100644
index 0000000..6b628d7
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnNPCSurvivorUpdateEvent implements LuaEvent {
+
+	public OnNPCSurvivorUpdateEvent() {
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewFireEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewFireEvent.java
new file mode 100644
index 0000000..29aa6aa
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewFireEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.objects.IsoFire;
+
+/**
+ * Triggered when new instance of {@link IsoFire} is created.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnNewFireEvent implements LuaEvent {
+
+	/**
+	 * Instance of {@link IsoFire} just created.
+	 */
+	public final IsoFire isoFire;
+
+	public OnNewFireEvent(IsoFire isoFire) {
+		this.isoFire = isoFire;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java
new file mode 100644
index 0000000..1ee7c82
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+import zombie.iso.IsoGridSquare;
+
+/**
+ * Triggered after a world is initialized.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnNewGameEvent implements LuaEvent {
+
+	/**
+	 * The player that initialized the world.
+	 */
+	public final IsoPlayer player;
+
+	/**
+	 * The {@link IsoGridSquare} the player is located.
+	 */
+	public final IsoGridSquare gridSquare;
+
+	public OnNewGameEvent(IsoPlayer player, IsoGridSquare gridSquare) {
+		this.player = player;
+		this.gridSquare = gridSquare;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewSurvivorGroupEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewSurvivorGroupEvent.java
new file mode 100644
index 0000000..22d19c3
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewSurvivorGroupEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnNewSurvivorGroupEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAboutToBeRemovedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAboutToBeRemovedEvent.java
new file mode 100644
index 0000000..fce1155
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAboutToBeRemovedEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoObject;
+
+/**
+ * Triggered before an {@link IsoObject} is removed from world.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnObjectAboutToBeRemovedEvent implements LuaEvent {
+
+	/**
+	 * Object to be removed from world.
+	 */
+	public final IsoObject object;
+
+	public OnObjectAboutToBeRemovedEvent(IsoObject object) {
+		this.object = object;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAddedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAddedEvent.java
new file mode 100644
index 0000000..e5a5f23
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAddedEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoObject;
+
+/**
+ * Triggered after {@link IsoObject} has been added to world.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnObjectAddedEvent implements LuaEvent {
+
+	/**
+	 * Object that was just added to world.
+	 */
+	public final IsoObject object;
+
+	public OnObjectAddedEvent(IsoObject object) {
+		this.object = object;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java
new file mode 100644
index 0000000..d405b20
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java
@@ -0,0 +1,33 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoObject;
+
+/**
+ * Triggered when left mouse button clicked on {@link IsoObject}.
+ *
+ * @see OnObjectLeftMouseButtonUpEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnObjectLeftMouseButtonDownEvent implements LuaEvent {
+
+	/**
+	 * Object clicked on.
+	 */
+	public final IsoObject object;
+
+	/**
+	 * Position of mouse along x-axis.
+	 */
+	public final Integer x;
+
+	/**
+	 * Position of mouse along y-axis.
+	 */
+	public final Integer y;
+
+	public OnObjectLeftMouseButtonDownEvent(IsoObject object, Integer x, Integer y) {
+		this.object = object;
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java
new file mode 100644
index 0000000..10a636f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java
@@ -0,0 +1,33 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoObject;
+
+/**
+ * Triggered when left mouse button is released on {@link IsoObject}.
+ *
+ * @see OnObjectLeftMouseButtonDownEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnObjectLeftMouseButtonUpEvent implements LuaEvent {
+
+	/**
+	 * Object clicked on.
+	 */
+	public final IsoObject object;
+
+	/**
+	 * Position of mouse along x-axis.
+	 */
+	public final Integer x;
+
+	/**
+	 * Position of mouse along y-axis.
+	 */
+	public final Integer y;
+
+	public OnObjectLeftMouseButtonUpEvent(IsoObject object, Integer x, Integer y) {
+		this.object = object;
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java
new file mode 100644
index 0000000..3458a69
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java
@@ -0,0 +1,33 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoObject;
+
+/**
+ * Triggered when right mouse button clicked on {@link IsoObject}.
+ *
+ * @see OnObjectRightMouseButtonUpEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnObjectRightMouseButtonDownEvent implements LuaEvent {
+
+	/**
+	 * Object clicked on.
+	 */
+	public final IsoObject object;
+
+	/**
+	 * Position of mouse along x-axis.
+	 */
+	public final Integer x;
+
+	/**
+	 * Position of mouse along y-axis.
+	 */
+	public final Integer y;
+
+	public OnObjectRightMouseButtonDownEvent(IsoObject object, Integer x, Integer y) {
+		this.object = object;
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java
new file mode 100644
index 0000000..869a444
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java
@@ -0,0 +1,33 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoObject;
+
+/**
+ * Triggered when right mouse button is released on {@link IsoObject}.
+ *
+ * @see OnObjectRightMouseButtonDownEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnObjectRightMouseButtonUpEvent implements LuaEvent {
+
+	/**
+	 * Object clicked on.
+	 */
+	public final IsoObject object;
+
+	/**
+	 * Position of mouse along x-axis.
+	 */
+	public final Integer x;
+
+	/**
+	 * Position of mouse along y-axis.
+	 */
+	public final Integer y;
+
+	public OnObjectRightMouseButtonUpEvent(IsoObject object, Integer x, Integer y) {
+		this.object = object;
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPauseGameEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPauseGameEvent.java
new file mode 100644
index 0000000..97efbae
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPauseGameEvent.java
@@ -0,0 +1,13 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggers after the game gets paused.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPauseGameEvent implements LuaEvent {
+
+	@Override
+	public String getName() {
+		return "OnServerStartSaving";
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java
new file mode 100644
index 0000000..147a69f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.inventory.types.HandWeapon;
+
+/**
+ * Triggered when player attack state finishes.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPlayerAttackFinishedEvent implements LuaEvent {
+
+	/**
+	 * Player who initiates the attack.
+	 */
+	public final IsoGameCharacter player;
+
+	/**
+	 * Weapon used to attack.
+	 */
+	public final HandWeapon weapon;
+
+	public OnPlayerAttackFinishedEvent(IsoGameCharacter player, HandWeapon weapon) {
+		this.player = player;
+		this.weapon = weapon;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerDeathEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerDeathEvent.java
new file mode 100644
index 0000000..32b42e5
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerDeathEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+
+/**
+ * Triggered when a player dies.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPlayerDeathEvent implements LuaEvent {
+
+	/**
+	 * The player which died.
+	 */
+	public final IsoPlayer player;
+
+	public OnPlayerDeathEvent(IsoPlayer player) {
+		this.player = player;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerMoveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerMoveEvent.java
new file mode 100644
index 0000000..b5a390c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerMoveEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+
+/**
+ * Triggered while the player is moving.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPlayerMoveEvent implements LuaEvent {
+
+	/**
+	 * The player that is moving.
+	 */
+	public final IsoPlayer player;
+
+	public OnPlayerMoveEvent(IsoPlayer player) {
+		this.player = player;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerSetSafehouseEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerSetSafehouseEvent.java
new file mode 100644
index 0000000..a211d23
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerSetSafehouseEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPlayerSetSafehouseEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostCharactersSquareDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostCharactersSquareDrawEvent.java
new file mode 100644
index 0000000..c3f6511
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostCharactersSquareDrawEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostCharactersSquareDrawEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostDistributionMergeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostDistributionMergeEvent.java
new file mode 100644
index 0000000..67c37e7
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostDistributionMergeEvent.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm.event.lua;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostDistributionMergeEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorLayerDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorLayerDrawEvent.java
new file mode 100644
index 0000000..8948ffd
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorLayerDrawEvent.java
@@ -0,0 +1,17 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered after a floor layer is rendered.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostFloorLayerDrawEvent implements LuaEvent {
+
+	/**
+	 * The Z-index of the layer which was rendered.
+	 */
+	public final Integer zIndex;
+
+	public OnPostFloorLayerDrawEvent(Integer zIndex) {
+		this.zIndex = zIndex;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorSquareDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorSquareDrawEvent.java
new file mode 100644
index 0000000..3232d05
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorSquareDrawEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostFloorSquareDrawEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java
new file mode 100644
index 0000000..0f5a0bc
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java
@@ -0,0 +1,31 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoCell;
+
+/**
+ * Triggered after a cell is loaded.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostMapLoadEvent implements LuaEvent {
+
+	/**
+	 * The cell which was loaded.
+	 */
+	public final IsoCell isoCell;
+
+	/**
+	 * The position of cell along x-axis.
+	 */
+	public final Integer x;
+
+	/**
+	 * The position of cell along y-axis.
+	 */
+	public final Integer y;
+
+	public OnPostMapLoadEvent(IsoCell isoCell, Integer x, Integer y) {
+		this.isoCell = isoCell;
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostRenderEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostRenderEvent.java
new file mode 100644
index 0000000..67120cc
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostRenderEvent.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm.event.lua;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostRenderEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostSaveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostSaveEvent.java
new file mode 100644
index 0000000..5c48da8
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostSaveEvent.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered after the game was saved.
+ *
+ * @see OnSaveEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostSaveEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTileDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTileDrawEvent.java
new file mode 100644
index 0000000..275f6bb
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTileDrawEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostTileDrawEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTilesSquareDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTilesSquareDrawEvent.java
new file mode 100644
index 0000000..a3d6df2
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTilesSquareDrawEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostTilesSquareDrawEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostWallSquareDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostWallSquareDrawEvent.java
new file mode 100644
index 0000000..26eb0ea
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostWallSquareDrawEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPostWallSquareDrawEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreDistributionMergeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreDistributionMergeEvent.java
new file mode 100644
index 0000000..dd41f5d
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreDistributionMergeEvent.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm.event.lua;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPreDistributionMergeEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreGameStartEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreGameStartEvent.java
new file mode 100644
index 0000000..5fa03c1
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreGameStartEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPreGameStartEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreMapLoadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreMapLoadEvent.java
new file mode 100644
index 0000000..674ae63
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreMapLoadEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered before a map is loaded.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPreMapLoadEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java
new file mode 100644
index 0000000..6de9961
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+import zombie.inventory.types.HandWeapon;
+
+/**
+ * Triggered after the player presses the weapon rack button.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPressRackButtonEvent implements LuaEvent {
+
+	/**
+	 * The player that is racking the weapon.
+	 */
+	public final IsoPlayer player;
+
+	/**
+	 * The weapon that is being racked.
+	 */
+	public final HandWeapon weapon;
+
+	public OnPressRackButtonEvent(IsoPlayer player, HandWeapon weapon) {
+		this.player = player;
+		this.weapon = weapon;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java
new file mode 100644
index 0000000..fa073ec
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+import zombie.inventory.types.HandWeapon;
+
+/**
+ * Triggers after the player presses the weapon reload button.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnPressReloadButtonEvent implements LuaEvent {
+
+	/**
+	 * The player that is reloading the weapon.
+	 */
+	public final IsoPlayer player;
+
+	/**
+	 * The weapon is being reloaded.
+	 */
+	public final HandWeapon weapon;
+
+	public OnPressReloadButtonEvent(IsoPlayer player, HandWeapon weapon) {
+		this.player = player;
+		this.weapon = weapon;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRadioInteractionEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRadioInteractionEvent.java
new file mode 100644
index 0000000..882cede
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRadioInteractionEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnRadioInteractionEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStartEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStartEvent.java
new file mode 100644
index 0000000..8a88527
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStartEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnRainStartEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStopEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStopEvent.java
new file mode 100644
index 0000000..aeeaf16
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStopEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered after the rain stops falling.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnRainStopEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java
new file mode 100644
index 0000000..ba276b2
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java
@@ -0,0 +1,22 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+
+import java.util.ArrayList;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnReceiveItemListNetEvent implements LuaEvent {
+
+	public final IsoPlayer player1, player2;
+	public final ArrayList<?> list;
+	public final String text1, text2;
+
+	public OnReceiveItemListNetEvent(IsoPlayer player1, ArrayList<?> list, IsoPlayer player2, String text1, String text2) {
+		this.player1 = player1;
+		this.list = list;
+		this.player2 = player2;
+		this.text1 = text1;
+		this.text2 = text2;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java
new file mode 100644
index 0000000..33b01e4
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+
+/**
+ * Triggered when game client receives user log.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnReceiveUserlogEvent implements LuaEvent {
+
+	// TODO: finish documenting this event
+	public final String identifier;
+	public final ArrayList<?> userLogs;
+
+	public OnReceiveUserlogEvent(String identifier, ArrayList<?> userLogs) {
+		this.identifier = identifier;
+		this.userLogs = userLogs;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderTickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderTickEvent.java
new file mode 100644
index 0000000..2df9bcb
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderTickEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggers when rendering each tick.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnRenderTickEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderUpdateEvent.java
new file mode 100644
index 0000000..4250111
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderUpdateEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnRenderUpdateEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnResetLuaEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnResetLuaEvent.java
new file mode 100644
index 0000000..31ebc87
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnResetLuaEvent.java
@@ -0,0 +1,15 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Trigger after resetting Lua scripts.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnResetLuaEvent implements LuaEvent {
+
+	// TODO: finish documenting this event
+	public final String var1;
+
+	public OnResetLuaEvent(String var1) {
+		this.var1 = var1;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java
new file mode 100644
index 0000000..9d742f0
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java
@@ -0,0 +1,35 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggers when changing game resolution.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnResolutionChangeEvent implements LuaEvent {
+
+	/**
+	 * Screen width before the resolution change.
+	 */
+	public final Integer oldWidth;
+
+	/**
+	 * Screen height before the resolution change.
+	 */
+	public final Integer oldHeight;
+
+	/**
+	 * Screen width after the resolution change.
+	 */
+	public final Integer newWidth;
+
+	/**
+	 * Screen height after the resolution change.
+	 */
+	public final Integer newHeight;
+
+	public OnResolutionChangeEvent(Integer oldWidth, Integer oldHeight, Integer newWidth, Integer newHeight) {
+		this.oldWidth = oldWidth;
+		this.oldHeight = oldHeight;
+		this.newWidth = newWidth;
+		this.newHeight = newHeight;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java
new file mode 100644
index 0000000..584b3fb
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java
@@ -0,0 +1,23 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when right mouse button is down.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnRightMouseDownEvent implements LuaEvent {
+
+	/**
+	 * Position of mouse along x-axis.
+	 */
+	public final Integer x;
+
+	/**
+	 * Position of mouse along y-axis.
+	 */
+	public final Integer y;
+
+	public OnRightMouseDownEvent(Integer x, Integer y) {
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java
new file mode 100644
index 0000000..1a8d417
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java
@@ -0,0 +1,23 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when mouse button is released.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnRightMouseUpEvent implements LuaEvent {
+
+	/**
+	 * Position of mouse along x-axis.
+	 */
+	public final Integer x;
+
+	/**
+	 * Position of mouse along y-axis.
+	 */
+	public final Integer y;
+
+	public OnRightMouseUpEvent(Integer x, Integer y) {
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSGlobalObjectSystemInitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSGlobalObjectSystemInitEvent.java
new file mode 100644
index 0000000..79dd93c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSGlobalObjectSystemInitEvent.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm.event.lua;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnSGlobalObjectSystemInitEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSafehousesChangedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSafehousesChangedEvent.java
new file mode 100644
index 0000000..68718b3
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSafehousesChangedEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when a safehouse gets added or removed.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnSafehousesChangedEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSaveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSaveEvent.java
new file mode 100644
index 0000000..5a78d68
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSaveEvent.java
@@ -0,0 +1,11 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered during the game's saving process.
+ *
+ * @see OnPostSaveEvent
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnSaveEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java
new file mode 100644
index 0000000..625b4c1
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import java.util.ArrayList;
+
+/**
+ * Called when multiplayer scoreboard is updated.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnScoreboardUpdateEvent implements LuaEvent {
+
+	// TODO: finish documenting event
+	public final ArrayList<?> var1, var2, var3;
+
+	public OnScoreboardUpdateEvent(ArrayList<?> var1, ArrayList<?> var2, ArrayList<?> var3) {
+		this.var1 = var1;
+		this.var2 = var2;
+		this.var3 = var3;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSeeNewRoomEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSeeNewRoomEvent.java
new file mode 100644
index 0000000..82c90cf
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSeeNewRoomEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.areas.IsoRoom;
+
+/**
+ * Triggered when new room was spotted by player.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnSeeNewRoomEvent implements LuaEvent {
+
+	/**
+	 * The new room spotted.
+	 */
+	public final IsoRoom room;
+
+	public OnSeeNewRoomEvent(IsoRoom room) {
+		this.room = room;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java
new file mode 100644
index 0000000..604e213
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+import se.krka.kahlua.vm.KahluaTable;
+
+/**
+ * Triggered when client receives server command.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnServerCommandEvent implements LuaEvent {
+
+	// TODO: finish documenting this event
+	public final String var1, var2;
+	public final KahluaTable var3;
+
+	public OnServerCommandEvent(String var1, String var2, KahluaTable var3) {
+		this.var1 = var1;
+		this.var2 = var2;
+		this.var3 = var3;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartedEvent.java
new file mode 100644
index 0000000..72a47a5
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartedEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggers when the game server starts.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnServerStartedEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerWorkshopItemsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerWorkshopItemsEvent.java
new file mode 100644
index 0000000..794b002
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerWorkshopItemsEvent.java
@@ -0,0 +1,46 @@
+package io.pzstorm.storm.event.lua;
+
+import java.util.ArrayList;
+
+/**
+ * Triggers when Steam workshop item is being processed.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnServerWorkshopItemsEvent implements LuaEvent {
+
+	public final String state, errorReason;
+	public final Long workshopItemID;
+	public final ArrayList<String> itemIDs;
+	public final Long var1, var2;
+
+	public OnServerWorkshopItemsEvent(String state, String errorReason, Long workshopItemID,
+									  ArrayList<String> itemIDs, Long var1, Long var2) {
+
+		this.state = state;
+		this.errorReason = errorReason;
+		this.workshopItemID = workshopItemID;
+		this.itemIDs = itemIDs;
+		this.var1 = var1;
+		this.var2 = var2;
+	}
+
+	public OnServerWorkshopItemsEvent(String state, String workshopItemID, Long var1, Long var2) {
+		this(state, "", Long.parseLong(workshopItemID), new ArrayList<>(), var1, var2);
+	}
+
+	public OnServerWorkshopItemsEvent(String state, ArrayList<String> itemIDs) {
+		this(state, "", -1L, itemIDs, -1L, -1L);
+	}
+
+	public OnServerWorkshopItemsEvent(String state, String errorReason) {
+		this(state, errorReason, -1L, new ArrayList<>(), -1L, -1L);
+	}
+
+	public OnServerWorkshopItemsEvent(String state, long workshopItemID, String errorReason) {
+		this(state, errorReason, workshopItemID, new ArrayList<>(), -1L, -1L);
+	}
+
+	public OnServerWorkshopItemsEvent(String state) {
+		this(state, "", -1L, new ArrayList<>(), -1L, -1L);
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSetDefaultTabEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSetDefaultTabEvent.java
new file mode 100644
index 0000000..ed26d2c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSetDefaultTabEvent.java
@@ -0,0 +1,12 @@
+package io.pzstorm.storm.event.lua;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnSetDefaultTabEvent implements LuaEvent {
+
+	// TODO: document this event
+	public final String tabName;
+
+	public OnSetDefaultTabEvent(String tabName) {
+		this.tabName = tabName;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSpawnRegionsLoadedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSpawnRegionsLoadedEvent.java
new file mode 100644
index 0000000..aaa1f05
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSpawnRegionsLoadedEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import se.krka.kahlua.vm.KahluaTable;
+
+/**
+ * Triggered when spawn regions are loaded in Lua.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnSpawnRegionsLoadedEvent implements LuaEvent {
+
+	/**
+	 * Table with loaded regions.
+	 */
+	public final KahluaTable table;
+
+	public OnSpawnRegionsLoadedEvent(KahluaTable table) {
+		this.table = table;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSteamGameJoinEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSteamGameJoinEvent.java
new file mode 100644
index 0000000..fa94966
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSteamGameJoinEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * When client joins game over Steam.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnSteamGameJoinEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java
new file mode 100644
index 0000000..0f6a0e1
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java
@@ -0,0 +1,23 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when a chat tab has been added.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnTabAddedEvent implements LuaEvent {
+
+	/**
+	 * Title of the tab being added.
+	 */
+	public final String tabTitle;
+
+	/**
+	 * ID of the tab being added.
+	 */
+	public final Short tabID;
+
+	public OnTabAddedEvent(String tabTitle, Short tabID) {
+		this.tabTitle = tabTitle;
+		this.tabID = tabID;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java
new file mode 100644
index 0000000..7c35c10
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java
@@ -0,0 +1,22 @@
+package io.pzstorm.storm.event.lua;
+/**
+ * Triggered when a chat tab has been removed.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnTabRemovedEvent implements LuaEvent {
+
+	/**
+	 * Title of the tab being added.
+	 */
+	public final String tabTitle;
+
+	/**
+	 * ID of the tab being removed.
+	 */
+	public final Short tabID;
+
+	public OnTabRemovedEvent(String tabTitle, Short tabID) {
+		this.tabTitle = tabTitle;
+		this.tabID = tabID;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java
new file mode 100644
index 0000000..9860dc2
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java
@@ -0,0 +1,25 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered before a thunder strike.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnThunderEvent implements LuaEvent {
+
+	// TODO: finish documenting this event
+	public final Integer var1, var2;
+	public final Boolean var3, var4, var5;
+
+	public OnThunderEvent(Integer var1, Integer var2, Boolean var3, Boolean var4, Boolean var5) {
+		this.var1 = var1;
+		this.var2 = var2;
+		this.var3 = var3;
+		this.var4 = var4;
+		this.var5 = var5;
+	}
+
+	@Override
+	public String getName() {
+		return "OnThunderEvent";
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTileRemovedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTileRemovedEvent.java
new file mode 100644
index 0000000..ba129d1
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTileRemovedEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoObject;
+
+/**
+ * Triggered after tile object was removed from world.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnTileRemovedEvent implements LuaEvent {
+
+	/**
+	 * Object that was removed from world.
+	 */
+	public final IsoObject object;
+
+	public OnTileRemovedEvent(IsoObject object) {
+		this.object = object;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnUnpauseGameEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnUnpauseGameEvent.java
new file mode 100644
index 0000000..644241c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnUnpauseGameEvent.java
@@ -0,0 +1,13 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggers after the game gets unpaused.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnUnpauseGameEvent implements LuaEvent {
+
+	@Override
+	public String getName() {
+		return "OnServerFinishSaving";
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java
new file mode 100644
index 0000000..95d246c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java
@@ -0,0 +1,18 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.weather.WeatherPeriod;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnUpdateModdedWeatherStageEvent implements LuaEvent {
+
+	public final WeatherPeriod period;
+	public final WeatherPeriod.WeatherStage stage;
+	public final Float airFrontStrength;
+
+	public OnUpdateModdedWeatherStageEvent(WeatherPeriod period, WeatherPeriod.WeatherStage stage, Float airFrontStrength) {
+		this.period = period;
+		this.stage = stage;
+		this.airFrontStrength = airFrontStrength;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnVehicleDamageTextureEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnVehicleDamageTextureEvent.java
new file mode 100644
index 0000000..eaf6696
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnVehicleDamageTextureEvent.java
@@ -0,0 +1,20 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.vehicles.VehiclePart;
+
+/**
+ * Triggered when {@link VehiclePart} is damaged while being driven.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnVehicleDamageTextureEvent implements LuaEvent {
+
+	/**
+	 * Player driving the vehicle.
+	 */
+	public final IsoGameCharacter driver;
+
+	public OnVehicleDamageTextureEvent(IsoGameCharacter driver) {
+		this.driver = driver;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java
new file mode 100644
index 0000000..522cdb8
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java
@@ -0,0 +1,25 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoObject;
+
+/**
+ * Triggered when water amount changes for water containers.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnWaterAmountChangeEvent implements LuaEvent {
+
+	/**
+	 * Water container being updated.
+	 */
+	public final IsoObject container;
+
+	/**
+	 * Amount of water before update.
+	 */
+	public final Integer oldWaterAmount;
+
+	public OnWaterAmountChangeEvent(IsoObject container, Integer oldWaterAmount) {
+		this.container = container;
+		this.oldWaterAmount = oldWaterAmount;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java
new file mode 100644
index 0000000..3c44655
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java
@@ -0,0 +1,27 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.inventory.types.HandWeapon;
+import zombie.iso.objects.IsoTree;
+
+/**
+ * Triggered when an {@link IsoGameCharacter} uses a {@link HandWeapon} to hit an {@link IsoTree}.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnWeaponHitTreeEvent implements LuaEvent {
+
+	/**
+	 * Character hitting the tree.
+	 */
+	public final IsoGameCharacter owner;
+
+	/**
+	 * Weapon used to hit the tree.
+	 */
+	public final HandWeapon weapon;
+
+	public OnWeaponHitTreeEvent(IsoGameCharacter owner, HandWeapon weapon) {
+		this.owner = owner;
+		this.weapon = weapon;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java
new file mode 100644
index 0000000..48acb62
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java
@@ -0,0 +1,39 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.inventory.types.HandWeapon;
+import zombie.iso.IsoMovingObject;
+
+/**
+ * Triggered when experience is earned by attacking with weapon.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnWeaponHitXpEvent implements LuaEvent {
+
+	/**
+	 * Player earning experience.
+	 */
+	public final IsoGameCharacter player;
+
+	/**
+	 * Weapon used to attack.
+	 */
+	public final HandWeapon weapon;
+
+	/**
+	 * Object being hit with weapon.
+	 */
+	public final IsoMovingObject target;
+
+	/**
+	 * Either amount of damage or experience earned.
+	 */
+	public final Float value;
+
+	public OnWeaponHitXpEvent(IsoGameCharacter player, HandWeapon weapon, IsoMovingObject target, Float value) {
+		this.player = player;
+		this.weapon = weapon;
+		this.target = target;
+		this.value = value;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java
new file mode 100644
index 0000000..ad48148
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java
@@ -0,0 +1,26 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.inventory.types.HandWeapon;
+
+/**
+ * Triggered when a {@link HandWeapon} has hit the apex of its swing.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnWeaponSwingHitPointEvent implements LuaEvent {
+
+	/**
+	 * Character swinging the weapon.
+	 */
+	public final IsoGameCharacter owner;
+
+	/**
+	 * Weapon being swung.
+	 */
+	public final HandWeapon weapon;
+
+	public OnWeaponSwingHitPointEvent(IsoGameCharacter owner, HandWeapon weapon) {
+		this.owner = owner;
+		this.weapon = weapon;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWorldMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWorldMessageEvent.java
new file mode 100644
index 0000000..c297c2e
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWorldMessageEvent.java
@@ -0,0 +1,9 @@
+package io.pzstorm.storm.event.lua;
+
+import io.pzstorm.storm.event.InertEvent;
+
+@InertEvent
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnWorldMessageEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieDeadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieDeadEvent.java
new file mode 100644
index 0000000..34bacf3
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieDeadEvent.java
@@ -0,0 +1,17 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoGameCharacter;
+import zombie.characters.IsoZombie;
+
+/**
+ * Called after a {@link IsoZombie} dies.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class OnZombieDeadEvent implements LuaEvent {
+
+	public final IsoGameCharacter zombie;
+
+	public OnZombieDeadEvent(IsoGameCharacter zombie) {
+		this.zombie = zombie;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java
new file mode 100644
index 0000000..ea8aa71
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java
@@ -0,0 +1,13 @@
+package io.pzstorm.storm.event.lua;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class ReceiveFactionInviteEvent implements LuaEvent {
+
+	// TODO: document this event
+	public final String var1, var2;
+
+	public ReceiveFactionInviteEvent(String var1, String var2) {
+		this.var1 = var1;
+		this.var2 = var2;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/RequestTradeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/RequestTradeEvent.java
new file mode 100644
index 0000000..3364e12
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/RequestTradeEvent.java
@@ -0,0 +1,14 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class RequestTradeEvent implements LuaEvent {
+
+	// TODO: document this event
+	public final IsoPlayer player;
+
+	public RequestTradeEvent(IsoPlayer player) {
+		this.player = player;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ReuseGridsquareEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ReuseGridsquareEvent.java
new file mode 100644
index 0000000..d16394e
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ReuseGridsquareEvent.java
@@ -0,0 +1,14 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoGridSquare;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class ReuseGridsquareEvent implements LuaEvent {
+
+	// TODO: document this event
+	public final IsoGridSquare gridSquare;
+
+	public ReuseGridsquareEvent(IsoGridSquare gridSquare) {
+		this.gridSquare = gridSquare;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/SendCustomModDataEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/SendCustomModDataEvent.java
new file mode 100644
index 0000000..85dcccb
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/SendCustomModDataEvent.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm.event.lua;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class SendCustomModDataEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java
new file mode 100644
index 0000000..9fb4c8c
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java
@@ -0,0 +1,16 @@
+package io.pzstorm.storm.event.lua;
+
+/**
+ * Triggered when server reads info from ping.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class ServerPingedEvent implements LuaEvent {
+
+	// TODO: finish documenting this event
+	public final String var1, var2;
+
+	public ServerPingedEvent(String var1, String var2) {
+		this.var1 = var1;
+		this.var2 = var2;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/SwitchChatStreamEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/SwitchChatStreamEvent.java
new file mode 100644
index 0000000..6c29074
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/SwitchChatStreamEvent.java
@@ -0,0 +1,7 @@
+package io.pzstorm.storm.event.lua;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class SwitchChatStreamEvent implements LuaEvent {
+
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/SyncFactionEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/SyncFactionEvent.java
new file mode 100644
index 0000000..437ca9f
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/SyncFactionEvent.java
@@ -0,0 +1,12 @@
+package io.pzstorm.storm.event.lua;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class SyncFactionEvent implements LuaEvent {
+
+	public final String var1;
+
+	public SyncFactionEvent(String var1) {
+		this.var1 = var1;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java
new file mode 100644
index 0000000..ddbb6d5
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java
@@ -0,0 +1,17 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+import zombie.inventory.InventoryItem;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class TradingUIAddItemEvent implements LuaEvent {
+
+	public final IsoPlayer var1;
+	public final InventoryItem var2;
+
+	public TradingUIAddItemEvent(IsoPlayer var1, InventoryItem var2) {
+		this.var1 = var1;
+		this.var2 = var2;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java
new file mode 100644
index 0000000..6a3dff1
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java
@@ -0,0 +1,16 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class TradingUIRemoveItemEvent implements LuaEvent {
+
+	public final IsoPlayer var1;
+	public final Integer var2;
+
+	public TradingUIRemoveItemEvent(IsoPlayer var1, Integer var2) {
+		this.var1 = var1;
+		this.var2 = var2;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java
new file mode 100644
index 0000000..bdc88cb
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java
@@ -0,0 +1,16 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.characters.IsoPlayer;
+
+// TODO: document this event
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class TradingUIUpdateStateEvent implements LuaEvent {
+
+	public final IsoPlayer var1;
+	public final Integer var2;
+
+	public TradingUIUpdateStateEvent(IsoPlayer var1, Integer var2) {
+		this.var1 = var1;
+		this.var2 = var2;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java
new file mode 100644
index 0000000..c0a57dc
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java
@@ -0,0 +1,15 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.network.DBTicket;
+
+import java.util.ArrayList;
+
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class ViewTicketsEvent implements LuaEvent {
+
+	public final ArrayList<DBTicket> var1;
+
+	public ViewTicketsEvent(ArrayList<DBTicket> var1) {
+		this.var1 = var1;
+	}
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/onLoadModDataFromServerEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/onLoadModDataFromServerEvent.java
new file mode 100644
index 0000000..c092289
--- /dev/null
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/onLoadModDataFromServerEvent.java
@@ -0,0 +1,19 @@
+package io.pzstorm.storm.event.lua;
+
+import zombie.iso.IsoGridSquare;
+
+/**
+ * Triggered on both client and server when mod data is loaded on server.
+ */
+@SuppressWarnings({ "WeakerAccess", "unused" })
+public class onLoadModDataFromServerEvent implements LuaEvent {
+
+	/**
+	 * {@link IsoGridSquare} where mod data is being loaded.
+	 */
+	public final IsoGridSquare gridSquare;
+
+	public onLoadModDataFromServerEvent(IsoGridSquare gridSquare) {
+		this.gridSquare = gridSquare;
+	}
+}

From b8c80b1b0faa4acf87c6138e79007d79ba40f5b3 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:18:38 +0200
Subject: [PATCH 284/323] Start dispatching LuaEvent instances

---
 .../java/io/pzstorm/storm/event/StormEventHandler.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
index 8267ab2..b91e599 100644
--- a/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
+++ b/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
@@ -1,5 +1,6 @@
 package io.pzstorm.storm.event;
 
+import io.pzstorm.storm.event.lua.LuaEvent;
 import se.krka.kahlua.j2se.KahluaTableImpl;
 import se.krka.kahlua.vm.KahluaTable;
 import zombie.core.Core;
@@ -37,7 +38,9 @@ public static void handleUIElementRenderEvent(OnUIElementPreRenderEvent event) {
 	@SubscribeEvent
 	public static void handleLuaEventTrigger(OnTriggerLuaEvent event) {
 
-		// TODO: handle lua event triggers here
-		// StormLogger.info("Triggered lua event '" + event.luaEvent.name + '\'');
+		LuaEvent luaEvent = LuaEventFactory.constructLuaEvent(
+				event.luaEvent.name, event.args.toArray(new Object[0])
+		);
+		StormEventDispatcher.dispatchEvent(luaEvent);
 	}
 }

From 202555c83415c4b6e553683681e3aed3ad193a35 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:22:46 +0200
Subject: [PATCH 285/323] Make LuaEvent fields more inclusive

---
 .../storm/event/lua/OnContainerUpdateEvent.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
index 094f39c..f73ed34 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.Nullable;
 import zombie.inventory.InventoryItem;
 import zombie.iso.IsoGridSquare;
-import zombie.iso.objects.IsoDeadBody;
+import zombie.iso.IsoObject;
 
 /**
  * Triggered when an inventory container is being updated.
@@ -22,19 +22,19 @@ public class OnContainerUpdateEvent implements LuaEvent {
 	public final @Nullable InventoryItem item;
 
 	/**
-	 * Dead body that triggered the container update.
+	 * Object that triggered the container update.
 	 */
-	public final @Nullable IsoDeadBody deadBody;
+	public final @Nullable IsoObject object;
 
 	private OnContainerUpdateEvent(@Nullable IsoGridSquare gridSquare,
-								  @Nullable InventoryItem item, @Nullable IsoDeadBody deadBody) {
+								  @Nullable InventoryItem item, @Nullable IsoObject object) {
 
 		this.gridSquare = gridSquare;
 		this.item = item;
-		this.deadBody = deadBody;
+		this.object = object;
 	}
 
-	public OnContainerUpdateEvent(@Nullable IsoDeadBody deadBody) {
+	public OnContainerUpdateEvent(@Nullable IsoObject deadBody) {
 		this(null, null, deadBody);
 	}
 

From b22d2b15bc75b8eab3110517968ba89417e6a9f2 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:49:25 +0200
Subject: [PATCH 286/323] Add more zomboid dummy classes

---
 zombie/src/main/java/zombie/GameTime.java                 | 5 +++++
 zombie/src/main/java/zombie/Lua/Event.java                | 1 +
 zombie/src/main/java/zombie/ai/State.java                 | 5 +++++
 zombie/src/main/java/zombie/characters/BodyDamage.java    | 8 ++++++++
 .../main/java/zombie/characters/skills/PerkFactory.java   | 8 ++++++++
 zombie/src/main/java/zombie/chat/ChatMessage.java         | 5 +++++
 zombie/src/main/java/zombie/erosion/ErosionMain.java      | 5 +++++
 .../main/java/zombie/erosion/season/ErosionSeason.java    | 5 +++++
 zombie/src/main/java/zombie/inventory/InventoryItem.java  | 5 +++++
 zombie/src/main/java/zombie/inventory/ItemContainer.java  | 5 +++++
 zombie/src/main/java/zombie/iso/IsoCell.java              | 5 +++++
 zombie/src/main/java/zombie/iso/IsoGridSquare.java        | 5 +++++
 zombie/src/main/java/zombie/iso/areas/IsoRoom.java        | 5 +++++
 zombie/src/main/java/zombie/iso/objects/IsoFire.java      | 5 +++++
 zombie/src/main/java/zombie/iso/objects/IsoThumpable.java | 5 +++++
 zombie/src/main/java/zombie/iso/objects/IsoTree.java      | 5 +++++
 .../src/main/java/zombie/iso/sprite/IsoSpriteManager.java | 5 +++++
 .../src/main/java/zombie/iso/weather/ClimateManager.java  | 5 +++++
 .../src/main/java/zombie/iso/weather/WeatherPeriod.java   | 8 ++++++++
 zombie/src/main/java/zombie/network/DBTicket.java         | 5 +++++
 zombie/src/main/java/zombie/radio/ZomboidRadio.java       | 5 +++++
 .../main/java/zombie/radio/devices/WaveSignalDevice.java  | 5 +++++
 .../java/zombie/radio/scripting/RadioScriptManager.java   | 5 +++++
 zombie/src/main/java/zombie/ui/ObjectTooltip.java         | 5 +++++
 zombie/src/main/java/zombie/vehicles/VehiclePart.java     | 5 +++++
 25 files changed, 130 insertions(+)
 create mode 100644 zombie/src/main/java/zombie/GameTime.java
 create mode 100644 zombie/src/main/java/zombie/ai/State.java
 create mode 100644 zombie/src/main/java/zombie/characters/BodyDamage.java
 create mode 100644 zombie/src/main/java/zombie/characters/skills/PerkFactory.java
 create mode 100644 zombie/src/main/java/zombie/chat/ChatMessage.java
 create mode 100644 zombie/src/main/java/zombie/erosion/ErosionMain.java
 create mode 100644 zombie/src/main/java/zombie/erosion/season/ErosionSeason.java
 create mode 100644 zombie/src/main/java/zombie/inventory/InventoryItem.java
 create mode 100644 zombie/src/main/java/zombie/inventory/ItemContainer.java
 create mode 100644 zombie/src/main/java/zombie/iso/IsoCell.java
 create mode 100644 zombie/src/main/java/zombie/iso/IsoGridSquare.java
 create mode 100644 zombie/src/main/java/zombie/iso/areas/IsoRoom.java
 create mode 100644 zombie/src/main/java/zombie/iso/objects/IsoFire.java
 create mode 100644 zombie/src/main/java/zombie/iso/objects/IsoThumpable.java
 create mode 100644 zombie/src/main/java/zombie/iso/objects/IsoTree.java
 create mode 100644 zombie/src/main/java/zombie/iso/sprite/IsoSpriteManager.java
 create mode 100644 zombie/src/main/java/zombie/iso/weather/ClimateManager.java
 create mode 100644 zombie/src/main/java/zombie/iso/weather/WeatherPeriod.java
 create mode 100644 zombie/src/main/java/zombie/network/DBTicket.java
 create mode 100644 zombie/src/main/java/zombie/radio/ZomboidRadio.java
 create mode 100644 zombie/src/main/java/zombie/radio/devices/WaveSignalDevice.java
 create mode 100644 zombie/src/main/java/zombie/radio/scripting/RadioScriptManager.java
 create mode 100644 zombie/src/main/java/zombie/ui/ObjectTooltip.java
 create mode 100644 zombie/src/main/java/zombie/vehicles/VehiclePart.java

diff --git a/zombie/src/main/java/zombie/GameTime.java b/zombie/src/main/java/zombie/GameTime.java
new file mode 100644
index 0000000..5945a90
--- /dev/null
+++ b/zombie/src/main/java/zombie/GameTime.java
@@ -0,0 +1,5 @@
+package zombie;
+
+public class GameTime {
+
+}
diff --git a/zombie/src/main/java/zombie/Lua/Event.java b/zombie/src/main/java/zombie/Lua/Event.java
index 426a35c..f76fbd0 100644
--- a/zombie/src/main/java/zombie/Lua/Event.java
+++ b/zombie/src/main/java/zombie/Lua/Event.java
@@ -2,4 +2,5 @@
 
 public class Event {
 
+	public String name;
 }
diff --git a/zombie/src/main/java/zombie/ai/State.java b/zombie/src/main/java/zombie/ai/State.java
new file mode 100644
index 0000000..852f72c
--- /dev/null
+++ b/zombie/src/main/java/zombie/ai/State.java
@@ -0,0 +1,5 @@
+package zombie.ai;
+
+public class State {
+
+}
diff --git a/zombie/src/main/java/zombie/characters/BodyDamage.java b/zombie/src/main/java/zombie/characters/BodyDamage.java
new file mode 100644
index 0000000..5bb36fb
--- /dev/null
+++ b/zombie/src/main/java/zombie/characters/BodyDamage.java
@@ -0,0 +1,8 @@
+package zombie.characters;
+
+public class BodyDamage {
+
+	public static class BodyPartType {
+
+	}
+}
diff --git a/zombie/src/main/java/zombie/characters/skills/PerkFactory.java b/zombie/src/main/java/zombie/characters/skills/PerkFactory.java
new file mode 100644
index 0000000..a140855
--- /dev/null
+++ b/zombie/src/main/java/zombie/characters/skills/PerkFactory.java
@@ -0,0 +1,8 @@
+package zombie.characters.skills;
+
+public class PerkFactory {
+
+	public static class Perks {
+
+	}
+}
diff --git a/zombie/src/main/java/zombie/chat/ChatMessage.java b/zombie/src/main/java/zombie/chat/ChatMessage.java
new file mode 100644
index 0000000..315c694
--- /dev/null
+++ b/zombie/src/main/java/zombie/chat/ChatMessage.java
@@ -0,0 +1,5 @@
+package zombie.chat;
+
+public class ChatMessage {
+
+}
diff --git a/zombie/src/main/java/zombie/erosion/ErosionMain.java b/zombie/src/main/java/zombie/erosion/ErosionMain.java
new file mode 100644
index 0000000..2f9e12d
--- /dev/null
+++ b/zombie/src/main/java/zombie/erosion/ErosionMain.java
@@ -0,0 +1,5 @@
+package zombie.erosion;
+
+public class ErosionMain {
+
+}
diff --git a/zombie/src/main/java/zombie/erosion/season/ErosionSeason.java b/zombie/src/main/java/zombie/erosion/season/ErosionSeason.java
new file mode 100644
index 0000000..86a5242
--- /dev/null
+++ b/zombie/src/main/java/zombie/erosion/season/ErosionSeason.java
@@ -0,0 +1,5 @@
+package zombie.erosion.season;
+
+public class ErosionSeason {
+
+}
diff --git a/zombie/src/main/java/zombie/inventory/InventoryItem.java b/zombie/src/main/java/zombie/inventory/InventoryItem.java
new file mode 100644
index 0000000..7b719c6
--- /dev/null
+++ b/zombie/src/main/java/zombie/inventory/InventoryItem.java
@@ -0,0 +1,5 @@
+package zombie.inventory;
+
+public class InventoryItem {
+
+}
diff --git a/zombie/src/main/java/zombie/inventory/ItemContainer.java b/zombie/src/main/java/zombie/inventory/ItemContainer.java
new file mode 100644
index 0000000..6de627f
--- /dev/null
+++ b/zombie/src/main/java/zombie/inventory/ItemContainer.java
@@ -0,0 +1,5 @@
+package zombie.inventory;
+
+public class ItemContainer {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/IsoCell.java b/zombie/src/main/java/zombie/iso/IsoCell.java
new file mode 100644
index 0000000..5bc302f
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/IsoCell.java
@@ -0,0 +1,5 @@
+package zombie.iso;
+
+public class IsoCell {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/IsoGridSquare.java b/zombie/src/main/java/zombie/iso/IsoGridSquare.java
new file mode 100644
index 0000000..9fdcb3f
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/IsoGridSquare.java
@@ -0,0 +1,5 @@
+package zombie.iso;
+
+public class IsoGridSquare {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/areas/IsoRoom.java b/zombie/src/main/java/zombie/iso/areas/IsoRoom.java
new file mode 100644
index 0000000..4601f69
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/areas/IsoRoom.java
@@ -0,0 +1,5 @@
+package zombie.iso.areas;
+
+public class IsoRoom {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/objects/IsoFire.java b/zombie/src/main/java/zombie/iso/objects/IsoFire.java
new file mode 100644
index 0000000..67c8c8a
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/objects/IsoFire.java
@@ -0,0 +1,5 @@
+package zombie.iso.objects;
+
+public class IsoFire {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/objects/IsoThumpable.java b/zombie/src/main/java/zombie/iso/objects/IsoThumpable.java
new file mode 100644
index 0000000..0699e82
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/objects/IsoThumpable.java
@@ -0,0 +1,5 @@
+package zombie.iso.objects;
+
+public class IsoThumpable {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/objects/IsoTree.java b/zombie/src/main/java/zombie/iso/objects/IsoTree.java
new file mode 100644
index 0000000..a85619b
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/objects/IsoTree.java
@@ -0,0 +1,5 @@
+package zombie.iso.objects;
+
+public class IsoTree {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/sprite/IsoSpriteManager.java b/zombie/src/main/java/zombie/iso/sprite/IsoSpriteManager.java
new file mode 100644
index 0000000..06497b4
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/sprite/IsoSpriteManager.java
@@ -0,0 +1,5 @@
+package zombie.iso.sprite;
+
+public class IsoSpriteManager {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/weather/ClimateManager.java b/zombie/src/main/java/zombie/iso/weather/ClimateManager.java
new file mode 100644
index 0000000..4793a9a
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/weather/ClimateManager.java
@@ -0,0 +1,5 @@
+package zombie.iso.weather;
+
+public class ClimateManager {
+
+}
diff --git a/zombie/src/main/java/zombie/iso/weather/WeatherPeriod.java b/zombie/src/main/java/zombie/iso/weather/WeatherPeriod.java
new file mode 100644
index 0000000..f2f645b
--- /dev/null
+++ b/zombie/src/main/java/zombie/iso/weather/WeatherPeriod.java
@@ -0,0 +1,8 @@
+package zombie.iso.weather;
+
+public class WeatherPeriod {
+
+	public static class WeatherStage {
+
+	}
+}
diff --git a/zombie/src/main/java/zombie/network/DBTicket.java b/zombie/src/main/java/zombie/network/DBTicket.java
new file mode 100644
index 0000000..41f7d30
--- /dev/null
+++ b/zombie/src/main/java/zombie/network/DBTicket.java
@@ -0,0 +1,5 @@
+package zombie.network;
+
+public class DBTicket {
+
+}
diff --git a/zombie/src/main/java/zombie/radio/ZomboidRadio.java b/zombie/src/main/java/zombie/radio/ZomboidRadio.java
new file mode 100644
index 0000000..d1d9f4f
--- /dev/null
+++ b/zombie/src/main/java/zombie/radio/ZomboidRadio.java
@@ -0,0 +1,5 @@
+package zombie.radio;
+
+public class ZomboidRadio {
+
+}
diff --git a/zombie/src/main/java/zombie/radio/devices/WaveSignalDevice.java b/zombie/src/main/java/zombie/radio/devices/WaveSignalDevice.java
new file mode 100644
index 0000000..1c63c63
--- /dev/null
+++ b/zombie/src/main/java/zombie/radio/devices/WaveSignalDevice.java
@@ -0,0 +1,5 @@
+package zombie.radio.devices;
+
+public class WaveSignalDevice {
+
+}
diff --git a/zombie/src/main/java/zombie/radio/scripting/RadioScriptManager.java b/zombie/src/main/java/zombie/radio/scripting/RadioScriptManager.java
new file mode 100644
index 0000000..7520e6c
--- /dev/null
+++ b/zombie/src/main/java/zombie/radio/scripting/RadioScriptManager.java
@@ -0,0 +1,5 @@
+package zombie.radio.scripting;
+
+public class RadioScriptManager {
+
+}
diff --git a/zombie/src/main/java/zombie/ui/ObjectTooltip.java b/zombie/src/main/java/zombie/ui/ObjectTooltip.java
new file mode 100644
index 0000000..c7bca0b
--- /dev/null
+++ b/zombie/src/main/java/zombie/ui/ObjectTooltip.java
@@ -0,0 +1,5 @@
+package zombie.ui;
+
+public class ObjectTooltip {
+
+}
diff --git a/zombie/src/main/java/zombie/vehicles/VehiclePart.java b/zombie/src/main/java/zombie/vehicles/VehiclePart.java
new file mode 100644
index 0000000..a967832
--- /dev/null
+++ b/zombie/src/main/java/zombie/vehicles/VehiclePart.java
@@ -0,0 +1,5 @@
+package zombie.vehicles;
+
+public class VehiclePart {
+
+}

From 57b6db8302de915094c948ca7d9004506aa6e8fb Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:54:02 +0200
Subject: [PATCH 287/323] Resolve error prone warnings

---
 core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java  | 2 +-
 core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java  | 1 +
 .../test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
index c122ef7..81ebb52 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
@@ -42,7 +42,7 @@ public static void registerMods() throws ReflectiveOperationException {
 
 				StormLogger.warn(String.format(format, meta != null ? meta.name : "unknown"));
 			}
-			else MOD_REGISTRY.put(entry.getKey(), (ZomboidMod) modClass.get().newInstance());
+			else MOD_REGISTRY.put(entry.getKey(), (ZomboidMod) modClass.get().getDeclaredConstructor().newInstance());
 		}
 	}
 
diff --git a/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java b/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
index db6d8fd..94c4f43 100644
--- a/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
+++ b/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
@@ -211,6 +211,7 @@ private enum LogSeverity {
 		/**
 		 * Log4j 2 level associated with this {@link LogSeverity} entry.
 		 */
+		@SuppressWarnings("ImmutableEnumChecker")
 		private final Level level;
 
 		LogSeverity(String name, Level level) {
diff --git a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
index 4def701..a1023b8 100644
--- a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
+++ b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
@@ -22,7 +22,7 @@
 
 class LuaEventFactoryTest implements UnitTest {
 
-	private static final Map<Class<? extends LuaEvent>, Class<?>[]> EVENT_CLASS_CONSTRUCTOR_DATA =
+	private static final ImmutableMap<Class<? extends LuaEvent>, Class<?>[]> EVENT_CLASS_CONSTRUCTOR_DATA =
 			ImmutableMap.<Class<? extends LuaEvent>, Class<?>[]>builder()
 					.put(OnChallengeQueryEvent.class, new Class<?>[]{})
 					.put(OnCharacterCollideEvent.class, new Class<?>[] {

From 2ff23e71332dc290fe96f7147acfda048fe52ec8 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Fri, 21 May 2021 03:59:40 +0200
Subject: [PATCH 288/323] Apply project code formatting

---
 .../io/pzstorm/storm/event/InertEvent.java    |  4 +-
 .../storm/event/OnTriggerLuaEvent.java        |  9 +++--
 .../event/lua/AcceptedFactionInviteEvent.java |  1 +
 .../pzstorm/storm/event/lua/AddXPEvent.java   |  1 +
 .../event/lua/DoSpecialTooltipEvent.java      |  1 +
 .../storm/event/lua/LevelPerkEvent.java       |  1 +
 .../storm/event/lua/OnAIStateChangeEvent.java |  1 +
 .../storm/event/lua/OnAddMessageEvent.java    |  1 +
 .../storm/event/lua/OnAdminMessageEvent.java  |  1 +
 .../storm/event/lua/OnAmbientSoundEvent.java  |  1 +
 .../event/lua/OnChallengeQueryEvent.java      |  1 -
 .../storm/event/lua/OnClientCommandEvent.java |  1 +
 .../storm/event/lua/OnClimateTickEvent.java   |  2 +-
 .../lua/OnConnectionStateChangedEvent.java    |  1 +
 .../event/lua/OnContainerUpdateEvent.java     |  3 +-
 .../event/lua/OnCoopServerMessageEvent.java   |  1 +
 .../lua/OnCreateLivingCharacterEvent.java     |  1 +
 .../storm/event/lua/OnCreatePlayerEvent.java  |  1 +
 .../event/lua/OnDestroyIsoThumpableEvent.java |  2 +
 .../storm/event/lua/OnDeviceTextEvent.java    |  8 ++--
 .../event/lua/OnDoTileBuilding3Event.java     |  2 +-
 .../storm/event/lua/OnEquipPrimaryEvent.java  |  1 +
 .../event/lua/OnEquipSecondaryEvent.java      |  1 +
 .../storm/event/lua/OnFillContainerEvent.java |  1 +
 ...OnFillInventoryObjectContextMenuEvent.java |  1 -
 .../OnFillWorldObjectContextMenuEvent.java    |  1 -
 .../storm/event/lua/OnGameBootEvent.java      |  1 +
 .../storm/event/lua/OnGameStartEvent.java     |  1 +
 .../event/lua/OnGetTableResultEvent.java      |  2 +-
 .../storm/event/lua/OnHitZombieEvent.java     |  1 +
 .../lua/OnInitModdedWeatherStageEvent.java    |  1 +
 .../storm/event/lua/OnInitSeasonsEvent.java   |  1 -
 .../event/lua/OnLoadRadioScriptsEvent.java    |  1 +
 .../event/lua/OnLoadSoundBanksEvent.java      |  1 -
 .../storm/event/lua/OnMakeItemEvent.java      |  1 -
 .../lua/OnMapLoadCreateIsoObjectEvent.java    |  1 -
 .../lua/OnMiniScoreboardUpdateEvent.java      |  1 -
 .../storm/event/lua/OnMouseDownEvent.java     |  1 +
 .../storm/event/lua/OnMouseMoveEvent.java     |  1 +
 .../storm/event/lua/OnMouseUpEvent.java       |  1 +
 .../event/lua/OnNPCSurvivorUpdateEvent.java   |  1 -
 .../storm/event/lua/OnNewGameEvent.java       |  1 +
 .../lua/OnObjectLeftMouseButtonDownEvent.java |  1 +
 .../lua/OnObjectLeftMouseButtonUpEvent.java   |  1 +
 .../OnObjectRightMouseButtonDownEvent.java    |  1 +
 .../lua/OnObjectRightMouseButtonUpEvent.java  |  1 +
 .../lua/OnPlayerAttackFinishedEvent.java      |  1 +
 .../storm/event/lua/OnPostMapLoadEvent.java   |  1 +
 .../storm/event/lua/OnPostUIDrawEvent.java    |  1 +
 ...reFillInventoryObjectContextMenuEvent.java |  1 -
 .../OnPreFillWorldObjectContextMenuEvent.java |  1 -
 .../storm/event/lua/OnPreUIDrawEvent.java     |  1 +
 .../event/lua/OnPressRackButtonEvent.java     |  1 +
 .../event/lua/OnPressReloadButtonEvent.java   |  1 +
 .../event/lua/OnReceiveItemListNetEvent.java  |  5 ++-
 .../event/lua/OnReceiveUserlogEvent.java      |  2 +-
 ...RefreshInventoryWindowContainersEvent.java |  1 +
 .../event/lua/OnResolutionChangeEvent.java    |  1 +
 .../event/lua/OnRightMouseDownEvent.java      |  1 +
 .../storm/event/lua/OnRightMouseUpEvent.java  |  1 +
 .../event/lua/OnScoreboardUpdateEvent.java    |  1 +
 .../storm/event/lua/OnServerCommandEvent.java |  1 +
 .../storm/event/lua/OnTabAddedEvent.java      |  1 +
 .../storm/event/lua/OnTabRemovedEvent.java    |  2 +
 .../storm/event/lua/OnThunderEvent.java       |  1 +
 .../lua/OnUpdateModdedWeatherStageEvent.java  |  1 +
 .../event/lua/OnWaterAmountChangeEvent.java   |  1 +
 .../storm/event/lua/OnWeaponHitTreeEvent.java |  1 +
 .../storm/event/lua/OnWeaponHitXpEvent.java   |  1 +
 .../storm/event/lua/OnWeaponSwingEvent.java   |  1 +
 .../event/lua/OnWeaponSwingHitPointEvent.java |  1 +
 .../event/lua/ReceiveFactionInviteEvent.java  |  1 +
 .../storm/event/lua/ServerPingedEvent.java    |  1 +
 .../event/lua/TradingUIAddItemEvent.java      |  1 +
 .../event/lua/TradingUIRemoveItemEvent.java   |  1 +
 .../event/lua/TradingUIUpdateStateEvent.java  |  1 +
 .../storm/event/lua/ViewTicketsEvent.java     |  4 +-
 .../java/io/pzstorm/storm/mod/ZomboidMod.java |  1 -
 .../pzstorm/storm/core/StormClassLoader.java  | 28 +++++++-------
 .../storm/core/StormClassTransformers.java    | 37 +++++++++++--------
 .../io/pzstorm/storm/core/StormLauncher.java  |  4 +-
 .../io/pzstorm/storm/core/StormModLoader.java | 15 +++-----
 .../pzstorm/storm/core/StormModRegistry.java  | 12 +++---
 .../pzstorm/storm/event/LuaEventFactory.java  | 25 +++++++------
 .../storm/hook/OnTriggerLuaEventHook.java     |  7 ++--
 .../io/pzstorm/storm/IntegrationTest.java     |  4 +-
 .../test/java/io/pzstorm/storm/TestUtils.java |  4 +-
 .../storm/core/ModLoaderTestFixture.java      | 16 ++++----
 .../core/StormModLoaderIntegrationTest.java   | 18 +++++----
 .../core/StormModRegistryIntegrationTest.java | 11 +++---
 .../storm/event/LuaEventFactoryTest.java      | 17 +++++----
 .../io/pzstorm/storm/util/StormUtilsTest.java |  2 +-
 zombie/src/main/java/zombie/Lua/Event.java    |  1 -
 .../java/zombie/characters/BodyDamage.java    |  2 -
 .../zombie/characters/skills/PerkFactory.java |  2 -
 .../zombie/iso/weather/WeatherPeriod.java     |  2 -
 96 files changed, 186 insertions(+), 132 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/InertEvent.java b/api/src/main/java/io/pzstorm/storm/event/InertEvent.java
index cb86cca..e823554 100644
--- a/api/src/main/java/io/pzstorm/storm/event/InertEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/InertEvent.java
@@ -1,12 +1,12 @@
 package io.pzstorm.storm.event;
 
-import io.pzstorm.storm.event.lua.LuaEvent;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import io.pzstorm.storm.event.lua.LuaEvent;
+
 /**
  * This annotation indicates that the annotated {@link LuaEvent} is never triggered
  * from game code. Note that this annotation is only used to document classes and
diff --git a/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java b/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java
index ebece95..d30f875 100644
--- a/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java
@@ -1,13 +1,14 @@
 package io.pzstorm.storm.event;
 
-import io.pzstorm.storm.event.lua.LuaEvent;
-import org.jetbrains.annotations.Unmodifiable;
-import zombie.Lua.Event;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.jetbrains.annotations.Unmodifiable;
+
+import io.pzstorm.storm.event.lua.LuaEvent;
+import zombie.Lua.Event;
+
 /**
  * This event fires when an in-game Lua event has been triggered. This event is only used
  * internally to catch <i>most</i>  triggered Lua events, after which they are used to
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
index 487edb0..a07bd75 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
@@ -7,6 +7,7 @@ public class AcceptedFactionInviteEvent implements LuaEvent {
 	public final String var1, var2;
 
 	public AcceptedFactionInviteEvent(String var1, String var2) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
index a916285..aa59ca8 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
@@ -25,6 +25,7 @@ public class AddXPEvent implements LuaEvent {
 	public final Float xpAmount;
 
 	public AddXPEvent(IsoGameCharacter player, PerkFactory.Perks perk, Float xpAmount) {
+
 		this.player = player;
 		this.perk = perk;
 		this.xpAmount = xpAmount;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java
index b16937d..aa1dad7 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java
@@ -21,6 +21,7 @@ public class DoSpecialTooltipEvent implements LuaEvent {
 	public final IsoGridSquare square;
 
 	public DoSpecialTooltipEvent(ObjectTooltip tooltip, IsoGridSquare square) {
+
 		this.tooltip = tooltip;
 		this.square = square;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
index 9c8968f..53d9761 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
@@ -30,6 +30,7 @@ public class LevelPerkEvent implements LuaEvent {
 	public final Boolean levelingUp;
 
 	public LevelPerkEvent(IsoGameCharacter player, PerkFactory.Perks perk, Integer level, Boolean levelingUp) {
+
 		this.player = player;
 		this.perk = perk;
 		this.level = level;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java
index fe4106e..8a53a2c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java
@@ -25,6 +25,7 @@ public class OnAIStateChangeEvent implements LuaEvent {
 	public final State prevState;
 
 	public OnAIStateChangeEvent(IsoGameCharacter character, State newState, State prevState) {
+
 		this.character = character;
 		this.newState = newState;
 		this.prevState = prevState;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
index 59637ee..a7d117f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
@@ -19,6 +19,7 @@ public class OnAddMessageEvent implements LuaEvent {
 	public final Short tabID;
 
 	public OnAddMessageEvent(ChatMessage message, Short tabID) {
+
 		this.message = message;
 		this.tabID = tabID;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
index 07e63c5..367fa61 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
@@ -10,6 +10,7 @@ public class OnAdminMessageEvent implements LuaEvent {
 	public final Integer var1, var2, var3;
 
 	public OnAdminMessageEvent(String message, Integer var1, Integer var2, Integer var3) {
+
 		this.message = message;
 		this.var1 = var1;
 		this.var2 = var2;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
index b194911..6f8aed2 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
@@ -22,6 +22,7 @@ public class OnAmbientSoundEvent implements LuaEvent {
 	public final Float y;
 
 	public OnAmbientSoundEvent(String soundName, Float x, Float y) {
+
 		this.soundName = soundName;
 		this.x = x;
 		this.y = y;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java
index 9de38f4..e6f1b6a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java
@@ -6,5 +6,4 @@
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnChallengeQueryEvent implements LuaEvent {
 
-
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java
index 6d9ecba..860cbe6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java
@@ -15,6 +15,7 @@ public class OnClientCommandEvent implements LuaEvent {
 	public final KahluaTable table;
 
 	public OnClientCommandEvent(String var1, String var2, IsoPlayer player, KahluaTable table) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 		this.player = player;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java
index bbf110d..0f7dc8e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java
@@ -16,4 +16,4 @@ public class OnClimateTickEvent implements LuaEvent {
 	public OnClimateTickEvent(ClimateManager manager) {
 		this.manager = manager;
 	}
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java
index 9601c44..048c243 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java
@@ -10,6 +10,7 @@ public class OnConnectionStateChangedEvent implements LuaEvent {
 	public final String state, message;
 
 	public OnConnectionStateChangedEvent(String state, String message) {
+
 		this.state = state;
 		this.message = message;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
index f73ed34..45ed5f4 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
@@ -1,6 +1,7 @@
 package io.pzstorm.storm.event.lua;
 
 import org.jetbrains.annotations.Nullable;
+
 import zombie.inventory.InventoryItem;
 import zombie.iso.IsoGridSquare;
 import zombie.iso.IsoObject;
@@ -27,7 +28,7 @@ public class OnContainerUpdateEvent implements LuaEvent {
 	public final @Nullable IsoObject object;
 
 	private OnContainerUpdateEvent(@Nullable IsoGridSquare gridSquare,
-								  @Nullable InventoryItem item, @Nullable IsoObject object) {
+								   @Nullable InventoryItem item, @Nullable IsoObject object) {
 
 		this.gridSquare = gridSquare;
 		this.item = item;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java
index 4e2bd7a..d1d3098 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java
@@ -7,6 +7,7 @@ public class OnCoopServerMessageEvent implements LuaEvent {
 	public final String var1, var2, var3;
 
 	public OnCoopServerMessageEvent(String var1, String var2, String var3) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 		this.var3 = var3;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
index 1bcba6d..f489353 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
@@ -15,6 +15,7 @@ public class OnCreateLivingCharacterEvent implements LuaEvent {
 	public final SurvivorDesc descriptor;
 
 	public OnCreateLivingCharacterEvent(IsoGameCharacter character, SurvivorDesc descriptor) {
+
 		this.character = character;
 		this.descriptor = descriptor;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
index a0ca298..ff4858a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
@@ -19,6 +19,7 @@ public class OnCreatePlayerEvent implements LuaEvent {
 	public final IsoPlayer player;
 
 	public OnCreatePlayerEvent(Integer playerIndex, IsoPlayer player) {
+
 		this.playerIndex = playerIndex;
 		this.player = player;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java
index 3e561e4..d5e1195 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java
@@ -1,6 +1,7 @@
 package io.pzstorm.storm.event.lua;
 
 import org.jetbrains.annotations.Nullable;
+
 import zombie.iso.objects.IsoThumpable;
 
 /**
@@ -20,6 +21,7 @@ public class OnDestroyIsoThumpableEvent implements LuaEvent {
 	public final @Nullable Object object;
 
 	public OnDestroyIsoThumpableEvent(IsoThumpable thumpableObject, @Nullable Object object) {
+
 		this.thumpableObject = thumpableObject;
 		this.object = object;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
index c350168..73e4dfa 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
@@ -11,15 +11,17 @@ public class OnDeviceTextEvent implements LuaEvent {
 	public final Float x, y, z;
 
 	public OnDeviceTextEvent(String text1, Integer x, Integer y, Integer z, String text2, WaveSignalDevice device) {
+
 		this.text1 = text1;
-		this.x = (float)x;
-		this.y = (float)y;
-		this.z = (float)z;
+		this.x = (float) x;
+		this.y = (float) y;
+		this.z = (float) z;
 		this.text2 = text2;
 		this.device = device;
 	}
 
 	public OnDeviceTextEvent(String text1, Float x, Float y, WaveSignalDevice device) {
+
 		this.text1 = text1;
 		this.x = x;
 		this.y = y;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
index fd9e3ae..3040e70 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
@@ -1,7 +1,6 @@
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
-import zombie.iso.IsoGridSquare;
 
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnDoTileBuilding3Event implements LuaEvent {
@@ -12,6 +11,7 @@ public class OnDoTileBuilding3Event implements LuaEvent {
 	public final Integer x, y, z;
 
 	public OnDoTileBuilding3Event(KahluaTable table, Boolean render, Integer x, Integer y, Integer z) {
+
 		this.table = table;
 		this.render = render;
 		this.x = x;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java
index f75dc49..b7e3bd3 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java
@@ -20,6 +20,7 @@ public class OnEquipPrimaryEvent implements LuaEvent {
 	public final InventoryItem item;
 
 	public OnEquipPrimaryEvent(IsoGameCharacter player, InventoryItem item) {
+
 		this.player = player;
 		this.item = item;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java
index ac64ea7..7a67bea 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java
@@ -20,6 +20,7 @@ public class OnEquipSecondaryEvent implements LuaEvent {
 	public final InventoryItem item;
 
 	public OnEquipSecondaryEvent(IsoGameCharacter player, InventoryItem item) {
+
 		this.player = player;
 		this.item = item;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java
index a8e3041..ee3a715 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java
@@ -24,6 +24,7 @@ public class OnFillContainerEvent implements LuaEvent {
 	public final ItemContainer container;
 
 	public OnFillContainerEvent(String roomName, String containerType, ItemContainer container) {
+
 		this.roomName = roomName;
 		this.containerType = containerType;
 		this.container = container;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java
index ab04de1..68e17df 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java
@@ -4,6 +4,5 @@
  * Use this event to add items to context menu without mod conflicts.
  */
 public class OnFillInventoryObjectContextMenuEvent implements LuaEvent {
-
 	// TODO: finish writing this event
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java
index a0ebb89..ebcd94d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java
@@ -1,6 +1,5 @@
 package io.pzstorm.storm.event.lua;
 
 public class OnFillWorldObjectContextMenuEvent implements LuaEvent {
-
 	// TODO: finish writing this event
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java
index e94082a..834e38c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java
@@ -8,4 +8,5 @@
  */
 @SuppressWarnings("unused")
 public class OnGameBootEvent implements LuaEvent {
+
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
index 2d1e929..1f89204 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
@@ -5,4 +5,5 @@
  */
 @SuppressWarnings("unused")
 public class OnGameStartEvent implements LuaEvent {
+
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
index c8b3077..00778cd 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
@@ -1,6 +1,5 @@
 package io.pzstorm.storm.event.lua;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 
 @SuppressWarnings({ "WeakerAccess", "unused" })
@@ -12,6 +11,7 @@ public class OnGetTableResultEvent implements LuaEvent {
 	public final String var3;
 
 	public OnGetTableResultEvent(ArrayList<?> var1, Integer var2, String var3) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 		this.var3 = var3;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java
index 67cc5ca..bc1af8e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java
@@ -32,6 +32,7 @@ public class OnHitZombieEvent implements LuaEvent {
 	public final HandWeapon weapon;
 
 	public OnHitZombieEvent(IsoZombie zombie, IsoGameCharacter attacker, BodyPartType target, HandWeapon weapon) {
+
 		this.zombie = zombie;
 		this.attacker = attacker;
 		this.target = target;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
index 1a36be8..f23bf42 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
@@ -14,6 +14,7 @@ public class OnInitModdedWeatherStageEvent implements LuaEvent {
 	public final Float airFrontStrength;
 
 	public OnInitModdedWeatherStageEvent(WeatherPeriod period, WeatherPeriod.WeatherStage stage, Float airFrontStrength) {
+
 		this.period = period;
 		this.stage = stage;
 		this.airFrontStrength = airFrontStrength;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java
index 312391f..9be2204 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java
@@ -1,6 +1,5 @@
 package io.pzstorm.storm.event.lua;
 
-import zombie.erosion.ErosionMain;
 import zombie.erosion.season.ErosionSeason;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java
index 583b3bc..885ce6c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java
@@ -21,6 +21,7 @@ public class OnLoadRadioScriptsEvent implements LuaEvent {
 	public final Boolean noSaveWorldVersion;
 
 	public OnLoadRadioScriptsEvent(RadioScriptManager scriptManager, Boolean noSaveWorldVersion) {
+
 		this.scriptManager = scriptManager;
 		this.noSaveWorldVersion = noSaveWorldVersion;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java
index 8a0e25f..ec86022 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java
@@ -8,5 +8,4 @@ public class OnLoadSoundBanksEvent implements LuaEvent {
 
 	// TODO: this event is not actually triggered directly after sound banks have been loaded,
 	//  	so move this event to be triggered directly after sound banks have been loaded
-
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java
index 829b9bd..76ecb86 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java
@@ -5,7 +5,6 @@
 @InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnMakeItemEvent implements LuaEvent {
-
 	public OnMakeItemEvent() {
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java
index 329946d..a14a13d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java
@@ -5,7 +5,6 @@
 @InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnMapLoadCreateIsoObjectEvent implements LuaEvent {
-
 	public OnMapLoadCreateIsoObjectEvent() {
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java
index a8b9e63..2633c21 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java
@@ -2,6 +2,5 @@
 
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnMiniScoreboardUpdateEvent implements LuaEvent {
-
 	// TODO: document this event
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java
index ab65571..1db1a5a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java
@@ -19,6 +19,7 @@ public class OnMouseDownEvent implements LuaEvent {
 	public final Integer y;
 
 	public OnMouseDownEvent(Integer x, Integer y) {
+
 		this.x = x;
 		this.y = y;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java
index 674690c..9f6cae8 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java
@@ -13,6 +13,7 @@ public class OnMouseMoveEvent implements LuaEvent {
 	public final Double y;
 
 	public OnMouseMoveEvent(Double xA, Double yA, Double x, Double y) {
+
 		this.xA = xA;
 		this.yA = yA;
 		this.x = x;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java
index a312c65..3bcde16 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java
@@ -19,6 +19,7 @@ public class OnMouseUpEvent implements LuaEvent {
 	public final Integer y;
 
 	public OnMouseUpEvent(Integer x, Integer y) {
+
 		this.x = x;
 		this.y = y;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java
index 6b628d7..1d2ae9d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java
@@ -5,7 +5,6 @@
 @InertEvent
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnNPCSurvivorUpdateEvent implements LuaEvent {
-
 	public OnNPCSurvivorUpdateEvent() {
 	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java
index 1ee7c82..6fc70bc 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java
@@ -20,6 +20,7 @@ public class OnNewGameEvent implements LuaEvent {
 	public final IsoGridSquare gridSquare;
 
 	public OnNewGameEvent(IsoPlayer player, IsoGridSquare gridSquare) {
+
 		this.player = player;
 		this.gridSquare = gridSquare;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java
index d405b20..70705be 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java
@@ -26,6 +26,7 @@ public class OnObjectLeftMouseButtonDownEvent implements LuaEvent {
 	public final Integer y;
 
 	public OnObjectLeftMouseButtonDownEvent(IsoObject object, Integer x, Integer y) {
+
 		this.object = object;
 		this.x = x;
 		this.y = y;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java
index 10a636f..1c83d8d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java
@@ -26,6 +26,7 @@ public class OnObjectLeftMouseButtonUpEvent implements LuaEvent {
 	public final Integer y;
 
 	public OnObjectLeftMouseButtonUpEvent(IsoObject object, Integer x, Integer y) {
+
 		this.object = object;
 		this.x = x;
 		this.y = y;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java
index 3458a69..4f9dfba 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java
@@ -26,6 +26,7 @@ public class OnObjectRightMouseButtonDownEvent implements LuaEvent {
 	public final Integer y;
 
 	public OnObjectRightMouseButtonDownEvent(IsoObject object, Integer x, Integer y) {
+
 		this.object = object;
 		this.x = x;
 		this.y = y;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java
index 869a444..0c457dc 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java
@@ -26,6 +26,7 @@ public class OnObjectRightMouseButtonUpEvent implements LuaEvent {
 	public final Integer y;
 
 	public OnObjectRightMouseButtonUpEvent(IsoObject object, Integer x, Integer y) {
+
 		this.object = object;
 		this.x = x;
 		this.y = y;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java
index 147a69f..aad8707 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java
@@ -20,6 +20,7 @@ public class OnPlayerAttackFinishedEvent implements LuaEvent {
 	public final HandWeapon weapon;
 
 	public OnPlayerAttackFinishedEvent(IsoGameCharacter player, HandWeapon weapon) {
+
 		this.player = player;
 		this.weapon = weapon;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java
index 0f5a0bc..66f1f3e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java
@@ -24,6 +24,7 @@ public class OnPostMapLoadEvent implements LuaEvent {
 	public final Integer y;
 
 	public OnPostMapLoadEvent(IsoCell isoCell, Integer x, Integer y) {
+
 		this.isoCell = isoCell;
 		this.x = x;
 		this.y = y;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java
index d4b27e5..647a158 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java
@@ -7,4 +7,5 @@
  */
 @SuppressWarnings("WeakerAccess")
 public class OnPostUIDrawEvent implements LuaEvent {
+
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java
index f199a63..2d6554d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java
@@ -1,6 +1,5 @@
 package io.pzstorm.storm.event.lua;
 
 public class OnPreFillInventoryObjectContextMenuEvent implements LuaEvent {
-
 	// TODO: finish writing this event
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java
index 4ad5711..459c6e4 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java
@@ -1,6 +1,5 @@
 package io.pzstorm.storm.event.lua;
 
 public class OnPreFillWorldObjectContextMenuEvent implements LuaEvent {
-
 	// TODO: finish writing this event
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java
index 4339e0c..3b42628 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java
@@ -7,4 +7,5 @@
  */
 @SuppressWarnings("WeakerAccess")
 public class OnPreUIDrawEvent implements LuaEvent {
+
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java
index 6de9961..1662045 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java
@@ -20,6 +20,7 @@ public class OnPressRackButtonEvent implements LuaEvent {
 	public final HandWeapon weapon;
 
 	public OnPressRackButtonEvent(IsoPlayer player, HandWeapon weapon) {
+
 		this.player = player;
 		this.weapon = weapon;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java
index fa073ec..4d885bd 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java
@@ -20,6 +20,7 @@ public class OnPressReloadButtonEvent implements LuaEvent {
 	public final HandWeapon weapon;
 
 	public OnPressReloadButtonEvent(IsoPlayer player, HandWeapon weapon) {
+
 		this.player = player;
 		this.weapon = weapon;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java
index ba276b2..29789f0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java
@@ -1,9 +1,9 @@
 package io.pzstorm.storm.event.lua;
 
-import zombie.characters.IsoPlayer;
-
 import java.util.ArrayList;
 
+import zombie.characters.IsoPlayer;
+
 // TODO: document this event
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnReceiveItemListNetEvent implements LuaEvent {
@@ -13,6 +13,7 @@ public class OnReceiveItemListNetEvent implements LuaEvent {
 	public final String text1, text2;
 
 	public OnReceiveItemListNetEvent(IsoPlayer player1, ArrayList<?> list, IsoPlayer player2, String text1, String text2) {
+
 		this.player1 = player1;
 		this.list = list;
 		this.player2 = player2;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java
index 33b01e4..5179610 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java
@@ -1,6 +1,5 @@
 package io.pzstorm.storm.event.lua;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
 
 /**
@@ -14,6 +13,7 @@ public class OnReceiveUserlogEvent implements LuaEvent {
 	public final ArrayList<?> userLogs;
 
 	public OnReceiveUserlogEvent(String identifier, ArrayList<?> userLogs) {
+
 		this.identifier = identifier;
 		this.userLogs = userLogs;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
index 545332f..bc9a58e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
@@ -19,6 +19,7 @@ public class OnRefreshInventoryWindowContainersEvent implements LuaEvent {
 	public final String action;
 
 	public OnRefreshInventoryWindowContainersEvent(KahluaTable inventoryPage, String action) {
+
 		this.inventoryPage = inventoryPage;
 		this.action = action;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java
index 9d742f0..33de4fe 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java
@@ -27,6 +27,7 @@ public class OnResolutionChangeEvent implements LuaEvent {
 	public final Integer newHeight;
 
 	public OnResolutionChangeEvent(Integer oldWidth, Integer oldHeight, Integer newWidth, Integer newHeight) {
+
 		this.oldWidth = oldWidth;
 		this.oldHeight = oldHeight;
 		this.newWidth = newWidth;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java
index 584b3fb..82e3f2f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java
@@ -17,6 +17,7 @@ public class OnRightMouseDownEvent implements LuaEvent {
 	public final Integer y;
 
 	public OnRightMouseDownEvent(Integer x, Integer y) {
+
 		this.x = x;
 		this.y = y;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java
index 1a8d417..0a2ae2a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java
@@ -17,6 +17,7 @@ public class OnRightMouseUpEvent implements LuaEvent {
 	public final Integer y;
 
 	public OnRightMouseUpEvent(Integer x, Integer y) {
+
 		this.x = x;
 		this.y = y;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java
index 625b4c1..e0ea5cd 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java
@@ -12,6 +12,7 @@ public class OnScoreboardUpdateEvent implements LuaEvent {
 	public final ArrayList<?> var1, var2, var3;
 
 	public OnScoreboardUpdateEvent(ArrayList<?> var1, ArrayList<?> var2, ArrayList<?> var3) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 		this.var3 = var3;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java
index 604e213..06e0bec 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java
@@ -13,6 +13,7 @@ public class OnServerCommandEvent implements LuaEvent {
 	public final KahluaTable var3;
 
 	public OnServerCommandEvent(String var1, String var2, KahluaTable var3) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 		this.var3 = var3;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java
index 0f6a0e1..c9f4523 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java
@@ -17,6 +17,7 @@ public class OnTabAddedEvent implements LuaEvent {
 	public final Short tabID;
 
 	public OnTabAddedEvent(String tabTitle, Short tabID) {
+
 		this.tabTitle = tabTitle;
 		this.tabID = tabID;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java
index 7c35c10..159146d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java
@@ -1,4 +1,5 @@
 package io.pzstorm.storm.event.lua;
+
 /**
  * Triggered when a chat tab has been removed.
  */
@@ -16,6 +17,7 @@ public class OnTabRemovedEvent implements LuaEvent {
 	public final Short tabID;
 
 	public OnTabRemovedEvent(String tabTitle, Short tabID) {
+
 		this.tabTitle = tabTitle;
 		this.tabID = tabID;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java
index 9860dc2..7a7a8ed 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java
@@ -11,6 +11,7 @@ public class OnThunderEvent implements LuaEvent {
 	public final Boolean var3, var4, var5;
 
 	public OnThunderEvent(Integer var1, Integer var2, Boolean var3, Boolean var4, Boolean var5) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 		this.var3 = var3;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java
index 95d246c..d2e85eb 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java
@@ -11,6 +11,7 @@ public class OnUpdateModdedWeatherStageEvent implements LuaEvent {
 	public final Float airFrontStrength;
 
 	public OnUpdateModdedWeatherStageEvent(WeatherPeriod period, WeatherPeriod.WeatherStage stage, Float airFrontStrength) {
+
 		this.period = period;
 		this.stage = stage;
 		this.airFrontStrength = airFrontStrength;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java
index 522cdb8..bb577bf 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java
@@ -19,6 +19,7 @@ public class OnWaterAmountChangeEvent implements LuaEvent {
 	public final Integer oldWaterAmount;
 
 	public OnWaterAmountChangeEvent(IsoObject container, Integer oldWaterAmount) {
+
 		this.container = container;
 		this.oldWaterAmount = oldWaterAmount;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java
index 3c44655..c626e6f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java
@@ -21,6 +21,7 @@ public class OnWeaponHitTreeEvent implements LuaEvent {
 	public final HandWeapon weapon;
 
 	public OnWeaponHitTreeEvent(IsoGameCharacter owner, HandWeapon weapon) {
+
 		this.owner = owner;
 		this.weapon = weapon;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java
index 48acb62..49a7d4a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java
@@ -31,6 +31,7 @@ public class OnWeaponHitXpEvent implements LuaEvent {
 	public final Float value;
 
 	public OnWeaponHitXpEvent(IsoGameCharacter player, HandWeapon weapon, IsoMovingObject target, Float value) {
+
 		this.player = player;
 		this.weapon = weapon;
 		this.target = target;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java
index 9aca358..11936d0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java
@@ -15,6 +15,7 @@ public class OnWeaponSwingEvent implements LuaEvent {
 	public final HandWeapon weapon;
 
 	public OnWeaponSwingEvent(IsoGameCharacter player, HandWeapon weapon) {
+
 		this.player = player;
 		this.weapon = weapon;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java
index ad48148..f27e550 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java
@@ -20,6 +20,7 @@ public class OnWeaponSwingHitPointEvent implements LuaEvent {
 	public final HandWeapon weapon;
 
 	public OnWeaponSwingHitPointEvent(IsoGameCharacter owner, HandWeapon weapon) {
+
 		this.owner = owner;
 		this.weapon = weapon;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java
index ea8aa71..7f5f3fd 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java
@@ -7,6 +7,7 @@ public class ReceiveFactionInviteEvent implements LuaEvent {
 	public final String var1, var2;
 
 	public ReceiveFactionInviteEvent(String var1, String var2) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java
index 9fb4c8c..0fbc26b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java
@@ -10,6 +10,7 @@ public class ServerPingedEvent implements LuaEvent {
 	public final String var1, var2;
 
 	public ServerPingedEvent(String var1, String var2) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java
index ddbb6d5..cba9c8e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java
@@ -11,6 +11,7 @@ public class TradingUIAddItemEvent implements LuaEvent {
 	public final InventoryItem var2;
 
 	public TradingUIAddItemEvent(IsoPlayer var1, InventoryItem var2) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java
index 6a3dff1..64c564d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java
@@ -10,6 +10,7 @@ public class TradingUIRemoveItemEvent implements LuaEvent {
 	public final Integer var2;
 
 	public TradingUIRemoveItemEvent(IsoPlayer var1, Integer var2) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java
index bdc88cb..cfd8728 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java
@@ -10,6 +10,7 @@ public class TradingUIUpdateStateEvent implements LuaEvent {
 	public final Integer var2;
 
 	public TradingUIUpdateStateEvent(IsoPlayer var1, Integer var2) {
+
 		this.var1 = var1;
 		this.var2 = var2;
 	}
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java
index c0a57dc..adac943 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java
@@ -1,9 +1,9 @@
 package io.pzstorm.storm.event.lua;
 
-import zombie.network.DBTicket;
-
 import java.util.ArrayList;
 
+import zombie.network.DBTicket;
+
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class ViewTicketsEvent implements LuaEvent {
 
diff --git a/api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java b/api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java
index 22a99aa..0bfb052 100644
--- a/api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java
+++ b/api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java
@@ -6,6 +6,5 @@
  * registered and will not be eligible to subscribe to events.
  */
 public interface ZomboidMod {
-
 	void registerEventHandlers();
 }
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 0dd43b1..5336722 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -36,18 +36,16 @@ public class StormClassLoader extends ClassLoader {
 			"io.pzstorm.storm.logging.StormLogger", "io.pzstorm.storm.core.StormBootstrap",
 			"io.pzstorm.storm.core.StormClassLoader"
 	);
-
-	/**
-	 * {@code URLClassLoader} responsible for loading mod classes and assets.
-	 */
-	private URLClassLoader modResourceLoader;
-
 	/**
 	 * {@code ClassLoader} that is the parent of this {@code ClassLoader}.
 	 * When loading classes, those classes not matching the whitelist pattern will have
 	 * their loading process delegated to this {@code ClassLoader}.
 	 */
 	private final ClassLoader parentClassLoader;
+	/**
+	 * {@code URLClassLoader} responsible for loading mod classes and assets.
+	 */
+	private URLClassLoader modResourceLoader;
 
 	/**
 	 * Create {@code StormClassLoader} with additional locations to search for resources.
@@ -67,15 +65,6 @@ public StormClassLoader() {
 		modResourceLoader = (URLClassLoader) getParent();
 	}
 
-	/**
-	 * Reinitialize mod resource loader instance. This method should be called
-	 * after new mods have been loaded by {@link StormModLoader} since new
-	 * {@code URL}s have to be added to loader classpath.
-	 */
-	void setModResourceLoader(URLClassLoader classLoader) {
-		modResourceLoader = classLoader;
-	}
-
 	/**
 	 * Returns {@code true} if at least one prefix pattern in blacklist matches the given name.
 	 * When a class name is considered <i>blacklisted</i> it will not be loaded by this {@code ClassLoader}.
@@ -85,6 +74,15 @@ static boolean isBlacklistedClass(String name) {
 		return CLASS_BLACKLIST.stream().anyMatch(name::startsWith);
 	}
 
+	/**
+	 * Reinitialize mod resource loader instance. This method should be called
+	 * after new mods have been loaded by {@link StormModLoader} since new
+	 * {@code URL}s have to be added to loader classpath.
+	 */
+	void setModResourceLoader(URLClassLoader classLoader) {
+		modResourceLoader = classLoader;
+	}
+
 	@Override
 	public @Nullable URL getResource(String name) {
 		Objects.requireNonNull(name);
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index d12b62a..db24234 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -3,19 +3,23 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.google.common.collect.ImmutableMap;
-import io.pzstorm.storm.hook.*;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
-
-import io.pzstorm.storm.patch.DebugLogPatch;
-import io.pzstorm.storm.patch.DebugLogStreamPatch;
-import io.pzstorm.storm.patch.ZomboidPatch;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
+import com.google.common.collect.ImmutableMap;
+
+import io.pzstorm.storm.hook.OnMainScreenRenderHook;
+import io.pzstorm.storm.hook.OnTriggerLuaEventHook;
+import io.pzstorm.storm.hook.OnUIElementPreRenderHook;
+import io.pzstorm.storm.hook.StormHook;
+import io.pzstorm.storm.patch.DebugLogPatch;
+import io.pzstorm.storm.patch.DebugLogStreamPatch;
+import io.pzstorm.storm.patch.ZomboidPatch;
+
 /**
  * This class defines, initializes and stores {@link StormClassTransformer} instances.
  * To retrieve a mapped instance of registered transformer call {@link #getRegistered(String)}.
@@ -41,21 +45,21 @@ public class StormClassTransformers {
 		registerTransformer("zombie.Lua.LuaEventManager",
 				new OnTriggerLuaEventHook(), ImmutableMap.<MethodData, Integer>builder()
 						.put(new MethodData("triggerEvent",
-						"(Ljava/lang/String;Ljava/lang/Object;)V"), 7)
+								"(Ljava/lang/String;Ljava/lang/Object;)V"), 7)
 						.put(new MethodData("triggerEvent",
-						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
+								"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
 						.put(new MethodData("triggerEvent",
-						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
-								"Ljava/lang/Object;)V"), 7)
+								"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
+										"Ljava/lang/Object;)V"), 7)
 						.put(new MethodData("triggerEvent",
-						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
-								"Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
+								"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
+										"Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
 						.put(new MethodData("triggerEvent",
-						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
-								"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
+								"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
+										"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
 						.put(new MethodData("triggerEvent",
-						"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
-								"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
+								"(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;" +
+										"Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V"), 7)
 						.build()
 		);
 
@@ -179,6 +183,7 @@ private static class MethodData {
 		private final String descriptor;
 
 		private MethodData(String name, String descriptor) {
+
 			this.name = name;
 			this.descriptor = descriptor;
 		}
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 40265aa..18ec165 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -1,9 +1,9 @@
 package io.pzstorm.storm.core;
 
-import io.pzstorm.storm.logging.StormLogger;
-
 import java.lang.reflect.Method;
 
+import io.pzstorm.storm.logging.StormLogger;
+
 class StormLauncher {
 
 	/**
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index c69bc47..ed80463 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -13,12 +13,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.ObjectArrays;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ObjectArrays;
 
 import io.pzstorm.storm.logging.StormLogger;
 import io.pzstorm.storm.mod.ModJar;
@@ -36,20 +36,18 @@
  */
 public class StormModLoader extends URLClassLoader {
 
-	/**
-	 * This catalog stores {@link ModJar} instances mapped to directory names.
-	 */
-	private static final Map<String, ImmutableSet<ModJar>> JAR_CATALOG = new HashMap<>();
-
 	/**
 	 * This catalog contains {@link ModMetadata} instances mapped to directory names.
 	 */
 	static final Map<String, ModMetadata> METADATA_CATALOG = new HashMap<>();
-
 	/**
 	 * This catalog stores {@link Class} instances mapped to directory names.
 	 */
 	static final Map<String, ImmutableSet<Class<?>>> CLASS_CATALOG = new HashMap<>();
+	/**
+	 * This catalog stores {@link ModJar} instances mapped to directory names.
+	 */
+	private static final Map<String, ImmutableSet<ModJar>> JAR_CATALOG = new HashMap<>();
 
 	StormModLoader(URL[] urls) {
 		super(ObjectArrays.concat(urls, getJarResourcePaths(), URL.class));
@@ -224,7 +222,6 @@ else if (modVersion.isEmpty())
 	 * {@link #catalogModJars()} method, otherwise this method will only clear the class catalog.
 	 */
 	public static void loadModClasses() {
-
 		StormLogger.info(String.format("%s mod class catalog", JAR_CATALOG.isEmpty() ? "Building" : "Rebuilding"));
 
 		// clear map before entering new data
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
index 81ebb52..0def0a1 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
@@ -1,14 +1,16 @@
 package io.pzstorm.storm.core;
 
-import com.google.common.collect.ImmutableSet;
-import io.pzstorm.storm.logging.StormLogger;
-import io.pzstorm.storm.mod.ModMetadata;
-import io.pzstorm.storm.mod.ZomboidMod;
+import java.util.*;
+
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.annotations.UnmodifiableView;
 
-import java.util.*;
+import com.google.common.collect.ImmutableSet;
+
+import io.pzstorm.storm.logging.StormLogger;
+import io.pzstorm.storm.mod.ModMetadata;
+import io.pzstorm.storm.mod.ZomboidMod;
 
 /**
  * This class is responsible for creating and registering {@link ZomboidMod} instances.
diff --git a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
index 716e9e2..610fd4c 100644
--- a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
+++ b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
@@ -1,8 +1,5 @@
 package io.pzstorm.storm.event;
 
-import io.pzstorm.storm.event.lua.*;
-import org.jetbrains.annotations.Unmodifiable;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -10,6 +7,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.jetbrains.annotations.Unmodifiable;
+
+import io.pzstorm.storm.event.lua.*;
+
 /**
  * This class is used to creates new {@link LuaEvent} instances on demand.
  * The factory uses reflection to invoke the event class constructor to instantiate events.
@@ -255,11 +256,11 @@ public class LuaEventFactory {
 	 * @param eventClass {@code Class} denoting the {@code LuaEvent} to construct.
 	 * @param args array of arguments to use when instantiating {@code LuaEvent}.
 	 *
+	 * @return new instance of {@code LuaEvent} for given class.
+	 *
 	 * @throws IllegalArgumentException if no constructor with parameters matching specified array of
 	 * 		arguments was found for given {@code LuaEvent} class, an error occurred while instantiating
-	 * 		{@code LuaEvent} or no registered constructors found for given event class.
-	 *
-	 * @return new instance of {@code LuaEvent} for given class.
+	 *        {@code LuaEvent} or no registered constructors found for given event class.
 	 */
 	public static LuaEvent constructLuaEvent(Class<? extends LuaEvent> eventClass, Object... args) {
 
@@ -296,7 +297,7 @@ public static LuaEvent constructLuaEvent(Class<? extends LuaEvent> eventClass, O
 	/**
 	 * Returns {@code true} if given constructor parameter types match specified
 	 * array of classes exactly, or {@code false} otherwise.
-	 * 
+	 *
 	 * @param constructor {@code Constructor} to match types for.
 	 * @param argTypes array of classes to match against constructor parameters.
 	 */
@@ -320,12 +321,12 @@ private static boolean doesConstructorMatchArgTypes(Constructor<?> constructor,
 	 * @param eventName name of the {@code Class} denoting the {@code LuaEvent} to construct.
 	 * @param args array of arguments to use when instantiating {@code LuaEvent}.
 	 *
-	 * @throws IllegalStateException if no constructor with parameters matching specified array of
-	 * 	 	arguments was found for {@code LuaEvent} class resolved from given name, no registered
-	 * 	 	{@code LuaEvent} class found for given name, an error occurred while instantiating
-	 * 	 	{@code LuaEvent} or no registered constructors found for event class resolved from given name.
-	 *
 	 * @return new instance of {@code LuaEvent} for class of given name.
+	 *
+	 * @throws IllegalStateException if no constructor with parameters matching specified array of
+	 * 		arguments was found for {@code LuaEvent} class resolved from given name, no registered
+	 *        {@code LuaEvent} class found for given name, an error occurred while instantiating
+	 *        {@code LuaEvent} or no registered constructors found for event class resolved from given name.
 	 */
 	public static LuaEvent constructLuaEvent(String eventName, Object... args) {
 
diff --git a/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java b/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java
index eff98f4..82bfafc 100644
--- a/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java
+++ b/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java
@@ -1,19 +1,20 @@
 package io.pzstorm.storm.hook;
 
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.tree.*;
+
 import com.google.common.collect.ImmutableList;
+
 import io.pzstorm.storm.core.StormClassTransformer;
 import io.pzstorm.storm.event.OnTriggerLuaEvent;
 import io.pzstorm.storm.event.StormEventDispatcher;
 import io.pzstorm.storm.util.AsmUtils;
 import io.pzstorm.storm.util.StormUtils;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
 
 public class OnTriggerLuaEventHook implements StormHook {
 
 	@Override
 	public void installHook(StormClassTransformer transformer) {
-
 		String eventDescriptor = StormUtils.getClassAsPath(OnTriggerLuaEvent.class);
 
 		// new OnTriggerLuaEvent(Event)
diff --git a/core/src/test/java/io/pzstorm/storm/IntegrationTest.java b/core/src/test/java/io/pzstorm/storm/IntegrationTest.java
index a7e7390..b4eaf1d 100644
--- a/core/src/test/java/io/pzstorm/storm/IntegrationTest.java
+++ b/core/src/test/java/io/pzstorm/storm/IntegrationTest.java
@@ -1,9 +1,9 @@
 package io.pzstorm.storm;
 
-import org.junit.jupiter.api.Tag;
-
 import java.io.File;
 
+import org.junit.jupiter.api.Tag;
+
 @Tag("integration")
 public interface IntegrationTest {
 
diff --git a/core/src/test/java/io/pzstorm/storm/TestUtils.java b/core/src/test/java/io/pzstorm/storm/TestUtils.java
index 305a282..9ee2fa0 100644
--- a/core/src/test/java/io/pzstorm/storm/TestUtils.java
+++ b/core/src/test/java/io/pzstorm/storm/TestUtils.java
@@ -1,11 +1,11 @@
 package io.pzstorm.storm;
 
-import io.pzstorm.storm.logging.StormLogger;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import io.pzstorm.storm.logging.StormLogger;
+
 public class TestUtils {
 
 	/**
diff --git a/core/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java b/core/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java
index e3f6e29..c976621 100644
--- a/core/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java
+++ b/core/src/test/java/io/pzstorm/storm/core/ModLoaderTestFixture.java
@@ -1,12 +1,5 @@
 package io.pzstorm.storm.core;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.io.CharSink;
-import com.google.common.io.MoreFiles;
-import io.pzstorm.storm.IntegrationTest;
-import org.junit.jupiter.api.Assertions;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -18,6 +11,15 @@
 import java.util.Map;
 import java.util.Objects;
 
+import org.junit.jupiter.api.Assertions;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.CharSink;
+import com.google.common.io.MoreFiles;
+
+import io.pzstorm.storm.IntegrationTest;
+
 class ModLoaderTestFixture implements IntegrationTest {
 
 	static final ImmutableMap<String, String[]> MOD_JAR_DATA = ImmutableMap.of(
diff --git a/core/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java b/core/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
index a2ad3b0..4e00b15 100644
--- a/core/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
+++ b/core/src/test/java/io/pzstorm/storm/core/StormModLoaderIntegrationTest.java
@@ -1,20 +1,22 @@
 package io.pzstorm.storm.core;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.jupiter.api.*;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+
 import io.pzstorm.storm.IntegrationTest;
 import io.pzstorm.storm.mod.ModJar;
 import io.pzstorm.storm.mod.ModMetadata;
 import io.pzstorm.storm.mod.ModVersion;
-import org.junit.jupiter.api.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * Run test methods in a certain order to ensure the tests pass on CI.
diff --git a/core/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java b/core/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
index b925997..23091bb 100644
--- a/core/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
+++ b/core/src/test/java/io/pzstorm/storm/core/StormModRegistryIntegrationTest.java
@@ -1,16 +1,17 @@
 package io.pzstorm.storm.core;
 
-import io.pzstorm.storm.IntegrationTest;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URLClassLoader;
 
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import io.pzstorm.storm.IntegrationTest;
+
 class StormModRegistryIntegrationTest extends ModLoaderTestFixture {
 
 	private static final File TEMP_DIR = IntegrationTest.getTemporaryBuildDir(StormModRegistryIntegrationTest.class);
diff --git a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
index a1023b8..4fdf5cc 100644
--- a/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
+++ b/core/src/test/java/io/pzstorm/storm/event/LuaEventFactoryTest.java
@@ -1,11 +1,16 @@
 package io.pzstorm.storm.event;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import com.google.common.collect.ImmutableMap;
+
 import io.pzstorm.storm.UnitTest;
-import io.pzstorm.storm.event.LuaEventFactory;
 import io.pzstorm.storm.event.lua.*;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
 import se.krka.kahlua.vm.KahluaTable;
 import zombie.characters.IsoGameCharacter;
 import zombie.characters.IsoPlayer;
@@ -16,15 +21,11 @@
 import zombie.iso.IsoMovingObject;
 import zombie.iso.IsoObject;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 class LuaEventFactoryTest implements UnitTest {
 
 	private static final ImmutableMap<Class<? extends LuaEvent>, Class<?>[]> EVENT_CLASS_CONSTRUCTOR_DATA =
 			ImmutableMap.<Class<? extends LuaEvent>, Class<?>[]>builder()
-					.put(OnChallengeQueryEvent.class, new Class<?>[]{})
+					.put(OnChallengeQueryEvent.class, new Class<?>[] {})
 					.put(OnCharacterCollideEvent.class, new Class<?>[] {
 							IsoMovingObject.class, IsoObject.class
 					})
diff --git a/core/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java b/core/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
index 4a329dd..0e9b936 100644
--- a/core/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
+++ b/core/src/test/java/io/pzstorm/storm/util/StormUtilsTest.java
@@ -2,10 +2,10 @@
 
 import java.lang.reflect.Method;
 
-import io.pzstorm.storm.TestUtils;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import io.pzstorm.storm.TestUtils;
 import io.pzstorm.storm.UnitTest;
 
 @SuppressWarnings("unused")
diff --git a/zombie/src/main/java/zombie/Lua/Event.java b/zombie/src/main/java/zombie/Lua/Event.java
index f76fbd0..00ef040 100644
--- a/zombie/src/main/java/zombie/Lua/Event.java
+++ b/zombie/src/main/java/zombie/Lua/Event.java
@@ -1,6 +1,5 @@
 package zombie.Lua;
 
 public class Event {
-
 	public String name;
 }
diff --git a/zombie/src/main/java/zombie/characters/BodyDamage.java b/zombie/src/main/java/zombie/characters/BodyDamage.java
index 5bb36fb..6c6d6ea 100644
--- a/zombie/src/main/java/zombie/characters/BodyDamage.java
+++ b/zombie/src/main/java/zombie/characters/BodyDamage.java
@@ -1,8 +1,6 @@
 package zombie.characters;
 
 public class BodyDamage {
-
 	public static class BodyPartType {
-
 	}
 }
diff --git a/zombie/src/main/java/zombie/characters/skills/PerkFactory.java b/zombie/src/main/java/zombie/characters/skills/PerkFactory.java
index a140855..333c6b8 100644
--- a/zombie/src/main/java/zombie/characters/skills/PerkFactory.java
+++ b/zombie/src/main/java/zombie/characters/skills/PerkFactory.java
@@ -1,8 +1,6 @@
 package zombie.characters.skills;
 
 public class PerkFactory {
-
 	public static class Perks {
-
 	}
 }
diff --git a/zombie/src/main/java/zombie/iso/weather/WeatherPeriod.java b/zombie/src/main/java/zombie/iso/weather/WeatherPeriod.java
index f2f645b..a26878a 100644
--- a/zombie/src/main/java/zombie/iso/weather/WeatherPeriod.java
+++ b/zombie/src/main/java/zombie/iso/weather/WeatherPeriod.java
@@ -1,8 +1,6 @@
 package zombie.iso.weather;
 
 public class WeatherPeriod {
-
 	public static class WeatherStage {
-
 	}
 }

From 0619dc5d901a5aaa61ed7a0021149ef98eea4455 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 03:47:55 +0200
Subject: [PATCH 289/323] Improve LuaEvent class naming

These events are not called on pause/unpause.
---
 .../{OnUnpauseGameEvent.java => OnServerFinishSavingEvent.java} | 2 +-
 .../{OnPauseGameEvent.java => OnServerStartSavingEvent.java}    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename api/src/main/java/io/pzstorm/storm/event/lua/{OnUnpauseGameEvent.java => OnServerFinishSavingEvent.java} (77%)
 rename api/src/main/java/io/pzstorm/storm/event/lua/{OnPauseGameEvent.java => OnServerStartSavingEvent.java} (77%)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnUnpauseGameEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java
similarity index 77%
rename from api/src/main/java/io/pzstorm/storm/event/lua/OnUnpauseGameEvent.java
rename to api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java
index 644241c..e3f30fc 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnUnpauseGameEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java
@@ -4,7 +4,7 @@
  * Triggers after the game gets unpaused.
  */
 @SuppressWarnings({ "WeakerAccess", "unused" })
-public class OnUnpauseGameEvent implements LuaEvent {
+public class OnServerFinishSavingEvent implements LuaEvent {
 
 	@Override
 	public String getName() {
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPauseGameEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java
similarity index 77%
rename from api/src/main/java/io/pzstorm/storm/event/lua/OnPauseGameEvent.java
rename to api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java
index 97efbae..65c1c95 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPauseGameEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java
@@ -4,7 +4,7 @@
  * Triggers after the game gets paused.
  */
 @SuppressWarnings({ "WeakerAccess", "unused" })
-public class OnPauseGameEvent implements LuaEvent {
+public class OnServerStartSavingEvent implements LuaEvent {
 
 	@Override
 	public String getName() {

From 21e53015b1d3ff2bb135833a7d523a306054e58b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 03:48:45 +0200
Subject: [PATCH 290/323] Clean LuaEvent documentation

---
 .../storm/event/lua/OnServerFinishSavingEvent.java        | 8 +-------
 .../pzstorm/storm/event/lua/OnServerStartSavingEvent.java | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java
index e3f30fc..3611519 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java
@@ -1,13 +1,7 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * Triggers after the game gets unpaused.
- */
+// TODO: document this event
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnServerFinishSavingEvent implements LuaEvent {
 
-	@Override
-	public String getName() {
-		return "OnServerFinishSaving";
-	}
 }
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java
index 65c1c95..b471d2e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java
@@ -1,13 +1,7 @@
 package io.pzstorm.storm.event.lua;
 
-/**
- * Triggers after the game gets paused.
- */
+// TODO: document this event
 @SuppressWarnings({ "WeakerAccess", "unused" })
 public class OnServerStartSavingEvent implements LuaEvent {
 
-	@Override
-	public String getName() {
-		return "OnServerStartSaving";
-	}
 }

From 2867b4b31fd41516fbb82da67161cbbce83d894f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 03:49:24 +0200
Subject: [PATCH 291/323] Update factory LuaEvent references

---
 .../src/main/java/io/pzstorm/storm/event/LuaEventFactory.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
index 610fd4c..987d62b 100644
--- a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
+++ b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
@@ -209,8 +209,8 @@ public class LuaEventFactory {
 				OnPostDistributionMergeEvent.class,
 				MngInvReceiveItemsEvent.class,
 				OnTileRemovedEvent.class,
-				OnPauseGameEvent.class,
-				OnUnpauseGameEvent.class,
+				OnServerStartSavingEvent.class,
+				OnServerFinishSavingEvent.class,
 				OnMechanicActionDoneEvent.class,
 				OnClimateTickEvent.class,
 				OnThunderEvent.class,

From 1e975ca7007373c12b5235c5441b07fa2cd3a732 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 03:51:33 +0200
Subject: [PATCH 292/323] Define IDEA project copyright profile

---
 .idea/copyright/GPL_v3_0.xml          | 6 ++++++
 .idea/copyright/profiles_settings.xml | 7 +++++++
 2 files changed, 13 insertions(+)
 create mode 100644 .idea/copyright/GPL_v3_0.xml
 create mode 100644 .idea/copyright/profiles_settings.xml

diff --git a/.idea/copyright/GPL_v3_0.xml b/.idea/copyright/GPL_v3_0.xml
new file mode 100644
index 0000000..49dadc7
--- /dev/null
+++ b/.idea/copyright/GPL_v3_0.xml
@@ -0,0 +1,6 @@
+<component name="CopyrightManager">
+  <copyright>
+    <option name="notice" value="Zomboid Storm - Java modding toolchain for Project Zomboid&#10;Copyright (C) 2021 Matthew Cain&#10;&#10;This program is free software: you can redistribute it and/or modify&#10;it under the terms of the GNU General Public License as published by&#10;the Free Software Foundation, either version 3 of the License, or&#10;(at your option) any later version.&#10;&#10;This program is distributed in the hope that it will be useful,&#10;but WITHOUT ANY WARRANTY; without even the implied warranty of&#10;MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the&#10;GNU General Public License for more details.&#10;&#10;You should have received a copy of the GNU General Public License&#10;along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;." />
+    <option name="myName" value="GPL v3.0" />
+  </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..b8013d8
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="CopyrightManager">
+  <settings>
+    <module2copyright>
+      <element module="Project Files" copyright="GPL v3.0" />
+    </module2copyright>
+  </settings>
+</component>
\ No newline at end of file

From c81d90887766f67b3de8b4a12cf5eb56140c96b7 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 03:52:08 +0200
Subject: [PATCH 293/323] Write code copyright notice

---
 .../java/io/pzstorm/storm/NonNullPackage.java  | 18 ++++++++++++++++++
 .../io/pzstorm/storm/event/InertEvent.java     | 18 ++++++++++++++++++
 .../storm/event/OnMainScreenRenderEvent.java   | 18 ++++++++++++++++++
 .../pzstorm/storm/event/OnTriggerLuaEvent.java | 18 ++++++++++++++++++
 .../storm/event/OnUIElementPreRenderEvent.java | 18 ++++++++++++++++++
 .../storm/event/StormEventDispatcher.java      | 18 ++++++++++++++++++
 .../io/pzstorm/storm/event/SubscribeEvent.java | 18 ++++++++++++++++++
 .../io/pzstorm/storm/event/ZomboidEvent.java   | 18 ++++++++++++++++++
 .../event/lua/AcceptedFactionInviteEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/AcceptedTradeEvent.java    | 18 ++++++++++++++++++
 .../io/pzstorm/storm/event/lua/AddXPEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/DoSpecialTooltipEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/EveryDaysEvent.java        | 18 ++++++++++++++++++
 .../storm/event/lua/EveryHoursEvent.java       | 18 ++++++++++++++++++
 .../storm/event/lua/EveryOneMinuteEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/EveryTenMinutesEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/LevelPerkEvent.java        | 18 ++++++++++++++++++
 .../storm/event/lua/LoadGridsquareEvent.java   | 18 ++++++++++++++++++
 .../io/pzstorm/storm/event/lua/LuaEvent.java   | 18 ++++++++++++++++++
 .../event/lua/MngInvReceiveItemsEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnAIStateChangeEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnAIStateEnterEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnAIStateExecuteEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnAIStateExitEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnAcceptInviteEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnAddBuildingEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnAddMessageEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnAdminMessageEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnAmbientSoundEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnBeingHitByZombieEvent.java     | 18 ++++++++++++++++++
 .../lua/OnCGlobalObjectSystemInitEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnChallengeQueryEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnChangeWeatherEvent.java  | 18 ++++++++++++++++++
 .../event/lua/OnCharacterCollideEvent.java     | 18 ++++++++++++++++++
 .../event/lua/OnCharacterCreateStatsEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnCharacterDeathEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnCharacterMeetEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnChatWindowInitEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnClientCommandEvent.java  | 18 ++++++++++++++++++
 .../event/lua/OnClimateManagerInitEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnClimateTickDebugEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnClimateTickEvent.java    | 18 ++++++++++++++++++
 .../event/lua/OnClothingUpdatedEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnConnectFailedEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnConnectedEvent.java      | 18 ++++++++++++++++++
 .../lua/OnConnectionStateChangedEvent.java     | 18 ++++++++++++++++++
 .../event/lua/OnContainerUpdateEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnCoopJoinFailedEvent.java | 18 ++++++++++++++++++
 .../event/lua/OnCoopServerMessageEvent.java    | 18 ++++++++++++++++++
 .../lua/OnCreateLivingCharacterEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnCreatePlayerEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnCreateSurvivorEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnCreateUIEvent.java       | 18 ++++++++++++++++++
 .../storm/event/lua/OnCustomUIKeyEvent.java    | 18 ++++++++++++++++++
 .../event/lua/OnCustomUIKeyPressedEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnCustomUIKeyReleasedEvent.java  | 18 ++++++++++++++++++
 .../pzstorm/storm/event/lua/OnDawnEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnDestroyIsoThumpableEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnDeviceTextEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnDisconnectEvent.java     | 18 ++++++++++++++++++
 .../event/lua/OnDistributionMergeEvent.java    | 18 ++++++++++++++++++
 .../event/lua/OnDoTileBuilding2Event.java      | 18 ++++++++++++++++++
 .../event/lua/OnDoTileBuilding3Event.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnDoTileBuildingEvent.java | 18 ++++++++++++++++++
 .../pzstorm/storm/event/lua/OnDuskEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnEnterVehicleEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnEquipPrimaryEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnEquipSecondaryEvent.java | 18 ++++++++++++++++++
 .../pzstorm/storm/event/lua/OnFETickEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnFillContainerEvent.java  | 18 ++++++++++++++++++
 .../OnFillInventoryObjectContextMenuEvent.java | 18 ++++++++++++++++++
 .../lua/OnFillWorldObjectContextMenuEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnGameBootEvent.java       | 18 ++++++++++++++++++
 .../storm/event/lua/OnGameStartEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnGameTimeLoadedEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnGetDBSchemaEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnGetTableResultEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnGridBurntEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnHitZombieEvent.java      | 18 ++++++++++++++++++
 .../lua/OnInitModdedWeatherStageEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnInitSeasonsEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnInitWorldEvent.java      | 18 ++++++++++++++++++
 .../event/lua/OnIsoThumpableLoadEvent.java     | 18 ++++++++++++++++++
 .../event/lua/OnIsoThumpableSaveEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnJoypadActivateEvent.java | 18 ++++++++++++++++++
 .../event/lua/OnJoypadActivateUIEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnKeyKeepPressedEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnKeyPressedEvent.java     | 18 ++++++++++++++++++
 .../event/lua/OnKeyStartPressedEvent.java      | 18 ++++++++++++++++++
 .../pzstorm/storm/event/lua/OnLoadEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnLoadMapZonesEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnLoadRadioScriptsEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnLoadSoundBanksEvent.java | 18 ++++++++++++++++++
 .../lua/OnLoadedTileDefinitionsEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnLoginStateEvent.java     | 18 ++++++++++++++++++
 .../event/lua/OnLoginStateSuccessEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnMainMenuEnterEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnMakeItemEvent.java       | 18 ++++++++++++++++++
 .../lua/OnMapLoadCreateIsoObjectEvent.java     | 18 ++++++++++++++++++
 .../event/lua/OnMechanicActionDoneEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnMiniScoreboardUpdateEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnModsModifiedEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnMouseDownEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnMouseMoveEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnMouseUpEvent.java        | 18 ++++++++++++++++++
 .../event/lua/OnMultiTriggerNPCEvent.java      | 18 ++++++++++++++++++
 .../event/lua/OnNPCSurvivorUpdateEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnNewFireEvent.java        | 18 ++++++++++++++++++
 .../storm/event/lua/OnNewGameEvent.java        | 18 ++++++++++++++++++
 .../event/lua/OnNewSurvivorGroupEvent.java     | 18 ++++++++++++++++++
 .../lua/OnObjectAboutToBeRemovedEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnObjectAddedEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnObjectCollideEvent.java  | 18 ++++++++++++++++++
 .../lua/OnObjectLeftMouseButtonDownEvent.java  | 18 ++++++++++++++++++
 .../lua/OnObjectLeftMouseButtonUpEvent.java    | 18 ++++++++++++++++++
 .../lua/OnObjectRightMouseButtonDownEvent.java | 18 ++++++++++++++++++
 .../lua/OnObjectRightMouseButtonUpEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnPlayerAttackFinishedEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnPlayerDeathEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnPlayerMoveEvent.java     | 18 ++++++++++++++++++
 .../event/lua/OnPlayerSetSafehouseEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnPlayerUpdateEvent.java   | 18 ++++++++++++++++++
 .../lua/OnPostCharactersSquareDrawEvent.java   | 18 ++++++++++++++++++
 .../lua/OnPostDistributionMergeEvent.java      | 18 ++++++++++++++++++
 .../event/lua/OnPostFloorLayerDrawEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnPostFloorSquareDrawEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnPostMapLoadEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnPostRenderEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnPostSaveEvent.java       | 18 ++++++++++++++++++
 .../storm/event/lua/OnPostTileDrawEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnPostTilesSquareDrawEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnPostUIDrawEvent.java     | 18 ++++++++++++++++++
 .../event/lua/OnPostWallSquareDrawEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnPreDistributionMergeEvent.java | 18 ++++++++++++++++++
 ...PreFillInventoryObjectContextMenuEvent.java | 18 ++++++++++++++++++
 .../OnPreFillWorldObjectContextMenuEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnPreGameStartEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnPreMapLoadEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnPreUIDrawEvent.java      | 18 ++++++++++++++++++
 .../event/lua/OnPressRackButtonEvent.java      | 18 ++++++++++++++++++
 .../event/lua/OnPressReloadButtonEvent.java    | 18 ++++++++++++++++++
 .../event/lua/OnRadioInteractionEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnRainStartEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/OnRainStopEvent.java       | 18 ++++++++++++++++++
 .../event/lua/OnReceiveItemListNetEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnReceiveUserlogEvent.java | 18 ++++++++++++++++++
 ...nRefreshInventoryWindowContainersEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnRenderTickEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnRenderUpdateEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnResetLuaEvent.java       | 18 ++++++++++++++++++
 .../event/lua/OnResolutionChangeEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnRightMouseDownEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/OnRightMouseUpEvent.java   | 18 ++++++++++++++++++
 .../lua/OnSGlobalObjectSystemInitEvent.java    | 18 ++++++++++++++++++
 .../event/lua/OnSafehousesChangedEvent.java    | 18 ++++++++++++++++++
 .../pzstorm/storm/event/lua/OnSaveEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnScoreboardUpdateEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnSeeNewRoomEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnServerCommandEvent.java  | 18 ++++++++++++++++++
 .../event/lua/OnServerFinishSavingEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnServerStartSavingEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnServerStartedEvent.java  | 18 ++++++++++++++++++
 .../event/lua/OnServerWorkshopItemsEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnSetDefaultTabEvent.java  | 18 ++++++++++++++++++
 .../event/lua/OnSpawnRegionsLoadedEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnSteamGameJoinEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnTabAddedEvent.java       | 18 ++++++++++++++++++
 .../storm/event/lua/OnTabRemovedEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnThunderEvent.java        | 18 ++++++++++++++++++
 .../storm/event/lua/OnTickEvenPausedEvent.java | 18 ++++++++++++++++++
 .../pzstorm/storm/event/lua/OnTickEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnTileRemovedEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnTriggerNPCEvent.java     | 18 ++++++++++++++++++
 .../lua/OnUpdateModdedWeatherStageEvent.java   | 18 ++++++++++++++++++
 .../event/lua/OnVehicleDamageTextureEvent.java | 18 ++++++++++++++++++
 .../event/lua/OnWaterAmountChangeEvent.java    | 18 ++++++++++++++++++
 .../event/lua/OnWeaponHitCharacterEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnWeaponHitTreeEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnWeaponHitXpEvent.java    | 18 ++++++++++++++++++
 .../storm/event/lua/OnWeaponSwingEvent.java    | 18 ++++++++++++++++++
 .../event/lua/OnWeaponSwingHitPointEvent.java  | 18 ++++++++++++++++++
 .../storm/event/lua/OnWorldMessageEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/OnZombieDeadEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/OnZombieUpdateEvent.java   | 18 ++++++++++++++++++
 .../event/lua/ReceiveFactionInviteEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/RequestTradeEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/ReuseGridsquareEvent.java  | 18 ++++++++++++++++++
 .../event/lua/SendCustomModDataEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/ServerPingedEvent.java     | 18 ++++++++++++++++++
 .../storm/event/lua/SwitchChatStreamEvent.java | 18 ++++++++++++++++++
 .../storm/event/lua/SyncFactionEvent.java      | 18 ++++++++++++++++++
 .../storm/event/lua/TradingUIAddItemEvent.java | 18 ++++++++++++++++++
 .../event/lua/TradingUIRemoveItemEvent.java    | 18 ++++++++++++++++++
 .../event/lua/TradingUIUpdateStateEvent.java   | 18 ++++++++++++++++++
 .../storm/event/lua/ViewTicketsEvent.java      | 18 ++++++++++++++++++
 .../lua/onLoadModDataFromServerEvent.java      | 18 ++++++++++++++++++
 .../pzstorm/storm/event/lua/package-info.java  | 18 ++++++++++++++++++
 .../io/pzstorm/storm/event/package-info.java   | 18 ++++++++++++++++++
 .../io/pzstorm/storm/logging/StormLogger.java  | 18 ++++++++++++++++++
 .../java/io/pzstorm/storm/mod/ModMetadata.java | 18 ++++++++++++++++++
 .../java/io/pzstorm/storm/mod/ModVersion.java  | 18 ++++++++++++++++++
 .../java/io/pzstorm/storm/mod/ZomboidMod.java  | 18 ++++++++++++++++++
 .../core/ClassTransformationException.java     | 18 ++++++++++++++++++
 .../io/pzstorm/storm/core/StormBootstrap.java  | 18 ++++++++++++++++++
 .../pzstorm/storm/core/StormClassLoader.java   | 18 ++++++++++++++++++
 .../storm/core/StormClassTransformer.java      | 18 ++++++++++++++++++
 .../storm/core/StormClassTransformers.java     | 18 ++++++++++++++++++
 .../io/pzstorm/storm/core/StormLauncher.java   | 18 ++++++++++++++++++
 .../io/pzstorm/storm/core/StormModLoader.java  | 18 ++++++++++++++++++
 .../pzstorm/storm/core/StormModRegistry.java   | 18 ++++++++++++++++++
 .../io/pzstorm/storm/core/package-info.java    | 18 ++++++++++++++++++
 .../pzstorm/storm/event/LuaEventFactory.java   | 18 ++++++++++++++++++
 .../pzstorm/storm/event/StormEventHandler.java | 18 ++++++++++++++++++
 .../storm/hook/OnMainScreenRenderHook.java     | 18 ++++++++++++++++++
 .../storm/hook/OnTriggerLuaEventHook.java      | 18 ++++++++++++++++++
 .../storm/hook/OnUIElementPreRenderHook.java   | 18 ++++++++++++++++++
 .../java/io/pzstorm/storm/hook/StormHook.java  | 18 ++++++++++++++++++
 .../io/pzstorm/storm/hook/package-info.java    | 18 ++++++++++++++++++
 .../pzstorm/storm/logging/ZomboidLogger.java   | 18 ++++++++++++++++++
 .../main/java/io/pzstorm/storm/mod/ModJar.java | 18 ++++++++++++++++++
 .../io/pzstorm/storm/patch/DebugLogPatch.java  | 18 ++++++++++++++++++
 .../storm/patch/DebugLogStreamPatch.java       | 18 ++++++++++++++++++
 .../io/pzstorm/storm/patch/ZomboidPatch.java   | 18 ++++++++++++++++++
 .../io/pzstorm/storm/patch/package-info.java   | 18 ++++++++++++++++++
 .../java/io/pzstorm/storm/util/AsmUtils.java   | 18 ++++++++++++++++++
 .../java/io/pzstorm/storm/util/StormUtils.java | 18 ++++++++++++++++++
 .../io/pzstorm/storm/util/package-info.java    | 18 ++++++++++++++++++
 227 files changed, 4086 insertions(+)

diff --git a/api/src/main/java/io/pzstorm/storm/NonNullPackage.java b/api/src/main/java/io/pzstorm/storm/NonNullPackage.java
index 14b5087..9e5a37c 100644
--- a/api/src/main/java/io/pzstorm/storm/NonNullPackage.java
+++ b/api/src/main/java/io/pzstorm/storm/NonNullPackage.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm;
 
 import java.lang.annotation.*;
diff --git a/api/src/main/java/io/pzstorm/storm/event/InertEvent.java b/api/src/main/java/io/pzstorm/storm/event/InertEvent.java
index e823554..a4cc88d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/InertEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/InertEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event;
 
 import java.lang.annotation.ElementType;
diff --git a/api/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java b/api/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
index a0212ac..99fbd25 100644
--- a/api/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/OnMainScreenRenderEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event;
 
 import zombie.gameStates.MainScreenState;
diff --git a/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java b/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java
index d30f875..82b8609 100644
--- a/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/OnTriggerLuaEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event;
 
 import java.util.Arrays;
diff --git a/api/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java b/api/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
index f956a1f..fbe1a93 100644
--- a/api/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/OnUIElementPreRenderEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event;
 
 import zombie.ui.UIElement;
diff --git a/api/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java b/api/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
index adc5f5e..b80dc23 100644
--- a/api/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
+++ b/api/src/main/java/io/pzstorm/storm/event/StormEventDispatcher.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event;
 
 import java.lang.reflect.Method;
diff --git a/api/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java b/api/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
index ca45e49..374fcb5 100644
--- a/api/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/SubscribeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event;
 
 import java.lang.annotation.ElementType;
diff --git a/api/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java b/api/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
index bf61117..5f46c2d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/ZomboidEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
index a07bd75..789d1b0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedFactionInviteEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 @SuppressWarnings({ "WeakerAccess", "unused" })
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java
index 6a7ce76..4cf6cf3 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AcceptedTradeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
index aa59ca8..e3447aa 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/AddXPEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java
index aa1dad7..5e6b611 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/DoSpecialTooltipEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoGridSquare;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/EveryDaysEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/EveryDaysEvent.java
index 88d2fba..c51c456 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/EveryDaysEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/EveryDaysEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/EveryHoursEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/EveryHoursEvent.java
index f33578d..81e733c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/EveryHoursEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/EveryHoursEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/EveryOneMinuteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/EveryOneMinuteEvent.java
index 63411af..05af89b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/EveryOneMinuteEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/EveryOneMinuteEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/EveryTenMinutesEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/EveryTenMinutesEvent.java
index bd70d9f..56bbc3d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/EveryTenMinutesEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/EveryTenMinutesEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
index 53d9761..b8b02d6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LevelPerkEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LoadGridsquareEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LoadGridsquareEvent.java
index 508c04f..451722a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/LoadGridsquareEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LoadGridsquareEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoGridSquare;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
index 29a31fe..1737c6b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/LuaEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.ZomboidEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/MngInvReceiveItemsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/MngInvReceiveItemsEvent.java
index 6c65bce..fb824be 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/MngInvReceiveItemsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/MngInvReceiveItemsEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java
index 8a53a2c..471441b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateChangeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.ai.State;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateEnterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateEnterEvent.java
index d0e7a8d..be9cff3 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateEnterEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateEnterEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExecuteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExecuteEvent.java
index e4a0c44..bb68084 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExecuteEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExecuteEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExitEvent.java
index 5a30744..21d7f2a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExitEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAIStateExitEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAcceptInviteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAcceptInviteEvent.java
index 672229d..af3e4f6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAcceptInviteEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAcceptInviteEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java
index 5aae3c4..6f01259 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddBuildingEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
index a7d117f..4a7612d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAddMessageEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.chat.ChatMessage;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
index 367fa61..57fb4e0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAdminMessageEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
index 6f8aed2..ba05816 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnAmbientSoundEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java
index bcc8c0d..c8e7fea 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnBeingHitByZombieEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCGlobalObjectSystemInitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCGlobalObjectSystemInitEvent.java
index ab32f71..7389041 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCGlobalObjectSystemInitEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCGlobalObjectSystemInitEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java
index e6f1b6a..fdb53af 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnChallengeQueryEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java
index 9830c5d..e5d39f1 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnChangeWeatherEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCollideEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCollideEvent.java
index 03a9484..bf36f16 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCollideEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCollideEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java
index 2889c61..e221f8e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterCreateStatsEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterDeathEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterDeathEvent.java
index 941f301..16eac5f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterDeathEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterDeathEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java
index d8403b3..44b6255 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCharacterMeetEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnChatWindowInitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnChatWindowInitEvent.java
index 83ff12b..cac843b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnChatWindowInitEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnChatWindowInitEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java
index 860cbe6..0f077c1 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClientCommandEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateManagerInitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateManagerInitEvent.java
index f39ac04..5a8882d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateManagerInitEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateManagerInitEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.weather.ClimateManager;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickDebugEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickDebugEvent.java
index 56c1095..130b3ae 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickDebugEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickDebugEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.weather.ClimateManager;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java
index 0f7dc8e..8a66b9b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClimateTickEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.weather.ClimateManager;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnClothingUpdatedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnClothingUpdatedEvent.java
index 6097186..812e203 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnClothingUpdatedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnClothingUpdatedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectFailedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectFailedEvent.java
index 4315999..5cdd7fa 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectFailedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectFailedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectedEvent.java
index 38eac6c..f7f1dd8 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java
index 048c243..f283e4b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnConnectionStateChangedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
index 45ed5f4..7e8d210 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnContainerUpdateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java
index e77db5d..da4d485 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopJoinFailedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java
index d1d3098..9f54a28 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCoopServerMessageEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 @SuppressWarnings({ "WeakerAccess", "unused" })
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
index f489353..b60362f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateLivingCharacterEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
index ff4858a..afbeb26 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreatePlayerEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateSurvivorEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateSurvivorEvent.java
index 36fc2fa..9166a08 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateSurvivorEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateSurvivorEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoSurvivor;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateUIEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateUIEvent.java
index 523b767..374512a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateUIEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCreateUIEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java
index bf6cc2a..11c956e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java
index 66acabf..3084ab9 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyPressedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java
index e6eb19a..293da9d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnCustomUIKeyReleasedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java
index 6d99f52..b12d22f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDawnEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java
index d5e1195..070b570 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDestroyIsoThumpableEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import org.jetbrains.annotations.Nullable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
index 73e4dfa..b2bbc5e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDeviceTextEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.radio.devices.WaveSignalDevice;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDisconnectEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDisconnectEvent.java
index f5a69d1..e622b50 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDisconnectEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDisconnectEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDistributionMergeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDistributionMergeEvent.java
index 5394800..fadc1aa 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDistributionMergeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDistributionMergeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java
index a624530..cbb12de 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding2Event.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
index 3040e70..2447649 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuilding3Event.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java
index cc38f69..12bd285 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDoTileBuildingEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java
index 8c85e6c..d1f1c98 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnDuskEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnEnterVehicleEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnEnterVehicleEvent.java
index c717664..a26cb3b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnEnterVehicleEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnEnterVehicleEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java
index b7e3bd3..156c1e4 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipPrimaryEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java
index 7a67bea..ffc800c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnEquipSecondaryEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java
index 1461368..d1c6ea6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFETickEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java
index ee3a715..37f7545 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillContainerEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.inventory.ItemContainer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java
index 68e17df..82007ed 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillInventoryObjectContextMenuEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java
index ebcd94d..b9eb418 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnFillWorldObjectContextMenuEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 public class OnFillWorldObjectContextMenuEvent implements LuaEvent {
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java
index 834e38c..3ac64c5 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameBootEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
index 1f89204..4ec7002 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameStartEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameTimeLoadedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameTimeLoadedEvent.java
index 470b9e5..476ca08 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGameTimeLoadedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGameTimeLoadedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.GameTime;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetDBSchemaEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetDBSchemaEvent.java
index cefc480..62b213d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetDBSchemaEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetDBSchemaEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
index 00778cd..e4b7639 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGetTableResultEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import java.util.ArrayList;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnGridBurntEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnGridBurntEvent.java
index 03afc20..bccab13 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnGridBurntEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnGridBurntEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoGridSquare;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java
index bc1af8e..364cf7a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnHitZombieEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.BodyDamage.BodyPartType;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
index f23bf42..f71e8c0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitModdedWeatherStageEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.weather.WeatherPeriod;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java
index 9be2204..ddecfe4 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitSeasonsEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.erosion.season.ErosionSeason;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitWorldEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitWorldEvent.java
index a34cd55..6f76bc0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnInitWorldEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnInitWorldEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableLoadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableLoadEvent.java
index 8172705..3423234 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableLoadEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableLoadEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableSaveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableSaveEvent.java
index 1f810ac..961a4f7 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableSaveEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnIsoThumpableSaveEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java
index 59a29b2..80cbfff 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateUIEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateUIEvent.java
index ffc53cd..226f033 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateUIEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnJoypadActivateUIEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyKeepPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyKeepPressedEvent.java
index ed0c6b7..270d9df 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyKeepPressedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyKeepPressedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
index 88d8aa0..578399e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyPressedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
index 3640328..c6cfdb1 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnKeyStartPressedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadEvent.java
index ca15100..9383dfb 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadMapZonesEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadMapZonesEvent.java
index 625631a..97d11b4 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadMapZonesEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadMapZonesEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoWorld;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java
index 885ce6c..3f78262 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadRadioScriptsEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoWorld;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java
index ec86022..1c7bc05 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadSoundBanksEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadedTileDefinitionsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadedTileDefinitionsEvent.java
index 5fb871b..8b59a1c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadedTileDefinitionsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoadedTileDefinitionsEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoWorld;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateEvent.java
index 60dce3f..5bfcbd9 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateSuccessEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateSuccessEvent.java
index d654325..d6f4135 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateSuccessEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnLoginStateSuccessEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMainMenuEnterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMainMenuEnterEvent.java
index 68269cb..f3f8a86 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMainMenuEnterEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMainMenuEnterEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java
index 76ecb86..0bbc060 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMakeItemEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java
index a14a13d..f34f885 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMapLoadCreateIsoObjectEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMechanicActionDoneEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMechanicActionDoneEvent.java
index c3b997a..674f852 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMechanicActionDoneEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMechanicActionDoneEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java
index 2633c21..b6db819 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMiniScoreboardUpdateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 @SuppressWarnings({ "WeakerAccess", "unused" })
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnModsModifiedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnModsModifiedEvent.java
index f773bb9..cc4ebb5 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnModsModifiedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnModsModifiedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java
index 1db1a5a..b2fef16 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseDownEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java
index 9f6cae8..4d66d16 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseMoveEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java
index 3bcde16..1190cb3 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMouseUpEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnMultiTriggerNPCEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnMultiTriggerNPCEvent.java
index 678dd4d..c87dfb8 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnMultiTriggerNPCEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnMultiTriggerNPCEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java
index 1d2ae9d..e7a04c9 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNPCSurvivorUpdateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewFireEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewFireEvent.java
index 29aa6aa..cfac08b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewFireEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewFireEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.objects.IsoFire;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java
index 6fc70bc..4a856bf 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewGameEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewSurvivorGroupEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewSurvivorGroupEvent.java
index 22d19c3..ee22f94 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnNewSurvivorGroupEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnNewSurvivorGroupEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAboutToBeRemovedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAboutToBeRemovedEvent.java
index fce1155..87da0ba 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAboutToBeRemovedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAboutToBeRemovedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoObject;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAddedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAddedEvent.java
index e5a5f23..fc8e70b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAddedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectAddedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoObject;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectCollideEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectCollideEvent.java
index 996b091..9196947 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectCollideEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectCollideEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoMovingObject;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java
index 70705be..09f915b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonDownEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoObject;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java
index 1c83d8d..033c455 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectLeftMouseButtonUpEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoObject;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java
index 4f9dfba..2cc2fef 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonDownEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoObject;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java
index 0c457dc..30e8961 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnObjectRightMouseButtonUpEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoObject;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java
index aad8707..286801a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerAttackFinishedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerDeathEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerDeathEvent.java
index 32b42e5..42d9827 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerDeathEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerDeathEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerMoveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerMoveEvent.java
index b5a390c..c0e6666 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerMoveEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerMoveEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerSetSafehouseEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerSetSafehouseEvent.java
index a211d23..26be7eb 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerSetSafehouseEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerSetSafehouseEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerUpdateEvent.java
index d256cdc..2d9f7b6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPlayerUpdateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostCharactersSquareDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostCharactersSquareDrawEvent.java
index c3f6511..e02044f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostCharactersSquareDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostCharactersSquareDrawEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostDistributionMergeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostDistributionMergeEvent.java
index 67c37e7..2a81fa0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostDistributionMergeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostDistributionMergeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorLayerDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorLayerDrawEvent.java
index 8948ffd..55486c3 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorLayerDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorLayerDrawEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorSquareDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorSquareDrawEvent.java
index 3232d05..0663879 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorSquareDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostFloorSquareDrawEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java
index 66f1f3e..b2eb218 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostMapLoadEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoCell;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostRenderEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostRenderEvent.java
index 67120cc..e43bdea 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostRenderEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostRenderEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostSaveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostSaveEvent.java
index 5c48da8..c7455db 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostSaveEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostSaveEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTileDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTileDrawEvent.java
index 275f6bb..8d2b6be 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTileDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTileDrawEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTilesSquareDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTilesSquareDrawEvent.java
index a3d6df2..aa88011 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTilesSquareDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostTilesSquareDrawEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java
index 647a158..d459d47 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostUIDrawEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostWallSquareDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostWallSquareDrawEvent.java
index 26eb0ea..951ca12 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPostWallSquareDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPostWallSquareDrawEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreDistributionMergeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreDistributionMergeEvent.java
index dd41f5d..81caf83 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreDistributionMergeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreDistributionMergeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java
index 2d6554d..8db8ee8 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillInventoryObjectContextMenuEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 public class OnPreFillInventoryObjectContextMenuEvent implements LuaEvent {
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java
index 459c6e4..8dbc912 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreFillWorldObjectContextMenuEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 public class OnPreFillWorldObjectContextMenuEvent implements LuaEvent {
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreGameStartEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreGameStartEvent.java
index 5fa03c1..a417197 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreGameStartEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreGameStartEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreMapLoadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreMapLoadEvent.java
index 674ae63..1b35108 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreMapLoadEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreMapLoadEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java
index 3b42628..646b41e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPreUIDrawEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java
index 1662045..1ec240f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressRackButtonEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java
index 4d885bd..23cabf6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnPressReloadButtonEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRadioInteractionEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRadioInteractionEvent.java
index 882cede..89b6f5a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRadioInteractionEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRadioInteractionEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStartEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStartEvent.java
index 8a88527..bd73bc1 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStartEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStartEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStopEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStopEvent.java
index aeeaf16..806db02 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStopEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRainStopEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java
index 29789f0..cad50de 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveItemListNetEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import java.util.ArrayList;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java
index 5179610..1b8d9cf 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnReceiveUserlogEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import java.util.ArrayList;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
index bc9a58e..7306c80 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRefreshInventoryWindowContainersEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderTickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderTickEvent.java
index 2df9bcb..49eb0f6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderTickEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderTickEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderUpdateEvent.java
index 4250111..f32e928 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRenderUpdateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnResetLuaEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnResetLuaEvent.java
index 31ebc87..104cf99 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnResetLuaEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnResetLuaEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java
index 33de4fe..a43b87b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnResolutionChangeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java
index 82e3f2f..4e2cb36 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseDownEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java
index 0a2ae2a..10d619e 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnRightMouseUpEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSGlobalObjectSystemInitEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSGlobalObjectSystemInitEvent.java
index 79dd93c..b9f14ac 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnSGlobalObjectSystemInitEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSGlobalObjectSystemInitEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSafehousesChangedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSafehousesChangedEvent.java
index 68718b3..a9b63d6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnSafehousesChangedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSafehousesChangedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSaveEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSaveEvent.java
index 5a78d68..384e21a 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnSaveEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSaveEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java
index e0ea5cd..1105a87 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnScoreboardUpdateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import java.util.ArrayList;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSeeNewRoomEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSeeNewRoomEvent.java
index 82c90cf..08944e9 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnSeeNewRoomEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSeeNewRoomEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.areas.IsoRoom;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java
index 06e0bec..9052e66 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerCommandEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java
index 3611519..48e5779 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerFinishSavingEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java
index b471d2e..20956cc 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartSavingEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartedEvent.java
index 72a47a5..4402b27 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerStartedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerWorkshopItemsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerWorkshopItemsEvent.java
index 794b002..7d61d1d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnServerWorkshopItemsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnServerWorkshopItemsEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import java.util.ArrayList;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSetDefaultTabEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSetDefaultTabEvent.java
index ed26d2c..73d513d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnSetDefaultTabEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSetDefaultTabEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 @SuppressWarnings({ "WeakerAccess", "unused" })
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSpawnRegionsLoadedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSpawnRegionsLoadedEvent.java
index aaa1f05..b285355 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnSpawnRegionsLoadedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSpawnRegionsLoadedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnSteamGameJoinEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnSteamGameJoinEvent.java
index fa94966..2132d2c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnSteamGameJoinEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnSteamGameJoinEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java
index c9f4523..d6297f7 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabAddedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java
index 159146d..989bbf4 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTabRemovedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java
index 7a7a8ed..5f010b6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnThunderEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java
index 6f57611..9913dc8 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvenPausedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java
index c576d1f..a15fa1b 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTickEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTileRemovedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTileRemovedEvent.java
index ba129d1..e9cf282 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTileRemovedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTileRemovedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoObject;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnTriggerNPCEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnTriggerNPCEvent.java
index 4e70b3c..fd095b6 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnTriggerNPCEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnTriggerNPCEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import se.krka.kahlua.vm.KahluaTable;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java
index d2e85eb..3139582 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnUpdateModdedWeatherStageEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.weather.WeatherPeriod;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnVehicleDamageTextureEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnVehicleDamageTextureEvent.java
index eaf6696..4e392d3 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnVehicleDamageTextureEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnVehicleDamageTextureEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java
index bb577bf..32e1080 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWaterAmountChangeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoObject;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java
index 3d220a7..c325b63 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitCharacterEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java
index c626e6f..674e763 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitTreeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java
index 49a7d4a..cc587d7 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponHitXpEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java
index 11936d0..ccc4f9c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java
index f27e550..c1b2b53 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWeaponSwingHitPointEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnWorldMessageEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnWorldMessageEvent.java
index c297c2e..11049c0 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnWorldMessageEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnWorldMessageEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import io.pzstorm.storm.event.InertEvent;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieDeadEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieDeadEvent.java
index 34bacf3..312899f 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieDeadEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieDeadEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoGameCharacter;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieUpdateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieUpdateEvent.java
index 57f56e6..fada225 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieUpdateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/OnZombieUpdateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoZombie;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java
index 7f5f3fd..12b0376 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ReceiveFactionInviteEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 @SuppressWarnings({ "WeakerAccess", "unused" })
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/RequestTradeEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/RequestTradeEvent.java
index 3364e12..02eab23 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/RequestTradeEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/RequestTradeEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ReuseGridsquareEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ReuseGridsquareEvent.java
index d16394e..81caa18 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/ReuseGridsquareEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ReuseGridsquareEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoGridSquare;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/SendCustomModDataEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/SendCustomModDataEvent.java
index 85dcccb..bc76e88 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/SendCustomModDataEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/SendCustomModDataEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java
index 0fbc26b..d4b63c9 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ServerPingedEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 /**
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/SwitchChatStreamEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/SwitchChatStreamEvent.java
index 6c29074..12b8107 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/SwitchChatStreamEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/SwitchChatStreamEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/SyncFactionEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/SyncFactionEvent.java
index 437ca9f..568c2ec 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/SyncFactionEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/SyncFactionEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 // TODO: document this event
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java
index cba9c8e..5bbe254 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIAddItemEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java
index 64c564d..098924d 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIRemoveItemEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java
index cfd8728..533bb79 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/TradingUIUpdateStateEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.characters.IsoPlayer;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java
index adac943..a7a9dbb 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/ViewTicketsEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import java.util.ArrayList;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/onLoadModDataFromServerEvent.java b/api/src/main/java/io/pzstorm/storm/event/lua/onLoadModDataFromServerEvent.java
index c092289..8b3ee7c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/onLoadModDataFromServerEvent.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/onLoadModDataFromServerEvent.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event.lua;
 
 import zombie.iso.IsoGridSquare;
diff --git a/api/src/main/java/io/pzstorm/storm/event/lua/package-info.java b/api/src/main/java/io/pzstorm/storm/event/lua/package-info.java
index 9ab9cb0..442f0f2 100644
--- a/api/src/main/java/io/pzstorm/storm/event/lua/package-info.java
+++ b/api/src/main/java/io/pzstorm/storm/event/lua/package-info.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 @NonNullPackage
 package io.pzstorm.storm.event.lua;
 
diff --git a/api/src/main/java/io/pzstorm/storm/event/package-info.java b/api/src/main/java/io/pzstorm/storm/event/package-info.java
index 24eda10..7d8113c 100644
--- a/api/src/main/java/io/pzstorm/storm/event/package-info.java
+++ b/api/src/main/java/io/pzstorm/storm/event/package-info.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 @NonNullPackage
 package io.pzstorm.storm.event;
 
diff --git a/api/src/main/java/io/pzstorm/storm/logging/StormLogger.java b/api/src/main/java/io/pzstorm/storm/logging/StormLogger.java
index 1904e15..5176136 100644
--- a/api/src/main/java/io/pzstorm/storm/logging/StormLogger.java
+++ b/api/src/main/java/io/pzstorm/storm/logging/StormLogger.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.logging;
 
 import org.apache.logging.log4j.Level;
diff --git a/api/src/main/java/io/pzstorm/storm/mod/ModMetadata.java b/api/src/main/java/io/pzstorm/storm/mod/ModMetadata.java
index 537e54f..4420519 100644
--- a/api/src/main/java/io/pzstorm/storm/mod/ModMetadata.java
+++ b/api/src/main/java/io/pzstorm/storm/mod/ModMetadata.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.mod;
 
 import java.util.Objects;
diff --git a/api/src/main/java/io/pzstorm/storm/mod/ModVersion.java b/api/src/main/java/io/pzstorm/storm/mod/ModVersion.java
index 53e879a..7ec7c0d 100644
--- a/api/src/main/java/io/pzstorm/storm/mod/ModVersion.java
+++ b/api/src/main/java/io/pzstorm/storm/mod/ModVersion.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.mod;
 
 import java.util.Objects;
diff --git a/api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java b/api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java
index 0bfb052..b5687f1 100644
--- a/api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java
+++ b/api/src/main/java/io/pzstorm/storm/mod/ZomboidMod.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.mod;
 
 /**
diff --git a/core/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java b/core/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java
index bbb0997..589db84 100644
--- a/core/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java
+++ b/core/src/main/java/io/pzstorm/storm/core/ClassTransformationException.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.core;
 
 /**
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java b/core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
index 57cae38..f40c448 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormBootstrap.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.core;
 
 import java.lang.reflect.Method;
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java b/core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
index 5336722..2326a96 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormClassLoader.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.core;
 
 import java.io.ByteArrayOutputStream;
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
index 089efae..1579dd4 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformer.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.core;
 
 import java.util.Optional;
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
index db24234..48019b2 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormClassTransformers.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.core;
 
 import java.util.HashMap;
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
index 18ec165..cc14b60 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormLauncher.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.core;
 
 import java.lang.reflect.Method;
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java b/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
index ed80463..3a8fadb 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormModLoader.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.core;
 
 import java.io.File;
diff --git a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
index 0def0a1..f7fe3d0 100644
--- a/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
+++ b/core/src/main/java/io/pzstorm/storm/core/StormModRegistry.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.core;
 
 import java.util.*;
diff --git a/core/src/main/java/io/pzstorm/storm/core/package-info.java b/core/src/main/java/io/pzstorm/storm/core/package-info.java
index af12c85..0fab831 100644
--- a/core/src/main/java/io/pzstorm/storm/core/package-info.java
+++ b/core/src/main/java/io/pzstorm/storm/core/package-info.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 @NonNullPackage
 package io.pzstorm.storm.core;
 
diff --git a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
index 987d62b..22c92a0 100644
--- a/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
+++ b/core/src/main/java/io/pzstorm/storm/event/LuaEventFactory.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event;
 
 import java.lang.reflect.Constructor;
diff --git a/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java b/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
index b91e599..4aa02d1 100644
--- a/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
+++ b/core/src/main/java/io/pzstorm/storm/event/StormEventHandler.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.event;
 
 import io.pzstorm.storm.event.lua.LuaEvent;
diff --git a/core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java b/core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
index 816c075..956d5cb 100644
--- a/core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
+++ b/core/src/main/java/io/pzstorm/storm/hook/OnMainScreenRenderHook.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.hook;
 
 import org.objectweb.asm.Opcodes;
diff --git a/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java b/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java
index 82bfafc..8239a06 100644
--- a/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java
+++ b/core/src/main/java/io/pzstorm/storm/hook/OnTriggerLuaEventHook.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.hook;
 
 import org.objectweb.asm.Opcodes;
diff --git a/core/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java b/core/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
index 35023ba..8ade4d8 100644
--- a/core/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
+++ b/core/src/main/java/io/pzstorm/storm/hook/OnUIElementPreRenderHook.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.hook;
 
 import org.objectweb.asm.Opcodes;
diff --git a/core/src/main/java/io/pzstorm/storm/hook/StormHook.java b/core/src/main/java/io/pzstorm/storm/hook/StormHook.java
index 6d4daba..ba13004 100644
--- a/core/src/main/java/io/pzstorm/storm/hook/StormHook.java
+++ b/core/src/main/java/io/pzstorm/storm/hook/StormHook.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.hook;
 
 import io.pzstorm.storm.core.StormClassTransformer;
diff --git a/core/src/main/java/io/pzstorm/storm/hook/package-info.java b/core/src/main/java/io/pzstorm/storm/hook/package-info.java
index 72877ea..e88a539 100644
--- a/core/src/main/java/io/pzstorm/storm/hook/package-info.java
+++ b/core/src/main/java/io/pzstorm/storm/hook/package-info.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 @NonNullPackage
 package io.pzstorm.storm.hook;
 
diff --git a/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java b/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
index 94c4f43..cb24640 100644
--- a/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
+++ b/core/src/main/java/io/pzstorm/storm/logging/ZomboidLogger.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.logging;
 
 import java.io.ByteArrayOutputStream;
diff --git a/core/src/main/java/io/pzstorm/storm/mod/ModJar.java b/core/src/main/java/io/pzstorm/storm/mod/ModJar.java
index 3433384..4b79ad3 100644
--- a/core/src/main/java/io/pzstorm/storm/mod/ModJar.java
+++ b/core/src/main/java/io/pzstorm/storm/mod/ModJar.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.mod;
 
 import java.io.File;
diff --git a/core/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java b/core/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
index 109ec6b..8dacb26 100644
--- a/core/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
+++ b/core/src/main/java/io/pzstorm/storm/patch/DebugLogPatch.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.patch;
 
 import java.util.Objects;
diff --git a/core/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java b/core/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
index dea333a..ba12497 100644
--- a/core/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
+++ b/core/src/main/java/io/pzstorm/storm/patch/DebugLogStreamPatch.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.patch;
 
 import java.util.List;
diff --git a/core/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java b/core/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java
index 7306bcb..90faf28 100644
--- a/core/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java
+++ b/core/src/main/java/io/pzstorm/storm/patch/ZomboidPatch.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.patch;
 
 import io.pzstorm.storm.core.StormClassTransformer;
diff --git a/core/src/main/java/io/pzstorm/storm/patch/package-info.java b/core/src/main/java/io/pzstorm/storm/patch/package-info.java
index bc06750..b622a8f 100644
--- a/core/src/main/java/io/pzstorm/storm/patch/package-info.java
+++ b/core/src/main/java/io/pzstorm/storm/patch/package-info.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 @NonNullPackage
 package io.pzstorm.storm.patch;
 
diff --git a/core/src/main/java/io/pzstorm/storm/util/AsmUtils.java b/core/src/main/java/io/pzstorm/storm/util/AsmUtils.java
index 1ca3bbb..6a9070d 100644
--- a/core/src/main/java/io/pzstorm/storm/util/AsmUtils.java
+++ b/core/src/main/java/io/pzstorm/storm/util/AsmUtils.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.util;
 
 import java.util.Arrays;
diff --git a/core/src/main/java/io/pzstorm/storm/util/StormUtils.java b/core/src/main/java/io/pzstorm/storm/util/StormUtils.java
index 835e19d..21f9591 100644
--- a/core/src/main/java/io/pzstorm/storm/util/StormUtils.java
+++ b/core/src/main/java/io/pzstorm/storm/util/StormUtils.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package io.pzstorm.storm.util;
 
 import org.jetbrains.annotations.Contract;
diff --git a/core/src/main/java/io/pzstorm/storm/util/package-info.java b/core/src/main/java/io/pzstorm/storm/util/package-info.java
index d4fc46f..5ab1fb6 100644
--- a/core/src/main/java/io/pzstorm/storm/util/package-info.java
+++ b/core/src/main/java/io/pzstorm/storm/util/package-info.java
@@ -1,3 +1,21 @@
+/*
+ * Zomboid Storm - Java modding toolchain for Project Zomboid
+ * Copyright (C) 2021 Matthew Cain
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 @NonNullPackage
 package io.pzstorm.storm.util;
 

From e7191faf87fbbc989ef47207860f68af6db9df8f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 08:42:40 +0200
Subject: [PATCH 294/323] Apply metadata to root project

---
 build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6bf55cf..5518198 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,6 +23,8 @@ boolean isCI = sIsCI != null ? Boolean.parseBoolean(sIsCI) : false
 allprojects {
     repositories { mavenCentral() }
     project.ext.set('CI', isCI)
+    group 'io.github.pzstorm'
+    version '0.1.0'
 }
 
 // make sure to configure zombie subproject first because other
@@ -31,9 +33,6 @@ def zombieProject = project(':zombie')
 subprojects.sort {
     return it.name.equals('zombie') ? 0 : 1
 }.each {
-    it.group 'io.github.pzstorm'
-    it.version '0.1.0'
-
     it.apply plugin: 'java'
     it.apply plugin: 'maven-publish'
     it.apply plugin: 'net.ltgt.errorprone'

From 351ac49333b8674e51efd51071ae3fefd5a61d0e Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 08:55:40 +0200
Subject: [PATCH 295/323] Add application gradle plugin

---
 build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5518198..8443083 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,9 @@ import io.pzstorm.capsid.setup.xml.LaunchRunConfig
 plugins {
     id 'io.pzstorm.capsid' version '0.4.0'
 
-    // Plugin that keeps your code spotless with Gradle
+    // https://docs.gradle.org/current/userguide/application_plugin.html
+    id 'application'
+
     // https://plugins.gradle.org/plugin/com.diffplug.spotless
     id "com.diffplug.spotless" version "5.12.1"
 

From d44657c1c853de887da29e3955745c9651226b33 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 08:58:18 +0200
Subject: [PATCH 296/323] Declare distribution libraries

---
 build.gradle | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/build.gradle b/build.gradle
index 8443083..4179d55 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,6 +76,35 @@ subprojects.sort {
     }
 }
 
+// exclude configurations from distribution
+configurations {
+    excludeFromDist.extendsFrom(zomboidImplementation, zomboidRuntimeOnly, errorprone)
+}
+
+// these dependencies will be included as libraries in distribution
+dependencies {
+    // https://mvnrepository.com/artifact/com.google.guava/guava
+    runtimeOnly('com.google.guava:guava:30.1.1-jre') {
+        exclude group: 'com.google.code.findbugs'
+        exclude group: 'com.google.errorprone'
+        exclude group: 'org.checkerframework'
+        exclude module: 'failureaccess'
+        exclude module: 'listenablefuture'
+        exclude module: 'j2objc-annotations'
+    }
+    // https://mvnrepository.com/artifact/org.ow2.asm/asm
+    runtimeOnly 'org.ow2.asm:asm:9.1'
+
+    // https://mvnrepository.com/artifact/org.ow2.asm/asm-tree
+    runtimeOnly 'org.ow2.asm:asm-tree:9.1'
+
+    // https://mvnrepository.com/artifact/org.ow2.asm/asm-util
+    runtimeOnly 'org.ow2.asm:asm-util:9.1'
+
+    // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
+    runtimeOnly 'org.apache.logging.log4j:log4j-core:2.14.0'
+}
+
 capsid {
     isModProject = false
     setProjectRepository('pzstorm', 'storm')

From 6ae571de6dc6e3cae6f1fe4ba0dff08b60052c9f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 09:08:15 +0200
Subject: [PATCH 297/323] Configure root project jar task

---
 build.gradle | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4179d55..34dcf37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -140,6 +140,12 @@ tasks.createRunConfigurations.configure {
     }
 }
 
-// root project does not produce any artifacts on it's own,
-// it is just an aggregate task for subproject jar tasks
-jar.actions.clear()
+// include modules classes and resources in jar
+def buildDirs = [ project(':core').buildDir, project(':api').buildDir ]
+jar {
+    from(new File(buildDirs[0], 'classes/java/main'),
+            new File(buildDirs[0], 'resources/main'),
+            new File(buildDirs[1], 'classes/java/main')
+    )
+}
+

From 6cbf1071d648ae68fdcd323961cd00e45f063c7b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 09:10:20 +0200
Subject: [PATCH 298/323] Configure storm distribution

---
 build.gradle | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/build.gradle b/build.gradle
index 34dcf37..3d0a515 100644
--- a/build.gradle
+++ b/build.gradle
@@ -149,3 +149,20 @@ jar {
     )
 }
 
+distributions.main.contents {
+    it.from ('README.md', 'LICENSE.txt', 'CHANGELOG.md')
+    it.exclude {
+        File file = it.file
+        if (!isCI) {
+            // exclude Project Zomboid classes
+            if (file in configurations.excludeFromDist.files) {
+                return true
+            }
+            // exclude Project Zomboid libraries
+            if (file.toPath().startsWith(gameDir)) {
+                return true
+            }
+        }
+        return false
+    }
+}

From a3f917e7ba272e7890773eea173165fce79e3599 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 09:21:34 +0200
Subject: [PATCH 299/323] Create linux launch script

---
 build.gradle         |  5 +++
 dist/launch_storm.sh | 99 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 dist/launch_storm.sh

diff --git a/build.gradle b/build.gradle
index 3d0a515..b50f455 100644
--- a/build.gradle
+++ b/build.gradle
@@ -166,3 +166,8 @@ distributions.main.contents {
         return false
     }
 }
+
+// use a custom launch script template
+startScripts {
+    unixStartScriptGenerator.template = resources.text.fromFile('dist/launch_storm.sh')
+}
\ No newline at end of file
diff --git a/dist/launch_storm.sh b/dist/launch_storm.sh
new file mode 100644
index 0000000..c2d718e
--- /dev/null
+++ b/dist/launch_storm.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+#
+# Launch Zomboid Storm
+#
+###############################################################################
+
+# Assume launch script is in 'pz/storm/bin' directory and declare storm and zomboid root directories
+STORM_HOME=\$(readlink -f "\$(pwd)/../")
+PZ_HOME=\$(readlink -f "\${STORM_HOME}/../")
+cd "\${PZ_HOME}" || exit 1
+PZ_HOME=\$(pwd)
+
+# path to local game directory where logs, mods and configs are stored
+LOCAL_PZ_HOME="\${HOME}/Zomboid"
+
+exportGameJava() {
+  if "\$1/jre64/bin/java" -version >/dev/null 2>&1; then
+    echo "64-bit java detected in game directory"
+    export JAVA_CMD="\$1/jre64/bin/java"
+    return 0
+  elif "\${INSTDIR}/jre/bin/java" -client -version >/dev/null 2>&1; then
+    echo "32-bit java detected game directory"
+    export JAVA_CMD="\$1/jre/bin/java"
+    return 0
+  else
+    echo -e "\\nERROR: Couldn't determine 32/64 bit of java in game directory\\n"
+    return 1
+  fi
+}
+
+# Create local game directory if it doesn't exist and set directory permission to a+rwx,g-w,o-w
+[[ ! -d "\${LOCAL_PZ_HOME}" ]] && mkdir -m 0755 "\${LOCAL_PZ_HOME}"
+
+if [ -n "\$JAVA_HOME" ]; then
+  if [ -x "\$JAVA_HOME/jre/sh/java" ]; then
+    # IBM's JDK on AIX uses strange locations for the executables
+    JAVA_CMD="\$JAVA_HOME/jre/sh/java"
+  else
+    JAVA_CMD="\$JAVA_HOME/bin/java"
+  fi
+  if [ ! -x "\$JAVA_CMD" ]; then
+    if [ "\$(exportGameJava "\$PZ_HOME")" != 0 ]; then
+      echo -e "\\nERROR: JAVA_HOME is set to an invalid directory (\$JAVA_HOME) and no Java distribution" \\
+        "found in game directory.\\nPlease reinstall Project Zomboid or set the JAVA_HOME variable" \\
+        "to match the location of your Java installation if you want to run Storm" \\
+        "with a custom Java distribution\\n"
+      exit 1
+    fi
+  fi
+else
+  if [ "\$(exportGameJava "\$PZ_HOME")" != 0 ]; then
+    JAVA_CMD="java"
+    which java >/dev/null 2>&1 || echo -e "\\nERROR: JAVA_HOME is not set and no 'java' command" \\
+      "could be found in your PATH.\\nPlease set the JAVA_HOME variable in your environment" \\
+      "to match the location of your Java installation.\\n"
+    exit 1
+  fi
+fi
+
+# This is the Java version we want
+JAVA_TARGET_VERSION="1.8"
+
+# Determine which Java version is used
+JAVA_VERSION_INFO=\$("\$JAVA_CMD" -version 2>&1 | awk -F '"' '/version/ {print \$2}')
+JAVA_VERSION=\$(echo "\$JAVA_VERSION_INFO" | cut -d '.' -f -2)
+
+if [ "\$JAVA_VERSION" != \$JAVA_TARGET_VERSION ]; then
+  echo -e "\\nERROR: JAVA_HOME points to wrong Java version (\$JAVA_VERSION)." \\
+    "\\nPlease set the JAVA_HOME variable in your environment to match the" \\
+    "location of Java version \$JAVA_TARGET_VERSION installation.\\n"
+  exit 1
+fi
+
+# Path to Storm jar library directory
+LIB_PATH="\${STORM_HOME}/lib"
+
+CLASSPATH="\${LIB_PATH}/storm-0.1.0.jar:\${LIB_PATH}/asm-9.1.jar:\${LIB_PATH}/asm-analysis-9.1.jar:\\
+\${LIB_PATH}/asm-tree-9.1.jar:\${LIB_PATH}/asm-util-9.1.jar:\${LIB_PATH}/guava-30.1.1-jre.jar:\\
+\${LIB_PATH}/log4j-api-2.14.0.jar:\${LIB_PATH}/log4j-core-2.14.0.jar:\${PZ_HOME}:\${PZ_HOME}/jassimp.jar:\\
+\${PZ_HOME}/lwjgl_util_applet.jar:\${PZ_HOME}/uncommons-maths-1.2.3.jar:\${PZ_HOME}/jinput.jar:\\
+\${PZ_HOME}/trove-3.0.3.jar:\${PZ_HOME}/pzexe.jar:\${PZ_HOME}/javacord-2.0.17-shaded.jar:\\
+\${PZ_HOME}/lwjgl_util.jar:\${PZ_HOME}/guava-23.0.jar:\${PZ_HOME}/sqlite-jdbc-3.27.2.1.jar:\\
+\${PZ_HOME}/hamcrest-2.1.jar:\${PZ_HOME}/lwjgl.jar"
+
+# Java command-line options
+JAVA_OPTS="-XX:+UseConcMarkSweepGC -XX:-CreateMinidumpOnCrash \\
+-XX:-OmitStackTraceInFastThrow -Xms1800m -Xmx2048m"
+
+# Java system properties
+SYS_PROPS="-Djava.library.path=\${PZ_HOME}:\${PZ_HOME}/linux64:\\
+\${PZ_HOME}/jre64/lib/amd64 -Dorg.lwjgl.librarypath=\${PZ_HOME}"
+
+echo "Launching Zomboid Storm..."
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- \$JAVA_OPTS \$SYS_PROPS -classpath "\$CLASSPATH" io.pzstorm.storm.core.StormLauncher
+
+# Execute Java command to launch Storm
+exec "\$JAVA_CMD" "\$@"

From 2ab3e2353d660d93a505a8a8d3e23d80f45c794f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sat, 22 May 2021 22:10:02 +0200
Subject: [PATCH 300/323] Add launch script install directory check

---
 dist/launch_storm.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dist/launch_storm.sh b/dist/launch_storm.sh
index c2d718e..4175a39 100644
--- a/dist/launch_storm.sh
+++ b/dist/launch_storm.sh
@@ -10,6 +10,13 @@ PZ_HOME=\$(readlink -f "\${STORM_HOME}/../")
 cd "\${PZ_HOME}" || exit 1
 PZ_HOME=\$(pwd)
 
+# ensure Storm is installed in the right location
+if [ ! -f "\$PZ_HOME/ProjectZomboid64" ] && [ ! -f "\$PZ_HOME/ProjectZomboid32" ]; then
+  echo -e "\\nERROR: Unable to find Project Zomboid installation directory." \\
+    "Searched in directory '\${PZ_HOME}' as relative to Storm installation directory '\${STORM_HOME}/../'\\n"
+	exit 1
+fi
+
 # path to local game directory where logs, mods and configs are stored
 LOCAL_PZ_HOME="\${HOME}/Zomboid"
 

From 361c09b0130bd7ad60ecf75fe372ff08e885e986 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 23 May 2021 05:35:36 +0200
Subject: [PATCH 301/323] Rename linux launch script

---
 build.gradle                             | 2 +-
 dist/{launch_storm.sh => storm_linux.sh} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename dist/{launch_storm.sh => storm_linux.sh} (100%)

diff --git a/build.gradle b/build.gradle
index b50f455..3f69faf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -169,5 +169,5 @@ distributions.main.contents {
 
 // use a custom launch script template
 startScripts {
-    unixStartScriptGenerator.template = resources.text.fromFile('dist/launch_storm.sh')
+    unixStartScriptGenerator.template = resources.text.fromFile('dist/storm_linux.sh')
 }
\ No newline at end of file
diff --git a/dist/launch_storm.sh b/dist/storm_linux.sh
similarity index 100%
rename from dist/launch_storm.sh
rename to dist/storm_linux.sh

From f6263f32858aa2369255c1774d202b90ce913c9d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 23 May 2021 05:39:29 +0200
Subject: [PATCH 302/323] Reformat launch script to regular script

---
 dist/storm_linux.sh | 93 +++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 49 deletions(-)

diff --git a/dist/storm_linux.sh b/dist/storm_linux.sh
index 4175a39..1c48bfd 100644
--- a/dist/storm_linux.sh
+++ b/dist/storm_linux.sh
@@ -5,61 +5,60 @@
 ###############################################################################
 
 # Assume launch script is in 'pz/storm/bin' directory and declare storm and zomboid root directories
-STORM_HOME=\$(readlink -f "\$(pwd)/../")
-PZ_HOME=\$(readlink -f "\${STORM_HOME}/../")
-cd "\${PZ_HOME}" || exit 1
-PZ_HOME=\$(pwd)
-
-# ensure Storm is installed in the right location
-if [ ! -f "\$PZ_HOME/ProjectZomboid64" ] && [ ! -f "\$PZ_HOME/ProjectZomboid32" ]; then
-  echo -e "\\nERROR: Unable to find Project Zomboid installation directory." \\
-    "Searched in directory '\${PZ_HOME}' as relative to Storm installation directory '\${STORM_HOME}/../'\\n"
+STORM_HOME=$(readlink -f "$(pwd)/../")
+PZ_HOME=$(readlink -f "${STORM_HOME}/../")
+cd "${PZ_HOME}" || exit 1
+PZ_HOME=$(pwd)
+
+if [ ! -f "$PZ_HOME/ProjectZomboid64" ] && [ ! -f "$PZ_HOME/ProjectZomboid32" ]; then
+  echo -e "\nERROR: Unable to find Project Zomboid installation directory." \
+    "Searched in directory '${PZ_HOME}' as relative to Storm installation directory '${STORM_HOME}/../'\n"
 	exit 1
 fi
 
 # path to local game directory where logs, mods and configs are stored
-LOCAL_PZ_HOME="\${HOME}/Zomboid"
+LOCAL_PZ_HOME="${HOME}/Zomboid"
 
 exportGameJava() {
-  if "\$1/jre64/bin/java" -version >/dev/null 2>&1; then
+  if "$1/jre64/bin/java" -version >/dev/null 2>&1; then
     echo "64-bit java detected in game directory"
-    export JAVA_CMD="\$1/jre64/bin/java"
+    export JAVA_CMD="$1/jre64/bin/java"
     return 0
-  elif "\${INSTDIR}/jre/bin/java" -client -version >/dev/null 2>&1; then
+  elif "${INSTDIR}/jre/bin/java" -client -version >/dev/null 2>&1; then
     echo "32-bit java detected game directory"
-    export JAVA_CMD="\$1/jre/bin/java"
+    export JAVA_CMD="$1/jre/bin/java"
     return 0
   else
-    echo -e "\\nERROR: Couldn't determine 32/64 bit of java in game directory\\n"
+    echo -e "\nERROR: Couldn't determine 32/64 bit of java in game directory\n"
     return 1
   fi
 }
 
 # Create local game directory if it doesn't exist and set directory permission to a+rwx,g-w,o-w
-[[ ! -d "\${LOCAL_PZ_HOME}" ]] && mkdir -m 0755 "\${LOCAL_PZ_HOME}"
+[[ ! -d "${LOCAL_PZ_HOME}" ]] && mkdir -m 0755 "${LOCAL_PZ_HOME}"
 
-if [ -n "\$JAVA_HOME" ]; then
-  if [ -x "\$JAVA_HOME/jre/sh/java" ]; then
+if [ -n "$JAVA_HOME" ]; then
+  if [ -x "$JAVA_HOME/jre/sh/java" ]; then
     # IBM's JDK on AIX uses strange locations for the executables
-    JAVA_CMD="\$JAVA_HOME/jre/sh/java"
+    JAVA_CMD="$JAVA_HOME/jre/sh/java"
   else
-    JAVA_CMD="\$JAVA_HOME/bin/java"
+    JAVA_CMD="$JAVA_HOME/bin/java"
   fi
-  if [ ! -x "\$JAVA_CMD" ]; then
-    if [ "\$(exportGameJava "\$PZ_HOME")" != 0 ]; then
-      echo -e "\\nERROR: JAVA_HOME is set to an invalid directory (\$JAVA_HOME) and no Java distribution" \\
-        "found in game directory.\\nPlease reinstall Project Zomboid or set the JAVA_HOME variable" \\
-        "to match the location of your Java installation if you want to run Storm" \\
-        "with a custom Java distribution\\n"
+  if [ ! -x "$JAVA_CMD" ]; then
+    if [ "$(exportGameJava "$PZ_HOME")" != 0 ]; then
+      echo -e "\nERROR: JAVA_HOME is set to an invalid directory ($JAVA_HOME) and no Java distribution" \
+        "found in game directory.\nPlease reinstall Project Zomboid or set the JAVA_HOME variable" \
+        "to match the location of your Java installation if you want to run Storm" \
+        "with a custom Java distribution\n"
       exit 1
     fi
   fi
 else
-  if [ "\$(exportGameJava "\$PZ_HOME")" != 0 ]; then
+  if [ "$(exportGameJava "$PZ_HOME")" != 0 ]; then
     JAVA_CMD="java"
-    which java >/dev/null 2>&1 || echo -e "\\nERROR: JAVA_HOME is not set and no 'java' command" \\
-      "could be found in your PATH.\\nPlease set the JAVA_HOME variable in your environment" \\
-      "to match the location of your Java installation.\\n"
+    which java >/dev/null 2>&1 || echo -e "\nERROR: JAVA_HOME is not set and no 'java' command" \
+      "could be found in your PATH.\nPlease set the JAVA_HOME variable in your environment" \
+      "to match the location of your Java installation.\n"
     exit 1
   fi
 fi
@@ -68,39 +67,35 @@ fi
 JAVA_TARGET_VERSION="1.8"
 
 # Determine which Java version is used
-JAVA_VERSION_INFO=\$("\$JAVA_CMD" -version 2>&1 | awk -F '"' '/version/ {print \$2}')
-JAVA_VERSION=\$(echo "\$JAVA_VERSION_INFO" | cut -d '.' -f -2)
+JAVA_VERSION_INFO=$("$JAVA_CMD" -version 2>&1 | awk -F '"' '/version/ {print $2}')
+JAVA_VERSION=$(echo "$JAVA_VERSION_INFO" | cut -d '.' -f -2)
 
-if [ "\$JAVA_VERSION" != \$JAVA_TARGET_VERSION ]; then
-  echo -e "\\nERROR: JAVA_HOME points to wrong Java version (\$JAVA_VERSION)." \\
-    "\\nPlease set the JAVA_HOME variable in your environment to match the" \\
-    "location of Java version \$JAVA_TARGET_VERSION installation.\\n"
+if [ "$JAVA_VERSION" != $JAVA_TARGET_VERSION ]; then
+  echo -e "\nERROR: JAVA_HOME points to wrong Java version ($JAVA_VERSION)." \
+    "\nPlease set the JAVA_HOME variable in your environment to match the" \
+    "location of Java version $JAVA_TARGET_VERSION installation.\n"
   exit 1
 fi
 
 # Path to Storm jar library directory
-LIB_PATH="\${STORM_HOME}/lib"
+LIB_PATH="${STORM_HOME}/lib"
 
-CLASSPATH="\${LIB_PATH}/storm-0.1.0.jar:\${LIB_PATH}/asm-9.1.jar:\${LIB_PATH}/asm-analysis-9.1.jar:\\
-\${LIB_PATH}/asm-tree-9.1.jar:\${LIB_PATH}/asm-util-9.1.jar:\${LIB_PATH}/guava-30.1.1-jre.jar:\\
-\${LIB_PATH}/log4j-api-2.14.0.jar:\${LIB_PATH}/log4j-core-2.14.0.jar:\${PZ_HOME}:\${PZ_HOME}/jassimp.jar:\\
-\${PZ_HOME}/lwjgl_util_applet.jar:\${PZ_HOME}/uncommons-maths-1.2.3.jar:\${PZ_HOME}/jinput.jar:\\
-\${PZ_HOME}/trove-3.0.3.jar:\${PZ_HOME}/pzexe.jar:\${PZ_HOME}/javacord-2.0.17-shaded.jar:\\
-\${PZ_HOME}/lwjgl_util.jar:\${PZ_HOME}/guava-23.0.jar:\${PZ_HOME}/sqlite-jdbc-3.27.2.1.jar:\\
-\${PZ_HOME}/hamcrest-2.1.jar:\${PZ_HOME}/lwjgl.jar"
+CLASSPATH="${LIB_PATH}/storm-0.1.0.jar:${LIB_PATH}/asm-9.1.jar:${LIB_PATH}/asm-analysis-9.1.jar:\
+${LIB_PATH}/asm-tree-9.1.jar:${LIB_PATH}/asm-util-9.1.jar:${LIB_PATH}/guava-30.1.1-jre.jar:\
+${LIB_PATH}/log4j-api-2.14.0.jar:${LIB_PATH}/log4j-core-2.14.0.jar:${PZ_HOME}:${PZ_HOME}/*"
 
 # Java command-line options
-JAVA_OPTS="-XX:+UseConcMarkSweepGC -XX:-CreateMinidumpOnCrash \\
+JAVA_OPTS="-XX:+UseConcMarkSweepGC -XX:-CreateMinidumpOnCrash \
 -XX:-OmitStackTraceInFastThrow -Xms1800m -Xmx2048m"
 
 # Java system properties
-SYS_PROPS="-Djava.library.path=\${PZ_HOME}:\${PZ_HOME}/linux64:\\
-\${PZ_HOME}/jre64/lib/amd64 -Dorg.lwjgl.librarypath=\${PZ_HOME}"
+SYS_PROPS="-Djava.library.path=${PZ_HOME}:${PZ_HOME}/linux64:\
+${PZ_HOME}/jre64/lib/amd64 -Dorg.lwjgl.librarypath=${PZ_HOME}"
 
 echo "Launching Zomboid Storm..."
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- \$JAVA_OPTS \$SYS_PROPS -classpath "\$CLASSPATH" io.pzstorm.storm.core.StormLauncher
+eval set -- $JAVA_OPTS $SYS_PROPS -classpath "$CLASSPATH" io.pzstorm.storm.core.StormLauncher
 
 # Execute Java command to launch Storm
-exec "\$JAVA_CMD" "\$@"
+exec "$JAVA_CMD" "$@"

From 9f70adf174e015fa714d78bed4f652dd980fced8 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 23 May 2021 06:17:26 +0200
Subject: [PATCH 303/323] Start using custom launch scripts

---
 build.gradle                  | 10 +++++-----
 dist/{ => bin}/storm_linux.sh |  0
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename dist/{ => bin}/storm_linux.sh (100%)

diff --git a/build.gradle b/build.gradle
index 3f69faf..2835c44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -165,9 +165,9 @@ distributions.main.contents {
         }
         return false
     }
-}
+    // include additional distibution files
+    it.from 'dist'
 
-// use a custom launch script template
-startScripts {
-    unixStartScriptGenerator.template = resources.text.fromFile('dist/storm_linux.sh')
-}
\ No newline at end of file
+    // exclude generated launch scripts
+    it.exclude '**/storm', '**/storm.bat'
+}
diff --git a/dist/storm_linux.sh b/dist/bin/storm_linux.sh
similarity index 100%
rename from dist/storm_linux.sh
rename to dist/bin/storm_linux.sh

From 323ba61d88c55c168aeec345ff170040c896b23d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Sun, 23 May 2021 06:18:53 +0200
Subject: [PATCH 304/323] Create windows launch scripts

---
 dist/bin/storm_win32.bat | 106 +++++++++++++++++++++++++++++++++++++++
 dist/bin/storm_win64.bat | 106 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 dist/bin/storm_win32.bat
 create mode 100644 dist/bin/storm_win64.bat

diff --git a/dist/bin/storm_win32.bat b/dist/bin/storm_win32.bat
new file mode 100644
index 0000000..e06a279
--- /dev/null
+++ b/dist/bin/storm_win32.bat
@@ -0,0 +1,106 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Launch Zomboid Storm
+@rem
+@rem ##########################################################################
+
+@rem Assume launch script is in 'pz/storm/bin' directory
+@rem and declare storm and zomboid root directories
+set STORM_HOME=%~dp0\..\
+pushd %STORM_HOME% 2>nul
+set "STORM_HOME=%CD%"
+
+set "PZ_HOME=%STORM_HOME%\..\"
+
+@rem Save current directory and change to target directory
+pushd %PZ_HOME% 2>nul
+if %ERRORLEVEL% == 1 goto dirNotFoundError
+
+@rem Save value of current directory
+set "PZ_HOME=%CD%"
+
+if exist "%PZ_HOME%" goto checkValidDir
+
+:dirNotFoundError
+echo.
+echo ERROR: directory %PZ_HOME% does not exist or is not accessible
+echo.
+goto finish
+
+:checkValidDir
+if exist "%PZ_HOME%\ProjectZomboid32.exe" goto findJava
+echo.
+echo ERROR: Unable to find Project Zomboid installation directory.
+echo Searched in directory '%PZ_HOME%' as relative to Storm installation directory '%STORM_HOME%\..\'
+echo.
+goto finish
+
+@rem Find java.exe
+:findJava
+
+@rem Search for Java executable in game directory first
+set "JAVA_EXE=%PZ_HOME%\jre\bin\java.exe"
+if exist "%JAVA_EXE%" goto validateJavaVersion
+
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto finish
+
+:findJavaFromJavaHome
+set "JAVA_HOME=%JAVA_HOME:"=%"
+set "JAVA_EXE=%JAVA_HOME%\bin\java.exe"
+
+if exist "%JAVA_EXE%" goto validateJavaVersion
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto finish
+
+:validateJavaVersion
+@rem Validate java version
+"%JAVA_EXE%" -version 2> version.tmp
+set /p JAVA_VERSION_INFO=<version.tmp
+del version.tmp
+
+set JAVA_VERSION=%JAVA_VERSION_INFO:"=%
+for /f "tokens=3,4 delims=., " %%v in ("%JAVA_VERSION%") do (
+	@rem Only valid version is java 1.8
+    if not %%v%%w == 18 goto wrongJavaVersion
+)
+if "%ERRORLEVEL%" == "0" goto execute
+
+:wrongJavaVersion
+echo.
+echo ERROR: JAVA_HOME points to a wrong Java version (%JAVA_VERSION%).
+echo.
+echo Please set your JAVA_HOME variable in your environment to match the
+echo location of Java version 1.8 installation.
+
+goto finish
+
+:execute
+echo Executing with %JAVA_VERSION_INFO:"=%
+
+@rem Path to Storm jar library directory
+set LIB_PATH=%STORM_HOME%\lib
+
+@rem Setup the command line
+set CLASSPATH=%LIB_PATH%\storm-0.1.0.jar;%LIB_PATH%\asm-9.1.jar;%LIB_PATH%\asm-analysis-9.1.jar;%LIB_PATH%\asm-tree-9.1.jar;%LIB_PATH%\asm-util-9.1.jar;%LIB_PATH%\guava-30.1.1-jre.jar;%LIB_PATH%\log4j-api-2.14.0.jar;%LIB_PATH%\log4j-core-2.14.0.jar;%PZ_HOME%;%PZ_HOME%\jinput.jar;%PZ_HOME%\lwjgl.jar;%PZ_HOME%\lwjgl_util.jar;%PZ_HOME%\sqlite-jdbc-3.27.2.1.jar;%PZ_HOME%\uncommons-maths-1.2.3.jar;%PZ_HOME%\trove-3.0.3.jar;%PZ_HOME%\javacord-2.0.17-shaded.jar;%PZ_HOME%\guava-23.0.jar;%PZ_HOME%\jassimp.jar
+
+echo Launching Zomboid Storm...
+echo.
+"%JAVA_EXE%" -Dzomboid.steam=1 -Dzomboid.znetlog=1 -Xms768m -Xmx1200m -XX:+UseConcMarkSweepGC -XX:-CreateMinidumpOnCrash -XX:-OmitStackTraceInFastThrow -Djava.library.path="%PZ_HOME%" -classpath "%CLASSPATH%" io.pzstorm.storm.core.StormLauncher %*
+
+:finish
+exit /b 0
diff --git a/dist/bin/storm_win64.bat b/dist/bin/storm_win64.bat
new file mode 100644
index 0000000..f9569b4
--- /dev/null
+++ b/dist/bin/storm_win64.bat
@@ -0,0 +1,106 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Launch Zomboid Storm
+@rem
+@rem ##########################################################################
+
+@rem Assume launch script is in 'pz/storm/bin' directory
+@rem and declare storm and zomboid root directories
+set STORM_HOME=%~dp0\..\
+pushd %STORM_HOME% 2>nul
+set "STORM_HOME=%CD%"
+
+set "PZ_HOME=%STORM_HOME%\..\"
+
+@rem Save current directory and change to target directory
+pushd %PZ_HOME% 2>nul
+if %ERRORLEVEL% == 1 goto dirNotFoundError
+
+@rem Save value of current directory
+set "PZ_HOME=%CD%"
+
+if exist "%PZ_HOME%" goto checkValidDir
+
+:dirNotFoundError
+echo.
+echo ERROR: directory %PZ_HOME% does not exist or is not accessible
+echo.
+goto finish
+
+:checkValidDir
+if exist "%PZ_HOME%\ProjectZomboid64.exe" goto findJava
+echo.
+echo ERROR: Unable to find Project Zomboid installation directory.
+echo Searched in directory '%PZ_HOME%' as relative to Storm installation directory '%STORM_HOME%\..\'
+echo.
+goto finish
+
+@rem Find java.exe
+:findJava
+
+@rem Search for Java executable in game directory first
+set "JAVA_EXE=%PZ_HOME%\jre64\bin\java.exe"
+if exist "%JAVA_EXE%" goto validateJavaVersion
+
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto finish
+
+:findJavaFromJavaHome
+set "JAVA_HOME=%JAVA_HOME:"=%"
+set "JAVA_EXE=%JAVA_HOME%\bin\java.exe"
+
+if exist "%JAVA_EXE%" goto validateJavaVersion
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto finish
+
+:validateJavaVersion
+@rem Validate java version
+"%JAVA_EXE%" -version 2> version.tmp
+set /p JAVA_VERSION_INFO=<version.tmp
+del version.tmp
+
+set JAVA_VERSION=%JAVA_VERSION_INFO:"=%
+for /f "tokens=3,4 delims=., " %%v in ("%JAVA_VERSION%") do (
+	@rem Only valid version is java 1.8
+    if not %%v%%w == 18 goto wrongJavaVersion
+)
+if "%ERRORLEVEL%" == "0" goto execute
+
+:wrongJavaVersion
+echo.
+echo ERROR: JAVA_HOME points to a wrong Java version (%JAVA_VERSION%).
+echo.
+echo Please set your JAVA_HOME variable in your environment to match the
+echo location of Java version 1.8 installation.
+
+goto finish
+
+:execute
+echo Executing with %JAVA_VERSION_INFO:"=%
+
+@rem Path to Storm jar library directory
+set LIB_PATH=%STORM_HOME%\lib
+
+@rem Setup the command line
+set CLASSPATH=%LIB_PATH%\storm-0.1.0.jar;%LIB_PATH%\asm-9.1.jar;%LIB_PATH%\asm-analysis-9.1.jar;%LIB_PATH%\asm-tree-9.1.jar;%LIB_PATH%\asm-util-9.1.jar;%LIB_PATH%\guava-30.1.1-jre.jar;%LIB_PATH%\log4j-api-2.14.0.jar;%LIB_PATH%\log4j-core-2.14.0.jar;%PZ_HOME%;%PZ_HOME%\jinput.jar;%PZ_HOME%\lwjgl.jar;%PZ_HOME%\lwjgl_util.jar;%PZ_HOME%\sqlite-jdbc-3.27.2.1.jar;%PZ_HOME%\uncommons-maths-1.2.3.jar;%PZ_HOME%\trove-3.0.3.jar;%PZ_HOME%\javacord-2.0.17-shaded.jar;%PZ_HOME%\guava-23.0.jar;%PZ_HOME%\jassimp.jar
+
+echo Launching Zomboid Storm...
+echo.
+"%JAVA_EXE%" -Dzomboid.steam=1 -Dzomboid.znetlog=1 -XX:+UseConcMarkSweepGC -XX:-CreateMinidumpOnCrash -XX:-OmitStackTraceInFastThrow -Xms1800m -Xmx2048m -Djava.library.path="%PZ_HOME%" -classpath "%CLASSPATH%" io.pzstorm.storm.core.StormLauncher %*
+
+:finish
+exit /b 0

From 1d5b53ce10258103b95d3c3828ea4e02978fe23f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 24 May 2021 03:03:18 +0200
Subject: [PATCH 305/323] Change project readme title

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 292db07..7c0e0b0 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
-# storm
 Java modding API for Project Zomboid.
+# Zomboid Storm

From c3af5442df04fa9568bc5b7b36f0ec8d994a4dcb Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Mon, 24 May 2021 03:04:34 +0200
Subject: [PATCH 306/323] Add basic project badges

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7c0e0b0..7c7fb03 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,4 @@
-Java modding API for Project Zomboid.
 # Zomboid Storm
+
+[![build](https://github.com/pzstorm/storm/actions/workflows/java-ci.yaml/badge.svg?branch=dev)](https://github.com/pzstorm/storm/actions/workflows/java-ci.yaml) [![License](https://img.shields.io/github/license/pzstorm/storm?logo=gnu)](https://www.gnu.org/licenses/) [![Discord](https://img.shields.io/discord/823907021178798150?color=7289DA&label=discord&logo=discord&logoColor=white)](https://discord.gg/ZCmg9VsvSW)
+

From dca5d6688f4c66bd19345d7e1b44ea7b764f68e8 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 11:23:25 +0200
Subject: [PATCH 307/323] Add project description

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7c7fb03..2d0fa7d 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,4 @@
 
 [![build](https://github.com/pzstorm/storm/actions/workflows/java-ci.yaml/badge.svg?branch=dev)](https://github.com/pzstorm/storm/actions/workflows/java-ci.yaml) [![License](https://img.shields.io/github/license/pzstorm/storm?logo=gnu)](https://www.gnu.org/licenses/) [![Discord](https://img.shields.io/discord/823907021178798150?color=7289DA&label=discord&logo=discord&logoColor=white)](https://discord.gg/ZCmg9VsvSW)
 
+Zomboid Storm is a Java modding toolchain for [Project Zomboid](https://projectzomboid.com/blog/).

From d74254db4a40c3aa941c1bce0c8646ae23d4c767 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 11:23:33 +0200
Subject: [PATCH 308/323] Add project banner image

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 2d0fa7d..d06d183 100644
--- a/README.md
+++ b/README.md
@@ -3,3 +3,6 @@
 [![build](https://github.com/pzstorm/storm/actions/workflows/java-ci.yaml/badge.svg?branch=dev)](https://github.com/pzstorm/storm/actions/workflows/java-ci.yaml) [![License](https://img.shields.io/github/license/pzstorm/storm?logo=gnu)](https://www.gnu.org/licenses/) [![Discord](https://img.shields.io/discord/823907021178798150?color=7289DA&label=discord&logo=discord&logoColor=white)](https://discord.gg/ZCmg9VsvSW)
 
 Zomboid Storm is a Java modding toolchain for [Project Zomboid](https://projectzomboid.com/blog/).
+
+![banner](https://raw.githubusercontent.com/pzstorm/storm/gh-pages/images/storm-banner.png)
+

From da564dc10ce4b16b929ad5e436a36e497fe37681 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 11:23:43 +0200
Subject: [PATCH 309/323] Add introduction section

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index d06d183..5b97d3e 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,15 @@ Zomboid Storm is a Java modding toolchain for [Project Zomboid](https://projectz
 
 ![banner](https://raw.githubusercontent.com/pzstorm/storm/gh-pages/images/storm-banner.png)
 
+## Introduction
+
+Since the early days of Project Zomboid there was only ever two ways of modding the game; with Lua using the official API or with Java by modifying and recompiling game classes. For an in-depth analysis of Lua and Java modding you should read the [Unofficial Guide to Modding Project Zomboid](https://github.com/cocolabs/pz-modding-guide#writing-code). For now let's take a quickly look at and compare both approaches:
+
+- Lua modding is the officially supported way of modding. It is easy to learn and start with but has very limited scope of possible implementation and is much more difficult to debug when things eventually go wrong. It also has serious limitations due to simplistic language architecture. 
+
+- Java modding is more difficult to learn and start with but has a nearly unlimited scope of possible implementation and is very easy to inspect and debug during runtime. In addition to this, Java modders never had a way to interact with the game code in a standardized way (leading to mod incompatibility) or a way to load the mods in game (leading to limitations on how the mod can be used and distributed).
+
+Until now the preferred way of modding the game was with the use of Lua API, and looking at the brief comparison above it is clear why. It might seem that when choosing between these approaches you are choosing between usability and scope, but that is incorrect. From the community perspective you are choosing between developing mods for yourself or others, since Java mods were always incompatible with the whole concept of community modding.
+
+This is all in the past, now that Storm is here. Java mods can now use a community supported API to write their code without worrying about core compatibility issues, as well as an integrated mod loading system to load their classes during game execution. For more information read the [Features](#features) section to see an overview of all features currently implemented by Storm.
+

From 347e1131573a1a1a2652d4f332641c3c0f79d559 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 11:23:55 +0200
Subject: [PATCH 310/323] List application features

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 5b97d3e..24c08d4 100644
--- a/README.md
+++ b/README.md
@@ -18,3 +18,10 @@ Until now the preferred way of modding the game was with the use of Lua API, and
 
 This is all in the past, now that Storm is here. Java mods can now use a community supported API to write their code without worrying about core compatibility issues, as well as an integrated mod loading system to load their classes during game execution. For more information read the [Features](#features) section to see an overview of all features currently implemented by Storm.
 
+## Features
+
+- Comprehensive and easy to use API that allows modders to write fully functional Java mods.
+- 186 custom game events available to subscribe to when creating mods.
+- Integrated mod loader system that allows loading mod classes during game runtime.
+- Log4j 2 logging system with custom layout that embeds the time and date to each logged message.
+

From d0f525315385efd5fd749c5b9eb875dddafec64b Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 11:24:11 +0200
Subject: [PATCH 311/323] Write installation instructions

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 24c08d4..2a33261 100644
--- a/README.md
+++ b/README.md
@@ -25,3 +25,10 @@ This is all in the past, now that Storm is here. Java mods can now use a communi
 - Integrated mod loader system that allows loading mod classes during game runtime.
 - Log4j 2 logging system with custom layout that embeds the time and date to each logged message.
 
+## Installation
+
+- Download the [latest release](https://github.com/pzstorm/storm/releases/latest) from the project's Github repository.
+- Extract the archive in your Project Zomboid root directory.
+
+When updating an existing version remember to remove the contents of the old version before extracting the new version, as to avoid having redundant and possibly conflicting files in your installation directory. In future Storm versions this process will be automated for you.
+

From 3d3784da04bd2c88b374b8f5a4c27cb76c59caca Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 11:24:28 +0200
Subject: [PATCH 312/323] Explain how to use application

---
 README.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/README.md b/README.md
index 2a33261..35480e6 100644
--- a/README.md
+++ b/README.md
@@ -32,3 +32,25 @@ This is all in the past, now that Storm is here. Java mods can now use a communi
 
 When updating an existing version remember to remove the contents of the old version before extracting the new version, as to avoid having redundant and possibly conflicting files in your installation directory. In future Storm versions this process will be automated for you.
 
+## How to use
+
+To launch Storm simply run one of the launch script available in `bin` directory.
+Choose the launch script that corresponds to your operating system and system architecture:
+
+- 32-bit Windows - `storm_win32.bat`
+- 64-bit Windows - `storm_win64.bat`
+- Any Linux distribution - `storm_linux.sh`
+
+Place the mods you want Storm to load in `~/Zomboid/mods` directory as you would normally do when installing local mods. Note that mods have to be assembled in `jar` files, loose mod loading is currently not supported.
+
+Here is an example of a correct Java mod directory structure:
+
+```
+├── default.txt
+└── sample
+    ├── mod.info
+    └── sample.jar
+```
+
+If you are a mod developer interested in developing Storm mods see [For developers](#for-developers) section.
+

From 206d1200abeac185240f10f8fb86b231be7a6f6d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 11:46:21 +0200
Subject: [PATCH 313/323] Explain how to contribute

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 35480e6..f3ddc34 100644
--- a/README.md
+++ b/README.md
@@ -54,3 +54,12 @@ Here is an example of a correct Java mod directory structure:
 
 If you are a mod developer interested in developing Storm mods see [For developers](#for-developers) section.
 
+## Contribute
+
+Anyone can contribute to the Storm project, here are a few ways to start:
+
+- **Help test Storm** - Simply launch and play the game using Storm. You can play with or without Lua and/or Java mods, but note that there is no need to install any mods, just running the game with Storm is enough to test the core framework. If you come across any issue please report them using the project [issue tracker](https://github.com/pzstorm/storm/issues/new). This helps developers know what issues they need to address in future releases.
+- **Create mods** - Create and publish Java mods that use the Storm framework. 
+- **Spread the word** - Tell all your friends about the Storm project and how it changed your life (for the better).
+- **Join the community** - Join other Storm enthusiasts on [Discord](https://discord.gg/ZCmg9VsvSW) and discuss the future of this project.
+

From 2ba91000c8c54251ad1e4f11f738a5c66e6bf7fa Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 11:46:28 +0200
Subject: [PATCH 314/323] Add license section

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index f3ddc34..134ba1a 100644
--- a/README.md
+++ b/README.md
@@ -63,3 +63,6 @@ Anyone can contribute to the Storm project, here are a few ways to start:
 - **Spread the word** - Tell all your friends about the Storm project and how it changed your life (for the better).
 - **Join the community** - Join other Storm enthusiasts on [Discord](https://discord.gg/ZCmg9VsvSW) and discuss the future of this project.
 
+## License
+
+This project is licensed under [GNU General Public License v3.0](https://github.com/pzstorm/storm/blob/master/LICENSE).

From f46ba24d2720534d4eee6830b76ac6e07bcebeb6 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 13:37:05 +0200
Subject: [PATCH 315/323] Describe different Storm components

---
 README.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/README.md b/README.md
index 134ba1a..101cbb6 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,21 @@ Here is an example of a correct Java mod directory structure:
 
 If you are a mod developer interested in developing Storm mods see [For developers](#for-developers) section.
 
+## For developers
+
+This section is intended for those interested in developing Storm mods or helping develop the Storm framework. 
+
+### Components
+
+Storm is comprised of the following integrated components:
+
+- `StormBootstrap` - bootstraps everything needed to launch the game with static initialization.
+- `StormLauncher`-  servers as an application entry point and starts Project Zomboid.  
+- `StormClassLoader` - used to define, transform and load Project Zomboid classes.
+- `StormModLoader` - responsible for loading mod metadata files and classes.
+- `StormModRegistry` - responsible for creating and registering mod main class instances.
+- `StormEventDispatcher` - responsible for registering event handlers and dispatching event instances.
+
 ## Contribute
 
 Anyone can contribute to the Storm project, here are a few ways to start:

From bec6d1db044a3341be5c94a279c6564902a0b496 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 13:37:39 +0200
Subject: [PATCH 316/323] Explain metadata requirements

---
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/README.md b/README.md
index 101cbb6..2e22671 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,24 @@ Storm is comprised of the following integrated components:
 - `StormModRegistry` - responsible for creating and registering mod main class instances.
 - `StormEventDispatcher` - responsible for registering event handlers and dispatching event instances.
 
+### Metadata
+
+Mods are detected by the presence of metadata in mod directory. Metadata has to be written in a `mod.info` file and included in the distribution. If a metadata file is not present in the mod directory the mod will not be loaded.
+
+Here is an example of a valid `mod.info` file:
+
+ ```
+ name=Sample mod
+ poster=poster.png
+ description=This is a sample mod.
+ id=pz-sample-mod
+ url=https://github.com/pzstorm/sample-mod
+ modversion=0.1.0
+ pzversion=41.50-IWBUMS
+ ```
+
+The minimum requirement for valid metadata is the `name` property which has to be defined. Currently other properties are ignored, but support for more metadata definitions will be implemented in future releases.
+
 ## Contribute
 
 Anyone can contribute to the Storm project, here are a few ways to start:

From 94563668d344ac498ba7df7d5680666dd293e8ea Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 13:38:14 +0200
Subject: [PATCH 317/323] Explain how events work

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 2e22671..901c5bf 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,14 @@ Here is an example of a valid `mod.info` file:
 
 The minimum requirement for valid metadata is the `name` property which has to be defined. Currently other properties are ignored, but support for more metadata definitions will be implemented in future releases.
 
+### Events
+
+Events are object instances that were created by in-game hooks. Events can have class fields that contain additional information about event context, which is very helpful when handling events. All events are located in `io.pzstorm.storm.event.*` package.
+
+*Example: an event can be used to preform an action after an item is consumed.* 
+
+Storm uses a dispatcher system to receive event calls from game and dispatch them to event handlers. Before mods can start receiving events then need to register an event handler. The following section explains how to register an event handler.
+
 ## Contribute
 
 Anyone can contribute to the Storm project, here are a few ways to start:

From 924424f2978dcd20186de5d7ef522c3ab5be09b5 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 13:38:25 +0200
Subject: [PATCH 318/323] Explain how event handler works

---
 README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/README.md b/README.md
index 901c5bf..260755a 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,52 @@ Events are object instances that were created by in-game hooks. Events can have
 
 Storm uses a dispatcher system to receive event calls from game and dispatch them to event handlers. Before mods can start receiving events then need to register an event handler. The following section explains how to register an event handler.
 
+#### Event handler
+
+Event handlers need to be registered from `ZomboidMod#registerEventHandlers` method. Multiple event handlers can be registered by a single mod, although this should be rarely needed and should be done mostly to organize different events into categories.
+
+To register an event handler when subscribed methods are static methods:   
+
+```java
+@Override
+public void registerEventHandlers() {
+    StormEventDispatcher.registerEventHandler(EventHandler.class);
+}
+```
+
+To register an event handler when subscribed methods are instance methods:   
+
+```java
+@Override
+public void registerEventHandlers() {
+    StormEventDispatcher.registerEventHandler(new EventHandler());
+}
+```
+
+There is no practical difference between registering event handlers in static or instance context. The only difference is that registering event handler instances allows you more flexibility as more then one event handler of the same class can be registered using the event dispatcher.
+
+All methods in registered event handlers annotated with `SubscribeEvent` annotation will be called by the dispatcher when an appropriate event is created. Each subscribed method has to have **exactly one parameter** that matches the type of event it wants to subscribe to. For example if a method wanted to subscribe to `OnRenderEvent` it would define itself in one of two ways depending on the handler registration method used:
+
+- Subscribe to `OnRenderEvent` from static context:
+
+  ```java
+  // handler must be registered as a class
+  public static void handleRenderEvent(OnRenderEvent event) {
+  	...
+  }
+  ```
+
+- Subscribe to `OnRenderEvent` from instance context:
+
+  ```java
+  // handler must be registered as an instance
+  public void handleRenderEvent(OnRenderEvent event) {
+  	...
+  }
+  ```
+
+**Do not mix static and instance subscribed methods**. Doing so will cause an exception and crash the game. Registered handler has to have all subscribed methods declared as either static or instance methods depending on the method use to register the handler.
+
 ## Contribute
 
 Anyone can contribute to the Storm project, here are a few ways to start:

From cbd1e5b8f0751f0ffb80355ff14a81bab7ef13ea Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 13:39:27 +0200
Subject: [PATCH 319/323] Fix license not included in distribution

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2835c44..1a2bc07 100644
--- a/build.gradle
+++ b/build.gradle
@@ -150,7 +150,7 @@ jar {
 }
 
 distributions.main.contents {
-    it.from ('README.md', 'LICENSE.txt', 'CHANGELOG.md')
+    it.from ('README.md', 'LICENSE', 'CHANGELOG.md')
     it.exclude {
         File file = it.file
         if (!isCI) {

From 0562e7253648ca8dc61fb5acdd8a1cd504b39a7d Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 14:10:19 +0200
Subject: [PATCH 320/323] Define zomboidVersion property

---
 gradle.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle.properties b/gradle.properties
index 0b6b8a2..b3d7ee4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,3 @@
 spotlessGistID=8ace33e409f9b9e6d0dab05fec3f8188
+zomboidVersion=41.50
 CI=false
\ No newline at end of file

From ad69223b9f058c625e89b60a121f7cfce9ba42fa Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 14:11:05 +0200
Subject: [PATCH 321/323] Refactor distributions code block

---
 build.gradle | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1a2bc07..37970d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -149,25 +149,27 @@ jar {
     )
 }
 
-distributions.main.contents {
-    it.from ('README.md', 'LICENSE', 'CHANGELOG.md')
-    it.exclude {
-        File file = it.file
-        if (!isCI) {
-            // exclude Project Zomboid classes
-            if (file in configurations.excludeFromDist.files) {
-                return true
-            }
-            // exclude Project Zomboid libraries
-            if (file.toPath().startsWith(gameDir)) {
-                return true
+distributions.main {
+    contents {
+        it.from('README.md', 'LICENSE', 'CHANGELOG.md')
+        it.exclude {
+            File file = it.file
+            if (!isCI) {
+                // exclude Project Zomboid classes
+                if (file in configurations.excludeFromDist.files) {
+                    return true
+                }
+                // exclude Project Zomboid libraries
+                if (file.toPath().startsWith(gameDir)) {
+                    return true
+                }
             }
+            return false
         }
-        return false
-    }
-    // include additional distibution files
-    it.from 'dist'
+        // include additional distibution files
+        it.from 'dist'
 
-    // exclude generated launch scripts
-    it.exclude '**/storm', '**/storm.bat'
+        // exclude generated launch scripts
+        it.exclude '**/storm', '**/storm.bat'
+    }
 }

From d762fc600a9a3bbb4239a844296ed802eed99b7f Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 14:12:30 +0200
Subject: [PATCH 322/323] Change distribution base name

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 37970d9..360bf20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -150,6 +150,7 @@ jar {
 }
 
 distributions.main {
+    distributionBaseName.set("storm-${zomboidVersion}")
     contents {
         it.from('README.md', 'LICENSE', 'CHANGELOG.md')
         it.exclude {

From ec6b945f43b53de36a478f478247b1e9fd01cf06 Mon Sep 17 00:00:00 2001
From: Matthew <yooks@tuta.io>
Date: Wed, 26 May 2021 14:12:38 +0200
Subject: [PATCH 323/323] Ignore temporary files

---
 .gitignore | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15f9b1a..957d552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@
 local.properties
 version.properties
 
+# Temporary files
+*.java~
+*.gradle~
+
 ### Intellij ###
 
 # File-based project format
@@ -16,9 +20,6 @@ out/
 # Compiled class file
 *.class
 
-# Temporary java file
-*.java~
-
 # Exclude class files used as resources
 !**/resources/**/*.class