diff --git a/build.gradle.kts b/build.gradle.kts index aaf9390..4eb7e24 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,6 +50,7 @@ allprojects { tasks { shadowJar { relocate("com.willfp.libreforge.loader", "com.willfp.ecomobs.libreforge.loader") + relocate("com.willfp.modelenginebridge", "com.willfp.ecomobs.integrations.modelengine.bridge") } compileKotlin { diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts index 744651a..ae85f58 100644 --- a/eco-core/core-plugin/build.gradle.kts +++ b/eco-core/core-plugin/build.gradle.kts @@ -1,13 +1,11 @@ -import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.exclude - group = "com.willfp" version = rootProject.version dependencies { compileOnly("io.papermc.paper:paper-api:1.20.2-R0.1-SNAPSHOT") compileOnly("com.github.lokka30:LevelledMobs:3.1.4") - compileOnly("com.ticxo.modelengine:api:R3.1.8") compileOnly("LibsDisguises:LibsDisguises:10.0.38") + implementation("com.willfp:ModelEngineBridge:1.0.0") } publishing { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/integrations/modelengine/IntegrationModelEngine.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/integrations/modelengine/IntegrationModelEngine.kt index 350d715..3052d69 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/integrations/modelengine/IntegrationModelEngine.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomobs/integrations/modelengine/IntegrationModelEngine.kt @@ -1,12 +1,9 @@ package com.willfp.ecomobs.integrations.modelengine -import com.ticxo.modelengine.api.ModelEngineAPI import com.willfp.eco.core.integrations.Integration import com.willfp.ecomobs.event.EcoMobSpawnEvent import com.willfp.ecomobs.integrations.MobIntegration -import com.willfp.ecomobs.mob.impl.ecoMob -import me.lokka30.levelledmobs.events.MobPreLevelEvent -import org.bukkit.entity.Mob +import com.willfp.modelenginebridge.ModelEngineBridge import org.bukkit.event.EventHandler import org.bukkit.event.Listener @@ -20,10 +17,10 @@ class IntegrationModelEngine : Listener, Integration { val modelEngineID = mob.getIntegrationConfig(integration).getStringOrNull("id") ?: return - val model = ModelEngineAPI.createActiveModel(modelEngineID) ?: return + val model = ModelEngineBridge.instance.createActiveModel(modelEngineID) ?: return - val modelled = ModelEngineAPI.createModeledEntity(entity) - modelled.addModel(model, true) + val modelled = ModelEngineBridge.instance.createModeledEntity(entity) + modelled.addModel(model) modelled.isBaseEntityVisible = true } diff --git a/eco-core/core-plugin/src/main/resources/categories/_example.yml b/eco-core/core-plugin/src/main/resources/categories/_example.yml index 471a947..7d9596a 100644 --- a/eco-core/core-plugin/src/main/resources/categories/_example.yml +++ b/eco-core/core-plugin/src/main/resources/categories/_example.yml @@ -25,3 +25,9 @@ spawning: replace: - zombie - skeleton + + + # Options for custom spawning + custom: + +