diff --git a/eco-api/src/main/java/com/willfp/eco/util/TridentUtils.java b/eco-api/src/main/java/com/willfp/eco/util/TridentUtils.java deleted file mode 100644 index 2635ba64..00000000 --- a/eco-api/src/main/java/com/willfp/eco/util/TridentUtils.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.willfp.eco.util; - -import lombok.experimental.UtilityClass; -import org.apache.commons.lang.Validate; -import org.bukkit.entity.Trident; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; - -import java.util.function.Function; - -/** - * Utilities / API methods for tridents. - */ -@UtilityClass -public class TridentUtils { - /** - * If the meta set function has been set. - */ - private boolean initialized = false; - - /** - * The meta set function. - */ - private Function tridentFunction = null; - - /** - * Get a trident's ItemStack. - * - * @param trident The trident to query. - * @return The trident's ItemStack. - */ - public ItemStack getItemStack(@NotNull final Trident trident) { - Validate.isTrue(initialized, "Must be initialized!"); - Validate.notNull(tridentFunction, "Must be initialized!"); - - return tridentFunction.apply(trident); - } - - /** - * Initialize the trident function. - * - * @param function The function. - */ - @ApiStatus.Internal - public void initialize(@NotNull final Function function) { - Validate.isTrue(!initialized, "Already initialized!"); - - tridentFunction = function; - initialized = true; - } -} diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/TridentStack.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/TridentStack.java deleted file mode 100644 index 63c71329..00000000 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/eco/proxy/v1_16_R3/TridentStack.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.willfp.eco.proxy.v1_16_R3; - -import com.willfp.eco.proxy.TridentStackProxy; -import net.minecraft.server.v1_16_R3.EntityThrownTrident; -import org.bukkit.craftbukkit.v1_16_R3.entity.CraftTrident; -import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack; -import org.bukkit.entity.Trident; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public final class TridentStack implements TridentStackProxy { - @Override - public ItemStack getTridentStack(@NotNull final Trident trident) { - EntityThrownTrident t = ((CraftTrident) trident).getHandle(); - return CraftItemStack.asBukkitCopy(t.trident); - } -} diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/TridentStack.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/TridentStack.java deleted file mode 100644 index 7f7b95db..00000000 --- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/eco/proxy/v1_17_R1/TridentStack.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.willfp.eco.proxy.v1_17_R1; - -import com.willfp.eco.proxy.TridentStackProxy; -import org.bukkit.entity.Trident; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public final class TridentStack implements TridentStackProxy { - @Override - public ItemStack getTridentStack(@NotNull final Trident trident) { - return trident.getItem(); - } -} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java index 5a7742e0..5e54ac4c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java @@ -10,7 +10,6 @@ import com.willfp.eco.core.integrations.customitems.CustomItemsManager; import com.willfp.eco.core.integrations.mcmmo.McmmoManager; import com.willfp.eco.proxy.BlockBreakProxy; import com.willfp.eco.proxy.SkullProxy; -import com.willfp.eco.proxy.TridentStackProxy; import com.willfp.eco.spigot.arrows.ArrowDataListener; import com.willfp.eco.spigot.display.PacketAutoRecipe; import com.willfp.eco.spigot.display.PacketChat; @@ -43,7 +42,6 @@ import com.willfp.eco.spigot.integrations.mcmmo.McmmoIntegrationImpl; import com.willfp.eco.spigot.recipes.ShapedRecipeListener; import com.willfp.eco.util.BlockUtils; import com.willfp.eco.util.SkullUtils; -import com.willfp.eco.util.TridentUtils; import lombok.Getter; import org.bukkit.Bukkit; import org.bukkit.event.Listener; @@ -68,9 +66,6 @@ public abstract class EcoSpigotPlugin extends EcoPlugin { BlockBreakProxy blockBreakProxy = this.getProxy(BlockBreakProxy.class); BlockUtils.initialize(blockBreakProxy::breakBlock); - - TridentStackProxy tridentStackProxy = this.getProxy(TridentStackProxy.class); - TridentUtils.initialize(tridentStackProxy::getTridentStack); } @Override diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/TridentStackProxy.java b/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/TridentStackProxy.java deleted file mode 100644 index 2a6585ee..00000000 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/TridentStackProxy.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.willfp.eco.proxy; - -import com.willfp.eco.core.proxy.AbstractProxy; -import org.bukkit.entity.Trident; -import org.bukkit.inventory.ItemStack; -import org.jetbrains.annotations.NotNull; - -public interface TridentStackProxy extends AbstractProxy { - /** - * Get a trident's ItemStack. - * - * @param trident The trident to query. - * @return The trident's ItemStack. - */ - ItemStack getTridentStack(@NotNull Trident trident); -}