[Savestates] Add proper storage of tickListEntries

- Fixes pressure plates and other timed components not unpressing after a loadstate
- [MCTCommon] Fix eventlistener not checking for interfaces in the super class

Author: ScribbleTAS

build.gradle

@@ -15,8 +15,10 @@ if(project.release=="false") {
 version = project.version+hash
 group = project.group
 
-// compile for java 8
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
+java {
+	// compile for java 8
+	sourceCompatibility = targetCompatibility = 8
+}
 
 loom {
 	// set access widener
@@ -64,7 +66,7 @@ dependencies {
     //into 'run/mods/'
 //}
 
-compileJava{
+compileJava {
 	options.release = 8
 }
 

gradle.properties

@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx3G
 
 # Fabric properties
 minecraft_version=1.12.2
-loader_version=0.15.9
-loom_version=1.6-SNAPSHOT
+loader_version=0.16.9
+loom_version=1.8-SNAPSHOT
 
 # Mod properties
 mod_name=Tool-Assisted Speedrun Mod

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

@@ -1,12 +1,13 @@
 package com.minecrafttas.mctcommon.events;
 
-import org.apache.commons.lang3.ClassUtils;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.ClassUtils;
+
 /**
  * Registry for making objects available to listen for events.<br>
  * <br>
@@ -94,7 +95,8 @@ public static void register(EventBase eventListener) {
 		if (eventListener == null) {
 			throw new NullPointerException("Tried to register a packethandler with value null");
 		}
-		for (Class<?> type : eventListener.getClass().getInterfaces()) {
+
+		for (Class<?> type : searchForInterfaces(eventListener.getClass())) {
 			if (EventBase.class.isAssignableFrom(type)) {
 
 				// If a new event type is being registered, add a new arraylist
@@ -107,6 +109,18 @@ public static void register(EventBase eventListener) {
 		}
 	}
 
+	private static Class<?>[] searchForInterfaces(Class<?> clazz) {
+		if (clazz == null) {
+			return new Class<?>[] {};
+		}
+		Class<?>[] interfaces = clazz.getInterfaces();
+		Class<?> superclass = clazz.getSuperclass();
+		if (superclass != null && superclass != Object.class) {
+			interfaces = ArrayUtils.addAll(interfaces, searchForInterfaces(superclass));
+		}
+		return interfaces;
+	}
+
 	/**
 	 * Registers multiple objects to be an event listener. The objects must
 	 * implement an event extending {@link EventBase}
@@ -128,7 +142,7 @@ public static void unregister(EventBase eventListener) {
 		if (eventListener == null) {
 			throw new NullPointerException("Tried to unregister a packethandler with value null");
 		}
-		for (Class<?> type : eventListener.getClass().getInterfaces()) {
+		for (Class<?> type : searchForInterfaces(eventListener.getClass())) {
 			if (EventBase.class.isAssignableFrom(type)) {
 				ArrayList<EventBase> registryList = EVENTLISTENER_REGISTRY.get(type);
 				if (registryList != null) {

src/main/java/com/minecrafttas/tasmod/TASmod.java

@@ -29,6 +29,7 @@
 import com.minecrafttas.tasmod.playback.metadata.integrated.StartpositionMetadataExtension;
 import com.minecrafttas.tasmod.registries.TASmodPackets;
 import com.minecrafttas.tasmod.savestates.SavestateHandlerServer;
+import com.minecrafttas.tasmod.savestates.storage.NextTickListEntryStorage;
 import com.minecrafttas.tasmod.tickratechanger.TickrateChangerServer;
 import com.minecrafttas.tasmod.ticksync.TickSyncServer;
 import com.minecrafttas.tasmod.util.LoggerMarkers;
@@ -113,6 +114,7 @@ public void onInitialize() {
 		PacketHandlerRegistry.register(startPositionMetadataExtension);
 		PacketHandlerRegistry.register(tabCompletionUtils);
 		PacketHandlerRegistry.register(commandFileCommand);
+		EventListenerRegistry.register(new NextTickListEntryStorage());
 	}
 
 	@Override

src/main/java/com/minecrafttas/tasmod/events/EventSavestate.java

@@ -4,6 +4,8 @@
 
 import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
 
+import net.minecraft.server.MinecraftServer;
+
 public interface EventSavestate {
 
 	/**
@@ -19,7 +21,7 @@ interface EventServerSavestate extends EventBase {
 		 * @param target  Target folder, where the savestate is copied to
 		 * @param current The current folder that will be copied from
 		 */
-		public void onServerSavestate(int index, Path target, Path current);
+		public void onServerSavestate(MinecraftServer server, int index, Path target, Path current);
 	}
 
 	/**
@@ -35,7 +37,7 @@ interface EventServerLoadstate extends EventBase {
 		 * @param target  Target folder, where the savestate is copied to
 		 * @param current The current folder that will be copied from
 		 */
-		public void onServerLoadstate(int index, Path target, Path current);
+		public void onServerLoadstate(MinecraftServer server, int index, Path target, Path current);
 	}
 
 	/**
@@ -49,10 +51,10 @@ interface EventServerCompleteLoadstate extends EventBase {
 		 */
 		public void onServerLoadstateComplete();
 	}
-	
+
 	@FunctionalInterface
 	interface EventClientSavestate extends EventBase {
-		
+
 		public void onClientSavestate();
 	}
 }

src/main/java/com/minecrafttas/tasmod/mixin/savestates/MixinWorldServer.java

@@ -21,7 +21,7 @@
  * @author Scribble
  */
 @Mixin(WorldServer.class)
-public class MixinWorldServer implements WorldServerDuck {
+public abstract class MixinWorldServer implements WorldServerDuck {
 
 	@Shadow
 	private PlayerChunkMap playerChunkMap;
@@ -53,11 +53,17 @@ public void sendChunksToClient() {
 		this.playerChunkMap.tick();
 	}
 
+	/**
+	 * Retrieves the {@link #pendingTickListEntriesTreeSet}
+	 */
 	@Override
 	public TreeSet<NextTickListEntry> getTickListEntriesTreeSet() {
 		return this.pendingTickListEntriesTreeSet;
 	}
 
+	/**
+	 * Retrieves the {@link #pendingTickListEntriesHashSet}
+	 */
 	@Override
 	public Set<NextTickListEntry> getTickListEntriesHashSet() {
 		return this.pendingTickListEntriesHashSet;

src/main/java/com/minecrafttas/tasmod/mixin/storage/AccessorNextTickListEntry.java

@@ -0,0 +1,13 @@
+package com.minecrafttas.tasmod.mixin.storage;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.world.NextTickListEntry;
+
+@Mixin(NextTickListEntry.class)
+public interface AccessorNextTickListEntry {
+
+	@Accessor
+	public long getTickEntryID();
+}

src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java

@@ -8,6 +8,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -86,6 +87,8 @@ public static enum SavestateState {
 	private final SavestatePlayerHandler playerHandler;
 	private final SavestateWorldHandler worldHandler;
 
+	public static final Path storageDir = Paths.get("tasmod/");
+
 	private final Logger logger;
 	public static boolean wasLoading;
 
@@ -195,7 +198,7 @@ public void saveState(int savestateIndex, boolean tickrate0, boolean changeIndex
 		Path currentfolder = savestateDirectory.resolve(".." + File.separator + worldname);
 		Path targetfolder = getSavestateFile(indexToSave);
 
-		EventListenerRegistry.fireEvent(EventSavestate.EventServerSavestate.class, indexToSave, targetfolder, currentfolder);
+		EventListenerRegistry.fireEvent(EventSavestate.EventServerSavestate.class, server, indexToSave, targetfolder, currentfolder);
 
 		if (Files.exists(targetfolder)) {
 			logger.warn(LoggerMarkers.Savestate, "WARNING! Overwriting the savestate with the index {}", indexToSave);
@@ -334,7 +337,7 @@ public void loadState(int savestateIndex, boolean tickrate0, boolean changeIndex
 		Path currentfolder = savestateDirectory.resolve(".." + File.separator + worldname);
 		Path targetfolder = getSavestateFile(indexToLoad);
 
-		EventListenerRegistry.fireEvent(EventSavestate.EventServerLoadstate.class, indexToLoad, targetfolder, currentfolder);
+		EventListenerRegistry.fireEvent(EventSavestate.EventServerLoadstate.class, server, indexToLoad, targetfolder, currentfolder);
 
 		/*
 		 * Prevents loading an InputSavestate when loading index 0 (Index 0 is the
@@ -625,7 +628,7 @@ private void saveSavestateDataFile(boolean legacy) {
 	 */
 	private void loadSavestateDataFile() {
 		logger.trace(LoggerMarkers.Savestate, "Loading savestate data file");
-		Path tasmodDir = savestateDirectory.resolve("../" + server.getFolderName() + "/tasmod/");
+		Path tasmodDir = savestateDirectory.resolve("../" + server.getFolderName()).resolve(storageDir);
 		Path savestateDat = tasmodDir.resolve("savestateData.txt");
 
 		if (!Files.exists(savestateDat)) {
@@ -655,7 +658,7 @@ private void loadSavestateDataFile() {
 	public void loadCurrentIndexFromFile() {
 		logger.trace(LoggerMarkers.Savestate, "Loading current index from file");
 		int index = -1;
-		Path tasmodDir = savestateDirectory.resolve("../" + server.getFolderName() + "/tasmod/");
+		Path tasmodDir = savestateDirectory.resolve("../" + server.getFolderName()).resolve(storageDir);
 		if (!Files.exists(tasmodDir)) {
 			try {
 				Files.createDirectory(tasmodDir);
@@ -806,7 +809,7 @@ public void onServerPacket(PacketID id, ByteBuffer buf, String username) throws
 						if (player != null)
 							player.sendMessage(new TextComponentString(TextFormatting.RED + "Failed to load a savestate: " + e.getCause().toString()));
 
-						LOGGER.error(e);
+						LOGGER.throwing(e);
 						TASmod.savestateHandlerServer.state = SavestateState.NONE;
 					}
 				};

src/main/java/com/minecrafttas/tasmod/savestates/storage/AbstractExtendStorage.java

@@ -0,0 +1,7 @@
+package com.minecrafttas.tasmod.savestates.storage;
+
+import com.minecrafttas.tasmod.events.EventSavestate.EventServerLoadstate;
+import com.minecrafttas.tasmod.events.EventSavestate.EventServerSavestate;
+
+public abstract class AbstractExtendStorage implements EventServerSavestate, EventServerLoadstate {
+}