refactor(minecraft): 更新命令方块相关类引用

- 将 AbstractCommandBlockEditScreen 中的 BaseCommandBlock 替换为 BaseCommandBlockCommandSource
- 修改 AbstractMinecart 中的 MinecartCommandBlock 为 MinecartCommandBlockCommandSource
- 更新 AdvancementHolder 实现接口路径
- 移除未使用的 EnumMap 导入
- 添加 AdvancementTreeMixin 以移除日志输出

Author: wdog5

patches/net/minecraft/advancements/AdvancementHolder.java.patch

@@ -1,18 +1,17 @@
 --- a/net/minecraft/advancements/AdvancementHolder.java
 +++ b/net/minecraft/advancements/AdvancementHolder.java
-@@ -1,12 +_,14 @@
+@@ -1,12 +_,13 @@
  package net.minecraft.advancements;
 
  import java.util.List;
 +
-+import com.taiyitistmc.injection.advancements.AdvancementHolderInjection;
  import net.minecraft.network.RegistryFriendlyByteBuf;
  import net.minecraft.network.codec.ByteBufCodecs;
  import net.minecraft.network.codec.StreamCodec;
  import net.minecraft.resources.ResourceLocation;
 
 -public record AdvancementHolder(ResourceLocation id, Advancement value) {
-+public record AdvancementHolder(ResourceLocation id, Advancement value) implements AdvancementHolderInjection {
++public record AdvancementHolder(ResourceLocation id, Advancement value) implements com.taiyitistmc.injection.advancements.InjectionAdvancementHolder {
      public static final StreamCodec<RegistryFriendlyByteBuf, AdvancementHolder> STREAM_CODEC = StreamCodec.composite(
          ResourceLocation.STREAM_CODEC, AdvancementHolder::id, Advancement.STREAM_CODEC, AdvancementHolder::value, AdvancementHolder::new
      );

patches/net/minecraft/client/gui/screens/inventory/AbstractCommandBlockEditScreen.java.patch

@@ -0,0 +1,47 @@
+--- a/net/minecraft/client/gui/screens/inventory/AbstractCommandBlockEditScreen.java
++++ b/net/minecraft/client/gui/screens/inventory/AbstractCommandBlockEditScreen.java
+@@ -11,7 +_,7 @@
+ import net.minecraft.network.chat.CommonComponents;
+ import net.minecraft.network.chat.Component;
+ import net.minecraft.network.chat.MutableComponent;
+-import net.minecraft.world.level.BaseCommandBlock;
++import net.minecraft.world.level.BaseCommandBlockCommandSource;
+ import net.neoforged.api.distmarker.Dist;
+ import net.neoforged.api.distmarker.OnlyIn;
+ 
+@@ -38,7 +_,7 @@
+         }
+     }
+ 
+-    abstract BaseCommandBlock getCommandBlock();
++    abstract BaseCommandBlockCommandSource getCommandBlock();
+ 
+     abstract int getPreviousY();
+ 
+@@ -56,7 +_,7 @@
+                 .withInitialValue(flag)
+                 .displayOnlyValue()
+                 .create(this.width / 2 + 150 - 20, this.getPreviousY(), 20, 20, Component.translatable("advMode.trackOutput"), (p_169596_, p_169597_) -> {
+-                    BaseCommandBlock basecommandblock = this.getCommandBlock();
++                    BaseCommandBlockCommandSource basecommandblock = this.getCommandBlock();
+                     basecommandblock.setTrackOutput(p_169597_);
+                     this.updatePreviousOutput(p_169597_);
+                 })
+@@ -104,7 +_,7 @@
+     }
+ 
+     protected void onDone() {
+-        BaseCommandBlock basecommandblock = this.getCommandBlock();
++        BaseCommandBlockCommandSource basecommandblock = this.getCommandBlock();
+         this.populateAndSendPacket(basecommandblock);
+         if (!basecommandblock.isTrackOutput()) {
+             basecommandblock.setLastOutput(null);
+@@ -113,7 +_,7 @@
+         this.minecraft.setScreen(null);
+     }
+ 
+-    protected abstract void populateAndSendPacket(BaseCommandBlock p_97670_);
++    protected abstract void populateAndSendPacket(BaseCommandBlockCommandSource p_97670_);
+ 
+     private void onEdited(String p_97689_) {
+         this.commandSuggestions.updateCommandInfo();

patches/net/minecraft/client/gui/screens/inventory/CommandBlockEditScreen.java.patch

@@ -0,0 +1,38 @@
+--- a/net/minecraft/client/gui/screens/inventory/CommandBlockEditScreen.java
++++ b/net/minecraft/client/gui/screens/inventory/CommandBlockEditScreen.java
+@@ -5,7 +_,7 @@
+ import net.minecraft.core.BlockPos;
+ import net.minecraft.network.chat.Component;
+ import net.minecraft.network.protocol.game.ServerboundSetCommandBlockPacket;
+-import net.minecraft.world.level.BaseCommandBlock;
++import net.minecraft.world.level.BaseCommandBlockCommandSource;
+ import net.minecraft.world.level.block.entity.CommandBlockEntity;
+ import net.neoforged.api.distmarker.Dist;
+ import net.neoforged.api.distmarker.OnlyIn;
+@@ -25,7 +_,7 @@
+     }
+ 
+     @Override
+-    BaseCommandBlock getCommandBlock() {
++    BaseCommandBlockCommandSource getCommandBlock() {
+         return this.autoCommandBlock.getCommandBlock();
+     }
+ 
+@@ -76,7 +_,7 @@
+     }
+ 
+     public void updateGui() {
+-        BaseCommandBlock basecommandblock = this.autoCommandBlock.getCommandBlock();
++        BaseCommandBlockCommandSource basecommandblock = this.autoCommandBlock.getCommandBlock();
+         this.commandEdit.setValue(basecommandblock.getCommand());
+         boolean flag = basecommandblock.isTrackOutput();
+         this.mode = this.autoCommandBlock.getMode();
+@@ -97,7 +_,7 @@
+     }
+ 
+     @Override
+-    protected void populateAndSendPacket(BaseCommandBlock p_98384_) {
++    protected void populateAndSendPacket(BaseCommandBlockCommandSource p_98384_) {
+         this.minecraft
+             .getConnection()
+             .send(

patches/net/minecraft/client/gui/screens/inventory/MinecartCommandBlockEditScreen.java.patch

@@ -0,0 +1,39 @@
+--- a/net/minecraft/client/gui/screens/inventory/MinecartCommandBlockEditScreen.java
++++ b/net/minecraft/client/gui/screens/inventory/MinecartCommandBlockEditScreen.java
+@@ -1,21 +_,20 @@
+ package net.minecraft.client.gui.screens.inventory;
+ 
+ import net.minecraft.network.protocol.game.ServerboundSetCommandMinecartPacket;
+-import net.minecraft.world.entity.vehicle.MinecartCommandBlock;
+-import net.minecraft.world.level.BaseCommandBlock;
++import net.minecraft.world.level.BaseCommandBlockCommandSource;
+ import net.neoforged.api.distmarker.Dist;
+ import net.neoforged.api.distmarker.OnlyIn;
+ 
+ @OnlyIn(Dist.CLIENT)
+ public class MinecartCommandBlockEditScreen extends AbstractCommandBlockEditScreen {
+-    private final BaseCommandBlock commandBlock;
++    private final BaseCommandBlockCommandSource commandBlock;
+ 
+-    public MinecartCommandBlockEditScreen(BaseCommandBlock p_99216_) {
++    public MinecartCommandBlockEditScreen(BaseCommandBlockCommandSource p_99216_) {
+         this.commandBlock = p_99216_;
+     }
+ 
+     @Override
+-    public BaseCommandBlock getCommandBlock() {
++    public BaseCommandBlockCommandSource getCommandBlock() {
+         return this.commandBlock;
+     }
+ 
+@@ -31,8 +_,8 @@
+     }
+ 
+     @Override
+-    protected void populateAndSendPacket(BaseCommandBlock p_99218_) {
+-        if (p_99218_ instanceof MinecartCommandBlock.MinecartCommandBase minecartcommandblock$minecartcommandbase) {
++    protected void populateAndSendPacket(BaseCommandBlockCommandSource p_99218_) {
++        if (p_99218_ instanceof MinecartCommandBlock.MinecartCommandBaseCommandSource minecartcommandblock$minecartcommandbase) {
+             this.minecraft
+                 .getConnection()
+                 .send(

patches/net/minecraft/client/player/LocalPlayer.java.patch

@@ -1,5 +1,18 @@
 --- a/net/minecraft/client/player/LocalPlayer.java
 +++ b/net/minecraft/client/player/LocalPlayer.java
+@@ -69,11 +_,10 @@
+ import net.minecraft.world.entity.vehicle.AbstractMinecart;
+ import net.minecraft.world.entity.vehicle.Boat;
+ import net.minecraft.world.inventory.ClickAction;
+-import net.minecraft.world.item.ElytraItem;
+ import net.minecraft.world.item.ItemStack;
+ import net.minecraft.world.item.Items;
+ import net.minecraft.world.item.crafting.RecipeHolder;
+-import net.minecraft.world.level.BaseCommandBlock;
++import net.minecraft.world.level.BaseCommandBlockCommandSource;
+ import net.minecraft.world.level.GameType;
+ import net.minecraft.world.level.block.Portal;
+ import net.minecraft.world.level.block.entity.CommandBlockEntity;
 @@ -297,6 +_,7 @@
          ServerboundPlayerActionPacket.Action serverboundplayeractionpacket$action = p_108701_
              ? ServerboundPlayerActionPacket.Action.DROP_ALL_ITEMS
@@ -24,6 +37,15 @@
      }
 
      @Override
+@@ -574,7 +_,7 @@
+     }
+ 
+     @Override
+-    public void openMinecartCommandBlock(BaseCommandBlock p_108678_) {
++    public void openMinecartCommandBlock(BaseCommandBlockCommandSource p_108678_) {
+         this.minecraft.setScreen(new MinecartCommandBlockEditScreen(p_108678_));
+     }
+ 
 @@ -682,6 +_,7 @@
              && (this.isShiftKeyDown() || !this.isSleeping() && !this.canPlayerFitWithinBlocksAndEntitiesWhen(Pose.STANDING));
          float f = (float)this.getAttributeValue(Attributes.SNEAKING_SPEED);

patches/net/minecraft/commands/CommandSource.java.patch

@@ -0,0 +1,25 @@
+--- a/net/minecraft/commands/CommandSource.java
++++ b/net/minecraft/commands/CommandSource.java
+@@ -2,7 +_,7 @@
+ 
+ import net.minecraft.network.chat.Component;
+ 
+-public interface CommandSource {
++public interface CommandSource extends com.taiyitistmc.injection.commands.InjectionCommandSource {
+     CommandSource NULL = new CommandSource() {
+         @Override
+         public void sendSystemMessage(Component p_230799_) {
+@@ -22,6 +_,13 @@
+         public boolean shouldInformAdmins() {
+             return false;
+         }
++
++        // CraftBukkit start
++        @Override
++        public org.bukkit.command.CommandSender getBukkitSender(CommandSourceStack wrapper) {
++            throw new UnsupportedOperationException("Not supported yet.");
++        }
++        // CraftBukkit end
+     };
+ 
+     void sendSystemMessage(Component p_230797_);

patches/net/minecraft/commands/CommandSourceStack.java.patch

@@ -0,0 +1,19 @@
+--- a/net/minecraft/commands/CommandSourceStack.java
++++ b/net/minecraft/commands/CommandSourceStack.java
+@@ -17,6 +_,7 @@
+ import java.util.function.Supplier;
+ import java.util.stream.Stream;
+ import javax.annotation.Nullable;
++
+ import net.minecraft.ChatFormatting;
+ import net.minecraft.commands.arguments.EntityAnchorArgument;
+ import net.minecraft.commands.execution.TraceCallbacks;
+@@ -43,7 +_,7 @@
+ import net.minecraft.world.phys.Vec2;
+ import net.minecraft.world.phys.Vec3;
+ 
+-public class CommandSourceStack implements ExecutionCommandSource<CommandSourceStack>, SharedSuggestionProvider, net.neoforged.neoforge.common.extensions.ICommandSourceStackExtension {
++public class CommandSourceStack implements ExecutionCommandSource<CommandSourceStack>, SharedSuggestionProvider, net.neoforged.neoforge.common.extensions.ICommandSourceStackExtension, com.taiyitistmc.injection.commands.InjectionCommandSourceStack {
+     public static final SimpleCommandExceptionType ERROR_NOT_PLAYER = new SimpleCommandExceptionType(Component.translatable("permissions.requires.player"));
+     public static final SimpleCommandExceptionType ERROR_NOT_ENTITY = new SimpleCommandExceptionType(Component.translatable("permissions.requires.entity"));
+     public final CommandSource source;

patches/net/minecraft/commands/Commands.java.patch

@@ -1,11 +1,30 @@
 --- a/net/minecraft/commands/Commands.java
 +++ b/net/minecraft/commands/Commands.java
-@@ -25,6 +_,8 @@
+@@ -8,23 +_,25 @@
+ import com.mojang.brigadier.builder.ArgumentBuilder;
+ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+ import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+-import com.mojang.brigadier.context.CommandContext;
+ import com.mojang.brigadier.context.CommandContextBuilder;
+ import com.mojang.brigadier.context.ContextChain;
+ import com.mojang.brigadier.exceptions.CommandSyntaxException;
+ import com.mojang.brigadier.tree.CommandNode;
+ import com.mojang.brigadier.tree.RootCommandNode;
+ import com.mojang.logging.LogUtils;
+-import java.util.Collection;
++
+ import java.util.Map;
++import java.util.Objects;
+ import java.util.Optional;
+ import java.util.Set;
++import java.util.concurrent.atomic.AtomicReference;
+ import java.util.function.Consumer;
+ import java.util.function.Predicate;
+ import java.util.function.UnaryOperator;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
  import javax.annotation.Nullable;
 +
-+import com.taiyitistmc.injection.advancements.CommandsInjection;
  import net.minecraft.ChatFormatting;
  import net.minecraft.SharedConstants;
  import net.minecraft.Util;
@@ -22,7 +41,7 @@
  import org.slf4j.Logger;
 
 -public class Commands {
-+public class Commands implements CommandsInjection {
++public class Commands implements com.taiyitistmc.injection.commands.InjectionCommands {
      private static final ThreadLocal<ExecutionContext<CommandSourceStack>> CURRENT_EXECUTION_CONTEXT = new ThreadLocal<>();
      private static final Logger LOGGER = LogUtils.getLogger();
      public static final int LEVEL_ALL = 0;
@@ -60,6 +79,31 @@
          commandsourcestack.getServer().getProfiler().push(() -> "/" + p_242841_);
          ContextChain<CommandSourceStack> contextchain = finishParsing(p_242844_, p_242841_, commandsourcestack);
 
+@@ -306,6 +_,15 @@
+         }
+     }
+ 
++    private static AtomicReference<String> taiyitist$lable =
++            new AtomicReference<>("/");
++
++    @Nullable
++    private static ContextChain<CommandSourceStack> finishParsing(ParseResults<CommandSourceStack> p_307220_, String p_307311_, CommandSourceStack p_307676_, String label) { // CraftBukkit
++        taiyitist$lable.set(label);
++        return finishParsing(p_307220_, p_307311_, p_307676_);
++    }
++
+     @Nullable
+     private static ContextChain<CommandSourceStack> finishParsing(ParseResults<CommandSourceStack> p_307220_, String p_307311_, CommandSourceStack p_307676_) {
+         try {
+@@ -318,7 +_,7 @@
+                 int i = Math.min(commandsyntaxexception.getInput().length(), commandsyntaxexception.getCursor());
+                 MutableComponent mutablecomponent = Component.empty()
+                     .withStyle(ChatFormatting.GRAY)
+-                    .withStyle(p_82134_ -> p_82134_.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/" + p_307311_)));
++                    .withStyle(p_82134_ -> p_82134_.withClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, !Objects.equals(taiyitist$lable.get(), "/") ? taiyitist$lable.get() : taiyitist$lable.get() + p_307311_)));
+                 if (i > 10) {
+                     mutablecomponent.append(CommonComponents.ELLIPSIS);
+                 }
 @@ -362,7 +_,8 @@
          Map<CommandNode<CommandSourceStack>, CommandNode<SharedSuggestionProvider>> map = Maps.newHashMap();
          RootCommandNode<SharedSuggestionProvider> rootcommandnode = new RootCommandNode<>();

patches/net/minecraft/commands/arguments/EntityArgument.java.patch

@@ -1,5 +1,22 @@
 --- a/net/minecraft/commands/arguments/EntityArgument.java
 +++ b/net/minecraft/commands/arguments/EntityArgument.java
+@@ -13,6 +_,7 @@
+ import java.util.Collection;
+ import java.util.List;
+ import java.util.concurrent.CompletableFuture;
++
+ import net.minecraft.commands.CommandBuildContext;
+ import net.minecraft.commands.CommandSourceStack;
+ import net.minecraft.commands.SharedSuggestionProvider;
+@@ -24,7 +_,7 @@
+ import net.minecraft.server.level.ServerPlayer;
+ import net.minecraft.world.entity.Entity;
+ 
+-public class EntityArgument implements ArgumentType<EntitySelector> {
++public class EntityArgument implements ArgumentType<EntitySelector>, com.taiyitistmc.injection.commands.arguments.InjectionEntityArgument {
+     private static final Collection<String> EXAMPLES = Arrays.asList("Player", "0123", "@e", "@e[type=foo]", "dd12be42-52a9-4a91-a8a1-11c01849e498");
+     public static final SimpleCommandExceptionType ERROR_NOT_SINGLE_ENTITY = new SimpleCommandExceptionType(Component.translatable("argument.entity.toomany"));
+     public static final SimpleCommandExceptionType ERROR_NOT_SINGLE_PLAYER = new SimpleCommandExceptionType(Component.translatable("argument.player.toomany"));
 @@ -127,7 +_,7 @@
          if (p_91482_.getSource() instanceof SharedSuggestionProvider sharedsuggestionprovider) {
              StringReader stringreader = new StringReader(p_91483_.getInput());

patches/net/minecraft/commands/arguments/selector/EntitySelectorParser.java.patch

@@ -1,5 +1,14 @@
 --- a/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
 +++ b/net/minecraft/commands/arguments/selector/EntitySelectorParser.java
+@@ -31,7 +_,7 @@
+ import net.minecraft.world.phys.AABB;
+ import net.minecraft.world.phys.Vec3;
+ 
+-public class EntitySelectorParser {
++public class EntitySelectorParser implements com.taiyitistmc.injection.commands.arguments.selector.InjectionEntitySelectorParser{
+     public static final char SYNTAX_SELECTOR_START = '@';
+     private static final char SYNTAX_OPTIONS_START = '[';
+     private static final char SYNTAX_OPTIONS_END = ']';
 @@ -481,6 +_,9 @@
              }