[Savestates] Started on fixing resourcepacks

Author: ScribbleTAS

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

@@ -0,0 +1,46 @@
+package com.minecrafttas.tasmod.mixin.savestates;
+
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.minecrafttas.tasmod.util.Ducks.ResourcePackRepositoryDuck;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.IResourcePack;
+import net.minecraft.client.resources.ResourcePackRepository;
+
+@Mixin(ResourcePackRepository.class)
+public class MixinResourcePackRepository implements ResourcePackRepositoryDuck {
+
+	@Shadow
+	@Final
+	private ReentrantLock lock;
+	@Shadow
+	private ListenableFuture<Object> downloadingPacks;
+	@Shadow
+	private IResourcePack serverResourcePack;
+
+	@Override
+	public void clearServerResourcePackBlocking() {
+		this.lock.lock();
+
+		try {
+			if (this.downloadingPacks != null) {
+				this.downloadingPacks.cancel(true);
+			}
+
+			this.downloadingPacks = null;
+			if (this.serverResourcePack != null) {
+				this.serverResourcePack = null;
+				Minecraft.getMinecraft().refreshResources();
+			}
+		} finally {
+			this.lock.unlock();
+		}
+	}
+
+}

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

@@ -28,6 +28,7 @@
 import com.minecrafttas.tasmod.savestates.exceptions.SavestateException;
 import com.minecrafttas.tasmod.savestates.gui.GuiSavestateSavingScreen;
 import com.minecrafttas.tasmod.util.Ducks.ChunkProviderDuck;
+import com.minecrafttas.tasmod.util.Ducks.ResourcePackRepositoryDuck;
 import com.minecrafttas.tasmod.util.Ducks.SubtickDuck;
 import com.minecrafttas.tasmod.util.Ducks.WorldClientDuck;
 import com.minecrafttas.tasmod.util.LoggerMarkers;
@@ -151,6 +152,8 @@ public static void loadstate(String nameOfSavestate) throws Exception {
 			return;
 		}
 
+		((ResourcePackRepositoryDuck) Minecraft.getMinecraft().getResourcePackRepository()).clearServerResourcePackBlocking();
+
 		PlaybackControllerClient controller = TASmodClient.controller;
 
 		TASstate state = controller.getState();

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

@@ -398,6 +398,8 @@ public void loadState(int savestateIndex, boolean tickrate0, boolean changeIndex
 
 		worldHandler.sendChunksToClient();
 
+		playerHandler.updateServerResourcePack();
+
 		try {
 			TASmod.server.sendToAll(new TASmodBufferBuilder(CLEAR_SCREEN));
 		} catch (Exception e) {

src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestatePlayerHandler.java

@@ -225,4 +225,13 @@ public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws
 				break;
 		}
 	}
+
+	public void updateServerResourcePack() {
+		if (!this.server.getResourcePackUrl().isEmpty()) {
+			List<EntityPlayerMP> players = server.getPlayerList().getPlayers();
+			for (EntityPlayerMP player : players) {
+				player.loadResourcePack(this.server.getResourcePackUrl(), this.server.getResourcePackHash());
+			}
+		}
+	}
 }

src/main/java/com/minecrafttas/tasmod/util/Ducks.java

@@ -142,4 +142,8 @@ public static interface PlayerChunkMapDuck {
 		 */
 		public void forceTick();
 	}
+
+	public static interface ResourcePackRepositoryDuck {
+		public void clearServerResourcePackBlocking();
+	}
 }

src/main/resources/tasmod.mixin.json

@@ -32,6 +32,7 @@
 		// Savestates
 		"savestates.MixinChunkProviderClient",
 		"savestates.MixinWorldClient",
+		"savestates.MixinResourcePackRepository",
 
 		// Interpolation
 		"MixinFrustum",