8000 Register commands as plugin commands on Paper 1.20.6 and above by DerEchtePilz · Pull Request #629 · CommandAPI/CommandAPI · GitHub
[go: up one dir, main page]
Skip to content

Register commands as plugin commands on Paper 1.20.6 and above #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Feb 27, 2025
Merged

Register commands as plugin commands on Paper 1.20.6 and above #629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8fb93e1
Register commands as plugin commands for Paper 1.20.6 build 65 and above
DerEchtePilz Jan 4, 2025
f5ce01d
Remove the printlns
DerEchtePilz Jan 4, 2025
e3401fc
Deal with help
DerEchtePilz Jan 4, 2025
f440134
Minor clean-up
DerEchtePilz Jan 4, 2025
612e226
Add changelog entry
DerEchtePilz Jan 4, 2025
40f94b7
Account for Paper's latest changes for identifying plugin commands
DerEchtePilz Feb 17, 2025
d350bdc
Does this fix stuff?
DerEchtePilz Feb 20, 2025
35ecee0
This seems to work too
DerEchtePilz Feb 20, 2025
956d0f6
So it doesn't actually work...
DerEchtePilz Feb 21, 2025
e58b0e1
Let the server generate help topics
DerEchtePilz Feb 21, 2025
995fc6a
Don't let the server generate the help topic when anything other than…
DerEchtePilz Feb 25, 2025
a3371d8
Make sure that reloads don't mess up help topics we generate
DerEchtePilz Feb 25, 2025
0ad2439
Address code review
DerEchtePilz Feb 26, 2025
d753923
Addressing some review comments
DerEchtePilz Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
So it doesn't actually work... 
This fixes the issue described on discord where if a plugin registeres commands with the CommandAPI and Paper's Brigadier API, that the commands that were registered with the CommandAPI do
not appear in the plugin's help topic (/help PluginName) after running `minecraft:reload`.

This reverts commit 35ecee0.
  • Loading branch information
@DerEchtePilz
DerEchtePilz committed Feb 21, 2025
commit 956d0f699ef277b3383018726ff1135ebee7fbd3
7 changes: 6 additions & 1 deletion ...kkit-nms/commandapi-bukkit-1.20.5/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,12 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration
}
return new PaperCommandRegistration<>(
() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),
() -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),
() -> {
SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();
helpMap.clear();
helpMap.initializeGeneralTopics();
helpMap.initializeCommands();
},
node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())
);
}
Expand Down
7 changes: 6 additions & 1 deletion ...kkit-nms/commandapi-bukkit-1.21.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,12 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration
}
return new PaperCommandRegistration<>(
() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),
() -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),
() -> {
SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();
helpMap.clear();
helpMap.initializeGeneralTopics();
helpMap.initializeCommands();
},
node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())
);
}
Expand Down
7 changes: 6 additions & 1 deletion ...kkit-nms/commandapi-bukkit-1.21.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,12 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration
}
return new PaperCommandRegistration<>(
() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),
() -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),
() -> {
SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();
helpMap.clear();
helpMap.initializeGeneralTopics();
helpMap.initializeCommands();
},
node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())
);
}
Expand Down
7 changes: 6 additions & 1 deletion ...bukkit-nms/commandapi-bukkit-1.21/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,12 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration
}
return new PaperCommandRegistration<>(
() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),
() -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),
() -> {
SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();
helpMap.clear();
helpMap.initializeGeneralTopics();
helpMap.initializeCommands();
},
node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())
);
}
Expand Down
Loading
0