Player RNG simulation improvements

Author: Earthcomputer

src/main/java/net/earthcomputer/clientcommands/TempRules.java

@@ -31,6 +31,9 @@ public static void setEnchantingPrediction(boolean enchantingPrediction) {
             EnchantmentCracker.resetCracker();
     }
 
+    @Rule
+    public static boolean playerRNGMaintenance = true;
+
     public static Object get(String name) {
         Field field = rules.get(name);
         if (field == null)

src/main/java/net/earthcomputer/clientcommands/features/EnchantmentCracker.java

@@ -27,6 +27,7 @@
 import net.minecraft.enchantment.InfoEnchantment;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ArmorItem;
 import net.minecraft.item.Items;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.network.packet.PlayerMoveC2SPacket;
@@ -117,6 +118,9 @@ public static void resetCracker(String reason) {
     public static void onDropItem() {
         if (expectedThrows > 0)
             expectedThrows--;
+        else if (canMaintainPlayerRNG())
+            for (int i = 0; i < 4; i++)
+                playerRand.nextInt();
         else
             resetCracker("dropItem");
     }
@@ -162,22 +166,37 @@ public static void onGiveCommand() {
     }
 
     public static void onAnvilUse() {
-        resetCracker("anvil");
+        if (canMaintainPlayerRNG())
+            playerRand.nextInt();
+        else
+            resetCracker("anvil");
     }
 
     public static void onFrostWalker() {
         resetCracker("frostWalker");
     }
 
-    public static void onBaseOfArthropods() {
-        resetCracker("baneOfArthropods");
+    public static void onBaneOfArthropods() {
+        if (canMaintainPlayerRNG())
+            playerRand.nextInt();
+        else
+            resetCracker("baneOfArthropods");
     }
 
-    public static void onUnbreaking(int amount, int unbreakingLevel) {
-        resetCracker("unbreaking");
+    public static void onRecreatePlayer() {
+        resetCracker("recreated");
     }
 
-    public static void onUnbreakingUncertain(int minAmount, int maxAmount, int unbreakingLevel) {
+    public static void onUnbreaking(ItemStack stack, int amount, int unbreakingLevel) {
+        if (canMaintainPlayerRNG())
+            for (int i = 0; i < amount; i++)
+                if (!(stack.getItem() instanceof ArmorItem) || playerRand.nextFloat() >= 0.6)
+                    playerRand.nextInt(unbreakingLevel + 1);
+        else
+            resetCracker("unbreaking");
+    }
+
+    public static void onUnbreakingUncertain(ItemStack stack, int minAmount, int maxAmount, int unbreakingLevel) {
         resetCracker("unbreaking");
     }
 
@@ -187,7 +206,7 @@ public static void onItemDamage(int amount, LivingEntity holder, ItemStack stack
                 if (amount > 0) {
                     int unbreakingLevel = EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack);
                     if (unbreakingLevel > 0)
-                        onUnbreaking(amount, unbreakingLevel);
+                        onUnbreaking(stack, amount, unbreakingLevel);
                 }
             }
         }
@@ -199,12 +218,16 @@ public static void onItemDamageUncertain(int minAmount, int maxAmount, LivingEnt
                 if (maxAmount > 0) {
                     int unbreakingLevel = EnchantmentHelper.getLevel(Enchantments.UNBREAKING, stack);
                     if (unbreakingLevel > 0)
-                        onUnbreakingUncertain(minAmount, maxAmount, unbreakingLevel);
+                        onUnbreakingUncertain(stack, minAmount, maxAmount, unbreakingLevel);
                 }
             }
         }
     }
 
+    private static boolean canMaintainPlayerRNG() {
+        return TempRules.playerRNGMaintenance && TempRules.enchCrackState == EnumCrackState.CRACKED;
+    }
+
     // RENDERING
     /*
      * This section is in charge of rendering the overlay on the enchantment GUI

src/main/java/net/earthcomputer/clientcommands/mixin/MixinDamageEnchantment.java

@@ -16,7 +16,7 @@ public class MixinDamageEnchantment {
     @Inject(method = "onTargetDamaged", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextInt(I)I", remap = false))
     public void onAttackArthropod(LivingEntity attacker, Entity attacked, int level, CallbackInfo ci) {
         if (attacker instanceof ClientPlayerEntity) {
-            EnchantmentCracker.onBaseOfArthropods();
+            EnchantmentCracker.onBaneOfArthropods();
         }
     }
 

src/main/java/net/earthcomputer/clientcommands/mixin/MixinMinecraftClient.java

@@ -1,6 +1,7 @@
 package net.earthcomputer.clientcommands.mixin;
 
 import net.earthcomputer.clientcommands.GuiBlocker;
+import net.earthcomputer.clientcommands.features.EnchantmentCracker;
 import net.earthcomputer.clientcommands.features.RenderSettings;
 import net.earthcomputer.clientcommands.TempRules;
 import net.earthcomputer.clientcommands.task.TaskManager;
@@ -22,6 +23,7 @@ public void onHandleInputEvents(CallbackInfo ci) {
 
     @Inject(method = "setWorld", at = @At("HEAD"))
     public void onSetWorld(CallbackInfo ci) {
+        EnchantmentCracker.onRecreatePlayer();
         TaskManager.onWorldUnload();
     }
 

src/main/resources/assets/clientcommands/lang/en_us.json

@@ -74,6 +74,7 @@
   "enchCrack.reset.frostWalker": "Frost Walker Used",
   "enchCrack.reset.entityCramming": "Entity Cramming",
   "enchCrack.reset.enchanting": "Enchanted Item",
+  "enchCrack.reset.recreated": "Player Recreated",
 
   "enchCrack.xpSeed.one": "XP Seed: %08X",
   "enchCrack.xpSeed.many": "Possible XP seeds: %d",