2023-12-05 22:51:34 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Sweepyoface <github@sweepy.pw>
|
|
|
|
Date: Sat, 17 Jun 2017 18:48:21 -0400
|
|
|
|
Subject: [PATCH] Add UnknownCommandEvent
|
|
|
|
|
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
2024-04-24 03:25:14 +02:00
|
|
|
index ec34e402104d7a696ea95e0b11ee70189b678ab9..d9fc3c25bef251df6a53ee47ec224b07240a931c 100644
|
2023-12-05 22:51:34 +01:00
|
|
|
--- a/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
|
|
|
+++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -330,8 +330,13 @@ public class CommandSourceStack implements ExecutionCommandSource<CommandSourceS
|
2023-12-05 22:51:34 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public void sendFailure(Component message) {
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper start - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
+ this.sendFailure(message, true);
|
|
|
|
+ }
|
|
|
|
+ public void sendFailure(Component message, boolean withStyle) {
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper end - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
if (this.source.acceptsFailure() && !this.silent) {
|
|
|
|
- this.source.sendSystemMessage(Component.empty().append(message).withStyle(ChatFormatting.RED));
|
2024-01-22 19:01:10 +01:00
|
|
|
+ this.source.sendSystemMessage(withStyle ? Component.empty().append(message).withStyle(ChatFormatting.RED) : message); // Paper - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
|
2024-04-24 03:25:14 +02:00
|
|
|
index b81a4204a85e5b431cd6137fd8b80e43779c97b7..03966f447354fb16a01442ff6c6257fa19461bcd 100644
|
2023-12-05 22:51:34 +01:00
|
|
|
--- a/src/main/java/net/minecraft/commands/Commands.java
|
|
|
|
+++ b/src/main/java/net/minecraft/commands/Commands.java
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -154,6 +154,7 @@ public class Commands {
|
2023-12-05 22:51:34 +01:00
|
|
|
public static final int LEVEL_ADMINS = 3;
|
|
|
|
public static final int LEVEL_OWNERS = 4;
|
|
|
|
private final com.mojang.brigadier.CommandDispatcher<CommandSourceStack> dispatcher = new com.mojang.brigadier.CommandDispatcher();
|
2024-01-22 19:01:10 +01:00
|
|
|
+ public final java.util.List<CommandNode<CommandSourceStack>> vanillaCommandNodes = new java.util.ArrayList<>(); // Paper - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
|
|
|
|
public Commands(Commands.CommandSelection environment, CommandBuildContext commandRegistryAccess) {
|
|
|
|
this(); // CraftBukkit
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -257,6 +258,7 @@ public class Commands {
|
2023-12-05 22:51:34 +01:00
|
|
|
if (environment.includeIntegrated) {
|
|
|
|
PublishCommand.register(this.dispatcher);
|
|
|
|
}
|
2024-01-22 19:01:10 +01:00
|
|
|
+ this.vanillaCommandNodes.addAll(this.dispatcher.getRoot().getChildren()); // Paper - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
|
|
|
|
// CraftBukkit start
|
|
|
|
}
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -331,7 +333,7 @@ public class Commands {
|
2023-12-05 22:51:34 +01:00
|
|
|
commandlistenerwrapper.getServer().getProfiler().push(() -> {
|
|
|
|
return "/" + s;
|
|
|
|
});
|
2024-04-24 03:25:14 +02:00
|
|
|
- ContextChain<CommandSourceStack> contextchain = Commands.finishParsing(parseresults, s, commandlistenerwrapper, label); // CraftBukkit
|
2024-01-22 19:01:10 +01:00
|
|
|
+ ContextChain contextchain = this.finishParsing(parseresults, s, commandlistenerwrapper, label); // CraftBukkit // Paper - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
|
|
|
|
try {
|
|
|
|
if (contextchain != null) {
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -365,14 +367,23 @@ public class Commands {
|
2023-12-05 22:51:34 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
@Nullable
|
|
|
|
- private static ContextChain<CommandSourceStack> finishParsing(ParseResults<CommandSourceStack> parseresults, String s, CommandSourceStack commandlistenerwrapper, String label) { // CraftBukkit
|
2024-01-22 19:01:10 +01:00
|
|
|
+ private ContextChain<CommandSourceStack> finishParsing(ParseResults<CommandSourceStack> parseresults, String s, CommandSourceStack commandlistenerwrapper, String label) { // CraftBukkit // Paper - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
try {
|
|
|
|
Commands.validateParseResults(parseresults);
|
|
|
|
return (ContextChain) ContextChain.tryFlatten(parseresults.getContext().build(s)).orElseThrow(() -> {
|
|
|
|
return CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand().createWithContext(parseresults.getReader());
|
|
|
|
});
|
|
|
|
} catch (CommandSyntaxException commandsyntaxexception) {
|
|
|
|
- commandlistenerwrapper.sendFailure(ComponentUtils.fromMessage(commandsyntaxexception.getRawMessage()));
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper start - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
+ final net.kyori.adventure.text.TextComponent.Builder builder = net.kyori.adventure.text.Component.text();
|
|
|
|
+ if ((parseresults.getContext().getNodes().isEmpty() || !this.vanillaCommandNodes.contains(parseresults.getContext().getNodes().get(0).getNode()))) {
|
|
|
|
+ if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
|
|
|
|
+ builder.append(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.unknownCommandMessage));
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ // commandlistenerwrapper.sendFailure(ComponentUtils.fromMessage(commandsyntaxexception.getRawMessage()));
|
|
|
|
+ builder.color(net.kyori.adventure.text.format.NamedTextColor.RED).append(io.papermc.paper.brigadier.PaperBrigadier.componentFromMessage(commandsyntaxexception.getRawMessage()));
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper end - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
if (commandsyntaxexception.getInput() != null && commandsyntaxexception.getCursor() >= 0) {
|
|
|
|
int i = Math.min(commandsyntaxexception.getInput().length(), commandsyntaxexception.getCursor());
|
|
|
|
MutableComponent ichatmutablecomponent = Component.empty().withStyle(ChatFormatting.GRAY).withStyle((chatmodifier) -> {
|
2024-04-24 03:25:14 +02:00
|
|
|
@@ -391,7 +402,18 @@ public class Commands {
|
2023-12-05 22:51:34 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ichatmutablecomponent.append((Component) Component.translatable("command.context.here").withStyle(ChatFormatting.RED, ChatFormatting.ITALIC));
|
|
|
|
- commandlistenerwrapper.sendFailure(ichatmutablecomponent);
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper start - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
+ // commandlistenerwrapper.sendFailure(ichatmutablecomponent);
|
|
|
|
+ builder
|
|
|
|
+ .append(net.kyori.adventure.text.Component.newline())
|
|
|
|
+ .append(io.papermc.paper.adventure.PaperAdventure.asAdventure(ichatmutablecomponent));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ org.bukkit.event.command.UnknownCommandEvent event = new org.bukkit.event.command.UnknownCommandEvent(commandlistenerwrapper.getBukkitSender(), s, org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty() ? null : builder.build());
|
|
|
|
+ org.bukkit.Bukkit.getServer().getPluginManager().callEvent(event);
|
|
|
|
+ if (event.message() != null) {
|
|
|
|
+ commandlistenerwrapper.sendFailure(io.papermc.paper.adventure.PaperAdventure.asVanilla(event.message()), false);
|
2024-01-22 19:01:10 +01:00
|
|
|
+ // Paper end - Add UnknownCommandEvent
|
2023-12-05 22:51:34 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return null;
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2024-04-24 03:25:14 +02:00
|
|
|
index a7554f2028f93867360c27a51c9580a8b49f5b57..f351667cec83f39c28073e262b6c9b51873fb327 100644
|
2023-12-05 22:51:34 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
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:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
@@ -529,6 +529,7 @@ public final class CraftServer implements Server {
|
2023-12-05 22:51:34 +01:00
|
|
|
}
|
|
|
|
node = clone;
|
|
|
|
}
|
|
|
|
+ dispatcher.vanillaCommandNodes.add(node); // Paper
|
|
|
|
|
|
|
|
dispatcher.getDispatcher().getRoot().addChild(node);
|
|
|
|
} else {
|
Updated Upstream (Bukkit/CraftBukkit) (#10242)
* Updated Upstream (Bukkit/CraftBukkit)
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:
a6a9d2a4 Remove some old ApiStatus.Experimental annotations
be72314c SPIGOT-7300, PR-829: Add new DamageSource API providing enhanced information about entity damage
b252cf05 SPIGOT-7576, PR-970: Add methods in MushroomCow to change stew effects
b1c689bd PR-902: Add Server#isLoggingIPs to get log-ips configuration
08f86d1c PR-971: Add Player methods for client-side potion effects
2e3024a9 PR-963: Add API for in-world structures
a23292a7 SPIGOT-7530, PR-948: Improve Resource Pack API with new 1.20.3 functionality
1851857b SPIGOT-3071, PR-969: Add entity spawn method with spawn reason
cde4c52a SPIGOT-5553, PR-964: Add EntityKnockbackEvent
CraftBukkit Changes:
38fd4bd50 Fix accidentally renamed internal damage method
80f0ce4be SPIGOT-7300, PR-1180: Add new DamageSource API providing enhanced information about entity damage
7e43f3b16 SPIGOT-7581: Fix typo in BlockMushroom
ea14b7d90 SPIGOT-7576, PR-1347: Add methods in MushroomCow to change stew effects
4c687f243 PR-1259: Add Server#isLoggingIPs to get log-ips configuration
22a541a29 Improve support for per-world game rules
cb7dccce2 PR-1348: Add Player methods for client-side potion effects
b8d6109f0 PR-1335: Add API for in-world structures
4398a1b5b SPIGOT-7577: Make CraftWindCharge#explode discard the entity
e74107678 Fix Crafter maximum stack size
0bb0f4f6a SPIGOT-7530, PR-1314: Improve Resource Pack API with new 1.20.3 functionality
4949f556d SPIGOT-3071, PR-1345: Add entity spawn method with spawn reason
20ac73ca2 PR-1353: Fix Structure#place not working as documented with 0 palette
3c1b77871 SPIGOT-6911, PR-1349: Change max book length in CraftMetaBook
333701839 SPIGOT-7572: Bee nests generated without bees
f48f4174c SPIGOT-5553, PR-1336: Add EntityKnockbackEvent
2024-02-11 22:28:00 +01:00
|
|
|
@@ -911,7 +912,13 @@ public final class CraftServer implements Server {
|
2023-12-05 22:51:34 +01:00
|
|
|
|
|
|
|
// Spigot start
|
|
|
|
if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
|
|
|
|
- sender.sendMessage(org.spigotmc.SpigotConfig.unknownCommandMessage);
|
|
|
|
+ // Paper start
|
|
|
|
+ org.bukkit.event.command.UnknownCommandEvent event = new org.bukkit.event.command.UnknownCommandEvent(sender, commandLine, net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(org.spigotmc.SpigotConfig.unknownCommandMessage));
|
2024-02-01 10:15:57 +01:00
|
|
|
+ this.getPluginManager().callEvent(event);
|
2023-12-05 22:51:34 +01:00
|
|
|
+ if (event.message() != null) {
|
|
|
|
+ sender.sendMessage(event.message());
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
// Spigot end
|
|
|
|
|