diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKIntegration.java new file mode 100644 index 00000000..83726459 --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKIntegration.java @@ -0,0 +1,18 @@ +package com.willfp.eco.core.integrations.afk; + +import com.willfp.eco.core.integrations.Integration; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +/** + * AFK Integration. + */ +public interface AFKIntegration extends Integration { + /** + * Get if a player is afk. + * + * @param player The player. + * @return If afk. + */ + boolean isAfk(@NotNull Player player); +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java index f55b367a..7689c057 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKManager.java @@ -13,14 +13,14 @@ public final class AFKManager { /** * A set of all registered integrations. */ - private static final Set REGISTERED = new HashSet<>(); + private static final Set REGISTERED = new HashSet<>(); /** * Register a new integration. * * @param integration The integration to register. */ - public static void register(@NotNull final AFKWrapper integration) { + public static void register(@NotNull final AFKIntegration integration) { REGISTERED.add(integration); } @@ -31,8 +31,8 @@ public final class AFKManager { * @return If afk. */ public static boolean isAfk(@NotNull final Player player) { - for (AFKWrapper afkWrapper : REGISTERED) { - if (afkWrapper.isAfk(player)) { + for (AFKIntegration AFKIntegration : REGISTERED) { + if (AFKIntegration.isAfk(player)) { return true; } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKWrapper.java index f498abec..f79498b5 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/afk/AFKWrapper.java @@ -1,18 +1,11 @@ package com.willfp.eco.core.integrations.afk; -import com.willfp.eco.core.integrations.Integration; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - /** * Wrapper class for afk integrations. + * + * @deprecated Use AFKIntegration instead. */ -public interface AFKWrapper extends Integration { - /** - * Get if a player is afk. - * - * @param player The player. - * @return If afk. - */ - boolean isAfk(@NotNull Player player); +@Deprecated(since = "6.35.0", forRemoval = true) +public interface AFKWrapper extends AFKIntegration { + } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatIntegration.java new file mode 100644 index 00000000..fbeac636 --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatIntegration.java @@ -0,0 +1,24 @@ +package com.willfp.eco.core.integrations.anticheat; + +import com.willfp.eco.core.integrations.Integration; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +/** + * Wrapper class for anticheat integrations. + */ +public interface AnticheatIntegration extends Integration { + /** + * Exempt a player from checks. + * + * @param player The player to exempt. + */ + void exempt(@NotNull Player player); + + /** + * Unexempt a player from checks. + * + * @param player The player to unexempt. + */ + void unexempt(@NotNull Player player); +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java index 48960742..8d03624e 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java @@ -15,7 +15,7 @@ public final class AnticheatManager { /** * A set of all registered anticheats. */ - private static final Set ANTICHEATS = new HashSet<>(); + private static final Set ANTICHEATS = new HashSet<>(); /** * Register a new anticheat. @@ -24,7 +24,7 @@ public final class AnticheatManager { * @param anticheat The anticheat to register. */ public static void register(@NotNull final EcoPlugin plugin, - @NotNull final AnticheatWrapper anticheat) { + @NotNull final AnticheatIntegration anticheat) { if (anticheat instanceof Listener) { plugin.getEventManager().registerListener((Listener) anticheat); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java index 5aaf65f9..8b4a21b8 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java @@ -1,24 +1,11 @@ package com.willfp.eco.core.integrations.anticheat; -import com.willfp.eco.core.integrations.Integration; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - /** * Wrapper class for anticheat integrations. + * + * @deprecated Use AnticheatIntegration instead. */ -public interface AnticheatWrapper extends Integration { - /** - * Exempt a player from checks. - * - * @param player The player to exempt. - */ - void exempt(@NotNull Player player); +@Deprecated(since = "6.35.0", forRemoval = true) +public interface AnticheatWrapper extends AnticheatIntegration { - /** - * Unexempt a player from checks. - * - * @param player The player to unexempt. - */ - void unexempt(@NotNull Player player); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefIntegration.java new file mode 100644 index 00000000..b0ad28bc --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefIntegration.java @@ -0,0 +1,60 @@ +package com.willfp.eco.core.integrations.antigrief; + +import com.willfp.eco.core.integrations.Integration; +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +/** + * Wrapper class for antigrief integrations. + */ +public interface AntigriefIntegration extends Integration { + /** + * Can player break block. + * + * @param player The player. + * @param block The block. + * @return If player can break block. + */ + boolean canBreakBlock(@NotNull Player player, @NotNull Block block); + + /** + * Can player create explosion at location. + * + * @param player The player. + * @param location The location. + * @return If player can create explosion. + */ + boolean canCreateExplosion(@NotNull Player player, @NotNull Location location); + + /** + * Can player place block. + * + * @param player The player. + * @param block The block. + * @return If player can place block. + */ + boolean canPlaceBlock(@NotNull Player player, @NotNull Block block); + + /** + * Can player injure living entity. + * + * @param player The player. + * @param victim The victim. + * @return If player can injure. + */ + boolean canInjure(@NotNull Player player, @NotNull LivingEntity victim); + + /** + * Can player pick up item. + * + * @param player The player. + * @param location The location. + * @return If player can pick up item. + */ + default boolean canPickupItem(@NotNull Player player, @NotNull Location location) { + return true; + } +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java index b0d0a604..0321f1e5 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java @@ -16,14 +16,14 @@ public final class AntigriefManager { /** * Registered antigriefs. */ - private static final Set REGISTERED = new HashSet<>(); + private static final Set REGISTERED = new HashSet<>(); /** * Register a new AntiGrief/Land Management integration. * * @param antigrief The integration to register. */ - public static void register(@NotNull final AntigriefWrapper antigrief) { + public static void register(@NotNull final AntigriefIntegration antigrief) { REGISTERED.add(antigrief); } @@ -32,7 +32,7 @@ public final class AntigriefManager { * * @param antigrief The integration to unregister. */ - public static void unregister(@NotNull final AntigriefWrapper antigrief) { + public static void unregister(@NotNull final AntigriefIntegration antigrief) { REGISTERED.removeIf(it -> it.getPluginName().equalsIgnoreCase(antigrief.getPluginName())); REGISTERED.remove(antigrief); } @@ -46,7 +46,7 @@ public final class AntigriefManager { */ public static boolean canPickupItem(@NotNull final Player player, @NotNull final Location location) { - return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canPickupItem(player, location)); + return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canPickupItem(player, location)); } /** @@ -58,7 +58,7 @@ public final class AntigriefManager { */ public static boolean canBreakBlock(@NotNull final Player player, @NotNull final Block block) { - return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canBreakBlock(player, block)); + return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canBreakBlock(player, block)); } /** @@ -70,7 +70,7 @@ public final class AntigriefManager { */ public static boolean canCreateExplosion(@NotNull final Player player, @NotNull final Location location) { - return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canCreateExplosion(player, location)); + return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canCreateExplosion(player, location)); } /** @@ -82,7 +82,7 @@ public final class AntigriefManager { */ public static boolean canPlaceBlock(@NotNull final Player player, @NotNull final Block block) { - return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canPlaceBlock(player, block)); + return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canPlaceBlock(player, block)); } /** @@ -94,7 +94,7 @@ public final class AntigriefManager { */ public static boolean canInjure(@NotNull final Player player, @NotNull final LivingEntity victim) { - return REGISTERED.stream().allMatch(antigriefWrapper -> antigriefWrapper.canInjure(player, victim)); + return REGISTERED.stream().allMatch(antigriefIntegration -> antigriefIntegration.canInjure(player, victim)); } private AntigriefManager() { diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java index b9b95fb7..2c8787a0 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java @@ -1,60 +1,11 @@ package com.willfp.eco.core.integrations.antigrief; -import com.willfp.eco.core.integrations.Integration; -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - /** * Wrapper class for antigrief integrations. + * + * @deprecated Use AntigriefIntegration instead. */ -public interface AntigriefWrapper extends Integration { - /** - * Can player break block. - * - * @param player The player. - * @param block The block. - * @return If player can break block. - */ - boolean canBreakBlock(@NotNull Player player, @NotNull Block block); +@Deprecated(since = "6.35.0", forRemoval = true) +public interface AntigriefWrapper extends AntigriefIntegration { - /** - * Can player create explosion at location. - * - * @param player The player. - * @param location The location. - * @return If player can create explosion. - */ - boolean canCreateExplosion(@NotNull Player player, @NotNull Location location); - - /** - * Can player place block. - * - * @param player The player. - * @param block The block. - * @return If player can place block. - */ - boolean canPlaceBlock(@NotNull Player player, @NotNull Block block); - - /** - * Can player injure living entity. - * - * @param player The player. - * @param victim The victim. - * @return If player can injure. - */ - boolean canInjure(@NotNull Player player, @NotNull LivingEntity victim); - - /** - * Can player pick up item. - * - * @param player The player. - * @param location The location. - * @return If player can pick up item. - */ - default boolean canPickupItem(@NotNull Player player, @NotNull Location location) { - return true; - } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesIntegration.java new file mode 100644 index 00000000..7d4adc5b --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesIntegration.java @@ -0,0 +1,15 @@ +package com.willfp.eco.core.integrations.customentities; + +import com.willfp.eco.core.integrations.Integration; + +/** + * Wrapper class for custom item integrations. + */ +public interface CustomEntitiesIntegration extends Integration { + /** + * Register all the custom entities for a specific plugin into eco. + * + * @see com.willfp.eco.core.entities.Entities + */ + void registerAllEntities(); +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java index a36d424a..43903f95 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesManager.java @@ -12,14 +12,14 @@ public final class CustomEntitiesManager { /** * A set of all registered integrations. */ - private static final Set REGISTERED = new HashSet<>(); + private static final Set REGISTERED = new HashSet<>(); /** * Register a new integration. * * @param integration The integration to register. */ - public static void register(@NotNull final CustomEntitiesWrapper integration) { + public static void register(@NotNull final CustomEntitiesIntegration integration) { REGISTERED.add(integration); } @@ -29,8 +29,8 @@ public final class CustomEntitiesManager { * @see com.willfp.eco.core.entities.Entities */ public static void registerAllEntities() { - for (CustomEntitiesWrapper wrapper : REGISTERED) { - wrapper.registerAllEntities(); + for (CustomEntitiesIntegration Integration : REGISTERED) { + Integration.registerAllEntities(); } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java index 6d76e35c..c9debaf0 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/customentities/CustomEntitiesWrapper.java @@ -1,15 +1,11 @@ package com.willfp.eco.core.integrations.customentities; -import com.willfp.eco.core.integrations.Integration; - /** * Wrapper class for custom item integrations. + * + * @deprecated Use CustomEntitiesIntegration instead. */ -public interface CustomEntitiesWrapper extends Integration { - /** - * Register all the custom entities for a specific plugin into eco. - * - * @see com.willfp.eco.core.entities.Entities - */ - void registerAllEntities(); +@Deprecated(since = "6.35.0", forRemoval = true) +public interface CustomEntitiesWrapper extends CustomEntitiesIntegration { + } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsIntegration.java new file mode 100644 index 00000000..6b48f10d --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsIntegration.java @@ -0,0 +1,24 @@ +package com.willfp.eco.core.integrations.customitems; + +import com.willfp.eco.core.integrations.Integration; + +/** + * Wrapper class for custom item integrations. + */ +public interface CustomItemsIntegration extends Integration { + /** + * Register all the custom items for a specific plugin into eco. + * + * @see com.willfp.eco.core.items.Items + */ + default void registerAllItems() { + // Override when needed. + } + + /** + * Register {@link com.willfp.eco.core.items.provider.ItemProvider}s. + */ + default void registerProvider() { + // Override when needed. + } +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java index 51b973ee..b199c38f 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsManager.java @@ -12,14 +12,14 @@ public final class CustomItemsManager { /** * A set of all registered integrations. */ - private static final Set REGISTERED = new HashSet<>(); + private static final Set REGISTERED = new HashSet<>(); /** * Register a new integration. * * @param integration The integration to register. */ - public static void register(@NotNull final CustomItemsWrapper integration) { + public static void register(@NotNull final CustomItemsIntegration integration) { REGISTERED.add(integration); } @@ -29,8 +29,8 @@ public final class CustomItemsManager { * @see com.willfp.eco.core.items.Items */ public static void registerAllItems() { - for (CustomItemsWrapper customItemsWrapper : REGISTERED) { - customItemsWrapper.registerAllItems(); + for (CustomItemsIntegration customItemsIntegration : REGISTERED) { + customItemsIntegration.registerAllItems(); } } @@ -40,8 +40,8 @@ public final class CustomItemsManager { * @see com.willfp.eco.core.items.Items */ public static void registerProviders() { - for (CustomItemsWrapper customItemsWrapper : REGISTERED) { - customItemsWrapper.registerProvider(); + for (CustomItemsIntegration customItemsIntegration : REGISTERED) { + customItemsIntegration.registerProvider(); } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsWrapper.java index d1b53da4..bd5fe18a 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/customitems/CustomItemsWrapper.java @@ -1,24 +1,11 @@ package com.willfp.eco.core.integrations.customitems; -import com.willfp.eco.core.integrations.Integration; - /** * Wrapper class for custom item integrations. + * + * @deprecated Use CustomItemsIntegration instead. */ -public interface CustomItemsWrapper extends Integration { - /** - * Register all the custom items for a specific plugin into eco. - * - * @see com.willfp.eco.core.items.Items - */ - default void registerAllItems() { - // Override when needed. - } +@Deprecated(since = "6.35.0", forRemoval = true) +public interface CustomItemsWrapper extends CustomItemsIntegration { - /** - * Register {@link com.willfp.eco.core.items.provider.ItemProvider}s. - */ - default void registerProvider() { - // Override when needed. - } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyIntegration.java new file mode 100644 index 00000000..3e522a9f --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyIntegration.java @@ -0,0 +1,48 @@ +package com.willfp.eco.core.integrations.economy; + +import com.willfp.eco.core.integrations.Integration; +import org.bukkit.OfflinePlayer; +import org.jetbrains.annotations.NotNull; + +/** + * Wrapper class for economy integrations. + */ +public interface EconomyIntegration extends Integration { + /** + * Get if a player has a certain amount. + * + * @param player The player. + * @param amount The amount. + * @return If the player has the amount. + */ + boolean hasAmount(@NotNull OfflinePlayer player, + double amount); + + /** + * Give money to a player. + * + * @param player The player. + * @param amount The amount to give. + * @return If the transaction was a success. + */ + boolean giveMoney(@NotNull OfflinePlayer player, + double amount); + + /** + * Remove money from a player. + * + * @param player The player. + * @param amount The amount to remove. + * @return If the transaction was a success. + */ + boolean removeMoney(@NotNull OfflinePlayer player, + double amount); + + /** + * Get the balance of a player. + * + * @param player The player. + * @return The balance. + */ + double getBalance(@NotNull OfflinePlayer player); +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java index 002bf1fe..67043007 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyManager.java @@ -13,14 +13,14 @@ public final class EconomyManager { /** * A set of all registered integrations. */ - private static final Set REGISTERED = new HashSet<>(); + private static final Set REGISTERED = new HashSet<>(); /** * Register a new integration. * * @param integration The integration to register. */ - public static void register(@NotNull final EconomyWrapper integration) { + public static void register(@NotNull final EconomyIntegration integration) { REGISTERED.add(integration); } @@ -42,8 +42,8 @@ public final class EconomyManager { */ public static boolean hasAmount(@NotNull final OfflinePlayer player, final double amount) { - for (EconomyWrapper wrapper : REGISTERED) { - return wrapper.hasAmount(player, amount); + for (EconomyIntegration Integration : REGISTERED) { + return Integration.hasAmount(player, amount); } return false; @@ -58,8 +58,8 @@ public final class EconomyManager { */ public static boolean giveMoney(@NotNull final OfflinePlayer player, final double amount) { - for (EconomyWrapper wrapper : REGISTERED) { - return wrapper.giveMoney(player, amount); + for (EconomyIntegration Integration : REGISTERED) { + return Integration.giveMoney(player, amount); } return false; @@ -74,8 +74,8 @@ public final class EconomyManager { */ public static boolean removeMoney(@NotNull final OfflinePlayer player, final double amount) { - for (EconomyWrapper wrapper : REGISTERED) { - return wrapper.removeMoney(player, amount); + for (EconomyIntegration Integration : REGISTERED) { + return Integration.removeMoney(player, amount); } return false; @@ -88,8 +88,8 @@ public final class EconomyManager { * @return The balance. */ public static double getBalance(@NotNull final OfflinePlayer player) { - for (EconomyWrapper wrapper : REGISTERED) { - return wrapper.getBalance(player); + for (EconomyIntegration Integration : REGISTERED) { + return Integration.getBalance(player); } return 0; diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyWrapper.java index 28bade9e..af386038 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/economy/EconomyWrapper.java @@ -1,48 +1,11 @@ package com.willfp.eco.core.integrations.economy; -import com.willfp.eco.core.integrations.Integration; -import org.bukkit.OfflinePlayer; -import org.jetbrains.annotations.NotNull; - /** * Wrapper class for economy integrations. + * + * @deprecated Use EconomyIntegration instead. */ -public interface EconomyWrapper extends Integration { - /** - * Get if a player has a certain amount. - * - * @param player The player. - * @param amount The amount. - * @return If the player has the amount. - */ - boolean hasAmount(@NotNull OfflinePlayer player, - double amount); +@Deprecated(since = "6.35.0", forRemoval = true) +public interface EconomyWrapper extends EconomyIntegration { - /** - * Give money to a player. - * - * @param player The player. - * @param amount The amount to give. - * @return If the transaction was a success. - */ - boolean giveMoney(@NotNull OfflinePlayer player, - double amount); - - /** - * Remove money from a player. - * - * @param player The player. - * @param amount The amount to remove. - * @return If the transaction was a success. - */ - boolean removeMoney(@NotNull OfflinePlayer player, - double amount); - - /** - * Get the balance of a player. - * - * @param player The player. - * @return The balance. - */ - double getBalance(@NotNull OfflinePlayer player); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramIntegration.java new file mode 100644 index 00000000..9995b713 --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramIntegration.java @@ -0,0 +1,22 @@ +package com.willfp.eco.core.integrations.hologram; + +import com.willfp.eco.core.integrations.Integration; +import org.bukkit.Location; +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +/** + * Wrapper class for hologram integrations. + */ +public interface HologramIntegration extends Integration { + /** + * Create hologram. + * + * @param location The location. + * @param contents The contents for the hologram. + * @return The hologram. + */ + Hologram createHologram(@NotNull Location location, + @NotNull List contents); +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java index 952ffc08..f3b0f5b6 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramManager.java @@ -14,14 +14,14 @@ public final class HologramManager { /** * A set of all registered integrations. */ - private static final Set REGISTERED = new HashSet<>(); + private static final Set REGISTERED = new HashSet<>(); /** * Register a new integration. * * @param integration The integration to register. */ - public static void register(@NotNull final HologramWrapper integration) { + public static void register(@NotNull final HologramIntegration integration) { REGISTERED.add(integration); } @@ -34,8 +34,8 @@ public final class HologramManager { */ public static Hologram createHologram(@NotNull final Location location, @NotNull final List contents) { - for (HologramWrapper wrapper : REGISTERED) { - return wrapper.createHologram(location, contents); + for (HologramIntegration Integration : REGISTERED) { + return Integration.createHologram(location, contents); } return new DummyHologram(); diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramWrapper.java index 1444d5f4..34f5c9c4 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/hologram/HologramWrapper.java @@ -1,22 +1,10 @@ package com.willfp.eco.core.integrations.hologram; -import com.willfp.eco.core.integrations.Integration; -import org.bukkit.Location; -import org.jetbrains.annotations.NotNull; - -import java.util.List; - /** * Wrapper class for hologram integrations. + * + * @deprecated Use HologramIntegration instead. */ -public interface HologramWrapper extends Integration { - /** - * Create hologram. - * - * @param location The location. - * @param contents The contents for the hologram. - * @return The hologram. - */ - Hologram createHologram(@NotNull Location location, - @NotNull List contents); +public interface HologramWrapper extends HologramIntegration { + } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoIntegration.java new file mode 100644 index 00000000..00329aef --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoIntegration.java @@ -0,0 +1,27 @@ +package com.willfp.eco.core.integrations.mcmmo; + +import com.willfp.eco.core.integrations.Integration; +import org.bukkit.block.Block; +import org.bukkit.event.Event; +import org.jetbrains.annotations.NotNull; + +/** + * Wrapper class for mcmmo integrations. + */ +public interface McmmoIntegration extends Integration { + /** + * Get bonus drop count of block. + * + * @param block The block. + * @return The drop multiplier. + */ + int getBonusDropCount(@NotNull Block block); + + /** + * Get if event is fake. + * + * @param event The event. + * @return If is fake. + */ + boolean isFake(@NotNull Event event); +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java index 1fd9c3e5..135b0516 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java @@ -14,14 +14,14 @@ public final class McmmoManager { /** * A set of all registered integrations. */ - private static final Set REGISTERED = new HashSet<>(); + private static final Set REGISTERED = new HashSet<>(); /** * Register a new integration. * * @param integration The integration to register. */ - public static void register(@NotNull final McmmoWrapper integration) { + public static void register(@NotNull final McmmoIntegration integration) { REGISTERED.add(integration); } @@ -32,8 +32,8 @@ public final class McmmoManager { * @return The bonus drop count. */ public static int getBonusDropCount(@NotNull final Block block) { - for (McmmoWrapper mcmmoWrapper : REGISTERED) { - return mcmmoWrapper.getBonusDropCount(block); + for (McmmoIntegration mcmmoIntegration : REGISTERED) { + return mcmmoIntegration.getBonusDropCount(block); } return 0; } @@ -45,8 +45,8 @@ public final class McmmoManager { * @return If the event is fake. */ public static boolean isFake(@NotNull final Event event) { - for (McmmoWrapper mcmmoWrapper : REGISTERED) { - return mcmmoWrapper.isFake(event); + for (McmmoIntegration mcmmoIntegration : REGISTERED) { + return mcmmoIntegration.isFake(event); } return false; } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java index 2c0cf52e..665c0910 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java @@ -1,27 +1,11 @@ package com.willfp.eco.core.integrations.mcmmo; -import com.willfp.eco.core.integrations.Integration; -import org.bukkit.block.Block; -import org.bukkit.event.Event; -import org.jetbrains.annotations.NotNull; - /** * Wrapper class for mcmmo integrations. + * + * @deprecated Use McmmoIntegration instead. */ -public interface McmmoWrapper extends Integration { - /** - * Get bonus drop count of block. - * - * @param block The block. - * @return The drop multiplier. - */ - int getBonusDropCount(@NotNull Block block); +@Deprecated(since = "6.35.0", forRemoval = true) +public interface McmmoWrapper extends McmmoIntegration { - /** - * Get if event is fake. - * - * @param event The event. - * @return If is fake. - */ - boolean isFake(@NotNull Event event); } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopIntegration.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopIntegration.java new file mode 100644 index 00000000..feba1a74 --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopIntegration.java @@ -0,0 +1,28 @@ +package com.willfp.eco.core.integrations.shop; + +import com.willfp.eco.core.integrations.Integration; +import org.bukkit.event.Listener; +import org.jetbrains.annotations.Nullable; + +/** + * Wrapper class for shop integrations. + */ +public interface ShopIntegration extends Integration { + /** + * Register eco item provider for shop plugins. + */ + default void registerEcoProvider() { + // Do nothing unless overridden. + } + + /** + * Get the sell event adapter. + * + * @return The listener. + */ + @Nullable + default Listener getSellEventAdapter() { + // Do nothing unless overridden. + return null; + } +} diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java index 3e0118fa..24887f86 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopManager.java @@ -15,14 +15,14 @@ public final class ShopManager { /** * A set of all registered integrations. */ - private static final Set REGISTERED = new HashSet<>(); + private static final Set REGISTERED = new HashSet<>(); /** * Register a new integration. * * @param integration The integration to register. */ - public static void register(@NotNull final ShopWrapper integration) { + public static void register(@NotNull final ShopIntegration integration) { REGISTERED.add(integration); } @@ -33,8 +33,8 @@ public final class ShopManager { */ @ApiStatus.Internal public static void registerEvents(@NotNull final EcoPlugin plugin) { - for (ShopWrapper wrapper : REGISTERED) { - Listener listener = wrapper.getSellEventAdapter(); + for (ShopIntegration Integration : REGISTERED) { + Listener listener = Integration.getSellEventAdapter(); if (listener != null) { plugin.getEventManager().registerListener(listener); @@ -46,8 +46,8 @@ public final class ShopManager { * Register eco item provider for shop plugins. */ public static void registerEcoProvider() { - for (ShopWrapper shopWrapper : REGISTERED) { - shopWrapper.registerEcoProvider(); + for (ShopIntegration shopIntegration : REGISTERED) { + shopIntegration.registerEcoProvider(); } } diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java index aebd3de7..334e1a47 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/shop/ShopWrapper.java @@ -1,28 +1,11 @@ package com.willfp.eco.core.integrations.shop; -import com.willfp.eco.core.integrations.Integration; -import org.bukkit.event.Listener; -import org.jetbrains.annotations.Nullable; - /** * Wrapper class for shop integrations. + * + * @deprecated Use AFKIntegration instead. */ -public interface ShopWrapper extends Integration { - /** - * Register eco item provider for shop plugins. - */ - default void registerEcoProvider() { - // Do nothing unless overridden. - } +@Deprecated(since = "6.35.0", forRemoval = true) +public interface ShopWrapper extends ShopIntegration { - /** - * Get the sell event adapter. - * - * @return The listener. - */ - @Nullable - default Listener getSellEventAdapter() { - // Do nothing unless overridden. - return null; - } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationCMI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationCMI.kt index 4ac9d374..c4983d2e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationCMI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationCMI.kt @@ -1,10 +1,10 @@ package com.willfp.eco.internal.spigot.integrations.afk import com.Zrips.CMI.CMI -import com.willfp.eco.core.integrations.afk.AFKWrapper +import com.willfp.eco.core.integrations.afk.AFKIntegration import org.bukkit.entity.Player -class AFKIntegrationCMI : AFKWrapper { +class AFKIntegrationCMI : AFKIntegration { override fun isAfk(player: Player): Boolean { return CMI.getInstance().playerManager.getUser(player)?.isAfk ?: false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationEssentials.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationEssentials.kt index ffb7f205..f3bb8935 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationEssentials.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/afk/AFKIntegrationEssentials.kt @@ -1,11 +1,11 @@ package com.willfp.eco.internal.spigot.integrations.afk import com.earth2me.essentials.Essentials -import com.willfp.eco.core.integrations.afk.AFKWrapper +import com.willfp.eco.core.integrations.afk.AFKIntegration import org.bukkit.entity.Player import org.bukkit.plugin.java.JavaPlugin -class AFKIntegrationEssentials : AFKWrapper { +class AFKIntegrationEssentials : AFKIntegration { private val ess = JavaPlugin.getPlugin(Essentials::class.java) override fun isAfk(player: Player): Boolean { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAAC.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAAC.kt index 12e3787e..fd84b08b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAAC.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAAC.kt @@ -1,13 +1,13 @@ package com.willfp.eco.internal.spigot.integrations.anticheat -import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper +import com.willfp.eco.core.integrations.anticheat.AnticheatIntegration import me.konsolas.aac.api.AACAPI import me.konsolas.aac.api.AACExemption import org.bukkit.Bukkit import org.bukkit.entity.Player import org.bukkit.event.Listener -class AnticheatAAC : AnticheatWrapper, Listener { +class AnticheatAAC : AnticheatIntegration, Listener { private val ecoExemption = AACExemption("eco") private val api = Bukkit.getServicesManager().load(AACAPI::class.java)!! diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAlice.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAlice.kt index 0a52a35d..3ac3427a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAlice.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatAlice.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.anticheat -import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper +import com.willfp.eco.core.integrations.anticheat.AnticheatIntegration import me.nik.alice.api.events.AliceViolationEvent import org.bukkit.entity.Player import org.bukkit.event.EventHandler @@ -8,7 +8,7 @@ import org.bukkit.event.EventPriority import org.bukkit.event.Listener import java.util.UUID -class AnticheatAlice : AnticheatWrapper, Listener { +class AnticheatAlice : AnticheatIntegration, Listener { private val exempt: MutableSet = HashSet() override fun getPluginName(): String { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatMatrix.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatMatrix.kt index 7b0c1445..4a105836 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatMatrix.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatMatrix.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.anticheat -import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper +import com.willfp.eco.core.integrations.anticheat.AnticheatIntegration import me.rerere.matrix.api.events.PlayerViolationEvent import org.bukkit.entity.Player import org.bukkit.event.EventHandler @@ -8,7 +8,7 @@ import org.bukkit.event.EventPriority import org.bukkit.event.Listener import java.util.UUID -class AnticheatMatrix : AnticheatWrapper, Listener { +class AnticheatMatrix : AnticheatIntegration, Listener { private val exempt: MutableSet = HashSet() override fun getPluginName(): String { return "Matrix" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatNCP.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatNCP.kt index 797e56c2..5ce24651 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatNCP.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatNCP.kt @@ -1,12 +1,12 @@ package com.willfp.eco.internal.spigot.integrations.anticheat -import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper +import com.willfp.eco.core.integrations.anticheat.AnticheatIntegration import fr.neatmonster.nocheatplus.checks.CheckType import fr.neatmonster.nocheatplus.hooks.NCPExemptionManager import org.bukkit.entity.Player import java.util.UUID -class AnticheatNCP : AnticheatWrapper { +class AnticheatNCP : AnticheatIntegration { private val exempt: MutableSet = HashSet() override fun getPluginName(): String { return "NCP" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatSpartan.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatSpartan.kt index 22ac4904..0bc85da7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatSpartan.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatSpartan.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.anticheat -import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper +import com.willfp.eco.core.integrations.anticheat.AnticheatIntegration import me.vagdedes.spartan.api.PlayerViolationEvent import org.bukkit.entity.Player import org.bukkit.event.EventHandler @@ -8,7 +8,7 @@ import org.bukkit.event.EventPriority import org.bukkit.event.Listener import java.util.UUID -class AnticheatSpartan : AnticheatWrapper, Listener { +class AnticheatSpartan : AnticheatIntegration, Listener { private val exempt: MutableSet = HashSet() override fun getPluginName(): String { return "Spartan" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatVulcan.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatVulcan.kt index 3bc84d0a..5739fa62 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatVulcan.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/anticheat/AnticheatVulcan.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.anticheat -import com.willfp.eco.core.integrations.anticheat.AnticheatWrapper +import com.willfp.eco.core.integrations.anticheat.AnticheatIntegration import me.frep.vulcan.api.event.VulcanFlagEvent import org.bukkit.entity.Player import org.bukkit.event.EventHandler @@ -8,7 +8,7 @@ import org.bukkit.event.EventPriority import org.bukkit.event.Listener import java.util.UUID -class AnticheatVulcan : AnticheatWrapper, Listener { +class AnticheatVulcan : AnticheatIntegration, Listener { private val exempt: MutableSet = HashSet() override fun getPluginName(): String { return "Vulcan" diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefBentoBox.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefBentoBox.kt index 108675af..34f8891d 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefBentoBox.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefBentoBox.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.antigrief -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.bukkit.Location import org.bukkit.World import org.bukkit.block.Block @@ -11,7 +11,7 @@ import world.bentobox.bentobox.BentoBox import world.bentobox.bentobox.api.user.User import world.bentobox.bentobox.lists.Flags -class AntigriefBentoBox : AntigriefWrapper { +class AntigriefBentoBox : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block @@ -67,7 +67,7 @@ class AntigriefBentoBox : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt index 0fe29094..0f4554b3 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV10.kt @@ -4,14 +4,14 @@ import com.SirBlobman.combatlogx.api.ICombatLogX import com.SirBlobman.combatlogx.api.expansion.Expansion import com.SirBlobman.combatlogx.expansion.newbie.helper.NewbieHelper import com.SirBlobman.combatlogx.expansion.newbie.helper.listener.ListenerPVP -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.bukkit.Bukkit import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player -class AntigriefCombatLogXV10 : AntigriefWrapper { +class AntigriefCombatLogXV10 : AntigriefIntegration { private val instance: ICombatLogX = Bukkit.getPluginManager().getPlugin("CombatLogX") as ICombatLogX private var disabled = false @@ -72,7 +72,7 @@ class AntigriefCombatLogXV10 : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt index 86411083..4ebe9725 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCombatLogXV11.kt @@ -1,7 +1,7 @@ package com.willfp.eco.internal.spigot.integrations.antigrief import com.github.sirblobman.combatlogx.api.ICombatLogX -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import combatlogx.expansion.newbie.helper.NewbieHelperExpansion import combatlogx.expansion.newbie.helper.manager.PVPManager import combatlogx.expansion.newbie.helper.manager.ProtectionManager @@ -11,7 +11,7 @@ import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player -class AntigriefCombatLogXV11 : AntigriefWrapper { +class AntigriefCombatLogXV11 : AntigriefIntegration { private val instance: ICombatLogX = Bukkit.getPluginManager().getPlugin("CombatLogX") as ICombatLogX private var disabled = false @@ -74,7 +74,7 @@ class AntigriefCombatLogXV11 : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCrashClaim.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCrashClaim.kt index 551f812a..25f076ce 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCrashClaim.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefCrashClaim.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.antigrief -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import net.crashcraft.crashclaim.CrashClaim import net.crashcraft.crashclaim.permissions.PermissionRoute import org.bukkit.Location @@ -8,7 +8,7 @@ import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player -class AntigriefCrashClaim : AntigriefWrapper { +class AntigriefCrashClaim : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block @@ -57,7 +57,7 @@ class AntigriefCrashClaim : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt index 4fbea3bd..efa2899b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt @@ -1,13 +1,13 @@ package com.willfp.eco.internal.spigot.integrations.antigrief -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import nl.marido.deluxecombat.api.DeluxeCombatAPI import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player -class AntigriefDeluxeCombat: AntigriefWrapper { +class AntigriefDeluxeCombat: AntigriefIntegration { override fun getPluginName(): String { return "DeluxeCombat" } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt index 3ddf9187..dddf908b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt @@ -6,13 +6,13 @@ import com.massivecraft.factions.FPlayer import com.massivecraft.factions.FPlayers import com.massivecraft.factions.Faction import com.massivecraft.factions.perms.PermissibleAction -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player -class AntigriefFactionsUUID : AntigriefWrapper { +class AntigriefFactionsUUID : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block @@ -74,7 +74,7 @@ class AntigriefFactionsUUID : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefGriefPrevention.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefGriefPrevention.kt index 9eced761..d9b23861 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefGriefPrevention.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefGriefPrevention.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.antigrief -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import me.ryanhamshire.GriefPrevention.Claim import me.ryanhamshire.GriefPrevention.GriefPrevention import org.bukkit.Location @@ -8,7 +8,7 @@ import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player -class AntigriefGriefPrevention : AntigriefWrapper { +class AntigriefGriefPrevention : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block @@ -60,7 +60,7 @@ class AntigriefGriefPrevention : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt index ff1bcd30..8aeea0d0 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefIridiumSkyblock.kt @@ -2,13 +2,13 @@ package com.willfp.eco.internal.spigot.integrations.antigrief import com.iridium.iridiumskyblock.PermissionType import com.iridium.iridiumskyblock.api.IridiumSkyblockAPI -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player -class AntigriefIridiumSkyblock : AntigriefWrapper { +class AntigriefIridiumSkyblock : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block @@ -58,7 +58,7 @@ class AntigriefIridiumSkyblock : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt index 39ac405c..13cbff4e 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.antigrief -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity @@ -12,7 +12,7 @@ import org.kingdoms.constants.player.DefaultKingdomPermission import org.kingdoms.constants.player.KingdomPlayer import org.kingdoms.managers.PvPManager -class AntigriefKingdoms : AntigriefWrapper { +class AntigriefKingdoms : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block @@ -74,7 +74,7 @@ class AntigriefKingdoms : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefLands.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefLands.kt index 49b241f8..6b2dd6aa 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefLands.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefLands.kt @@ -1,7 +1,7 @@ package com.willfp.eco.internal.spigot.integrations.antigrief import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import me.angeschossen.lands.api.flags.Flags import me.angeschossen.lands.api.integration.LandsIntegration import org.bukkit.Location @@ -11,7 +11,7 @@ import org.bukkit.entity.LivingEntity import org.bukkit.entity.Monster import org.bukkit.entity.Player -class AntigriefLands(private val plugin: EcoPlugin) : AntigriefWrapper { +class AntigriefLands(private val plugin: EcoPlugin) : AntigriefIntegration { private val landsIntegration = LandsIntegration(this.plugin) override fun canBreakBlock( player: Player, @@ -62,7 +62,7 @@ class AntigriefLands(private val plugin: EcoPlugin) : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefRPGHorses.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefRPGHorses.kt index aaca150b..7080b02f 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefRPGHorses.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefRPGHorses.kt @@ -1,13 +1,13 @@ package com.willfp.eco.internal.spigot.integrations.antigrief -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player import org.plugins.rpghorses.RPGHorsesMain -class AntigriefRPGHorses : AntigriefWrapper { +class AntigriefRPGHorses : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt index 76c098c7..1df43b53 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefSuperiorSkyblock2.kt @@ -5,14 +5,14 @@ import com.bgsoftware.superiorskyblock.api.enums.HitActionResult import com.bgsoftware.superiorskyblock.api.island.Island import com.bgsoftware.superiorskyblock.api.island.IslandPrivilege import com.bgsoftware.superiorskyblock.api.wrappers.SuperiorPlayer -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.bukkit.Location import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Monster import org.bukkit.entity.Player -class AntigriefSuperiorSkyblock2 : AntigriefWrapper { +class AntigriefSuperiorSkyblock2 : AntigriefIntegration { override fun getPluginName(): String { return "SuperiorSkyblock2" } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefTowny.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefTowny.kt index f6c0f61c..531614c6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefTowny.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefTowny.kt @@ -4,14 +4,14 @@ import com.palmergames.bukkit.towny.TownyAPI import com.palmergames.bukkit.towny.TownyUniverse import com.palmergames.bukkit.towny.`object`.TownyPermission import com.palmergames.bukkit.towny.utils.PlayerCacheUtil -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.bukkit.Location import org.bukkit.Material import org.bukkit.block.Block import org.bukkit.entity.LivingEntity import org.bukkit.entity.Player -class AntigriefTowny : AntigriefWrapper { +class AntigriefTowny : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block @@ -78,7 +78,7 @@ class AntigriefTowny : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefWorldGuard.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefWorldGuard.kt index 1b4ddfe4..a6135779 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefWorldGuard.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefWorldGuard.kt @@ -7,7 +7,7 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin import com.sk89q.worldguard.protection.flags.Flags import com.sk89q.worldguard.protection.regions.RegionContainer import com.sk89q.worldguard.protection.regions.RegionQuery -import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.apache.commons.lang.Validate import org.bukkit.Location import org.bukkit.block.Block @@ -16,7 +16,7 @@ import org.bukkit.entity.LivingEntity import org.bukkit.entity.Monster import org.bukkit.entity.Player -class AntigriefWorldGuard : AntigriefWrapper { +class AntigriefWorldGuard : AntigriefIntegration { override fun canBreakBlock( player: Player, block: Block @@ -117,7 +117,7 @@ class AntigriefWorldGuard : AntigriefWrapper { } override fun equals(other: Any?): Boolean { - if (other !is AntigriefWrapper) { + if (other !is AntigriefIntegration) { return false } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customentities/CustomEntitiesMythicMobs.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customentities/CustomEntitiesMythicMobs.kt index b11f99df..f1e801fa 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customentities/CustomEntitiesMythicMobs.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customentities/CustomEntitiesMythicMobs.kt @@ -1,11 +1,11 @@ package com.willfp.eco.internal.spigot.integrations.customentities import com.willfp.eco.core.entities.CustomEntity -import com.willfp.eco.core.integrations.customentities.CustomEntitiesWrapper +import com.willfp.eco.core.integrations.customentities.CustomEntitiesIntegration import io.lumine.mythic.bukkit.MythicBukkit import org.bukkit.NamespacedKey -class CustomEntitiesMythicMobs : CustomEntitiesWrapper { +class CustomEntitiesMythicMobs : CustomEntitiesIntegration { override fun registerAllEntities() { val mobManager = MythicBukkit.inst().mobManager val api = MythicBukkit.inst().apiHelper diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsCustomCrafting.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsCustomCrafting.kt index 840658b6..cd9419f6 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsCustomCrafting.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsCustomCrafting.kt @@ -2,7 +2,7 @@ package com.willfp.eco.internal.spigot.integrations.customitems -import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper +import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration import com.willfp.eco.core.items.CustomItem import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.TestableItem @@ -13,7 +13,7 @@ import me.wolfyscript.utilities.util.Registry import org.bukkit.inventory.ItemStack import java.util.function.Predicate -class CustomItemsCustomCrafting : CustomItemsWrapper { +class CustomItemsCustomCrafting : CustomItemsIntegration { override fun registerProvider() { Items.registerItemProvider(CustomCraftingProvider()) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsExecutableItems.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsExecutableItems.kt index 88ab6d52..0fa86149 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsExecutableItems.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsExecutableItems.kt @@ -1,7 +1,7 @@ package com.willfp.eco.internal.spigot.integrations.customitems import com.ssomar.executableitems.api.ExecutableItemsAPI -import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper +import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration import com.willfp.eco.core.items.CustomItem import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.TestableItem @@ -10,7 +10,7 @@ import com.willfp.eco.util.NamespacedKeyUtils import org.bukkit.inventory.ItemStack import java.util.function.Predicate -class CustomItemsExecutableItems : CustomItemsWrapper { +class CustomItemsExecutableItems : CustomItemsIntegration { override fun registerProvider() { Items.registerItemProvider(ExecutableItemsProvider()) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsHeadDatabase.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsHeadDatabase.kt index c7174e40..e7fd045b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsHeadDatabase.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsHeadDatabase.kt @@ -1,7 +1,7 @@ package com.willfp.eco.internal.spigot.integrations.customitems import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper +import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration import com.willfp.eco.core.items.CustomItem import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.TestableItem @@ -16,7 +16,7 @@ import java.util.function.Predicate class CustomItemsHeadDatabase( plugin: EcoPlugin -) : CustomItemsWrapper { +) : CustomItemsIntegration { private val provider = HeadDBProvider() init { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsItemsAdder.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsItemsAdder.kt index 8ab0d910..ae4107b4 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsItemsAdder.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsItemsAdder.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.customitems -import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper +import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration import com.willfp.eco.core.items.CustomItem import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.TestableItem @@ -10,7 +10,7 @@ import dev.lone.itemsadder.api.CustomStack import org.bukkit.inventory.ItemStack import java.util.function.Predicate -class CustomItemsItemsAdder : CustomItemsWrapper { +class CustomItemsItemsAdder : CustomItemsIntegration { override fun registerProvider() { Items.registerItemProvider(ItemsAdderProvider()) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsMythicMobs.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsMythicMobs.kt index 74772d53..48de86f9 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsMythicMobs.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsMythicMobs.kt @@ -1,7 +1,7 @@ package com.willfp.eco.internal.spigot.integrations.customitems import com.willfp.eco.core.EcoPlugin -import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper +import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration import com.willfp.eco.core.items.Items import com.willfp.eco.core.recipe.parts.EmptyTestableItem import io.lumine.mythic.api.config.MythicLineConfig @@ -17,7 +17,7 @@ import org.bukkit.event.Listener class CustomItemsMythicMobs( private val plugin: EcoPlugin -) : CustomItemsWrapper, Listener { +) : CustomItemsIntegration, Listener { init { plugin.eventManager.registerListener(this) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsOraxen.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsOraxen.kt index 08375e7b..06492d27 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsOraxen.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsOraxen.kt @@ -1,6 +1,6 @@ package com.willfp.eco.internal.spigot.integrations.customitems -import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper +import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration import com.willfp.eco.core.items.CustomItem import com.willfp.eco.core.items.Items import com.willfp.eco.core.items.TestableItem @@ -8,7 +8,7 @@ import com.willfp.eco.core.items.provider.ItemProvider import com.willfp.eco.util.NamespacedKeyUtils import io.th0rgal.oraxen.items.OraxenItems -class CustomItemsOraxen : CustomItemsWrapper { +class CustomItemsOraxen : CustomItemsIntegration { override fun registerProvider() { Items.registerItemProvider(OraxenProvider()) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/economy/EconomyVault.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/economy/EconomyVault.kt index f1bbef47..14162a77 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/economy/EconomyVault.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/economy/EconomyVault.kt @@ -1,12 +1,12 @@ package com.willfp.eco.internal.spigot.integrations.economy -import com.willfp.eco.core.integrations.economy.EconomyWrapper +import com.willfp.eco.core.integrations.economy.EconomyIntegration import net.milkbowl.vault.economy.Economy import org.bukkit.OfflinePlayer class EconomyVault( private val vault: Economy -): EconomyWrapper { +): EconomyIntegration { override fun hasAmount(player: OfflinePlayer, amount: Double): Boolean { return vault.has(player, amount) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramCMI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramCMI.kt index 5f02c00e..f078345c 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramCMI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramCMI.kt @@ -3,13 +3,13 @@ package com.willfp.eco.internal.spigot.integrations.hologram import com.Zrips.CMI.CMI import com.Zrips.CMI.Modules.Holograms.CMIHologram import com.willfp.eco.core.integrations.hologram.Hologram -import com.willfp.eco.core.integrations.hologram.HologramWrapper +import com.willfp.eco.core.integrations.hologram.HologramIntegration import net.Zrips.CMILib.Container.CMILocation import org.bukkit.Location import java.util.UUID @Suppress("DEPRECATION") -class HologramCMI : HologramWrapper { +class HologramCMI : HologramIntegration { override fun createHologram(location: Location, contents: MutableList): Hologram { val cmiHolo = CMIHologram(UUID.randomUUID().toString(), CMILocation(location)) CMI.getInstance().hologramManager.addHologram(cmiHolo) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt index 71c1a94d..cc1bd356 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramDecentHolograms.kt @@ -1,13 +1,13 @@ package com.willfp.eco.internal.spigot.integrations.hologram import com.willfp.eco.core.integrations.hologram.Hologram -import com.willfp.eco.core.integrations.hologram.HologramWrapper +import com.willfp.eco.core.integrations.hologram.HologramIntegration import eu.decentsoftware.holograms.api.DHAPI import org.bukkit.Location import java.util.UUID @Suppress("DEPRECATION") -class HologramDecentHolograms : HologramWrapper { +class HologramDecentHolograms : HologramIntegration { override fun createHologram(location: Location, contents: MutableList): Hologram { val id = UUID.randomUUID().toString() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt index 2248dbc5..0783d77b 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramGHolo.kt @@ -1,13 +1,13 @@ package com.willfp.eco.internal.spigot.integrations.hologram import com.willfp.eco.core.integrations.hologram.Hologram -import com.willfp.eco.core.integrations.hologram.HologramWrapper +import com.willfp.eco.core.integrations.hologram.HologramIntegration import me.gholo.api.GHoloAPI import org.bukkit.Location import java.util.UUID @Suppress("DEPRECATION") -class HologramGHolo : HologramWrapper { +class HologramGHolo : HologramIntegration { companion object { private val api = GHoloAPI() } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramHolographicDisplays.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramHolographicDisplays.kt index f8bdb070..f8a89666 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramHolographicDisplays.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/hologram/HologramHolographicDisplays.kt @@ -3,12 +3,12 @@ package com.willfp.eco.internal.spigot.integrations.hologram import com.gmail.filoghost.holographicdisplays.api.HologramsAPI import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.integrations.hologram.Hologram -import com.willfp.eco.core.integrations.hologram.HologramWrapper +import com.willfp.eco.core.integrations.hologram.HologramIntegration import org.bukkit.Location class HologramHolographicDisplays( private val plugin: EcoPlugin -) : HologramWrapper { +) : HologramIntegration { override fun createHologram(location: Location, contents: MutableList): Hologram { val hologram = HologramImplHolographicDisplays( diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt index af406e2a..41213a0a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/mcmmo/McmmoIntegrationImpl.kt @@ -3,12 +3,12 @@ package com.willfp.eco.internal.spigot.integrations.mcmmo import com.gmail.nossr50.datatypes.meta.BonusDropMeta import com.gmail.nossr50.events.fake.FakeEvent import com.gmail.nossr50.mcMMO -import com.willfp.eco.core.integrations.mcmmo.McmmoWrapper +import com.willfp.eco.core.integrations.mcmmo.McmmoIntegration import com.willfp.eco.util.ClassUtils import org.bukkit.block.Block import org.bukkit.event.Event -class McmmoIntegrationImpl : McmmoWrapper { +class McmmoIntegrationImpl : McmmoIntegration { private var disabled = false override fun getBonusDropCount(block: Block): Int { if (disabled) { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopDeluxeSellwands.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopDeluxeSellwands.kt index 222a00ec..4b543266 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopDeluxeSellwands.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopDeluxeSellwands.kt @@ -1,13 +1,13 @@ package com.willfp.eco.internal.spigot.integrations.shop +import com.willfp.eco.core.integrations.shop.ShopIntegration import com.willfp.eco.core.integrations.shop.ShopSellEvent -import com.willfp.eco.core.integrations.shop.ShopWrapper import dev.norska.dsw.api.DeluxeSellwandSellEvent import org.bukkit.Bukkit import org.bukkit.event.EventHandler import org.bukkit.event.Listener -class ShopDeluxeSellwands : ShopWrapper { +class ShopDeluxeSellwands : ShopIntegration { override fun getSellEventAdapter(): Listener { return DeluxeSellwandsSellEventListeners } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopEconomyShopGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopEconomyShopGUI.kt index 8fee5a9b..43874724 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopEconomyShopGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopEconomyShopGUI.kt @@ -1,13 +1,13 @@ package com.willfp.eco.internal.spigot.integrations.shop +import com.willfp.eco.core.integrations.shop.ShopIntegration import com.willfp.eco.core.integrations.shop.ShopSellEvent -import com.willfp.eco.core.integrations.shop.ShopWrapper import me.gypopo.economyshopgui.api.events.PreTransactionEvent import org.bukkit.Bukkit import org.bukkit.event.EventHandler import org.bukkit.event.Listener -class ShopEconomyShopGUI : ShopWrapper { +class ShopEconomyShopGUI : ShopIntegration { override fun getSellEventAdapter(): Listener { return EconomyShopGUISellEventListeners } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopShopGuiPlus.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopShopGuiPlus.kt index 043d5e30..4ea29836 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopShopGuiPlus.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopShopGuiPlus.kt @@ -1,7 +1,7 @@ package com.willfp.eco.internal.spigot.integrations.shop +import com.willfp.eco.core.integrations.shop.ShopIntegration import com.willfp.eco.core.integrations.shop.ShopSellEvent -import com.willfp.eco.core.integrations.shop.ShopWrapper import com.willfp.eco.core.items.Items import net.brcdev.shopgui.ShopGuiPlusApi import net.brcdev.shopgui.event.ShopPreTransactionEvent @@ -13,7 +13,7 @@ import org.bukkit.event.EventHandler import org.bukkit.event.Listener import org.bukkit.inventory.ItemStack -class ShopShopGuiPlus : ShopWrapper { +class ShopShopGuiPlus : ShopIntegration { override fun registerEcoProvider() { ShopGuiPlusApi.registerItemProvider(EcoShopGuiPlusProvider()) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopZShop.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopZShop.kt index 8c901bba..144e1045 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopZShop.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/shop/ShopZShop.kt @@ -1,13 +1,13 @@ package com.willfp.eco.internal.spigot.integrations.shop +import com.willfp.eco.core.integrations.shop.ShopIntegration import com.willfp.eco.core.integrations.shop.ShopSellEvent -import com.willfp.eco.core.integrations.shop.ShopWrapper import fr.maxlego08.shop.api.events.ZShopSellEvent import org.bukkit.Bukkit import org.bukkit.event.EventHandler import org.bukkit.event.Listener -class ShopZShop : ShopWrapper { +class ShopZShop : ShopIntegration { override fun getSellEventAdapter(): Listener { return ZShopSellEventListeners }