From cb3441286c53352c26a3d8bb098439ecf6579756 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 17 Feb 2021 13:39:32 +0000 Subject: [PATCH] Removed redundant Registerable interface --- .../java/com/willfp/eco/util/command/AbstractCommand.java | 4 +--- .../java/com/willfp/eco/util/interfaces/Registerable.java | 8 -------- .../willfp/eco/util/recipe/recipes/EcoShapedRecipe.java | 4 +--- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 eco-util/src/main/java/com/willfp/eco/util/interfaces/Registerable.java diff --git a/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java b/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java index 39e8e4ca..5da686a6 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java +++ b/eco-util/src/main/java/com/willfp/eco/util/command/AbstractCommand.java @@ -1,7 +1,6 @@ package com.willfp.eco.util.command; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.interfaces.Registerable; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -15,7 +14,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Arrays; import java.util.List; -public abstract class AbstractCommand extends PluginDependent implements CommandExecutor, Registerable { +public abstract class AbstractCommand extends PluginDependent implements CommandExecutor { /** * The name of the command *

@@ -130,7 +129,6 @@ public abstract class AbstractCommand extends PluginDependent implements Command *

* Requires the command name to exist, defined in plugin.yml. */ - @Override public final void register() { PluginCommand command = Bukkit.getPluginCommand(name); assert command != null; diff --git a/eco-util/src/main/java/com/willfp/eco/util/interfaces/Registerable.java b/eco-util/src/main/java/com/willfp/eco/util/interfaces/Registerable.java deleted file mode 100644 index 67e62db0..00000000 --- a/eco-util/src/main/java/com/willfp/eco/util/interfaces/Registerable.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.willfp.eco.util.interfaces; - -public interface Registerable { - /** - * Register an object with its respective registry. - */ - void register(); -} diff --git a/eco-util/src/main/java/com/willfp/eco/util/recipe/recipes/EcoShapedRecipe.java b/eco-util/src/main/java/com/willfp/eco/util/recipe/recipes/EcoShapedRecipe.java index 51765975..189d5f02 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/recipe/recipes/EcoShapedRecipe.java +++ b/eco-util/src/main/java/com/willfp/eco/util/recipe/recipes/EcoShapedRecipe.java @@ -1,6 +1,5 @@ package com.willfp.eco.util.recipe.recipes; -import com.willfp.eco.util.interfaces.Registerable; import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.recipe.Recipes; @@ -14,7 +13,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Arrays; -public final class EcoShapedRecipe extends PluginDependent implements Registerable { +public final class EcoShapedRecipe extends PluginDependent { /** * Recipe parts. */ @@ -91,7 +90,6 @@ public final class EcoShapedRecipe extends PluginDependent implements Registerab /** * Register the recipe. */ - @Override public void register() { Recipes.register(this); }