From 98e1f19145a657395a7d166f4ad526e5cffc4b6c Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 30 Nov 2021 18:53:43 +0000 Subject: [PATCH] Removed broken CustomCrafting integration --- .../eco/internal/spigot/EcoSpigotPlugin.kt | 2 - .../customitems/CustomItemsCustomCrafting.kt | 42 ------------------- 2 files changed, 44 deletions(-) delete mode 100644 eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsCustomCrafting.kt diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt index 539258c8..0a2463d7 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt @@ -59,7 +59,6 @@ import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefLands import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefSuperiorSkyblock2 import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefTowny import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefWorldGuard -import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsCustomCrafting import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsHeadDatabase import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsItemsAdder import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsOraxen @@ -203,7 +202,6 @@ abstract class EcoSpigotPlugin : EcoPlugin( IntegrationLoader("Oraxen") { CustomItemsManager.register(CustomItemsOraxen()) }, IntegrationLoader("ItemsAdder") { CustomItemsManager.register(CustomItemsItemsAdder()) }, IntegrationLoader("HeadDatabase") { CustomItemsManager.register(CustomItemsHeadDatabase(this)) }, - IntegrationLoader("CustomCrafting") { CustomItemsManager.register(CustomItemsCustomCrafting()) }, // Shop IntegrationLoader("ShopGUIPlus") { ShopManager.register(ShopShopGuiPlus()) }, 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 deleted file mode 100644 index 2d06f3d7..00000000 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customitems/CustomItemsCustomCrafting.kt +++ /dev/null @@ -1,42 +0,0 @@ -package com.willfp.eco.internal.spigot.integrations.customitems - -import com.willfp.eco.core.integrations.customitems.CustomItemsWrapper -import com.willfp.eco.core.items.CustomItem -import com.willfp.eco.core.items.Items -import com.willfp.eco.core.items.TestableItem -import com.willfp.eco.core.items.provider.ItemProvider -import com.willfp.eco.util.NamespacedKeyUtils -import dev.lone.itemsadder.api.CustomStack -import me.wolfyscript.utilities.util.NamespacedKey -import me.wolfyscript.utilities.util.Registry -import org.bukkit.inventory.ItemStack -import java.util.function.Predicate - -class CustomItemsCustomCrafting: CustomItemsWrapper { - override fun registerAllItems() { - Items.registerItemProvider(ItemsAdderProvider()) - } - - override fun getPluginName(): String { - return "CustomCrafting" - } - - private class ItemsAdderProvider : ItemProvider("customcrafting") { - override fun provideForKey(key: String): TestableItem? { - val nKey = key.replace("customcrafting:", "", ignoreCase = true) - val itemKey = NamespacedKey("customcrafting", nKey) - val item = Registry.CUSTOM_ITEMS.get(itemKey) ?: return null - val namespacedKey = NamespacedKeyUtils.create("customcrafting", key) - val stack = item.create(1) - return CustomItem( - namespacedKey, - Predicate { test: ItemStack -> - val customStack = CustomStack.byItemStack(test) ?: return@Predicate false - customStack.id.equals(nKey, ignoreCase = true) - }, - stack - ) - } - - } -} \ No newline at end of file