From dbdc6a5c9062170c7e3c918bb830d2e9e33753f8 Mon Sep 17 00:00:00 2001 From: lucian929 Date: Wed, 12 Jan 2022 20:44:24 -0500 Subject: [PATCH] Added help command --- .../command/CosmeticsCommand.java | 15 +++ .../hmccosmetics/message/Messages.java | 12 +++ .../hmccosmetics/message/Permission.java | 1 + src/main/resources/menus/dye-menu.yml | 96 +++++++++++++++++-- src/main/resources/menus/main.yml | 30 ++++-- src/main/resources/messages.yml | 13 ++- src/main/resources/plugin.yml | 2 +- 7 files changed, 151 insertions(+), 18 deletions(-) diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/command/CosmeticsCommand.java b/src/main/java/io/github/fisher2911/hmccosmetics/command/CosmeticsCommand.java index e94a7800..1d3e5f32 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/command/CosmeticsCommand.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/command/CosmeticsCommand.java @@ -4,6 +4,7 @@ import io.github.fisher2911.hmccosmetics.HMCCosmetics; import io.github.fisher2911.hmccosmetics.gui.ArmorItem; import io.github.fisher2911.hmccosmetics.gui.CosmeticsMenu; import io.github.fisher2911.hmccosmetics.gui.DyeSelectorGui; +import io.github.fisher2911.hmccosmetics.message.Message; import io.github.fisher2911.hmccosmetics.message.MessageHandler; import io.github.fisher2911.hmccosmetics.message.Messages; import io.github.fisher2911.hmccosmetics.user.User; @@ -86,4 +87,18 @@ public class CosmeticsCommand extends CommandBase { } } + @SubCommand("help") // WORK IN PROGRESS (WIP) + @Permission(io.github.fisher2911.hmccosmetics.message.Permission.HELP_COMMAND) + public void helpCommand(final CommandSender sender) { + Bukkit.getScheduler().runTaskAsynchronously( + this.plugin, + () -> { + this.messageHandler.sendMessage( + sender, + Messages.HELP_COMMAND + ); + } + ); + } + } diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/message/Messages.java b/src/main/java/io/github/fisher2911/hmccosmetics/message/Messages.java index b2e0f083..fe0f0aeb 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/message/Messages.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/message/Messages.java @@ -18,4 +18,16 @@ public class Messages { new Message("reloaded", "Config reloaded"); public static final Message INVALID_TYPE = new Message("invalid-type", "Invalid type"); + public static final Message HELP_COMMAND = + new Message("help-command", "<#6D9DC5> HMCCosmetics - Help<#6D9DC5> \n" + + "\n" + + "\n" + + "<#5AE4B5>• <#40B7D6>/cosmetics - <#6D9DC5>Opens cosmetics GUI.\n" + + "\n" + + "<#5AE4B5>• <#40B7D6>/cosmetics dye - <#6D9DC5>Opens dye menu for specified cosmetic.\n" + + "\n" + + "<#5AE4B5>• <#40B7D6>/cosmetics help - <#6D9DC5>Opens this menu.\n" + + "\n" + + "\n" + + " "); } diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/message/Permission.java b/src/main/java/io/github/fisher2911/hmccosmetics/message/Permission.java index 43ef710c..a033443b 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/message/Permission.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/message/Permission.java @@ -5,5 +5,6 @@ public class Permission { public static final String DEFAULT_COMMAND = "hmccosmetics.cmd.default"; public static final String DYE_COMMAND = "hmccosmetics.cmd.dye"; public static final String RELOAD_COMMAND = "hmccosmetics.cmd.reload"; + public static final String HELP_COMMAND = "hmccosmetics.cmd.help"; } diff --git a/src/main/resources/menus/dye-menu.yml b/src/main/resources/menus/dye-menu.yml index df407f07..eab80cbe 100644 --- a/src/main/resources/menus/dye-menu.yml +++ b/src/main/resources/menus/dye-menu.yml @@ -1,17 +1,93 @@ -title: Set Color -rows: 3 +title: "" +rows: 4 items: 10: - material: BLUE_STAINED_GLASS - name: "Set to blue" + material: LEATHER_HORSE_ARMOR + model-data: 1 + color: + red: 255 + green: 255 + blue: 255 + name: "Set to <#FFFFFF>white" + set-color: + red: 255 + green: 255 + blue: 255 + 11: + material: LEATHER_HORSE_ARMOR + model-data: 1 + color: + red: 190 + green: 20 + blue: 20 + name: "Set to <#BE1414>red" + set-color: + red: 190 + green: 20 + blue: 20 + 12: + material: LEATHER_HORSE_ARMOR + model-data: 1 + color: + red: 234 + green: 92 + blue: 43 + name: "Set to <#EA5C2B>orange" + set-color: + red: 234 + green: 92 + blue: 43 + 13: + material: LEATHER_HORSE_ARMOR + model-data: 1 + color: + red: 255 + green: 201 + blue: 0 + name: "Set to <#FFC900>yellow" + set-color: + red: 255 + green: 201 + blue: 0 + 14: + material: LEATHER_HORSE_ARMOR + model-data: 1 + color: + red: 163 + green: 218 + blue: 141 + name: "Set to <#A3DA8D>green" + set-color: + red: 163 + green: 218 + blue: 141 + 15: + material: LEATHER_HORSE_ARMOR + model-data: 1 + color: + red: 55 + green: 49 + blue: 181 + name: "Set to <#3731B5>blue" set-color: red: 55 green: 49 blue: 181 - 11: - material: RED_STAINED_GLASS - name: "Set to red" + 16: + material: LEATHER_HORSE_ARMOR + model-data: 1 + color: + red: 137 + green: 70 + blue: 166 + name: "Set to <#8946A6>purple" set-color: - red: 190 - green: 20 - blue: 20 \ No newline at end of file + red: 137 + green: 70 + blue: 166 + 31: + material: PAPER + name: "<#F7DCFA>Previous Page" + amount: 1 + model-data: 1 + open-menu: main \ No newline at end of file diff --git a/src/main/resources/menus/main.yml b/src/main/resources/menus/main.yml index c8f8baa5..5a3f1896 100644 --- a/src/main/resources/menus/main.yml +++ b/src/main/resources/menus/main.yml @@ -1,7 +1,7 @@ -title: "<#3066BE>Cosmetics Menu" # GUI Title -rows: 3 # Rows in the GUI +title: "" # GUI Title +rows: 5 # Rows in the GUI items: - 10: # GUI Slot number + 1: # GUI Slot number material: LEATHER_HORSE_ARMOR name: "Colorful Hat" lore: # Lore displayed when the player owns the item @@ -11,7 +11,7 @@ items: locked-lore: # Lore displayed when the player does not have the correct permission. - "You do not own this item!" amount: 1 - model-data: 1 # CustomModelData Number + model-data: 2 # CustomModelData Number type: HAT dyeable: true # Enables dyeable item feature color: # Sets default color for item. Uses RGB format. @@ -21,7 +21,7 @@ items: open-menu: dye-menu # Automatically open the dye menu when applying this cosmetic permission: "cosmetics.colorful_hat" # Can be anything you want. id: colorful_hat # Internal identifier. Can be anything you want. - 11: + 2: material: PAPER name: "Backpack" lore: @@ -31,7 +31,25 @@ items: locked-lore: - "You do not own this item!" amount: 1 - model-data: 1 + model-data: 4 type: BACKPACK permission: "" id: backpack + 37: + material: PAPER + name: "<#40B7D6>Previous Page" + amount: 1 + model-data: 1 + open-menu: menu-2 + 40: + material: PAPER + name: "Customization Menu" + amount: 1 + model-data: 3 + open-menu: dye-menu + 43: + material: PAPER + name: "<#40B7D6>Next Page" + amount: 1 + model-data: 2 + open-menu: menu-2 diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml index 90756945..7cc6f3b1 100644 --- a/src/main/resources/messages.yml +++ b/src/main/resources/messages.yml @@ -5,4 +5,15 @@ set-backpack: "Set Backpack!" removed-backpack: "Removed backpack." must-be-player: "You must be a player to do this!" reloaded: "Config files reloaded!" -invalid-type: "Invalid cosmetic type, please use hat or backpack" \ No newline at end of file +invalid-type: "Invalid cosmetic type, please use hat or backpack" +help-command: "<#6D9DC5> HMCCosmetics - Help<#6D9DC5> + + +<#5AE4B5>• <#40B7D6>/cosmetics - <#6D9DC5>Opens cosmetics GUI. + +<#5AE4B5>• <#40B7D6>/cosmetics dye - <#6D9DC5>Opens dye menu for specified cosmetic. + +<#5AE4B5>• <#40B7D6>/cosmetics help - <#6D9DC5>Opens this menu. + + + " \ No newline at end of file diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 11906999..5b475fec 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: HMCCosmetics main: io.github.fisher2911.hmccosmetics.HMCCosmetics -version: 1.0.2 +version: 1.0.3 api-version: 1.17 softdepend: - Multiverse