Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-08 20:09:59 +01:00
Code Issues Projects Releases Wiki Activity

Update commodore to 1.5

Browse Source
This commit is contained in:
Luck 2020-01-04 23:26:53 +00:00
parent 3ceb53aa4f
commit c1e3660551
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
3 changed files with 10 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/build.gradle
View File

@ -12,7 +12,7 @@ dependencies {
compileOnly 'org.spigotmc:spigot-api:1.14-R0.1-SNAPSHOT'
compileOnly 'net.kyori:text-adapter-bukkit:3.0.2'
compileOnly 'me.lucko:commodore:1.4'
compileOnly 'me.lucko:commodore:1.5'
compileOnly('net.milkbowl.vault:VaultAPI:1.6') {
exclude(module: 'bukkit')
}

49
bukkit/src/main/java/me/lucko/luckperms/bukkit/brigadier/LuckPermsBrigadier.java
View File

@ -34,28 +34,15 @@ import me.lucko.luckperms.bukkit.LPBukkitPlugin;
import me.lucko.luckperms.common.sender.Sender;
import org.bukkit.command.Command;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerCommandSendEvent;
import org.bukkit.plugin.PluginManager;
import java.io.InputStream;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* Registers LuckPerms command data to brigadier using {@link Commodore}.
*/
public class LuckPermsBrigadier {
public final class LuckPermsBrigadier {
private LuckPermsBrigadier() {}
/**
* Registers LuckPerms command data to the given {@code pluginCommand}.
*
* @param plugin the luckperms plugin
* @param pluginCommand the command
* @throws Exception if something goes wrong
*/
public static void register(LPBukkitPlugin plugin, Command pluginCommand) throws Exception {
Commodore commodore = CommodoreProvider.getCommodore(plugin.getBootstrap());
try (InputStream is = plugin.getBootstrap().getResourceStream("luckperms.commodore")) {
@ -63,33 +50,11 @@ public class LuckPermsBrigadier {
throw new Exception("Brigadier command data missing from jar");
}
LiteralCommandNode<?> command = CommodoreFileFormat.parse(is);
commodore.register(pluginCommand, command);
}
// add event listener to prevent completions from being send to players without permission
// to use any LP commands.
PluginManager pluginManager = plugin.getBootstrap().getServer().getPluginManager();
pluginManager.registerEvents(new PermissionListener(plugin, pluginCommand), plugin.getBootstrap());
}
private static final class PermissionListener implements Listener {
private final LPBukkitPlugin plugin;
private final List<String> aliases;
private PermissionListener(LPBukkitPlugin plugin, Command pluginCommand) {
this.plugin = plugin;
this.aliases = Commodore.getAliases(pluginCommand).stream()
.flatMap(alias -> Stream.of(alias, "minecraft:" + alias))
.collect(Collectors.toList());
}
@EventHandler
public void onCommandSend(PlayerCommandSendEvent e) {
Sender playerAsSender = this.plugin.getSenderFactory().wrap(e.getPlayer());
if (!this.plugin.getCommandManager().hasPermissionForAny(playerAsSender)) {
e.getCommands().removeAll(this.aliases);
}
LiteralCommandNode<?> commandNode = CommodoreFileFormat.parse(is);
commodore.register(pluginCommand, commandNode, player -> {
Sender playerAsSender = plugin.getSenderFactory().wrap(player);
return plugin.getCommandManager().hasPermissionForAny(playerAsSender);
});
}
}

4
common/src/main/java/me/lucko/luckperms/common/dependencies/Dependency.java
View File

@ -136,8 +136,8 @@ public enum Dependency {
COMMODORE(
"me{}lucko",
"commodore",
"1.4",
"9jrCBDKswqiT9/i97FtRmVJwYE3pXncxjoKFvdZMgzM=",
"1.5",
"vRQpmpYu/R780xwdOV5DNFYvKt9QKhkAVg6if6gMaa4=",
Relocation.of("commodore", "me{}lucko{}commodore")
),
MARIADB_DRIVER(