[KillTheRNG] Add world.updateLCG to randomness pool

Author: ScribbleTAS

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

@@ -21,6 +21,18 @@ public static Map<Integer, WorldRandomness> getWorldRandomnessMap() {
 		return out;
 	}
 
+	public static Map<Integer, Integer> getWorldLCGMap() {
+		Map<Integer, Integer> out = new HashMap<>();
+		WorldServer[] worlds = TASmod.getServerInstance().worlds;
+		int id = 0;
+		for (WorldServer worldServer : worlds) {
+			int updateLCG = worldServer.updateLCG;
+			out.put(id, updateLCG);
+			id++;
+		}
+		return out;
+	}
+
 	public static void setWorldRandomnessMap(Map<Integer, WorldRandomness> randomnessList) {
 		WorldServer[] worlds = TASmod.getServerInstance().worlds;
 		int id = 0;
@@ -32,6 +44,17 @@ public static void setWorldRandomnessMap(Map<Integer, WorldRandomness> randomnes
 		}
 	}
 
+	public static void setWorldLCGMap(Map<Integer, Integer> lcgList) {
+		WorldServer[] worlds = TASmod.getServerInstance().worlds;
+		int id = 0;
+		for (WorldServer worldServer : worlds) {
+			Integer updateLCG = lcgList.get(id);
+			if (updateLCG != null)
+				worldServer.updateLCG = updateLCG;
+			id++;
+		}
+	}
+
 	public static String getWorldRandom() {
 		if (TASmod.getServerInstance().worlds[0] != null)
 			return Long.toString(((WorldRandomness) TASmod.getServerInstance().worlds[0].rand).getSeed());

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

@@ -181,7 +181,11 @@ public boolean equals(Object obj) {
 	}
 
 	public void fireEvent(long seed, String value) {
-		StackTraceElement stackTraceElement = Thread.currentThread().getStackTrace()[3];
+		fireEvent(seed, value, 3);
+	}
+
+	public void fireEvent(long seed, String value, int stackTraceOffset) {
+		StackTraceElement stackTraceElement = Thread.currentThread().getStackTrace()[stackTraceOffset];
 		String methodName = stackTraceElement.getMethodName();
 		String[] classNames = stackTraceElement.getClassName().split("\\.");
 		String className = classNames[classNames.length - 1];

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

@@ -13,7 +13,7 @@ public WorldRandomness() {
 	}
 
 	@Override
-	public void fireEvent(long seed, String value) {
-//		super.fireEvent(seed, value);
+	public void fireEvent(long seed, String value, int offset) {
+		//super.fireEvent(seed, value, 5);
 	}
 }

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

@@ -40,11 +40,23 @@ public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) {
 		dataToSave.add("entityRandom", entityRandomDataJson);
 
 		JsonObject worldRandomDataJson = new JsonObject();
+
+		JsonObject worldListJson = new JsonObject();
 		Map<Integer, WorldRandomness> worldRandom = KTRNGWorldHandler.getWorldRandomnessMap();
 		for (Entry<Integer, WorldRandomness> entry : worldRandom.entrySet()) {
-			worldRandomDataJson.addProperty(entry.getKey().toString(), entry.getValue().getSeed());
+			worldListJson.addProperty(entry.getKey().toString(), entry.getValue().getSeed());
 		}
 
+		worldRandomDataJson.add("worldList", worldListJson);
+
+		JsonObject lcgListJson = new JsonObject();
+		Map<Integer, Integer> lcgMap = KTRNGWorldHandler.getWorldLCGMap();
+		for (Entry<Integer, Integer> entry : lcgMap.entrySet()) {
+			lcgListJson.addProperty(entry.getKey().toString(), entry.getValue());
+		}
+
+		worldRandomDataJson.add("lcgList", lcgListJson);
+
 		dataToSave.add("worldRandom", worldRandomDataJson);
 
 		return dataToSave;
@@ -69,15 +81,26 @@ public void onLoadstateComplete(MinecraftServer server, JsonObject loadedData) {
 
 		KTRNGEntityHandler.setRandomnessList(randomList);
 
-		JsonObject worldRandomListJson = loadedData.get("worldRandom").getAsJsonObject();
+		JsonObject worldRandomJson = loadedData.get("worldRandom").getAsJsonObject();
+		JsonObject worldListJson = worldRandomJson.get("worldList").getAsJsonObject();
 
 		Map<Integer, WorldRandomness> worldList = new HashMap<>();
-		for (Entry<String, JsonElement> entry : worldRandomListJson.entrySet()) {
+		for (Entry<String, JsonElement> entry : worldListJson.entrySet()) {
 			int id = Integer.parseInt(entry.getKey());
 			WorldRandomness worldRandomness = new WorldRandomness(entry.getValue().getAsLong());
 
 			worldList.put(id, worldRandomness);
 		}
+
+		JsonObject worldLCGList = worldRandomJson.get("lcgList").getAsJsonObject();
+		Map<Integer, Integer> lcgList = new HashMap<>();
+		for (Entry<String, JsonElement> entry : worldLCGList.entrySet()) {
+			int id = Integer.parseInt(entry.getKey());
+			int lcg = entry.getValue().getAsInt();
+
+			lcgList.put(id, lcg);
+		}
+
 		KTRNGWorldHandler.setWorldRandomnessMap(worldList);
 	}
 

src/main/resources/tasmod.accesswidener

@@ -15,4 +15,5 @@ accessible field net/minecraft/client/settings/KeyBinding CATEGORY_ORDER Ljava/u
 
 #KillTheRNG
 accessible field net/minecraft/entity/Entity rand Ljava/util/Random;
+accessible field net/minecraft/world/World updateLCG I
 mutable field net/minecraft/world/World rand Ljava/util/Random;

src/test/java/tasmod/killtherng/RNGTest.java

@@ -0,0 +1,39 @@
+package tasmod.killtherng;
+
+import com.minecrafttas.tasmod.ktrng.RandomBase;
+
+public class RNGTest {
+
+	public static void main(String[] args) {
+		long[] longlist = new long[] {
+				//@formatter:off
+				113621727298730L,
+				161845404674820L
+				//@formatter:on
+		};
+
+		printDistance(longlist);
+
+		longlist = new long[] {
+				//@formatter:off
+				161845404674820L,
+				107865211428631L,
+				252587169991970L,
+				223075662074294L,
+				66246869218509L,
+				81210955942352L,
+				183553865074233L,
+				11371681017552L
+				//@formatter:on
+		};
+//		printDistance(longlist);
+	}
+
+	private static void printDistance(long[] list) {
+		long prev = list[0];
+		for (long l : list) {
+			System.out.println(RandomBase.distance(prev, l));
+		}
+		System.out.println("");
+	}
+}