Update for 26.1.X

Author: Big-Iron-Cheems

src/main/java/meteordevelopment/meteorclient/commands/arguments/EnchantmentLevelArgumentType.java

@@ -12,16 +12,16 @@
 import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.text.Text;
+import net.minecraft.core.Holder;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.enchantment.Enchantment;
 
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public class EnchantmentLevelArgumentType implements ArgumentType<Integer> {
-    private static final SimpleCommandExceptionType INVALID_LEVEL = new SimpleCommandExceptionType(Text.literal("Level must be at least 1"));
+    private static final SimpleCommandExceptionType INVALID_LEVEL = new SimpleCommandExceptionType(Component.literal("Level must be at least 1"));
     private final String enchantmentArgName;
 
     public EnchantmentLevelArgumentType(String enchantmentArgName) {
@@ -49,7 +49,7 @@ public Integer parse(StringReader reader) throws CommandSyntaxException {
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
         try {
             // Try to get the enchantment from the previous argument
-            RegistryEntry.Reference<Enchantment> enchantment =
+            Holder.Reference<Enchantment> enchantment =
                 RegistryEntryReferenceArgumentType.getEnchantment(context, enchantmentArgName);
 
             int maxLevel = enchantment.value().getMaxLevel();
@@ -62,11 +62,11 @@ public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> cont
                     int typedLevel = Integer.parseInt(remaining);
                     if (typedLevel > maxLevel) {
                         // Show error in suggestions
-                        builder.suggest(maxLevel, Text.literal("§c" + enchantName + " max level: " + maxLevel));
+                        builder.suggest(maxLevel, Component.literal("§c" + enchantName + " max level: " + maxLevel));
                     }
 
                     return builder.buildFuture();
-                } catch (NumberFormatException ignored) {
+                } catch (NumberFormatException _) {
                     // Command handler highlights invalid input
                 }
             }
@@ -78,7 +78,7 @@ public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> cont
             }
 
             return builder.buildFuture();
-        } catch (Exception e) {
+        } catch (Exception _) {
             return Suggestions.empty();
         }
     }

src/main/java/meteordevelopment/meteorclient/commands/commands/OptimizeEnchantsCommand.java

@@ -14,15 +14,17 @@
 import meteordevelopment.meteorclient.commands.arguments.RegistryEntryReferenceArgumentType;
 import meteordevelopment.meteorclient.utils.misc.EnchantmentOptimizer;
 import meteordevelopment.meteorclient.utils.player.ChatUtils;
-import net.minecraft.command.CommandSource;
-import net.minecraft.command.argument.ItemStackArgumentType;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.item.Item;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.multiplayer.ClientSuggestionProvider;
+import net.minecraft.commands.arguments.item.ItemArgument;
+import net.minecraft.core.Holder;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.enchantment.Enchantment;
+
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,14 +35,14 @@ public OptimizeEnchantsCommand() {
     }
 
     @Override
-    public void build(LiteralArgumentBuilder<CommandSource> builder) {
+    public void build(LiteralArgumentBuilder<ClientSuggestionProvider> builder) {
         // TODO: The optimizer supports book-only mode (item=null) for combining enchanted books,
         // but this command currently requires an item argument, so item will never be null.
         // Should we add an item-less version of the command for book-only optimization?
 
         // TODO: should we restrict the available items to only those that can be enchanted?
         // e.g. armors, weapons, tools, books, etc.
-        builder.then(argument("item", ItemStackArgumentType.itemStack(REGISTRY_ACCESS))
+        builder.then(argument("item", ItemArgument.item(REGISTRY_ACCESS))
                 .then(buildEnchantmentChain(1, 20))
             // TODO: what should the max depth be? Idk how many enchantments on a single item MC supports.
         );
@@ -50,7 +52,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
      * Recursively builds a chain of enchantment arguments.
      * Each enchantment requires a name and level, and can optionally chain to the next.
      */
-    private RequiredArgumentBuilder<CommandSource, ?> buildEnchantmentChain(int index, int maxDepth) {
+    private RequiredArgumentBuilder<ClientSuggestionProvider, ?> buildEnchantmentChain(int index, int maxDepth) {
         String enchantArg = "enchantment" + index;
         String levelArg = "level" + index;
 
@@ -71,7 +73,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
     /**
      * Extracts all enchantments from context and runs optimization.
      */
-    private void executeOptimization(CommandContext<CommandSource> context, int enchantmentCount) {
+    private void executeOptimization(CommandContext<ClientSuggestionProvider> context, int enchantmentCount) {
         try {
             Item item = getItem(context);
             List<EnchantmentOptimizer.EnchantmentEntry> enchants = new ArrayList<>();
@@ -81,7 +83,7 @@ private void executeOptimization(CommandContext<CommandSource> context, int ench
                 String levelArg = "level" + i;
 
                 try {
-                    RegistryEntry.Reference<Enchantment> enchantment =
+                    Holder.Reference<Enchantment> enchantment =
                         RegistryEntryReferenceArgumentType.getEnchantment(context, enchantArg);
                     int level = IntegerArgumentType.getInteger(context, levelArg);
 
@@ -96,7 +98,7 @@ private void executeOptimization(CommandContext<CommandSource> context, int ench
                     }
 
                     enchants.add(new EnchantmentOptimizer.EnchantmentEntry(enchantment, level));
-                } catch (IllegalArgumentException e) {
+                } catch (IllegalArgumentException _) {
                     // Argument doesn't exist, we've reached the end
                     break;
                 }
@@ -113,23 +115,23 @@ private void executeOptimization(CommandContext<CommandSource> context, int ench
         }
     }
 
-    private Item getItem(CommandContext<CommandSource> context) {
+    private Item getItem(CommandContext<ClientSuggestionProvider> context) {
         try {
-            var itemArg = ItemStackArgumentType.getItemStackArgument(context, "item");
-            return itemArg.getItem();
-        } catch (Exception e) {
+            var itemArg = ItemArgument.getItem(context, "item");
+            return itemArg.item().value();
+        } catch (Exception _) {
             return null;
         }
     }
 
     private void optimize(Item item, List<EnchantmentOptimizer.EnchantmentEntry> enchants) {
         try {
             // Create optimizer from current registry
-            var registry = mc.getNetworkHandler().getRegistryManager().getOrThrow(RegistryKeys.ENCHANTMENT);
+            var registry = mc.getConnection().registryAccess().lookupOrThrow(Registries.ENCHANTMENT);
             EnchantmentOptimizer.OptimizationResult result = EnchantmentOptimizer.create(registry).optimize(item, enchants);
 
             // Display header
-            String itemName = item != null ? item.getName().getString() : "Book";
+            String itemName = item != null ? item.components().get(DataComponents.ITEM_NAME).getString() : "Book";
             ChatUtils.info("=== Enchantment Optimization for %s ===", itemName);
             ChatUtils.info("Total Cost: (highlight)%d levels(default) (%d XP)", result.totalLevels(), result.totalXp());
 
@@ -144,11 +146,11 @@ private void optimize(Item item, List<EnchantmentOptimizer.EnchantmentEntry> enc
             for (int i = 0; i < result.instructions().size(); i++) {
                 EnchantmentOptimizer.Instruction instr = result.instructions().get(i);
 
-                MutableText stepText = Text.literal(String.format("  %d. ", i + 1)).formatted(Formatting.GRAY);
-                stepText.append(Text.literal("Combine ").formatted(Formatting.GRAY));
-                stepText.append(formatItem(instr.left()).copy().formatted(Formatting.YELLOW));
-                stepText.append(Text.literal(" with ").formatted(Formatting.GRAY));
-                stepText.append(formatItem(instr.right()).copy().formatted(Formatting.AQUA));
+                MutableComponent stepText = Component.literal(String.format("  %d. ", i + 1)).withStyle(ChatFormatting.GRAY);
+                stepText.append(Component.literal("Combine ").withStyle(ChatFormatting.GRAY));
+                stepText.append(formatItem(instr.left()).copy().withStyle(ChatFormatting.YELLOW));
+                stepText.append(Component.literal(" with ").withStyle(ChatFormatting.GRAY));
+                stepText.append(formatItem(instr.right()).copy().withStyle(ChatFormatting.AQUA));
 
                 ChatUtils.sendMsg(stepText);
 
@@ -164,18 +166,18 @@ private void optimize(Item item, List<EnchantmentOptimizer.EnchantmentEntry> enc
         }
     }
 
-    private Text formatItem(EnchantmentOptimizer.Combination comb) {
+    private Component formatItem(EnchantmentOptimizer.Combination comb) {
         String baseName = comb.baseItem != null
-            ? comb.baseItem.getName().getString()
+            ? comb.baseItem.components().get(DataComponents.ITEM_NAME).getString()
             : "Book";
 
         List<String> enchantments = new ArrayList<>();
         collectEnchantments(comb, enchantments);
 
-        if (enchantments.isEmpty()) return Text.literal(baseName);
+        if (enchantments.isEmpty()) return Component.literal(baseName);
 
         // Format: "ItemName (ench1, ench2, ench3)"
-        return Text.literal(baseName + " (" + String.join(", ", enchantments) + ")");
+        return Component.literal(baseName + " (" + String.join(", ", enchantments) + ")");
     }
 
     private void collectEnchantments(EnchantmentOptimizer.Combination comb, List<String> out) {

src/main/java/meteordevelopment/meteorclient/utils/misc/EnchantmentOptimizer.java

@@ -8,10 +8,10 @@
 import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.item.Item;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.core.Holder;
+import net.minecraft.core.Registry;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.enchantment.Enchantment;
 import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
 
@@ -22,17 +22,17 @@
 public class EnchantmentOptimizer {
     private static final int MAXIMUM_MERGE_LEVELS = 39;
 
-    private final Object2IntMap<RegistryEntry<Enchantment>> enchantmentIds;
+    private final Object2IntMap<Holder<Enchantment>> enchantmentIds;
     private final int[] enchantmentWeights;
     private final Map<ResultKey, Int2ObjectMap<ItemObject>> memoCache;
 
-    public EnchantmentOptimizer(List<RegistryEntry<Enchantment>> enchantments) {
+    public EnchantmentOptimizer(List<Holder<Enchantment>> enchantments) {
         this.enchantmentIds = new Object2IntOpenHashMap<>();
         this.enchantmentWeights = new int[enchantments.size()];
         this.memoCache = new HashMap<>();
 
         int id = 0;
-        for (RegistryEntry<Enchantment> entry : enchantments) {
+        for (Holder<Enchantment> entry : enchantments) {
             enchantmentIds.put(entry, id);
             int anvilCost = entry.value().getAnvilCost();
 
@@ -48,7 +48,7 @@ public EnchantmentOptimizer(List<RegistryEntry<Enchantment>> enchantments) {
         }
     }
 
-    public record EnchantmentEntry(RegistryEntry<Enchantment> enchantment, int level) {
+    public record EnchantmentEntry(Holder<Enchantment> enchantment, int level) {
     }
 
     public OptimizationResult optimize(@Nullable Item item, List<EnchantmentEntry> enchants) {
@@ -59,7 +59,7 @@ public OptimizationResult optimize(@Nullable Item item, List<EnchantmentEntry> e
             .map(e -> {
                 int id = enchantmentIds.getOrDefault(e.enchantment(), -1);
                 if (id == -1) {
-                    throw new IllegalArgumentException("Unknown enchantment: " + e.enchantment().getKey().orElseThrow().getValue());
+                    throw new IllegalArgumentException("Unknown enchantment: " + e.enchantment().unwrapKey().orElseThrow().identifier());
                 }
                 int value = e.level() * enchantmentWeights[id];
                 IntList ids = IntLists.singleton(id);
@@ -157,13 +157,13 @@ private ItemObject cheapestItemFromItems(ItemObject left, ItemObject right) {
 
         try {
             normal = new MergeEnchants(left, right);
-        } catch (MergeLevelsTooExpensiveException ignored) {
+        } catch (MergeLevelsTooExpensiveException _) {
             // Ignore too expensive merges
         }
 
         try {
             reversed = new MergeEnchants(right, left);
-        } catch (MergeLevelsTooExpensiveException ignored) {
+        } catch (MergeLevelsTooExpensiveException _) {
             // Ignore too expensive merges
         }
 
@@ -224,7 +224,7 @@ private Int2ObjectMap<ItemObject> cheapestItemsFromDictionaries(
                     for (Int2ObjectMap.Entry<ItemObject> entry : newWork2Item.int2ObjectEntrySet()) {
                         cheapest.merge(entry.getIntKey(), entry.getValue(), this::compareCheapest);
                     }
-                } catch (MergeLevelsTooExpensiveException ignored) {
+                } catch (MergeLevelsTooExpensiveException _) {
                     // Ignore too expensive merges
                 }
             }
@@ -321,12 +321,10 @@ public static class ItemObject {
 
     public static class MergeEnchants extends ItemObject {
         MergeEnchants(ItemObject left, ItemObject right) {
-            super(left.type, left.value + right.value, new IntArrayList());
-
             int mergeCost = right.value + (1 << left.priorWork) - 1 + (1 << right.priorWork) - 1;
-            if (mergeCost > MAXIMUM_MERGE_LEVELS) {
-                throw new MergeLevelsTooExpensiveException();
-            }
+            if (mergeCost > MAXIMUM_MERGE_LEVELS) throw new MergeLevelsTooExpensiveException();
+
+            super(left.type, left.value + right.value, new IntArrayList());
 
             this.enchantIds.addAll(left.enchantIds);
             this.enchantIds.addAll(right.enchantIds);
@@ -344,7 +342,7 @@ public static class Combination {
         public int value;                                           // Total value (sum of all books)
         public @Nullable Item item;                                 // For base item (only set on leaf item nodes)
         public @Nullable Item baseItem;                             // The base item for this combination tree (null = book)
-        public @Nullable RegistryEntry<Enchantment> enchantment;    // For enchanted book
+        public @Nullable Holder<Enchantment> enchantment;    // For enchanted book
         public int level;
 
         Combination() {
@@ -358,7 +356,7 @@ public static class Combination {
         }
 
         // For leaf book nodes
-        Combination(RegistryEntry<Enchantment> enchantment, int level, int value) {
+        Combination(Holder<Enchantment> enchantment, int level, int value) {
             this.left = null;
             this.right = null;
             this.item = null;
@@ -455,8 +453,8 @@ private static class MergeLevelsTooExpensiveException extends RuntimeException {
 
     // Static factory method to create optimizer from registry
     public static EnchantmentOptimizer create(Registry<Enchantment> registry) {
-        // streamEntries returns RegistryEntry.Reference, which extends RegistryEntry
-        List<RegistryEntry<Enchantment>> enchantments = new ArrayList<>(registry.streamEntries().toList());
+        // listElements returns Holder.Reference, which extends Holder
+        List<Holder<Enchantment>> enchantments = new ArrayList<>(registry.listElements().toList());
         return new EnchantmentOptimizer(enchantments);
     }
 }