[KillTheRNG] Add entity randomness saving and loading

Author: ScribbleTAS

src/main/java/com/minecrafttas/tasmod/gui/InfoHud.java

@@ -297,15 +297,15 @@ public boolean checkInit() {
 			y += 14;
 
 //			if (TASmod.ktrngHandler.isLoaded()) {
-//				title = "ktrng_randomseed";
-//				if (configuration.getProperty(title + "_x", "err").equals("err"))
-//					setDefaults(title, y);
-//				lists.add(new InfoLabel(title, Integer.parseInt(configuration.getProperty(title + "_x")), Integer.parseInt(configuration.getProperty(title + "_y")), Boolean.parseBoolean(configuration.getProperty(title
-//						+ "_visible")), Boolean.parseBoolean(configuration.getProperty(title + "_rect")), () -> {
-//							if (Minecraft.getMinecraft().currentScreen == this)
-//								return "KTRNG";
-//							return "RandomSeed: " + TASmod.ktrngHandler.getGlobalSeedClient();
-//						}));
+			title = "ktrng_randomseed";
+			if (configuration.getProperty(title + "_x", "err").equals("err"))
+				setDefaults(title, y);
+			lists.add(new InfoLabel(title, Integer.parseInt(configuration.getProperty(title + "_x")), Integer.parseInt(configuration.getProperty(title + "_y")), Boolean.parseBoolean(configuration.getProperty(title
+					+ "_visible")), Boolean.parseBoolean(configuration.getProperty(title + "_rect")), () -> {
+						if (Minecraft.getMinecraft().currentScreen == this)
+							return "KTRNG";
+						return "Global RandomSeed: " + TASmod.globalRandomness.getCurrentSeed();
+					}));
 //			}
 
 			title = "facing";

src/main/java/com/minecrafttas/tasmod/ktrng/EntityRandomness.java

@@ -4,9 +4,13 @@
 
 public class EntityRandomness extends RandomBase {
 
-	private static long entityCounter = 0L;
+	public static long entityCounter = 0L;
 
 	public EntityRandomness() {
 		super(TASmod.globalRandomness.getCurrentSeed() + (entityCounter++));
 	}
+
+	public EntityRandomness(long seed) {
+		super(seed);
+	}
 }

src/main/java/com/minecrafttas/tasmod/ktrng/KTRNGEntityHandler.java

@@ -0,0 +1,38 @@
+package com.minecrafttas.tasmod.ktrng;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import com.minecrafttas.tasmod.TASmod;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.world.WorldServer;
+
+public class KTRNGEntityHandler {
+
+	public static Map<UUID, EntityRandomness> getRandomnessList() {
+		Map<UUID, EntityRandomness> out = new HashMap<>();
+		WorldServer[] worlds = TASmod.getServerInstance().worlds;
+		for (WorldServer worldServer : worlds) {
+			for (Entity entity : worldServer.loadedEntityList) {
+				UUID entityUUID = entity.getUniqueID();
+				EntityRandomness entityRandomness = (EntityRandomness) entity.rand;
+				out.put(entityUUID, entityRandomness);
+			}
+		}
+		return out;
+	}
+
+	public static void setRandomnessList(Map<UUID, EntityRandomness> randomnessList) {
+		WorldServer[] worlds = TASmod.getServerInstance().worlds;
+		for (WorldServer worldServer : worlds) {
+			for (Entity entity : worldServer.loadedEntityList) {
+				UUID uuid = entity.getUniqueID();
+				EntityRandomness rand = randomnessList.get(uuid);
+				if (rand != null)
+					entity.rand = rand;
+			}
+		}
+	}
+}

src/main/java/com/minecrafttas/tasmod/ktrng/RandomBase.java

@@ -160,7 +160,7 @@ public static long distance(long seed, long seed2) {
 
 	@Override
 	public String toString() {
-		return name + ": " + enabled;
+		return Long.toString(getSeed());
 	}
 
 	@Override

src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/KTRNGSeedStorage.java

@@ -1,7 +1,15 @@
 package com.minecrafttas.tasmod.savestates.storage.builtin;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.UUID;
+
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.minecrafttas.tasmod.TASmod;
+import com.minecrafttas.tasmod.ktrng.EntityRandomness;
+import com.minecrafttas.tasmod.ktrng.KTRNGEntityHandler;
 import com.minecrafttas.tasmod.savestates.storage.SavestateStorageExtensionBase;
 
 import net.minecraft.server.MinecraftServer;
@@ -16,13 +24,42 @@ public KTRNGSeedStorage() {
 	public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) {
 		long currentSeed = TASmod.globalRandomness.getCurrentSeed();
 		dataToSave.addProperty("globalSeed", currentSeed);
+
+		JsonObject entityRandomDataJson = new JsonObject();
+		entityRandomDataJson.addProperty("entityCount", EntityRandomness.entityCounter);
+
+		JsonObject entityRandomListJson = new JsonObject();
+		Map<UUID, EntityRandomness> randomList = KTRNGEntityHandler.getRandomnessList();
+		for (Entry<UUID, EntityRandomness> entry : randomList.entrySet()) {
+			entityRandomListJson.addProperty(entry.getKey().toString(), entry.getValue().getSeed());
+		}
+
+		entityRandomDataJson.add("entityList", entityRandomListJson);
+
+		dataToSave.add("entityRandom", entityRandomDataJson);
+
 		return dataToSave;
 	}
 
 	@Override
 	public void onLoadstate(MinecraftServer server, JsonObject loadedData) {
 		long newSeed = loadedData.get("globalSeed").getAsLong();
 		TASmod.globalRandomness.setSeed(newSeed);
+
+		JsonObject entityRandomDataJson = loadedData.get("entityRandom").getAsJsonObject();
+		EntityRandomness.entityCounter = entityRandomDataJson.get("entityCount").getAsLong();
+
+		JsonObject entityRandomListJson = entityRandomDataJson.get("entityList").getAsJsonObject();
+
+		Map<UUID, EntityRandomness> randomList = new HashMap<>();
+		for (Entry<String, JsonElement> entry : entityRandomListJson.entrySet()) {
+			UUID uuid = UUID.fromString(entry.getKey().toString());
+			EntityRandomness entityRandomness = new EntityRandomness(entry.getValue().getAsLong());
+
+			randomList.put(uuid, entityRandomness);
+		}
+
+		KTRNGEntityHandler.setRandomnessList(randomList);
 	}
 
 	@Override