[KillTheRNG] Finish MathRandomness

Author: ScribbleTAS

src/main/java/com/minecrafttas/tasmod/mixin/MixinMinecraftServer.java

@@ -13,6 +13,7 @@
 import com.minecrafttas.mctcommon.events.EventListenerRegistry;
 import com.minecrafttas.tasmod.TASmod;
 import com.minecrafttas.tasmod.events.EventServer.EventServerTickPost;
+import com.minecrafttas.tasmod.savestates.SavestateHandlerServer.SavestateState;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -109,18 +110,18 @@ public void redirectThreadSleep(long msToTick) {
 
 		TASmod.gameLoopSchedulerServer.runAllTasks();
 
-//		boolean stopTaskQueue = TASmod.savestateHandlerServer != null && TASmod.savestateHandlerServer.getState() == SavestateState.LOADING;
-//		if (!stopTaskQueue) {
-//			synchronized (this.futureTaskQueue) {
-//				while (!this.futureTaskQueue.isEmpty()) {
-//					try {
-//						((FutureTask<?>) this.futureTaskQueue.poll()).run();
-//					} catch (Throwable var9) {
-//						var9.printStackTrace();
-//					}
-//				}
-//			}
-//		}
+		boolean stopTaskQueue = TASmod.savestateHandlerServer != null && TASmod.savestateHandlerServer.getState() == SavestateState.LOADING;
+		if (!stopTaskQueue) {
+			synchronized (this.futureTaskQueue) {
+				while (!this.futureTaskQueue.isEmpty()) {
+					try {
+						((FutureTask<?>) this.futureTaskQueue.poll()).run();
+					} catch (Throwable var9) {
+						var9.printStackTrace();
+					}
+				}
+			}
+		}
 	}
 
 	@Environment(EnvType.SERVER)

src/main/java/com/minecrafttas/tasmod/mixin/killtherng/mathrand/MixinEntityItem.java

@@ -15,7 +15,6 @@ public class MixinEntityItem {
 
 	@WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/lang/Math;random()D"))
 	private double wrap_entityItemInit(Operation<Double> original, World world, double d, double e, double f) {
-		System.out.println("Test");
 		return TASmod.mathRandomness.nextDouble();
 	}
 }

src/main/java/com/minecrafttas/tasmod/mixin/killtherng/mathrand/MixinEntityLivingBase.java

@@ -8,10 +8,16 @@
 import com.minecrafttas.tasmod.TASmod;
 
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.world.World;
 
 @Mixin(EntityLivingBase.class)
 public class MixinEntityLivingBase {
 
+	@WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/lang/Math;random()D"))
+	private double wrap_entityLivingBase(Operation<Double> original, World world) {
+		return TASmod.mathRandomness.nextDouble();
+	}
+
 	@WrapOperation(method = "attackEntityFrom", at = @At(value = "INVOKE", target = "Ljava/lang/Math;random()D"))
 	private double wrap_attackEntityFrom(Operation<Double> original) {
 		return TASmod.mathRandomness.nextDouble();

src/main/java/com/minecrafttas/tasmod/mixin/killtherng/mathrand/MixinEntityTNTPrimed.java

@@ -0,0 +1,21 @@
+package com.minecrafttas.tasmod.mixin.killtherng.mathrand;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.minecrafttas.tasmod.TASmod;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityTNTPrimed;
+import net.minecraft.world.World;
+
+@Mixin(EntityTNTPrimed.class)
+public class MixinEntityTNTPrimed {
+
+	@WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/lang/Math;random()D"))
+	private double wrap_entityTNTPrimedInit(Operation<Double> original, World world, double d, double e, double f, EntityLivingBase entityLivingBase) {
+		return TASmod.mathRandomness.nextDouble();
+	}
+}

src/main/java/com/minecrafttas/tasmod/mixin/killtherng/mathrand/MixinEntityXPOrb.java

@@ -0,0 +1,20 @@
+package com.minecrafttas.tasmod.mixin.killtherng.mathrand;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.minecrafttas.tasmod.TASmod;
+
+import net.minecraft.entity.item.EntityXPOrb;
+import net.minecraft.world.World;
+
+@Mixin(EntityXPOrb.class)
+public class MixinEntityXPOrb {
+
+	@WrapOperation(method = "<init>", at = @At(value = "INVOKE", target = "Ljava/lang/Math;random()D"))
+	private double wrap_entityXPOrb(Operation<Double> original, World world, double d, double e, double f, int i) {
+		return TASmod.mathRandomness.nextDouble();
+	}
+}

src/main/java/com/minecrafttas/tasmod/mixin/killtherng/mathrand/MixinWorldEntitySpawner.java

@@ -0,0 +1,20 @@
+package com.minecrafttas.tasmod.mixin.killtherng.mathrand;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.minecrafttas.tasmod.TASmod;
+
+import net.minecraft.world.WorldEntitySpawner;
+import net.minecraft.world.WorldServer;
+
+@Mixin(WorldEntitySpawner.class)
+public class MixinWorldEntitySpawner {
+
+	@WrapOperation(method = "findChunksForSpawning", at = @At(value = "INVOKE", target = "Ljava/lang/Math;random()D"))
+	private double wrap_worldEntitySpawnerFindChunks(Operation<Double> original, WorldServer worldServer, boolean bl, boolean bl2, boolean bl3) {
+		return TASmod.mathRandomness.nextDouble();
+	}
+}

src/main/resources/tasmod.mixin.json

@@ -26,7 +26,10 @@
 		"killtherng.MixinEntity",
 		"killtherng.MixinWorld",
 		"killtherng.mathrand.MixinEntityLivingBase",
-		"killtherng.mathrand.MixinEntityItem"
+		"killtherng.mathrand.MixinEntityItem",
+		"killtherng.mathrand.MixinEntityXPOrb",
+		"killtherng.mathrand.MixinEntityTNTPrimed",
+		"killtherng.mathrand.MixinWorldEntitySpawner"
 
 	],
 	"client": [