Update Wool Counter & FakePlayer code from Leaves

This commit is contained in:
Helvetica Volubi
2025-12-27 20:39:17 +08:00
parent b3703e2069
commit a3e0a3ee1a
57 changed files with 902 additions and 780 deletions
@@ -1,6 +1,6 @@
package fun.bm.lophine.command.counter;
import net.minecraft.commands.CommandSourceStack;
import io.papermc.paper.command.brigadier.CommandSourceStack;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
import org.leavesmc.leaves.command.LiteralNode;
@@ -25,7 +25,7 @@ public class DisplayCommand extends CounterSubCommand {
}
public static void displayCounter(CommandContext context, @NotNull HopperCounter counter, boolean realTime) {
for (Component component : counter.format(MinecraftServer.getServer(), context.getSource().getLevel(), realTime)) {
for (Component component : counter.format(MinecraftServer.getServer(), realTime)) {
context.getSender().sendMessage(component);
}
}
@@ -9,6 +9,7 @@ import fun.bm.lophine.command.counter.CounterSubCommand;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.JoinConfiguration;
import net.kyori.adventure.text.format.TextColor;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.item.DyeColor;
import org.jetbrains.annotations.NotNull;
import org.leavesmc.leaves.command.ArgumentNode;
@@ -27,7 +28,7 @@ public class ResetCommand extends CounterSubCommand {
@Override
protected boolean execute(@NotNull CommandContext context) throws CommandSyntaxException {
HopperCounter.resetAll(context.getSource().getLevel(), false);
HopperCounter.resetAll(MinecraftServer.getServer(), false);
context.getSender().sendMessage(Component.text("Restarted all counters."));
return true;
}
@@ -41,14 +42,14 @@ public class ResetCommand extends CounterSubCommand {
protected boolean execute(@NotNull CommandContext context) {
String color0 = context.getArgument(DyeColorArg.class);
if (color0.equals("all")) {
HopperCounter.resetAll(context.getSource().getLevel(), false);
HopperCounter.resetAll(MinecraftServer.getServer(), false);
context.getSender().sendMessage(Component.text("Restarted all counters."));
return true;
}
DyeColor color = DyeColor.byName(color0, null);
if (color == null) return true;
HopperCounter counter = HopperCounter.getCounter(color);
counter.reset(context.getSource().getLevel());
counter.reset(MinecraftServer.getServer());
context.getSender().sendMessage(Component.join(JoinConfiguration.noSeparators(),
Component.text("Restarted "),
Component.text(color.getName(), TextColor.color(color.getTextColor())),