[KillTheRNG] Started adding MathRandomness

Author: ScribbleTAS

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

@@ -26,6 +26,7 @@
 import com.minecrafttas.tasmod.commands.CommandTickrate;
 import com.minecrafttas.tasmod.handlers.PlayUntilHandler;
 import com.minecrafttas.tasmod.ktrng.GlobalRandomnessTimer;
+import com.minecrafttas.tasmod.ktrng.MathRandomness;
 import com.minecrafttas.tasmod.playback.PlaybackControllerServer;
 import com.minecrafttas.tasmod.playback.metadata.builtin.StartpositionMetadataExtension;
 import com.minecrafttas.tasmod.registries.TASmodAPIRegistry;
@@ -92,6 +93,8 @@ public class TASmod implements ModInitializer, EventServerStart, EventServerInit
 
 	public static KTRNGSeedStorage seedStorage = new KTRNGSeedStorage();
 
+	public static MathRandomness mathRandomness = new MathRandomness(0);
+
 	@Override
 	public void onInitialize() {
 
@@ -144,6 +147,7 @@ public void onInitialize() {
 	public void onServerStart(MinecraftServer server) {
 		globalRandomness = new GlobalRandomnessTimer();
 		EventListenerRegistry.register(globalRandomness);
+		mathRandomness = new MathRandomness();
 	}
 
 	@Override

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

@@ -0,0 +1,19 @@
+package com.minecrafttas.tasmod.ktrng;
+
+import com.minecrafttas.tasmod.TASmod;
+
+/**
+ * <p>Randomness instance for hooking into {@link Math#random()}
+ * 
+ * @author Scribble
+ */
+public class MathRandomness extends RandomBase {
+
+	public MathRandomness() {
+		super(TASmod.globalRandomness.getCurrentSeed());
+	}
+
+	public MathRandomness(long seed) {
+		super(seed);
+	}
+}

src/main/java/com/minecrafttas/tasmod/mixin/killtherng/mathrand/MixinEntityItem.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.item.EntityItem;
+import net.minecraft.world.World;
+
+@Mixin(EntityItem.class)
+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

@@ -0,0 +1,19 @@
+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;
+
+@Mixin(EntityLivingBase.class)
+public class MixinEntityLivingBase {
+
+	@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/savestates/storage/builtin/KTRNGSeedStorage.java

@@ -59,6 +59,8 @@ public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) {
 
 		dataToSave.add("worldRandom", worldRandomDataJson);
 
+		dataToSave.addProperty("mathRandom", Long.toString(TASmod.mathRandomness.getSeed()));
+
 		return dataToSave;
 	}
 
@@ -103,6 +105,8 @@ public void onLoadstateComplete(MinecraftServer server, JsonObject loadedData) {
 		}
 
 		KTRNGWorldHandler.setWorldRandomnessMap(worldList);
+
+		TASmod.mathRandomness.setSeed(loadedData.get("mathRandom").getAsLong());
 	}
 
 	@Override

src/main/resources/tasmod.mixin.json

@@ -24,7 +24,9 @@
 		"fixes.MixinDragonFightManager",
 
 		"killtherng.MixinEntity",
-		"killtherng.MixinWorld"
+		"killtherng.MixinWorld",
+		"killtherng.mathrand.MixinEntityLivingBase",
+		"killtherng.mathrand.MixinEntityItem"
 
 	],
 	"client": [