diff --git a/build.gradle.kts b/build.gradle.kts index f51c7b19..4b277f19 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ -@Suppress("DSL_SCOPE_VIOLATION") plugins { alias(libs.plugins.mia.kotlin.jvm) alias(libs.plugins.kotlinx.serialization) @@ -25,6 +24,8 @@ repositories { dependencies { // MineInAbyss platform + compileOnly(libs.bundles.idofront.core) + compileOnly(libs.idofront.nms) compileOnly(libs.kotlinx.serialization.json) compileOnly(libs.kotlinx.serialization.kaml) compileOnly(libs.kotlinx.coroutines) @@ -44,8 +45,6 @@ dependencies { implementation(blockyLibs.minecraft.plugin.protectionlib) implementation(blockyLibs.minecraft.plugin.customblockdata) - implementation(libs.bundles.idofront.core) - implementation(libs.idofront.nms) } tasks.withType { diff --git a/gradle.properties b/gradle.properties index 8233d97d..ccae4a02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ group=com.mineinabyss version=0.8 -idofrontVersion=0.19.14 +idofrontVersion=0.20.2 composeVersion=1.2.1 diff --git a/gradle/blockyLibs.versions.toml b/gradle/blockyLibs.versions.toml index 03bffdd9..97e215d5 100644 --- a/gradle/blockyLibs.versions.toml +++ b/gradle/blockyLibs.versions.toml @@ -1,5 +1,5 @@ [versions] -gearyPaper = "0.26.0" +gearyPaper = "0.26.2" guiy="0.9.0" protocolburrito="0.8.0" @@ -9,6 +9,5 @@ guiy = { module = "com.mineinabyss:guiy-compose", version.ref = "guiy" } protocolburrito = { module = "com.mineinabyss:protocolburrito", version.ref = "protocolburrito" } minecraft-plugin-customblockdata = "com.jeff-media:custom-block-data:2.2.2" -minecraft-plugin-lightapi = "com.github.BeYkeRYkt:LightAPI:5.3.0-Bukkit" minecraft-plugin-protectionlib = "com.github.oraxen:protectionlib:1.3.5" minecraft-plugin-mythic = "io.lumine:Mythic-Dist:5.2.6" diff --git a/src/main/kotlin/com/mineinabyss/blocky/BlockyPlugin.kt b/src/main/kotlin/com/mineinabyss/blocky/BlockyPlugin.kt index c22cdbb6..1bc3671c 100644 --- a/src/main/kotlin/com/mineinabyss/blocky/BlockyPlugin.kt +++ b/src/main/kotlin/com/mineinabyss/blocky/BlockyPlugin.kt @@ -13,7 +13,6 @@ import com.mineinabyss.geary.prefabs.PrefabKey import com.mineinabyss.idofront.config.config import com.mineinabyss.idofront.di.DI import com.mineinabyss.idofront.messaging.logError -import com.mineinabyss.idofront.platforms.Platforms import com.mineinabyss.idofront.plugin.listeners import com.sk89q.worldedit.WorldEdit import io.papermc.paper.configuration.GlobalConfiguration @@ -29,12 +28,7 @@ import org.bukkit.plugin.java.JavaPlugin var prefabMap = mapOf() var registryTagMap = mapOf() class BlockyPlugin : JavaPlugin() { - override fun onLoad() { - Platforms.load(this, "mineinabyss") - } - override fun onEnable() { - createBlockyContext() if (Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) { diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml new file mode 100644 index 00000000..7e06f381 --- /dev/null +++ b/src/main/resources/paper-plugin.yml @@ -0,0 +1,28 @@ +name: Blocky +version: "${plugin_version}" +author: boy0000 +main: com.mineinabyss.blocky.BlockyPlugin +api-version: "1.20" + +dependencies: + server: + Geary: + required: true + load: BEFORE + join-classpath: true + ProtocolBurrito: + required: true + load: BEFORE + join-classpath: true + Guiy: + required: false + load: BEFORE + join-classpath: true + FastAsyncWorldEdit: + required: false + load: BEFORE + join-classpath: true + ModelEngine: + required: false + load: BEFORE + join-classpath: true diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml deleted file mode 100644 index cd038113..00000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Blocky -version: ${plugin_version} -main: com.mineinabyss.blocky.BlockyPlugin -api-version: "1.20" -authors: [ boy0000 ] -depend: [ Geary, ProtocolBurrito ] -softdepend: [ Guiy, FastAsyncWorldEdit, MythicMobs ] - -commands: - blocky: