[KillTheRNG] Make EntityRNG more robust

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

@@ -33,6 +33,7 @@
 import com.minecrafttas.tasmod.ktrng.builtin.MathRNG;
 import com.minecrafttas.tasmod.ktrng.builtin.WorldSeedRNG;
 import com.minecrafttas.tasmod.ktrng.events.KillTheRNGMonitor;
+import com.minecrafttas.tasmod.ktrng.handlers.UUIDHandler;
 import com.minecrafttas.tasmod.playback.PlaybackControllerServer;
 import com.minecrafttas.tasmod.playback.metadata.builtin.StartpositionMetadataExtension;
 import com.minecrafttas.tasmod.registries.TASmodAPIRegistry;
@@ -41,6 +42,8 @@
 import com.minecrafttas.tasmod.savestates.handlers.SavestateGuiHandlerServer;
 import com.minecrafttas.tasmod.savestates.handlers.SavestateResourcePackHandler;
 import com.minecrafttas.tasmod.savestates.storage.builtin.ClientMotionStorage;
+import com.minecrafttas.tasmod.savestates.storage.builtin.EntityBatSpawnPositionStorage;
+import com.minecrafttas.tasmod.savestates.storage.builtin.EntityTickTimersStorage;
 import com.minecrafttas.tasmod.savestates.storage.builtin.KTRNGSeedStorage;
 import com.minecrafttas.tasmod.tickratechanger.TickrateChangerServer;
 import com.minecrafttas.tasmod.ticksync.TickSyncServer;
@@ -98,13 +101,17 @@ public class TASmod implements ModInitializer, EventServerStart, EventServerInit
 	public static GlobalRNG globalRandomness;
 
 	public static KTRNGSeedStorage seedStorage = new KTRNGSeedStorage();
+	public static EntityTickTimersStorage entityTickTimers = new EntityTickTimersStorage();
+	public static EntityBatSpawnPositionStorage entityBatSpawnPositionStorage = new EntityBatSpawnPositionStorage();
 
 	public static MathRNG mathRandomness = new MathRNG(0);
 
 	public static WorldSeedRNG worldSeedRandomness = new WorldSeedRNG(0);
 
 	public static KillTheRNGMonitor debugRand = new KillTheRNGMonitor();
 
+	public static UUIDHandler uuidHandler = new UUIDHandler();
+
 	public static Configuration config;
 
 	@Override
@@ -151,15 +158,18 @@ public void onInitialize() {
 		EventListenerRegistry.register(resourcepackHandler);
 		PacketHandlerRegistry.register(playUntil);
 		EventListenerRegistry.register(playUntil);
+		EventListenerRegistry.register(uuidHandler);
 		EventListenerRegistry.register(TASmodAPIRegistry.SAVESTATE_STORAGE);
 
 		registerSavestateStorage();
 	}
 
 	@Override
 	public void onServerStart(MinecraftServer server) {
-		globalRandomness = new GlobalRNG();
-		EventListenerRegistry.register(globalRandomness);
+		if (globalRandomness == null) {
+			globalRandomness = new GlobalRNG();
+			EventListenerRegistry.register(globalRandomness);
+		}
 		mathRandomness = new MathRNG(0);
 	}
 
@@ -227,6 +237,8 @@ public void onServerStop(MinecraftServer mcserver) {
 	private void registerSavestateStorage() {
 		TASmodAPIRegistry.SAVESTATE_STORAGE.register(motionStorage);
 		TASmodAPIRegistry.SAVESTATE_STORAGE.register(seedStorage);
+		TASmodAPIRegistry.SAVESTATE_STORAGE.register(entityTickTimers);
+		TASmodAPIRegistry.SAVESTATE_STORAGE.register(entityBatSpawnPositionStorage);
 	}
 
 	public static MinecraftServer getServerInstance() {

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

@@ -12,14 +12,14 @@
 
 public abstract class RandomBase extends Random implements Registerable {
 
-	RNGSide side;
-	private long initialSeed;
-	private JRand jrand;
+	protected RNGSide side;
+	protected long initialSeed;
+	protected JRand jrand;
 
 	public RandomBase() {
 		super(TASmod.globalRandomness.getCurrentSeed());
 		initialSeed = TASmod.globalRandomness.getCurrentSeed();
-		jrand = new JRand(initialSeed);
+		jrand = new JRand(initialSeed, false);
 	}
 
 	public RandomBase(long seed) {

src/main/java/com/minecrafttas/tasmod/ktrng/builtin/EntityRNG.java

@@ -1,19 +1,31 @@
 package com.minecrafttas.tasmod.ktrng.builtin;
 
+import java.util.UUID;
+
+import com.minecrafttas.mctcommon.events.EventListenerRegistry;
+import com.minecrafttas.tasmod.events.EventKillTheRNGServer;
 import com.minecrafttas.tasmod.ktrng.RandomBase;
 
+import net.minecraft.entity.Entity;
+
 public class EntityRNG extends RandomBase {
 
-	public EntityRNG() {
+	private UUID uuid;
+
+	public EntityRNG(Entity entity) {
 		super();
+		this.uuid = entity.getUniqueID();
 	}
 
-	public EntityRNG(long seed) {
+	public EntityRNG(long seed, UUID uuid) {
 		super(seed);
+		this.uuid = uuid;
 	}
 
 	@Override
 	public void fireRNGEvent(String eventType, long seed, String value, int stackTraceOffset) {
+		String rngType = String.format("%s(%s)", this.getClass().getSimpleName(), uuid);
+		EventListenerRegistry.fireEvent(EventKillTheRNGServer.EventRNG.class, super.side, eventType, seed, value, rngType, stackTraceOffset);
 	}
 
 	@Override

src/main/java/com/minecrafttas/tasmod/ktrng/builtin/MathRNG.java

@@ -17,6 +17,11 @@ public MathRNG(long seed) {
 		super(seed);
 	}
 
+	@Override
+	public void fireRNGEvent(String eventType, long seed, String value, int stackTraceOffset) {
+//			super.fireRNGEvent(eventType, seed, value, stackTraceOffset);
+	}
+
 	@Override
 	public String getExtensionName() {
 		return "MathRNG";

src/main/java/com/minecrafttas/tasmod/ktrng/builtin/UUIDRNG.java

@@ -0,0 +1,25 @@
+package com.minecrafttas.tasmod.ktrng.builtin;
+
+import com.minecrafttas.tasmod.TASmod;
+import com.minecrafttas.tasmod.ktrng.RandomBase;
+
+public class UUIDRNG extends RandomBase {
+
+	public static int uuidcounter;
+
+	public UUIDRNG(int shift) {
+		super(TASmod.globalRandomness.getCurrentSeed() + shift);
+	}
+
+	@Override
+	public void fireRNGEvent(String eventType, long seed, String value, int stackTraceOffset) {
+		// TODO Auto-generated method stub
+//		super.fireRNGEvent(eventType, seed, value, stackTraceOffset);
+	}
+
+	@Override
+	public String getExtensionName() {
+		return "UUIDRNG";
+	}
+
+}

src/main/java/com/minecrafttas/tasmod/ktrng/builtin/WorldRNG.java

@@ -14,7 +14,7 @@ public WorldRNG(long seed) {
 
 	@Override
 	public void fireRNGEvent(String val, long seed, String value, int offset) {
-		super.fireRNGEvent(val, seed, value, 9);
+//		super.fireRNGEvent(val, seed, value, 9);
 	}
 
 	@Override

src/main/java/com/minecrafttas/tasmod/ktrng/handlers/UUIDHandler.java

@@ -0,0 +1,36 @@
+package com.minecrafttas.tasmod.ktrng.handlers;
+
+import java.util.UUID;
+
+import com.minecrafttas.mctcommon.events.EventServer.EventServerTick;
+import com.minecrafttas.tasmod.ktrng.builtin.UUIDRNG;
+
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.math.MathHelper;
+
+/**
+ * <p>Generates and distributes UUIDs deterministically
+ * <p>This is necessary since the RNG is deterministic and would result in duplicated UUIDs
+ * 
+ * @author Scribble
+ */
+public class UUIDHandler implements EventServerTick {
+
+	private int uuidIndex;
+
+	public UUIDHandler() {
+	}
+
+	@Override
+	public void onServerTick(MinecraftServer server) {
+		uuidIndex = -1;
+	}
+
+	public UUIDRNG getNewUUIDRNG() {
+		return new UUIDRNG(uuidIndex++);
+	}
+
+	public UUID getNewUUID() {
+		return MathHelper.getRandomUUID(getNewUUIDRNG());
+	}
+}

src/main/java/com/minecrafttas/tasmod/mixin/killtherng/MixinEntity.java

@@ -9,6 +9,7 @@
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.minecrafttas.tasmod.TASmod;
 import com.minecrafttas.tasmod.ktrng.builtin.EntityRNG;
 
 import net.minecraft.entity.Entity;
@@ -20,13 +21,16 @@ public class MixinEntity {
 	@ModifyExpressionValue(method = "<init>", at = @At(value = "NEW", target = "Ljava/util/Random;"))
 	public Random modify_entityRandom(Random original, World world) {
 		if (!world.isRemote) {
-			return new EntityRNG();
+			return new EntityRNG((Entity) (Object) this);
 		}
 		return original;
 	}
 
 	@WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;getRandomUUID(Ljava/util/Random;)Ljava/util/UUID;"))
-	private UUID wrap_getRandomUUID(Random rand, Operation<UUID> original) {
+	private UUID wrap_getRandomUUID(Random rand, Operation<UUID> original, World world) {
+//		return original.call(TASmod.uuidHandler.getNewUUID());
+		if (!world.isRemote)
+			return TASmod.uuidHandler.getNewUUID();
 		return original.call(new Random());
 	}
 }

src/main/java/com/minecrafttas/tasmod/mixin/killtherng/MixinRenderLivingBase.java

@@ -41,6 +41,7 @@ public void inject_renderName(EntityLivingBase entity, double d, double e, doubl
 			this.renderEntityName(entity, d, e + 0.69D, f, Long.toString(random.getInitialSeed()), 64);
 			this.renderEntityName(entity, d, e + 0.46D, f, Long.toString(seed), 64);
 			this.renderEntityName(entity, d, e + 0.23D, f, Long.toString(distance), 64);
+			this.renderEntityName(entity, d, e, f, entity.getUniqueID().toString(), 64);
 		}
 	}
 }

src/main/java/com/minecrafttas/tasmod/mixin/killtherng/MixinWorld.java

@@ -1,16 +1,22 @@
 package com.minecrafttas.tasmod.mixin.killtherng;
 
+import java.util.List;
 import java.util.Random;
+import java.util.UUID;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.ModifyReceiver;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.minecrafttas.tasmod.TASmod;
 import com.minecrafttas.tasmod.ktrng.builtin.WorldRNG;
+import com.minecrafttas.tasmod.util.SortedList;
 
+import net.minecraft.entity.Entity;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 
@@ -34,4 +40,19 @@ public Random modify_worldSetRNGRandom(Random original, long seed) {
 	public Random modify_worldSetRNGReturn(Random original) {
 		return TASmod.worldSeedRandomness;
 	}
+
+	@WrapOperation(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/world/World;loadedEntityList:Ljava/util/List;"))
+	private <E> void modify_loadedEntityList(World owner, List<E> list, Operation<Void> operation) {
+		operation.call(owner, new SortedList<Entity>((entity, entity2) -> {
+			if (entity == null || entity2 == null)
+				return 0;
+
+			UUID uuid = entity.getUniqueID();
+			UUID uuid2 = entity.getUniqueID();
+
+			if (uuid == null || uuid2 == null)
+				return 0;
+			return uuid.toString().compareTo(uuid2.toString());
+		}));
+	}
 }

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

@@ -9,10 +9,6 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.llamalad7.mixinextras.sugar.Local;
-import com.minecrafttas.mctcommon.events.EventListenerRegistry;
-import com.minecrafttas.tasmod.TASmod;
-import com.minecrafttas.tasmod.events.EventKillTheRNGServer;
-import com.minecrafttas.tasmod.ktrng.RandomBase.RNGSide;
 
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.chunk.Chunk;
@@ -22,12 +18,12 @@ public class MixinWorldServer {
 
 	@Inject(method = "updateBlocks", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/chunk/Chunk;enqueueRelightChecks()V"))
 	private void modify_extendedBlockStorage(CallbackInfo ci, @Local Chunk chunk) {
-		TASmod.debugRand.writeDebug(String.format("(%s, %s)", chunk.x, chunk.z));
+//		TASmod.debugRand.writeDebug(String.format("(%s, %s)", chunk.x, chunk.z));
 	}
 
 	@WrapOperation(method = "updateBlocks", at = @At(value = "FIELD", target = "Lnet/minecraft/world/WorldServer;updateLCG:I", opcode = Opcodes.PUTFIELD))
 	private void modify_updateLCG(WorldServer world, int original, Operation<Void> operation) {
-		EventListenerRegistry.fireEvent(EventKillTheRNGServer.EventRNG.class, RNGSide.Server, String.format("updateLCG"), (long) world.updateLCG, Integer.toString(original), "UpdateLCG", 7);
+//		EventListenerRegistry.fireEvent(EventKillTheRNGServer.EventRNG.class, RNGSide.Server, String.format("updateLCG"), (long) world.updateLCG, Integer.toString(original), "UpdateLCG", 7);
 		operation.call(world, original);
 	}
 }

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

@@ -15,7 +15,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.minecrafttas.tasmod.savestates.handlers.SavestateWorldHandler;
 import com.minecrafttas.tasmod.util.Ducks.PlayerChunkMapDuck;
-import com.minecrafttas.tasmod.util.SortedArrayList;
+import com.minecrafttas.tasmod.util.SortedList;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.management.PlayerChunkMap;
@@ -54,11 +54,11 @@ public List<EntityPlayerMP> getPlayers() {
 	}
 
 	/**
-	 * Replaces the type of PlayerChunkMap.entries with a {@link SortedArrayList}
+	 * Replaces the type of PlayerChunkMap.entries with a {@link SortedList}
 	 */
 	@WrapOperation(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/server/management/PlayerChunkMap;entries:Ljava/util/List;"))
 	private <E> void modify_entries(PlayerChunkMap owner, List<E> list, Operation<Void> operation) {
-		operation.call(owner, new SortedArrayList<PlayerChunkMapEntry>((playerChunkMapEntry, playerChunkMapEntry2) -> {
+		operation.call(owner, new SortedList<PlayerChunkMapEntry>((playerChunkMapEntry, playerChunkMapEntry2) -> {
 			if (playerChunkMapEntry == null || playerChunkMapEntry == null)
 				return 0;
 

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

@@ -0,0 +1,61 @@
+package com.minecrafttas.tasmod.savestates.storage.builtin;
+
+import java.util.UUID;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.minecrafttas.tasmod.savestates.storage.SavestateStorageExtensionBase;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.EntityBat;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.WorldServer;
+
+public class EntityBatSpawnPositionStorage extends SavestateStorageExtensionBase {
+
+	public EntityBatSpawnPositionStorage() {
+		super("entityBatSpawnPosition.json");
+	}
+
+	@Override
+	public String getExtensionName() {
+		return "EntityBatSpawnPosition";
+	}
+
+	@Override
+	public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) {
+		for (WorldServer worldServer : server.worlds) {
+			for (Entity entity : worldServer.loadedEntityList) {
+				if (entity instanceof EntityBat) {
+					EntityBat bat = (EntityBat) entity;
+					BlockPos spawnPos = bat.spawnPosition;
+					if (spawnPos == null)
+						continue;
+					UUID entityUUID = entity.getUniqueID();
+					dataToSave.addProperty(entityUUID.toString(), Long.toString(bat.spawnPosition.toLong()));
+				}
+			}
+		}
+		return dataToSave;
+	}
+
+	@Override
+	public void onLoadstatePost(MinecraftServer server, JsonObject loadedData) {
+		if (loadedData == null)
+			return;
+		for (WorldServer worldServer : server.worlds) {
+			for (Entity entity : worldServer.loadedEntityList) {
+				if (entity instanceof EntityBat) {
+					EntityBat bat = (EntityBat) entity;
+					UUID entityUUID = entity.getUniqueID();
+					JsonElement element = loadedData.get(entityUUID.toString());
+					if (element == null)
+						continue;
+					BlockPos spawnPos = BlockPos.fromLong(element.getAsLong());
+					bat.spawnPosition = spawnPos;
+				}
+			}
+		}
+	}
+}