Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2026-01-06 15:51:50 +00:00
Code Issues Releases Activity

Permissions + Messages update

Browse Source
This commit is contained in:
LoJoSho
2022-12-27 20:53:53 -06:00
parent 91fd370de9
commit 9f0f0b3a19
4 changed files with 68 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,10 +34,17 @@ public class CosmeticCommand implements CommandExecutor {
}
CosmeticUser user = CosmeticUsers.getUser(((Player) sender).getUniqueId());
Menu menu = Menus.getMenu(Settings.getDefaultMenu());
if (user == null || menu == null) {
sender.sendMessage("Invalid Menu");
if (user == null) {
MessagesUtil.sendMessage(sender, "invalid-player");
return true;
}
if (menu == null) {
MessagesUtil.sendMessage(sender, "invalid-menu");
return true;
}
menu.openMenu(user);
return true;
}
@@ -47,11 +54,10 @@ public class CosmeticCommand implements CommandExecutor {
return true;
}
HMCCosmeticsPlugin.setup();
sender.sendMessage("Reloaded.");
MessagesUtil.sendMessage(sender, "reloaded");
return true;
}
else if (args[0].equalsIgnoreCase("apply")) {
sender.sendMessage("Applying - Begin");
Player player = null;
Cosmetic cosmetic;
@@ -60,16 +66,25 @@ public class CosmeticCommand implements CommandExecutor {
cosmetic = Cosmetics.getCosmetic(args[1]);
if (player == null || cosmetic == null) {
sender.sendMessage("Something was null");
if (cosmetic == null) {
MessagesUtil.sendMessage(sender, "invalid-cosmetic");
return true;
}
if (player == null) {
MessagesUtil.sendMessage(sender, "invalid-player");
return true;
}
CosmeticUser user = CosmeticUsers.getUser(player);
if (!user.canEquipCosmetic(cosmetic)) {
MessagesUtil.sendMessage(player, "no-cosmetic-permission");
return true;
}
user.addPlayerCosmetic(cosmetic);
user.updateCosmetic(cosmetic.getSlot());
sender.sendMessage("Applying - Finish with " + cosmetic.getId());
return true;
}
else if (args[0].equalsIgnoreCase("unapply")) {
@@ -81,8 +96,13 @@ public class CosmeticCommand implements CommandExecutor {
cosmeticSlot = CosmeticSlot.valueOf(args[1]);
if (player == null || cosmeticSlot == null) {
sender.sendMessage("Something was null");
if (cosmeticSlot == null) {
MessagesUtil.sendMessage(sender, "invalid-slot");
return true;
}
if (player == null) {
MessagesUtil.sendMessage(sender, "invalid-player");
return true;
}
@@ -98,8 +118,13 @@ public class CosmeticCommand implements CommandExecutor {
if (sender instanceof Player) player = ((Player) sender).getPlayer();
if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
if (!player.hasPermission("HMCCosmetic.wardrobe")) {
MessagesUtil.sendMessage(sender, "no-permission");
return true;
}
if (player == null) {
sender.sendMessage("Player was null");
MessagesUtil.sendMessage(sender, "invalid-player");
return true;
}
@@ -116,13 +141,19 @@ public class CosmeticCommand implements CommandExecutor {
if (sender instanceof Player) player = ((Player) sender).getPlayer();
if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
CosmeticUser user = CosmeticUsers.getUser(player);
if (player == null || menu == null) {
sender.sendMessage("Something was null");
if (user == null) {
MessagesUtil.sendMessage(sender, "invalid-player");
return true;
}
menu.openMenu(CosmeticUsers.getUser(player));
if (menu == null) {
MessagesUtil.sendMessage(sender, "invalid-menu");
return true;
}
menu.openMenu(user);
return true;
}
@@ -130,6 +161,10 @@ public class CosmeticCommand implements CommandExecutor {
if (args.length == 1) return true;
OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
if (player == null) return true;
if (sender.hasPermission("HMCCosmetic.dataclear") || !sender.isOp()) {
MessagesUtil.sendMessage(sender, "no-permission");
return true;
}
Database.clearData(player.getUniqueId());
sender.sendMessage("Cleared data for " + player.getName());
return true;
@@ -140,6 +175,10 @@ public class CosmeticCommand implements CommandExecutor {
if (player == null) return true;
CosmeticUser user = CosmeticUsers.getUser(player);
if (user == null) return true;
if (sender.hasPermission("HMCCosmetic.dye") || !sender.isOp()) {
MessagesUtil.sendMessage(sender, "no-permission");
return true;
}
DyeMenu.openMenu(user, user.getCosmetic(CosmeticSlot.valueOf(args[1])));
}
@@ -148,6 +187,10 @@ public class CosmeticCommand implements CommandExecutor {
if (player == null) return true;
CosmeticUser user = CosmeticUsers.getUser(player);
if (user == null) return true;
if (sender.hasPermission("HMCCosmetic.dump") || !sender.isOp()) {
MessagesUtil.sendMessage(sender, "no-permission");
return true;
}
player.sendMessage("Passengers -> " + player.getPassengers());
if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
player.sendMessage("Backpack Location -> " + user.getBackpackEntity().getLocation());

4
common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java
View File

@@ -180,7 +180,7 @@ public class CosmeticUser {
public void enterWardrobe() {
if (!WardrobeSettings.inDistanceOfStatic(getPlayer().getLocation())) {
getPlayer().sendMessage("You are to far away!");
MessagesUtil.sendMessage(getPlayer(), "not-near-wardrobe");
return;
}
wardrobe = new Wardrobe(this);
@@ -276,7 +276,7 @@ public class CosmeticUser {
return dyableSlots;
}
public boolean hasCosmetic(Cosmetic cosmetic) {
public boolean canEquipCosmetic(Cosmetic cosmetic) {
if (!cosmetic.requiresPermission()) return true;
if (getPlayer().hasPermission(cosmetic.getPermission())) return true;
return false;

2
common/src/main/java/com/hibiscusmc/hmccosmetics/user/Wardrobe.java
View File

@@ -92,6 +92,7 @@ public class Wardrobe {
}
MessagesUtil.sendMessage(player, "opened-wardrobe");
this.active = true;
update();
}
@@ -137,6 +138,7 @@ public class Wardrobe {
}
if (!player.isOnline()) return;
VIEWER.updateCosmetic();
MessagesUtil.sendMessage(player, "closed-wardrobe");
}
public void update() {

63
common/src/main/resources/messages.yml
View File

@@ -1,60 +1,13 @@
prefix: "<white>HMCCosmetics > "
no-permission: "%prefix% <red>No Permission!"
# To-Do messages
no-cosmetic-permission: "%prefix% <red>You do not have permission for this cosmetic!"
set-hat: "%prefix% <gradient:#6D9DC5:#45CDE9>Applied hat!"
removed-hat: "%prefix% <gradient:#6D9DC5:#45CDE9>Removed hat!"
set-balloon: "%prefix% <gradient:#6D9DC5:#45CDE9>Applied Balloon!"
removed-balloon: "%prefix% <gradient:#6D9DC5:#45CDE9>Removed Balloon!"
set-backpack: "%prefix% <gradient:#6D9DC5:#45CDE9>Applied backpack!"
removed-backpack: "%prefix% <gradient:#6D9DC5:#45CDE9>Removed backpack!"
set-off-hand: "%prefix% <gradient:#6D9DC5:#45CDE9>Applied offhand!"
removed-off-hand: "%prefix% <gradient:#6D9DC5:#45CDE9>Removed offhand!"
set-chest-plate: "%prefix% <gradient:#6D9DC5:#45CDE9>Applied chest plate!"
removed-chest-plate: "%prefix% <gradient:#6D9DC5:#45CDE9>Removed chest plate!"
set-off-pants: "%prefix% <gradient:#6D9DC5:#45CDE9>Applied pants!"
removed-pants: "%prefix% <gradient:#6D9DC5:#45CDE9>Removed pants!"
set-boots: "%prefix% <gradient:#6D9DC5:#45CDE9>Applied boots!"
removed-boots: "%prefix% <gradient:#6D9DC5:#45CDE9>Removed boots!"
set-dye-color: "%prefix% <gradient:#6D9DC5:#45CDE9>Set color of %item%!"
must-be-player: "<red>You must be a player to do this!"
reloaded: "%prefix% <gradient:#00ff87:#60efff>Config files reloaded!"
invalid-type: "%prefix% <red>Invalid cosmetic type, please use <u>hat</u>, <u>backpack</u> or <u>off_hand</u>!"
set-other-backpack: "%prefix% <gradient:#6D9DC5:#45CDE9>You have set the backpack of %player% to %type%"
set-other-hat: "%prefix% <gradient:#6D9DC5:#45CDE9>You have set the hat of %player% to %type%"
set-other-off-hand: "%prefix% <gradient:#6D9DC5:#45CDE9>You have set the off hand of %player% to %type%"
set-other-chest-plate: "%prefix% <gradient:#6D9DC5:#45CDE9>You have set the chest plate of %player% to %type%"
set-other-pants: "%prefix% <gradient:#6D9DC5:#45CDE9>You have set the pants of %player% to %type%"
set-other-boots: "%prefix% <gradient:#6D9DC5:#45CDE9>You have set the boots of %player% to %type%"
hid-cosmetics: "%prefix% <gradient:#6D9DC5:#45CDE9>You have hidden your cosmetics"
shown-cosmetics: "%prefix% <gradient:#6D9DC5:#45CDE9>You have shown your cosmetics"
no-permission: "%prefix% <red>No Permission!"
no-cosmetic-permission: "%prefix% <red>You do not have permission for this cosmetic!"
opened-wardrobe: "%prefix% <gradient:#6D9DC5:#45CDE9>Opened wardrobe!"
closed-wardrobe: "%prefix% <gradient:#6D9DC5:#45CDE9>Closed wardrobe!"
wardrobe-already-open: "%prefix% <gradient:#6D9DC5:#45CDE9><red>The wardrobe is already open!"
not-near-wardrobe: "%prefix% <gradient:#6D9DC5:#45CDE9><red>You are not near the wardrobe!"
cannot-use-portable-wardrobe: "%prefix% <gradient:#6D9DC5:#45CDE9><red>You cannot use the portable wardrobe!"
opened-other-wardrobe: "%prefix% <gradient:#6D9DC5:#45CDE9><red>Opening %player%'s wardrobe."
gave-token: "%prefix% <gradient:#6D9DC5:#45CDE9><green>You gave %player% a %id% token"
received-token: "%prefix% <gradient:#6D9DC5:#45CDE9><green>You were given a %id% token"
traded-token: "%prefix% <gradient:#6D9DC5:#45CDE9><green>You have received the cosmetic: %id%"
already-unlocked: "%prefix% <gradient:#6D9DC5:#45CDE9><green>You have already unlocked the cosmetic: %id%"
help-command: "<#6D9DC5><st> </st> %prefix% <gradient:#40B7D6:#6D9DC5>HMCCosmetics - Help</gradient> %prefix% <#6D9DC5> <st> </st>
<#5AE4B5>- <#40B7D6>/cosmetics - <#6D9DC5>Opens cosmetics GUI.
<#5AE4B5>- <#40B7D6>/cosmetics add <gray><USERNAME> <ID> (#HEX)</gray> - <#6D9DC5>Adds cosmetic to player.
<#5AE4B5>- <#40B7D6>/cosmetics remove <gray><USERNAME> \\<BACKPACK/HAT></gray> - <#6D9DC5>Removes cosmetic from a player.
<#5AE4B5>- <#40B7D6>/cosmetics dye <gray>\\<BACKPACK/HAT></gray> - <#6D9DC5>Opens dye menu for the specified cosmetic type.
<#5AE4B5>- <#40B7D6>/cosmetics token <gray>\\<ID> <USERNAME></gray> - <#6D9DC5>Gives player a cosmetic token.
<#5AE4B5>- <#40B7D6>/cosmetics menu <gray>\\<MENU></gray> - <#6D9DC5>Opens the specified menu.
<#5AE4B5>- <#40B7D6>/cosmetics help - <#6D9DC5>Opens this menu.
<st> </st>"
invalid-slot: "%prefix% <red>Invalid cosmetic slot!"
invalid-player: "%prefix% <red>Invalid Player!"
invalid-menu: "%prefix% <red>Invalid Menu!"
invalid-cosmetic: "%prefix% <red>Invalid Cosmetic!"