Added custom exception

* Renamed class * Removed redundant variable
sarhatabaot · Jun 25, 2019 · 0c62d1f · 0c62d1f
1 parent 2561bf5
commit 0c62d1f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/src/main/java/me/tychsen/enchantgui/commands/PlayerCommand.java b/src/main/java/me/tychsen/enchantgui/commands/PlayerCommand.java
@@ -15,7 +15,6 @@
  */
 public abstract class PlayerCommand extends Command {
     private Player player;
-    private String[] args;
 
     @Setter(value= AccessLevel.PROTECTED)
     private String prefix;
@@ -32,7 +31,6 @@ public final boolean execute(@NotNull CommandSender sender,@NotNull String comma
         }
 
         this.player = (Player) sender;
-        this.args = args;
 
         try {
             run(player, args);

diff --git a/src/main/java/me/tychsen/enchantgui/menu/DefaultMenuGenerator.java b/src/main/java/me/tychsen/enchantgui/menu/DefaultMenuGenerator.java
@@ -5,7 +5,7 @@
 import me.tychsen.enchantgui.config.EShopShop;
 import me.tychsen.enchantgui.economy.NullPayment;
 import me.tychsen.enchantgui.Main;
-import me.tychsen.enchantgui.permissions.EshopPermissionSys;
+import me.tychsen.enchantgui.permissions.EShopPermissionSys;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
@@ -25,9 +25,9 @@ public class DefaultMenuGenerator implements MenuGenerator {
     private int inventorySize;
     private EShopConfig config;
     private EShopEnchants enchants;
-    private EshopPermissionSys permSys;
+    private EShopPermissionSys permSys;
 
-    public DefaultMenuGenerator(int inventorySize, EShopConfig config, EshopPermissionSys permSys) {
+    public DefaultMenuGenerator(int inventorySize, EShopConfig config, EShopPermissionSys permSys) {
         this.inventorySize = inventorySize;
         this.config = config;
         this.enchants = new EShopEnchants();

diff --git a/src/main/java/me/tychsen/enchantgui/menu/DefaultMenuSystem.java b/src/main/java/me/tychsen/enchantgui/menu/DefaultMenuSystem.java
@@ -5,7 +5,7 @@
 import me.tychsen.enchantgui.economy.PaymentStrategy;
 import me.tychsen.enchantgui.localization.LocalizationManager;
 import me.tychsen.enchantgui.Main;
-import me.tychsen.enchantgui.permissions.EshopPermissionSys;
+import me.tychsen.enchantgui.permissions.EShopPermissionSys;
 import me.tychsen.enchantgui.util.Common;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -24,13 +24,13 @@ public class DefaultMenuSystem implements MenuSystem {
 
     private Map<String, String[]> playerLevels;
 
-    private EshopPermissionSys permsys;
+    private EShopPermissionSys permsys;
     private EShopConfig config;
     private MenuGenerator generator;
 
     public DefaultMenuSystem() {
         playerLevels = new HashMap<>();
-        permsys = new EshopPermissionSys();
+        permsys = new EShopPermissionSys();
         config = new EShopConfig();
         generator = new DefaultMenuGenerator(36, config, permsys);
     }

diff --git a/...ntgui/permissions/EshopPermissionSys.java → ...ntgui/permissions/EShopPermissionSys.java b/...ntgui/permissions/EshopPermissionSys.java → ...ntgui/permissions/EShopPermissionSys.java
@@ -1,17 +1,18 @@
 package me.tychsen.enchantgui.permissions;
 
+import lombok.RequiredArgsConstructor;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
 
-public class EshopPermissionSys {
+public class EShopPermissionSys {
     public boolean hasEnchantPermission(Player p, ItemStack item) {
         if (p.isOp()) return true;
 
         Map<Enchantment, Integer> enchants = item.getEnchantments();
-        if (enchants.size() > 1) throw new RuntimeException("Item has more than one enchant!");
+        if (enchants.size() > 1) throw new TooManyEnchantmentsException("Item has more than one enchant!");
 
         Enchantment ench = enchants.keySet().toArray(new Enchantment[1])[0];
         String base = "eshop.enchants.";
@@ -39,4 +40,10 @@ public boolean hasUsePermission(Player p) {
 
         return  p.hasPermission(perm);
     }
+    @RequiredArgsConstructor
+    private final class TooManyEnchantmentsException extends RuntimeException {
+        private static final long serialVersionUID = 1L;
+
+        private final String tellMessage;
+    }
 }