From e6ef9970412859bd185d2893be36716d95fb98fa Mon Sep 17 00:00:00 2001 From: jameslfc19 Date: Tue, 14 Jul 2020 20:53:37 +0100 Subject: [PATCH] Fixed Descriptions & Cleaned Up --- .../minecraft/chests/ChestsPlusPlus.java | 4 ++-- .../chests/commands/AutoCraftCommand.java | 22 +++++++++---------- .../chests/listeners/StorageListener.java | 1 - 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java index 61b08f2..c2ad0ee 100644 --- a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java +++ b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/ChestsPlusPlus.java @@ -50,9 +50,9 @@ import org.bukkit.plugin.java.annotation.plugin.author.Author; @Permission(name = Permissions.OPEN, desc = "Gives permission to open ChestLinks!", defaultValue = PermissionDefault.TRUE) @Permission(name = Permissions.MENU, desc = "Gives permission to open the ChestLink menu!", defaultValue = PermissionDefault.TRUE) @Permission(name = Permissions.REMOVE, desc = "Gives permission to remove a ChestLink!", defaultValue = PermissionDefault.TRUE) -@Permission(name = Permissions.OPEN_ANY, desc = "Gives permission to open all chests, for admin use.", defaultValue = PermissionDefault.OP) +@Permission(name = Permissions.OPEN_ANY, desc = "Gives permission to open all chests/autocraft stations, for admin use.", defaultValue = PermissionDefault.OP) @Permission(name = Permissions.MEMBER, desc = "Gives permission to add/remove a member to/from their chestlink.", defaultValue = PermissionDefault.TRUE) -@Permission(name = Permissions.SORT, desc = "Set the sorting option for the given ChestLink.", defaultValue = PermissionDefault.TRUE) +@Permission(name = Permissions.SORT, desc = "Gives permission to sort ChestLinks.", defaultValue = PermissionDefault.TRUE) @Permission(name = Permissions.AUTOCRAFT_OPEN, desc = "Gives permission to open AutoCrafting stations.", defaultValue = PermissionDefault.TRUE) @Permission(name = Permissions.AUTOCRAFT_ADD, desc = "Gives permission to add AutoCrafting stations.", defaultValue = PermissionDefault.TRUE) @Permission(name = Permissions.AUTOCRAFT_REMOVE, desc = "Gives permission to remove AutoCrafting stations.", defaultValue = PermissionDefault.TRUE) diff --git a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/AutoCraftCommand.java b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/AutoCraftCommand.java index 18f5f0a..e3db1b0 100644 --- a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/AutoCraftCommand.java +++ b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/commands/AutoCraftCommand.java @@ -27,7 +27,7 @@ public class AutoCraftCommand extends ServerCommand { HELP("/autocraft help","List of commands and their uses!"), LIST("/autocraft list","Lists all AutoCraft groups that you own!"), MEMBER("/autocraft member [add/remove ] or [list ]","Add, remove or list members of a group"), - MENU("/autocraft menu","Open the AutoCraft menu to display all groups!"), +// MENU("/autocraft menu","Open the AutoCraft menu to display all groups!"), OPEN("/autocraft open ","Open the workbench of an AutoCraft group"), REMOVE("/autocraft remove ", "Delete an AutoCraft group and drop all the Crafting Tables!"), RENAME("/autocraft rename ","Rename an AutoCraft group."), @@ -110,16 +110,16 @@ public class AutoCraftCommand extends ServerCommand { player.sendMessage(ChatColor.RED+ OPTIONS.OPEN.description); return true; } - case MENU: - if(sender.hasPermission(Permissions.MENU)) { - //TODO Add AutoCraft menu. - player.sendMessage(ChatColor.GOLD+" Currently unimplemented in this BETA!"); - //ChestLinkMenu.getMenu(player).open(player); - return true; - } else { - Messages.NO_PERMISSION(player); - return true; - } +// case MENU: +// if(sender.hasPermission(Permissions.MENU)) { +// //TODO Add AutoCraft menu. +// player.sendMessage(ChatColor.GOLD+" Currently unimplemented in this BETA!"); +// //ChestLinkMenu.getMenu(player).open(player); +// return true; +// } else { +// Messages.NO_PERMISSION(player); +// return true; +// } case LIST: Config.getAutoCraft().getMessages().listStorageGroups(player); return true; diff --git a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/listeners/StorageListener.java b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/listeners/StorageListener.java index 3ff1c31..2c35040 100644 --- a/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/listeners/StorageListener.java +++ b/ChestsPlusPlus_Main/src/main/java/com/jamesdpeters/minecraft/chests/listeners/StorageListener.java @@ -133,7 +133,6 @@ public class StorageListener implements Listener { } if (storageType.hasPermissionToAdd(event.getPlayer())) { storageType.createStorageFacing(event.getPlayer(), owner, event.getBlockPlaced(), storageID, blockFace, false); -// storageType.add(event.getPlayer(), storageID, event.getBlockPlaced().getLocation(), event.getPlayer().) } else { event.setCancelled(true); Messages.NO_PERMISSION(event.getPlayer());