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

@@ -171,6 +171,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

@@ -7,6 +7,7 @@
 import net.earthcomputer.clientcommands.features.FishingCracker;
 import net.earthcomputer.clientcommands.features.PlayerRandCracker;
 import net.earthcomputer.clientcommands.features.ServerBrandManager;
+import net.earthcomputer.clientcommands.features.VillagerCracker;
 import net.earthcomputer.clientcommands.util.MultiVersionCompat;
 import net.minecraft.util.Mth;
 import net.minecraft.util.StringRepresentable;
@@ -183,4 +184,24 @@ public enum PacketDumpMethod {
     public static void setMinimumReplyDelaySeconds(float minimumReplyDelaySeconds) {
         Configs.minimumReplyDelaySeconds = Math.clamp(minimumReplyDelaySeconds, 0.0f, ReplyCommand.MAXIMUM_REPLY_DELAY_SECONDS);
     }
+
+    @Config(setter = @Config.Setter("setVillagerManipulation"), temporary = true)
+    private static boolean villagerManipulation = false;
+    public static boolean getVillagerManipulation() {
+        return villagerManipulation;
+    }
+    public static void setVillagerManipulation(boolean villagerManipulation) {
+        Configs.villagerManipulation = villagerManipulation;
+        if (villagerManipulation) {
+            ServerBrandManager.rngWarning();
+        } else {
+            VillagerCracker.reset();
+        }
+    }
+
+    @Config(setter = @Config.Setter("setMaxVillagerManipulationWaitTicks"), temporary = true)
+    public static int maxVillagerManipulationWaitTicks = 12000;
+    public static void setMaxVillagerManipulationWaitTicks(int maxVillagerManipulationWaitTicks) {
+        Configs.maxVillagerManipulationWaitTicks = Mth.clamp(maxVillagerManipulationWaitTicks, 0, 1_000_000);
+    }
 }

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

@@ -39,6 +39,7 @@
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 public class ItemAndEnchantmentsPredicateArgument implements ArgumentType<ItemAndEnchantmentsPredicateArgument.ItemAndEnchantmentsPredicate> {
 
@@ -51,6 +52,8 @@ public class ItemAndEnchantmentsPredicateArgument implements ArgumentType<ItemAn
     private Predicate<Item> itemPredicate = item -> true;
     private BiPredicate<Item, Holder<Enchantment>> enchantmentPredicate = (item, ench) -> true;
     private boolean constrainMaxLevel = false;
+    @Nullable
+    private String suffix;
 
     private ItemAndEnchantmentsPredicateArgument(HolderLookup.Provider holderLookupProvider) {
         this.enchantmentLookup = holderLookupProvider.lookupOrThrow(Registries.ENCHANTMENT);
@@ -75,6 +78,11 @@ public ItemAndEnchantmentsPredicateArgument constrainMaxLevel() {
         return this;
     }
 
+    public ItemAndEnchantmentsPredicateArgument withSuffix(String suffix) {
+        this.suffix = suffix;
+        return this;
+    }
+
     public static ItemAndEnchantmentsPredicate getItemAndEnchantmentsPredicate(CommandContext<?> context, String name) {
         return context.getArgument(name, ItemAndEnchantmentsPredicate.class);
     }
@@ -159,9 +167,10 @@ 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()
-                .map(entry -> new EnchantmentInstance(entry.getKey(), entry.getIntValue()))
-                .toList();
+            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);
         }
     }
@@ -220,6 +229,10 @@ private boolean parseEnchantmentInstancePredicate() throws CommandSyntaxExceptio
                 return false;
             }
 
+            if (option == Option.SUFFIX) {
+                return false;
+            }
+
             boolean suggest = reader.canRead();
             if (option == Option.EXACT) {
                 exact = true;
@@ -256,6 +269,7 @@ private enum Option {
             WITHOUT,
             EXACT,
             ORDERED,
+            SUFFIX,
         }
 
         @Nullable
@@ -267,7 +281,7 @@ private Option parseOption() {
                 case "without" -> Option.WITHOUT;
                 case "exactly" -> exact ? null : Option.EXACT;
                 case "ordered" -> ordered || MultiVersionCompat.INSTANCE.getProtocolVersion() >= MultiVersionCompat.V1_21 ? null : Option.ORDERED;
-                default -> null;
+                default -> option.equals(suffix) ? Option.SUFFIX : null;
             };
         }
 
@@ -451,6 +465,9 @@ private void suggestOption() {
                 if (!ordered && MultiVersionCompat.INSTANCE.getProtocolVersion() < MultiVersionCompat.V1_21) {
                     validOptions.add("ordered");
                 }
+                if (suffix != null) {
+                    validOptions.add(suffix);
+                }
                 SharedSuggestionProvider.suggest(validOptions, builder);
                 suggestions.add(builder);
             };

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

@@ -6,10 +6,10 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
 
 public class WithStringArgument<T> implements ArgumentType<WithStringArgument.Result<T>> {
 
@@ -46,5 +46,9 @@ public Collection<String> getExamples() {
         return delegate.getExamples();
     }
 
-    public record Result<T>(String string, T value) {}
+    public record Result<T>(String string, T value) {
+        public <U> Result<U> map(Function<? super T, ? extends U> mapper) {
+            return new Result<>(string, mapper.apply(value));
+        }
+    }
 }

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;
@@ -29,7 +30,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;
@@ -112,7 +112,6 @@ public class EnchantmentCracker {
      */
 
     public static final Logger LOGGER = LogUtils.getLogger();
-    private static final int PROGRESS_BAR_WIDTH = 50;
 
     // RENDERING
     /*
@@ -479,17 +478,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);
                                 }
                             });
                         }