From 65901852d2c8bee376c6c58984d2e883e6af7e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20F?= Date: Wed, 14 Oct 2020 13:00:46 +0100 Subject: [PATCH] CustomItem should be an interface instead --- .../java/com/tomff/beesplus/core/items/CustomItem.java | 8 ++++---- .../java/com/tomff/beesplus/items/BeeHiveUpgrade.java | 6 +----- .../java/com/tomff/beesplus/items/BeeProtectionBoots.java | 5 +---- .../com/tomff/beesplus/items/BeeProtectionChestplate.java | 5 +---- .../com/tomff/beesplus/items/BeeProtectionHelmet.java | 5 +---- .../com/tomff/beesplus/items/BeeProtectionLeggings.java | 5 +---- 6 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/tomff/beesplus/core/items/CustomItem.java b/src/main/java/com/tomff/beesplus/core/items/CustomItem.java index dbb04e2..1d7b1b9 100644 --- a/src/main/java/com/tomff/beesplus/core/items/CustomItem.java +++ b/src/main/java/com/tomff/beesplus/core/items/CustomItem.java @@ -5,10 +5,10 @@ import org.bukkit.inventory.ItemStack; import java.util.Map; -public abstract class CustomItem { +public interface CustomItem { - public abstract String[] getRecipe(); - public abstract Map getIngredients(); - public abstract ItemStack getResult(); + String[] getRecipe(); + Map getIngredients(); + ItemStack getResult(); } diff --git a/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java b/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java index 224bcae..11dfcc5 100644 --- a/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java +++ b/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java @@ -24,8 +24,7 @@ import org.bukkit.persistence.PersistentDataType; import java.util.HashMap; import java.util.Map; -public class BeeHiveUpgrade extends CustomItem implements Listener { - +public class BeeHiveUpgrade implements CustomItem, Listener { private NamespacedKey upgradeKey; private int maxPopulation; @@ -34,7 +33,6 @@ public class BeeHiveUpgrade extends CustomItem implements Listener { maxPopulation = beesPlus.getConfig().getInt("beehiveupgrade.maximumpopulation", 9); } - @Override public String[] getRecipe() { return new String[] { "CCC", @@ -43,7 +41,6 @@ public class BeeHiveUpgrade extends CustomItem implements Listener { }; } - @Override public Map getIngredients() { Map ingredients = new HashMap<>(); @@ -53,7 +50,6 @@ public class BeeHiveUpgrade extends CustomItem implements Listener { return ingredients; } - @Override public ItemStack getResult() { return new ItemBuilder(Material.HONEYCOMB) .setName(Localization.get(Localization.BEEHIVE_UPGRADE_ITEM_NAME)) diff --git a/src/main/java/com/tomff/beesplus/items/BeeProtectionBoots.java b/src/main/java/com/tomff/beesplus/items/BeeProtectionBoots.java index e77af44..be9a9ae 100644 --- a/src/main/java/com/tomff/beesplus/items/BeeProtectionBoots.java +++ b/src/main/java/com/tomff/beesplus/items/BeeProtectionBoots.java @@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack; import java.util.HashMap; import java.util.Map; -public class BeeProtectionBoots extends CustomItem { - @Override +public class BeeProtectionBoots implements CustomItem { public String[] getRecipe() { return new String[] { "SSS", @@ -19,7 +18,6 @@ public class BeeProtectionBoots extends CustomItem { }; } - @Override public Map getIngredients() { Map ingredients = new HashMap<>(); @@ -29,7 +27,6 @@ public class BeeProtectionBoots extends CustomItem { return ingredients; } - @Override public ItemStack getResult() { return new ItemBuilder(Material.CHAINMAIL_BOOTS) .setName(Localization.get(Localization.BEE_PROTECTION_BOOTS)) diff --git a/src/main/java/com/tomff/beesplus/items/BeeProtectionChestplate.java b/src/main/java/com/tomff/beesplus/items/BeeProtectionChestplate.java index b88b90c..b9e04f7 100644 --- a/src/main/java/com/tomff/beesplus/items/BeeProtectionChestplate.java +++ b/src/main/java/com/tomff/beesplus/items/BeeProtectionChestplate.java @@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack; import java.util.HashMap; import java.util.Map; -public class BeeProtectionChestplate extends CustomItem { - @Override +public class BeeProtectionChestplate implements CustomItem { public String[] getRecipe() { return new String[] { "SSS", @@ -19,7 +18,6 @@ public class BeeProtectionChestplate extends CustomItem { }; } - @Override public Map getIngredients() { Map ingredients = new HashMap<>(); @@ -29,7 +27,6 @@ public class BeeProtectionChestplate extends CustomItem { return ingredients; } - @Override public ItemStack getResult() { return new ItemBuilder(Material.CHAINMAIL_CHESTPLATE) .setName(Localization.get(Localization.BEE_PROTECTION_CHESTPLATE)) diff --git a/src/main/java/com/tomff/beesplus/items/BeeProtectionHelmet.java b/src/main/java/com/tomff/beesplus/items/BeeProtectionHelmet.java index 9d1f446..e6264c3 100644 --- a/src/main/java/com/tomff/beesplus/items/BeeProtectionHelmet.java +++ b/src/main/java/com/tomff/beesplus/items/BeeProtectionHelmet.java @@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack; import java.util.HashMap; import java.util.Map; -public class BeeProtectionHelmet extends CustomItem { - @Override +public class BeeProtectionHelmet implements CustomItem { public String[] getRecipe() { return new String[] { "SSS", @@ -19,7 +18,6 @@ public class BeeProtectionHelmet extends CustomItem { }; } - @Override public Map getIngredients() { Map ingredients = new HashMap<>(); @@ -29,7 +27,6 @@ public class BeeProtectionHelmet extends CustomItem { return ingredients; } - @Override public ItemStack getResult() { return new ItemBuilder(Material.CHAINMAIL_HELMET) .setName(Localization.get(Localization.BEE_PROTECTION_HELMET)) diff --git a/src/main/java/com/tomff/beesplus/items/BeeProtectionLeggings.java b/src/main/java/com/tomff/beesplus/items/BeeProtectionLeggings.java index dc5d439..dc3e202 100644 --- a/src/main/java/com/tomff/beesplus/items/BeeProtectionLeggings.java +++ b/src/main/java/com/tomff/beesplus/items/BeeProtectionLeggings.java @@ -9,8 +9,7 @@ import org.bukkit.inventory.ItemStack; import java.util.HashMap; import java.util.Map; -public class BeeProtectionLeggings extends CustomItem { - @Override +public class BeeProtectionLeggings implements CustomItem { public String[] getRecipe() { return new String[] { "SSS", @@ -19,7 +18,6 @@ public class BeeProtectionLeggings extends CustomItem { }; } - @Override public Map getIngredients() { Map ingredients = new HashMap<>(); @@ -29,7 +27,6 @@ public class BeeProtectionLeggings extends CustomItem { return ingredients; } - @Override public ItemStack getResult() { return new ItemBuilder(Material.CHAINMAIL_LEGGINGS) .setName(Localization.get(Localization.BEE_PROTECTION_LEGGINGS))