Villager RNG Manipulation

src/codeGen/java/net/earthcomputer/clientcommands/codegen/CodeGenerator.java

@@ -19,10 +19,9 @@ public static void main(String[] args) throws IOException {
         }
 
         Path destDir = Path.of(args[0]);
-        genLattiCG(destDir);
+        genPlayerLattiCG(destDir);
     }
-
-    private static void genLattiCG(Path destDir) throws IOException {
+    private static void genPlayerLattiCG(Path destDir) throws IOException {
         ProgramBuilder program = Program.builder(LCG.JAVA);
         program.skip(-CCrackRng.NUM_THROWS * 4);
         for (int i = 0; i < CCrackRng.NUM_THROWS; i++) {

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

@@ -169,6 +169,7 @@ public static void registerCommands(CommandDispatcher<FabricClientCommandSource>
         UsageTreeCommand.register(dispatcher);
         UuidCommand.register(dispatcher);
         VarCommand.register(dispatcher);
+        VillagerCommand.register(dispatcher, context);
         WeatherCommand.register(dispatcher);
         WhisperEncryptedCommand.register(dispatcher);
         WikiCommand.register(dispatcher);

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

@@ -173,4 +173,13 @@ public enum PacketDumpMethod {
 
     @Config
     public static int maximumPacketFieldDepth = 10;
+
+    @Config(temporary = true, setter = @Config.Setter("setMaxVillagerBruteForceSimulationCalls"))
+    public static int maxVillagerBruteForceSimulationCalls = 12000;
+    public static void setMaxVillagerBruteForceSimulationCalls(int maxVillagerBruteForceSimulationCalls) {
+        Configs.maxVillagerBruteForceSimulationCalls = Mth.clamp(maxVillagerBruteForceSimulationCalls, 0, 1_000_000);
+    }
+
+    @Config(temporary = true)
+    public static int villagerAdjustment = 0;
 }

src/main/java/net/earthcomputer/clientcommands/command/ClientCommandHelper.java

@@ -12,6 +12,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.HoverEvent;
 import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 
 import java.util.HashMap;
@@ -101,4 +102,18 @@ public static String registerCode(Runnable code) {
         runnables.put(randomString, code);
         return randomString;
     }
+
+    public static void updateOverlayProgressBar(int current, int total, int width, int time) {
+        MutableComponent builder = Component.empty();
+        int color = Mth.hsvToRgb(current / (total * 3.0f), 1.0f, 1.0f);
+        builder.append(Component.literal("[").withColor(0xAAAAAA));
+        builder.append(Component.literal("~" + Math.round(100.0 * current / total) + "%").withColor(color));
+        builder.append(Component.literal("] ").withColor(0xAAAAAA));
+        int filledWidth = (int) Math.round((double) width * current / total);
+        int unfilledWidth = width - filledWidth;
+        builder.append(Component.literal("|".repeat(filledWidth)).withColor(color));
+        builder.append(Component.literal("|".repeat(unfilledWidth)).withColor(0xAAAAAA));
+
+        addOverlayMessage(builder, time);
+    }
 }

src/main/java/net/earthcomputer/clientcommands/command/arguments/ItemAndEnchantmentsPredicateArgument.java

@@ -9,6 +9,7 @@
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import net.earthcomputer.clientcommands.command.VillagerCommand;
 import net.earthcomputer.clientcommands.util.MultiVersionCompat;
 import net.minecraft.advancements.critereon.MinMaxBounds;
 import net.minecraft.commands.SharedSuggestionProvider;
@@ -38,6 +39,8 @@
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class ItemAndEnchantmentsPredicateArgument implements ArgumentType<ItemAndEnchantmentsPredicateArgument.ItemAndEnchantmentsPredicate> {
 
@@ -126,7 +129,7 @@ public ItemAndEnchantmentsPredicate parse(StringReader reader) throws CommandSyn
             return true;
         };
 
-        return new ItemAndEnchantmentsPredicate(parser.item, predicate, parser.with.size());
+        return new ItemAndEnchantmentsPredicate(parser.item, predicate, parser.with, parser.without, parser.exact, parser.ordered);
     }
 
     @Override
@@ -152,17 +155,41 @@ public Collection<String> getExamples() {
         return EXAMPLES;
     }
 
-    public record ItemAndEnchantmentsPredicate(Item item, Predicate<List<EnchantmentInstance>> predicate, int numEnchantments) implements Predicate<ItemStack> {
+    public record ItemAndEnchantmentsPredicate(Item item, Predicate<List<EnchantmentInstance>> predicate, List<EnchantmentInstancePredicate> with, List<EnchantmentInstancePredicate> without, boolean exact, boolean ordered) implements Predicate<ItemStack> {
         @Override
         public boolean test(ItemStack stack) {
             if (item != stack.getItem() && (item != Items.BOOK || stack.getItem() != Items.ENCHANTED_BOOK)) {
                 return false;
             }
-            List<EnchantmentInstance> enchantments = stack.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).entrySet().stream()
+            List<EnchantmentInstance> enchantments = Stream.concat(stack.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY).entrySet().stream(), stack.getOrDefault(DataComponents.STORED_ENCHANTMENTS, ItemEnchantments.EMPTY).entrySet().stream())
                 .map(entry -> new EnchantmentInstance(entry.getKey(), entry.getIntValue()))
                 .toList();
             return predicate.test(enchantments);
         }
+
+        @Override
+        public String toString() {
+            String itemName = item.getName(new ItemStack(item)).getString();
+
+            StringBuilder flagsBuilder = new StringBuilder();
+            if (exact) {
+                flagsBuilder.append("Exactly");
+            }
+            if (ordered) {
+                flagsBuilder.append("Ordered");
+            }
+            String flags = flagsBuilder.isEmpty() ? "" : " [" + flagsBuilder + ')';
+
+            String enchantments = Stream.concat(
+                with.stream().filter(enchantment -> enchantment.enchantment().unwrapKey().isPresent()).map(EnchantmentInstancePredicate::toString),
+                without.stream().filter(enchantment -> enchantment.enchantment().unwrapKey().isPresent()).map(enchantment -> "!" + enchantment)
+            ).collect(Collectors.joining(", "));
+            if (!enchantments.isEmpty()) {
+                enchantments = '(' + enchantments + ')';
+            }
+
+            return String.format("%s%s %s", itemName, flags, enchantments);
+        }
     }
 
     private class Parser {
@@ -455,10 +482,15 @@ private void suggestOption() {
         }
     }
 
-    private record EnchantmentInstancePredicate(Holder<Enchantment> enchantment, MinMaxBounds.Ints level) implements Predicate<EnchantmentInstance> {
+    public record EnchantmentInstancePredicate(Holder<Enchantment> enchantment, MinMaxBounds.Ints level) implements Predicate<EnchantmentInstance> {
         @Override
         public boolean test(EnchantmentInstance enchInstance) {
             return enchantment.equals(enchInstance.enchantment) && level.matches(enchInstance.level);
         }
+
+        @Override
+        public String toString() {
+            return Component.translatable(enchantment.unwrapKey().get().location().toLanguageKey("enchantment")).getString() + " " + Objects.requireNonNullElse(VillagerCommand.displayRange(enchantment.value().getMaxLevel(), level), "*");
+        }
     }
 }

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

@@ -26,7 +26,7 @@ private CCrackRngGen() {}
     private static final BigVector ORIGIN = DeserializeRt.vec(
         "\u0a00ʈ뒦벎츖ʐ駗질긾ʘ뾖黱덪ʠ뚊ꃪ쀆ʨ躛\ue6d4锦ʰ힒볩ﱁʸꆽ\uaaf8葉ˀﲈ쎉錏ˈ\uf8a5\uf19e똠Ȁ");
     private static final BigVector ROOT_ORIGIN = DeserializeRt.vec(
-        "\u0ad7醌뗤ꪜހ肀肀耠횑貵\ue4aaﰃ肀肀肀‟ࣞ뚂\uf1e0뮚Ҁ肀肀耠骤蟓ꊳ輆肀肀肀⃟뚂\uf1e0뭲肀肀肀ဦ\u089aꒇ펢뎧ڀ肀肀耠\udeb6英\ue0bb㺀肀肀耐\udfb6英\ue0bbʀ肀肀耠");
+        "\u0ad7醌뗤ꪜހ肀肀耠횑貵\ue4aaﰃ肀肀肀‟ࣞ뚂\uf1e0뮚Ҁ肀肀耠骤蟓ꊳ輆肀肀肀⃟뚂\uf1e0뭲肀肀肀ဦ࢚ꒇ펢뎧ڀ肀肀耠\udeb6英\ue0bb㺀肀肀耐\udfb6英\ue0bbʀ肀肀耠");
 
     /**
      * Finds all values of {@code seed} that could produce the given results in the following code:

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

@@ -8,6 +8,7 @@
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.earthcomputer.clientcommands.Configs;
+import net.earthcomputer.clientcommands.command.ClientCommandHelper;
 import net.earthcomputer.clientcommands.util.MultiVersionCompat;
 import net.earthcomputer.clientcommands.task.ItemThrowTask;
 import net.earthcomputer.clientcommands.task.LongTask;
@@ -30,7 +31,6 @@
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
@@ -113,7 +113,6 @@ public class EnchantmentCracker {
      */
 
     public static final Logger LOGGER = LogUtils.getLogger();
-    private static final int PROGRESS_BAR_WIDTH = 50;
 
     // RENDERING
     /*
@@ -480,17 +479,7 @@ public void onCompleted() {
 
                                 @Override
                                 protected void onItemThrown(int current, int total) {
-                                    MutableComponent builder = Component.empty();
-                                    int color = Mth.hsvToRgb(current / (total * 3.0f), 1.0f, 1.0f);
-                                    builder.append(Component.literal("[").withColor(0xAAAAAA));
-                                    builder.append(Component.literal("~" + Math.round(100.0 * current / total) + "%").withColor(color));
-                                    builder.append(Component.literal("] ").withColor(0xAAAAAA));
-                                    int filledWidth = (int) Math.round((double) PROGRESS_BAR_WIDTH * current / total);
-                                    int unfilledWidth = PROGRESS_BAR_WIDTH - filledWidth;
-                                    builder.append(Component.literal("|".repeat(filledWidth)).withColor(color));
-                                    builder.append(Component.literal("|".repeat(unfilledWidth)).withColor(0xAAAAAA));
-
-                                    Minecraft.getInstance().gui.setOverlayMessage(builder, false);
+                                    ClientCommandHelper.updateOverlayProgressBar(current, total, 50, 60);
                                 }
                             });
                         }

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

@@ -425,7 +425,7 @@ record ErrorEntry(int tick, boolean isBox) {}
             LootTable fishingLootTable = MCLootTables.FISHING.get().apply(SeedfindingUtil.getMCVersion());
             for (var goal : goals) {
                 if (goal.value() instanceof ClientItemPredicateArgument.EnchantedItemPredicate predicate) {
-                    if (predicate.isEnchantedBook() && predicate.predicate.numEnchantments() >= 2) {
+                    if (predicate.isEnchantedBook() && predicate.predicate.with().size() >= 2) {
                         if (!hasWarnedMultipleEnchants) {
                             ClientCommandHelper.sendHelp(Component.translatable("commands.cfish.help.tooManyEnchants"));
                             hasWarnedMultipleEnchants = true;

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

@@ -0,0 +1,129 @@
+package net.earthcomputer.clientcommands.features;
+
+import net.earthcomputer.clientcommands.command.ClientCommandHelper;
+import net.earthcomputer.clientcommands.command.VillagerCommand;
+import net.earthcomputer.clientcommands.interfaces.IVillager;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.core.GlobalPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.game.ClientboundAddExperienceOrbPacket;
+import net.minecraft.network.protocol.game.ClientboundSoundPacket;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.npc.Villager;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.ref.WeakReference;
+import java.util.UUID;
+
+public class VillagerCracker {
+    // This value was computed by brute forcing all seeds
+    public static final float MAX_ERROR = 5 * 0x1.0p-24f;
+
+    @Nullable
+    private static UUID villagerUuid = null;
+    @Nullable
+    private static WeakReference<Villager> cachedVillager = null;
+    @Nullable
+    private static GlobalPos clockPos = null;
+    @Nullable
+    public static VillagerCommand.Offer targetOffer = null;
+    @Nullable
+    private static Long lastServerTick = null;
+    private static boolean receivedClockRateWarning = false;
+
+    @Nullable
+    public static Villager getVillager() {
+        if (villagerUuid == null) {
+            cachedVillager = null;
+            return null;
+        }
+        if (cachedVillager != null) {
+            Villager villager = cachedVillager.get();
+            if (villager != null && !villager.isRemoved()) {
+                return villager;
+            }
+        }
+        ClientLevel level = Minecraft.getInstance().level;
+        if (level != null) {
+            for (Entity entity : level.entitiesForRendering()) {
+                if (entity.getUUID() == villagerUuid && entity instanceof Villager villager) {
+                    cachedVillager = new WeakReference<>(villager);
+                    return villager;
+                }
+            }
+        }
+        return null;
+    }
+
+    @Nullable
+    public static GlobalPos getClockPos() {
+        return clockPos;
+    }
+
+    public static void setTargetVillager(@Nullable Villager villager) {
+        Villager oldVillager = getVillager();
+        if (oldVillager != null) {
+            ((IVillager) oldVillager).clientcommands_getVillagerRngSimulator().reset();
+        }
+
+        if (clockPos == null) {
+            ClientCommandHelper.sendHelp(Component.translatable("commands.cvillager.help.noClock"));
+        }
+
+        ClientLevel level = Minecraft.getInstance().level;
+
+        if (level.getDayTime() % 24000 < 12000) {
+            ClientCommandHelper.sendHelp(Component.translatable("commands.cvillager.help.day"));
+        }
+
+        VillagerCracker.cachedVillager = new WeakReference<>(villager);
+        VillagerCracker.villagerUuid = villager == null ? null : villager.getUUID();
+    }
+
+    public static void setClockPos(@Nullable GlobalPos pos) {
+        VillagerCracker.clockPos = pos;
+    }
+
+    public static void onSoundEventPlayed(ClientboundSoundPacket packet) {
+        Villager targetVillager = getVillager();
+        if (targetVillager == null || getClockPos() == null) {
+            return;
+        }
+
+        switch (packet.getSound().value().getLocation().toString()) {
+            case "minecraft:entity.villager.ambient", "minecraft:entity.villager.trade" -> ((IVillager) targetVillager).clientcommands_onAmbientSoundPlayed(packet.getPitch());
+            case "minecraft:entity.villager.no" -> ((IVillager) targetVillager).clientcommands_onNoSoundPlayed(packet.getPitch());
+            case "minecraft:entity.villager.yes" -> ((IVillager) targetVillager).clientcommands_onYesSoundPlayed(packet.getPitch());
+            case "minecraft:entity.generic.splash" -> ((IVillager) targetVillager).clientcommands_onSplashSoundPlayed(packet.getPitch());
+        }
+    }
+
+    public static void onXpOrbSpawned(ClientboundAddExperienceOrbPacket packet) {
+        Villager targetVillager = getVillager();
+        if (targetVillager == null) {
+            return;
+        }
+
+        ((IVillager) targetVillager).clientcommands_onXpOrbSpawned(packet.getValue());
+    }
+
+    public static void onServerTick() {
+        long now = System.currentTimeMillis();
+
+        Villager targetVillager = getVillager();
+        if (targetVillager == null) {
+            lastServerTick = now;
+            return;
+        }
+
+        if (lastServerTick != null && now - lastServerTick > 80L && !receivedClockRateWarning) {
+            ClientCommandHelper.sendHelp(Component.translatable("commands.cvillager.help.tooSlow"));
+            receivedClockRateWarning = true;
+        }
+
+        ((IVillager) targetVillager).clientcommands_onServerTick();
+
+        lastServerTick = now;
+    }
+}