mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-03 10:30:32 +02:00
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
179 lines
7.0 KiB
Diff
179 lines
7.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
Date: Tue, 1 Feb 2022 15:51:55 -0700
|
|
Subject: [PATCH] API for creating command sender which forwards feedback
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java b/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bff3914292
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/commands/FeedbackForwardingSender.java
|
|
@@ -0,0 +1,111 @@
|
|
+package io.papermc.paper.commands;
|
|
+
|
|
+import io.papermc.paper.adventure.PaperAdventure;
|
|
+import java.util.UUID;
|
|
+import java.util.function.Consumer;
|
|
+import net.kyori.adventure.audience.MessageType;
|
|
+import net.kyori.adventure.identity.Identity;
|
|
+import net.kyori.adventure.text.Component;
|
|
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
|
|
+import net.minecraft.commands.CommandSource;
|
|
+import net.minecraft.commands.CommandSourceStack;
|
|
+import net.minecraft.server.level.ServerLevel;
|
|
+import net.minecraft.world.phys.Vec2;
|
|
+import net.minecraft.world.phys.Vec3;
|
|
+import org.bukkit.command.CommandSender;
|
|
+import org.bukkit.craftbukkit.CraftServer;
|
|
+import org.bukkit.craftbukkit.command.ServerCommandSender;
|
|
+import org.checkerframework.checker.nullness.qual.NonNull;
|
|
+import org.checkerframework.checker.nullness.qual.Nullable;
|
|
+import org.checkerframework.framework.qual.DefaultQualifier;
|
|
+
|
|
+@DefaultQualifier(NonNull.class)
|
|
+public final class FeedbackForwardingSender extends ServerCommandSender {
|
|
+ private final Consumer<? super Component> feedback;
|
|
+ private final CraftServer server;
|
|
+
|
|
+ public FeedbackForwardingSender(final Consumer<? super Component> feedback, final CraftServer server) {
|
|
+ super(((ServerCommandSender) server.getConsoleSender()).perm);
|
|
+ this.server = server;
|
|
+ this.feedback = feedback;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void sendMessage(final String message) {
|
|
+ this.sendMessage(LegacyComponentSerializer.legacySection().deserialize(message));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void sendMessage(final String... messages) {
|
|
+ for (final String message : messages) {
|
|
+ this.sendMessage(message);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void sendMessage(final Identity identity, final Component message, final MessageType type) {
|
|
+ this.feedback.accept(message);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public String getName() {
|
|
+ return "FeedbackForwardingSender";
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public Component name() {
|
|
+ return Component.text(this.getName());
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isOp() {
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setOp(final boolean value) {
|
|
+ throw new UnsupportedOperationException("Cannot change operator status of " + this.getClass().getName());
|
|
+ }
|
|
+
|
|
+ public CommandSourceStack asVanilla() {
|
|
+ final @Nullable ServerLevel overworld = this.server.getServer().overworld();
|
|
+ return new CommandSourceStack(
|
|
+ new Source(this),
|
|
+ overworld == null ? Vec3.ZERO : Vec3.atLowerCornerOf(overworld.getSharedSpawnPos()),
|
|
+ Vec2.ZERO,
|
|
+ overworld,
|
|
+ 4,
|
|
+ this.getName(),
|
|
+ net.minecraft.network.chat.Component.literal(this.getName()),
|
|
+ this.server.getServer(),
|
|
+ null
|
|
+ );
|
|
+ }
|
|
+
|
|
+ private record Source(FeedbackForwardingSender sender) implements CommandSource {
|
|
+ @Override
|
|
+ public void sendSystemMessage(final net.minecraft.network.chat.Component message) {
|
|
+ this.sender.sendMessage(Identity.nil(), PaperAdventure.asAdventure(message));
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean acceptsSuccess() {
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean acceptsFailure() {
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean shouldInformAdmins() {
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public CommandSender getBukkitSender(final CommandSourceStack stack) {
|
|
+ return this.sender;
|
|
+ }
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 6ecaf821a908b68182879b5da1cbbd82939a785b..c0c88a974955e378c1df678a00d345a61e7f9336 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -2031,6 +2031,13 @@ public final class CraftServer implements Server {
|
|
return console.console;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public CommandSender createCommandSender(final java.util.function.Consumer<? super net.kyori.adventure.text.Component> feedback) {
|
|
+ return new io.papermc.paper.commands.FeedbackForwardingSender(feedback, this);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
public EntityMetadataStore getEntityMetadata() {
|
|
return this.entityMetadata;
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
|
|
index eaff8df6c8c12c64e005a68a02e2e35ed88f757c..1c638a4b1f2c841928d8b2a7ae43e4ebb1f7eac7 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/command/ServerCommandSender.java
|
|
@@ -13,9 +13,15 @@ import org.bukkit.plugin.Plugin;
|
|
|
|
public abstract class ServerCommandSender implements CommandSender {
|
|
private static PermissibleBase blockPermInst;
|
|
- private final PermissibleBase perm;
|
|
+ public final PermissibleBase perm; // Paper
|
|
private net.kyori.adventure.pointer.Pointers adventure$pointers; // Paper - implement pointers
|
|
|
|
+ // Paper start
|
|
+ public ServerCommandSender(final PermissibleBase permissibleBase) {
|
|
+ this.perm = permissibleBase;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
public ServerCommandSender() {
|
|
if (this instanceof CraftBlockCommandSender) {
|
|
if (ServerCommandSender.blockPermInst == null) {
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
|
|
index bd45d59cbfe877717b90221fbb8d03d266958984..eb20ac9d0e70c48c2c671109b7706c56ff0f10f6 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
|
|
@@ -84,6 +84,11 @@ public final class VanillaCommandWrapper extends BukkitCommand {
|
|
if (sender instanceof ProxiedCommandSender) {
|
|
return ((ProxiedNativeCommandSender) sender).getHandle();
|
|
}
|
|
+ // Paper start
|
|
+ if (sender instanceof io.papermc.paper.commands.FeedbackForwardingSender feedback) {
|
|
+ return feedback.asVanilla();
|
|
+ }
|
|
+ // Paper end
|
|
|
|
throw new IllegalArgumentException("Cannot make " + sender + " a vanilla command listener");
|
|
}
|