[Savestates] Merged WorldServerDuck into PlayerChunkMapDuck

Merged both "sendingToClient" functionality and removed a mixin and duck in the process

Author: ScribbleTAS

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

@@ -18,9 +18,10 @@
 import net.minecraft.server.management.PlayerChunkMapEntry;
 import net.minecraft.world.WorldProvider;
 import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.Chunk;
 
 @Mixin(PlayerChunkMap.class)
-public class MixinPlayerChunkMap implements PlayerChunkMapDuck {
+public abstract class MixinPlayerChunkMap implements PlayerChunkMapDuck {
 
 	@Shadow
 	@Final
@@ -54,6 +55,20 @@ public List<EntityPlayerMP> getPlayers() {
 	 */
 	@Override
 	public void forceTick() {
+
+		/*
+		 * Update the chunks to make them eligible to be sent to the client
+		 * 
+		 * In the #sendToPlayers() method is a check where the chunk is not sent,
+		 * when Chunk#isPopulated() is false. This would normally happen during the WorldServer#updateBlocks() method,
+		 * but we want to send the chunks without updating the blocks, hence this is circumvented like this.
+		 */
+		for (Iterator<Chunk> iterator2 = this.getChunkIterator(); iterator2.hasNext();) {
+			Chunk chunk = (Chunk) iterator2.next();
+			chunk.enqueueRelightChecks();
+			chunk.onTick(false);
+		}
+
 		this.sortMissingChunks = false;
 		Collections.sort(this.entriesWithoutChunks, new Comparator<PlayerChunkMapEntry>() {
 			public int compare(PlayerChunkMapEntry playerChunkMapEntry, PlayerChunkMapEntry playerChunkMapEntry2) {
@@ -92,4 +107,7 @@ public int compare(PlayerChunkMapEntry playerChunkMapEntry, PlayerChunkMapEntry
 			}
 		}
 	}
+
+	@Shadow
+	protected abstract Iterator<Chunk> getChunkIterator();
 }

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

@@ -8,7 +8,6 @@
 import com.minecrafttas.tasmod.savestates.SavestateHandlerClient;
 import com.minecrafttas.tasmod.util.Ducks.ChunkProviderDuck;
 import com.minecrafttas.tasmod.util.Ducks.PlayerChunkMapDuck;
-import com.minecrafttas.tasmod.util.Ducks.WorldServerDuck;
 import com.minecrafttas.tasmod.util.LoggerMarkers;
 
 import net.minecraft.client.Minecraft;
@@ -147,11 +146,6 @@ public void addPlayersToChunkMap() {
 					break;
 			}
 		}
-
-		// Tick the player chunk map to send the chunks to the clients
-		for (WorldServer world : worlds) {
-			((PlayerChunkMapDuck) world.getPlayerChunkMap()).forceTick();
-		}
 	}
 
 	/**
@@ -218,8 +212,8 @@ public void sendChunksToClient() {
 		WorldServer[] worlds = server.worlds;
 
 		for (WorldServer world : worlds) {
-			WorldServerDuck worldTick = (WorldServerDuck) world;
-			worldTick.sendChunksToClient();
+			PlayerChunkMapDuck chunkMap = (PlayerChunkMapDuck) world.getPlayerChunkMap();
+			chunkMap.forceTick();
 		}
 	}
 

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

@@ -38,20 +38,6 @@ public static interface ChunkProviderDuck {
 		public void unloadAllChunks();
 	}
 
-	/**
-	 * Quacks the worldserver to implement custom chunk ticking behavior
-	 * 
-	 * @author Scribble
-	 */
-	public static interface WorldServerDuck {
-
-		/**
-		 * Sends the chunks to the client
-		 * @see com.minecrafttas.tasmod.mixin.savestates.MixinWorldServer#sendChunksToClient() MixinWorldServer#sendChunksToClient()
-		 */
-		public void sendChunksToClient();
-	}
-
 	/**
 	 * Quacks the gui screen to spit out mouse positions independent of the display size
 	 */
@@ -149,8 +135,9 @@ public static interface PlayerChunkMapDuck {
 		 * <p>Forces a tick in the chunk map without being dependent on the world time.
 		 * <p>The chunk map is responsible for sending the necessary chunks to the client.<br>
 		 * However, to properly do that, the chunks have to be sorted first, which happens every few world ticks.
-		 * 
-		 * <p>This method sorts and sends the chunks to the clients, without waiting for the world time
+		 * <p>Under normal circumstances, WorldServer#tick() would update the world time to make this happen,
+		 * but our goal with savestates is to load the chunks without advancing the world time.
+		 * Hence why this method sorts and ticks the chunk map, without waiting for the world time
 		 * @see MixinPlayerChunkMap#forceTick()
 		 */
 		public void forceTick();

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

@@ -16,7 +16,6 @@
 		"savestates.MixinChunkProviderServer",
 		"savestates.MixinNetHandlerPlayServer",
 		"savestates.MixinScoreboard",
-		"savestates.MixinWorldServer",
 
 		// Events
 		"events.MixinEntityPlayerMP",