Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-20 07:29:15 +00:00
Code Issues Releases Activity

command improvements + /cosmetic emote playerName

Browse Source
This commit is contained in:
LoJoSho
2023-02-10 16:34:40 -06:00
parent 00cc3eef2c
commit b49cebdec8
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle.kts
View File

@@ -190,11 +190,14 @@ bukkit {
register("hmccosmetics.cmd.menu") { register("hmccosmetics.cmd.menu") {
default = BukkitPluginDescription.Permission.Default.TRUE default = BukkitPluginDescription.Permission.Default.TRUE
} }
register("hmccosmetics.emote.shiftrun") {
default = BukkitPluginDescription.Permission.Default.TRUE
}
register("hmccosmetics.cmd.emote") { register("hmccosmetics.cmd.emote") {
default = BukkitPluginDescription.Permission.Default.TRUE default = BukkitPluginDescription.Permission.Default.TRUE
} }
register("hmccosmetics.emote.shiftrun") { register("hmccosmetics.cmd.emote.other") {
default = BukkitPluginDescription.Permission.Default.TRUE default = BukkitPluginDescription.Permission.Default.OP
} }
register("hmccosmetics.cmd.setlocation") { register("hmccosmetics.cmd.setlocation") {
default = BukkitPluginDescription.Permission.Default.OP default = BukkitPluginDescription.Permission.Default.OP

3
common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java
View File

@@ -386,6 +386,9 @@ public class CosmeticCommand implements CommandExecutor {
if (!silent) MessagesUtil.sendMessage(sender, "no-permission"); if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
return true; return true;
} }
if (sender.hasPermission("hmccosmetics.cmd.emote.other")) {
if (args.length >= 2) player = Bukkit.getPlayer(args[1]);
}
CosmeticUser user = CosmeticUsers.getUser(player); CosmeticUser user = CosmeticUsers.getUser(player);
if (!user.hasCosmeticInSlot(CosmeticSlot.EMOTE)) { if (!user.hasCosmeticInSlot(CosmeticSlot.EMOTE)) {
if (!silent) MessagesUtil.sendMessage(sender, "emote-none"); if (!silent) MessagesUtil.sendMessage(sender, "emote-none");

6
common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommandTabComplete.java
View File

@@ -40,6 +40,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
if (hasPermission(sender, "hmccosmetics.cmd.hide")) completions.add("hide"); if (hasPermission(sender, "hmccosmetics.cmd.hide")) completions.add("hide");
if (hasPermission(sender, "hmccosmetics.cmd.show")) completions.add("show"); if (hasPermission(sender, "hmccosmetics.cmd.show")) completions.add("show");
if (hasPermission(sender, "hmccosmetics.cmd.debug")) completions.add("debug"); if (hasPermission(sender, "hmccosmetics.cmd.debug")) completions.add("debug");
if (hasPermission(sender, "hmccosmetics.cmd.emote")) completions.add("emote");
StringUtil.copyPartialMatches(args[0], completions, finalCompletitons); StringUtil.copyPartialMatches(args[0], completions, finalCompletitons);
} }
@@ -63,7 +64,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
if (menu.canOpen(user.getPlayer())) completions.add(menu.getId()); if (menu.canOpen(user.getPlayer())) completions.add(menu.getId());
} }
} }
case "dataclear", "wardrobe", "hide", "show" -> { case "dataclear", "wardrobe", "hide", "show", "emote" -> {
for (Player player : Bukkit.getOnlinePlayers()) { for (Player player : Bukkit.getOnlinePlayers()) {
completions.add(player.getName()); completions.add(player.getName());
} }
@@ -78,9 +79,6 @@ public class CosmeticCommandTabComplete implements TabCompleter {
completions.add("viewerlocation"); completions.add("viewerlocation");
completions.add("leavelocation"); completions.add("leavelocation");
} }
case "emote" -> {
completions.addAll(PlayerAnimator.api.getAnimationManager().getRegistry().keySet());
}
} }
StringUtil.copyPartialMatches(args[1], completions, finalCompletitons); StringUtil.copyPartialMatches(args[1], completions, finalCompletitons);
} }