diff --git a/build.gradle.kts b/build.gradle.kts index 24c1ee1f..6ebfc767 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -42,7 +42,7 @@ allprojects { maven("https://jitpack.io") // CustomCrafting - //maven("https://maven.wolfyscript.com/repository/public/") + maven("https://maven.wolfyscript.com/repository/public/") // SuperiorSkyblock2 maven("https://repo.bg-software.com/repository/api/") diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts index a495c280..924a69b4 100644 --- a/eco-core/core-plugin/build.gradle.kts +++ b/eco-core/core-plugin/build.gradle.kts @@ -46,7 +46,7 @@ dependencies { compileOnly("com.bgsoftware:SuperiorSkyblockAPI:1.8.3") compileOnly("com.github.MilkBowl:VaultAPI:1.7") compileOnly("com.github.WhipDevelopment:CrashClaim:f9cd7d92eb") - //compileOnly("com.wolfyscript.wolfyutilities:wolfyutilities:3.16.0.0") + compileOnly("com.wolfyscript.wolfyutilities:wolfyutilities:3.16.0.0") compileOnly("com.github.decentsoftware-eu:decentholograms:2.1.2") compileOnly("com.github.Gypopo:EconomyShopGUI-API:1.4.6") compileOnly("com.github.N0RSKA:ScytherAPI:55a") 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 a8b7c70b..384a9d8c 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 @@ -94,6 +94,7 @@ import com.willfp.eco.internal.spigot.integrations.antigrief.AntigriefSuperiorSk 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.customentities.CustomEntitiesMythicMobs +import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsCustomCrafting import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsDenizen import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsExecutableItems import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsHeadDatabase @@ -101,6 +102,7 @@ import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsItemsA import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsMythicMobs import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsOraxen import com.willfp.eco.internal.spigot.integrations.customitems.CustomItemsScyther +import com.willfp.eco.internal.spigot.integrations.customrecipes.CustomRecipeCustomCrafting import com.willfp.eco.internal.spigot.integrations.economy.EconomyVault import com.willfp.eco.internal.spigot.integrations.entitylookup.EntityLookupModelEngine import com.willfp.eco.internal.spigot.integrations.hologram.HologramCMI @@ -317,10 +319,10 @@ abstract class EcoSpigotPlugin : EcoPlugin() { IntegrationLoader("ItemsAdder") { CustomItemsManager.register(CustomItemsItemsAdder()) }, IntegrationLoader("HeadDatabase") { CustomItemsManager.register(CustomItemsHeadDatabase(this)) }, IntegrationLoader("ExecutableItems") { CustomItemsManager.register(CustomItemsExecutableItems()) }, - //IntegrationLoader("CustomCrafting") { - // CustomItemsManager.register(CustomItemsCustomCrafting()) - // CraftingRecipeListener.registerValidator(CustomRecipeCustomCrafting()) - //}, + IntegrationLoader("CustomCrafting") { + CustomItemsManager.register(CustomItemsCustomCrafting()) + CraftingRecipeListener.registerValidator(CustomRecipeCustomCrafting()) + }, IntegrationLoader("MythicMobs") { CustomItemsManager.register(CustomItemsMythicMobs(this)) }, IntegrationLoader("Scyther") { CustomItemsManager.register(CustomItemsScyther()) }, IntegrationLoader("Denizen") { CustomItemsManager.register(CustomItemsDenizen()) }, 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 5c487afb..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,6 @@ package com.willfp.eco.internal.spigot.integrations.customitems -/* import com.willfp.eco.core.integrations.customitems.CustomItemsIntegration import com.willfp.eco.core.items.CustomItem import com.willfp.eco.core.items.Items @@ -43,6 +42,4 @@ class CustomItemsCustomCrafting : CustomItemsIntegration { ) } } -} - - */ \ No newline at end of file +} \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customrecipes/CustomRecipeCustomCrafting.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customrecipes/CustomRecipeCustomCrafting.kt index e8201e18..b02f6e4a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customrecipes/CustomRecipeCustomCrafting.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/customrecipes/CustomRecipeCustomCrafting.kt @@ -1,6 +1,11 @@ package com.willfp.eco.internal.spigot.integrations.customrecipes -/* +import com.willfp.eco.core.integrations.Integration +import com.willfp.eco.internal.spigot.recipes.GenericCraftEvent +import com.willfp.eco.internal.spigot.recipes.RecipeValidator +import me.wolfyscript.customcrafting.CustomCrafting +import org.bukkit.entity.Player + class CustomRecipeCustomCrafting : RecipeValidator, Integration { override fun validate(event: GenericCraftEvent): Boolean { val player = event.inventory.viewers.getOrNull(0) as? Player ?: return false @@ -10,6 +15,4 @@ class CustomRecipeCustomCrafting : RecipeValidator, Integration { override fun getPluginName(): String { return "CustomCrafting" } -} - - */ \ No newline at end of file +} \ No newline at end of file