From 504f45c03fb4d18c3ba44e7c01bdf2bec9ad6fa7 Mon Sep 17 00:00:00 2001 From: TomTom <93038247+AverageGithub@users.noreply.github.com> Date: Sun, 22 Oct 2023 16:50:31 +0200 Subject: [PATCH] API publishing, fixes --- api/build.gradle | 8 ++++++++ .../com/artillexstudios/axminions/api/AxMinionsAPI.kt | 2 ++ build.gradle | 9 +++++++-- common/build.gradle | 5 +++++ .../artillexstudios/axminions/api/AxMinionsAPIImpl.kt | 5 +++++ common/src/main/resources/plugin.yml | 2 +- 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index ad55a5c..ea6b837 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -1,2 +1,10 @@ group = 'com.artillexstudios.axminions' version = rootProject.version + +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } +} \ No newline at end of file diff --git a/api/src/main/kotlin/com/artillexstudios/axminions/api/AxMinionsAPI.kt b/api/src/main/kotlin/com/artillexstudios/axminions/api/AxMinionsAPI.kt index 02bee99..c169471 100644 --- a/api/src/main/kotlin/com/artillexstudios/axminions/api/AxMinionsAPI.kt +++ b/api/src/main/kotlin/com/artillexstudios/axminions/api/AxMinionsAPI.kt @@ -27,6 +27,8 @@ interface AxMinionsAPI { fun getIntegrations(): Integrations + fun getTick(): Long + companion object { @JvmStatic lateinit var INSTANCE: AxMinionsAPI diff --git a/build.gradle b/build.gradle index 36d5d59..77dbf15 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { } group = 'com.artillexstudios.axminions' -version = '1.0-SNAPSHOT' +version = '1.0.0' repositories { mavenCentral() @@ -120,9 +120,14 @@ allprojects { relocate("com.artillexstudios.axapi", "com.artillexstudios.axminions.libs.axapi") relocate("org.h2", "com.artillexstudios.axminions.libs.h2") relocate("org.jetbrains.kotlin", "com.artillexstudios.axminions.libs.kotlin") + relocate("net.kyori", "com.artillexstudios.axminions.libs.kyori") + relocate("revxrsal.commands", "com.artillexstudios.axminions.libs.lamp") + relocate("org.apache.commons.math3", "com.artillexstudios.axminions.libs.math") } } kotlin { jvmToolchain(17) -} \ No newline at end of file +} + +tasks.build.dependsOn(shadowJar) \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index c002a21..3801697 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,6 +1,11 @@ group = 'com.artillexstudios.axminions' version = rootProject.version +processResources { + filesMatching("plugin.yml") { + expand(version: version) + } +} dependencies { implementation project(':api') diff --git a/common/src/main/kotlin/com/artillexstudios/axminions/api/AxMinionsAPIImpl.kt b/common/src/main/kotlin/com/artillexstudios/axminions/api/AxMinionsAPIImpl.kt index 5bafe03..490dc9a 100644 --- a/common/src/main/kotlin/com/artillexstudios/axminions/api/AxMinionsAPIImpl.kt +++ b/common/src/main/kotlin/com/artillexstudios/axminions/api/AxMinionsAPIImpl.kt @@ -7,6 +7,7 @@ import com.artillexstudios.axminions.api.config.Messages import com.artillexstudios.axminions.api.data.DataHandler import com.artillexstudios.axminions.api.integrations.Integrations import com.artillexstudios.axminions.api.minions.Minion +import com.artillexstudios.axminions.minions.MinionTicker import com.artillexstudios.axminions.minions.Minions import org.bukkit.entity.Player import java.io.File @@ -64,4 +65,8 @@ class AxMinionsAPIImpl(private val plugin: AxMinionsPlugin) : AxMinionsAPI { override fun getIntegrations(): Integrations { return AxMinionsPlugin.integrations } + + override fun getTick(): Long { + return MinionTicker.getTick() + } } \ No newline at end of file diff --git a/common/src/main/resources/plugin.yml b/common/src/main/resources/plugin.yml index eb54a11..4d77bce 100644 --- a/common/src/main/resources/plugin.yml +++ b/common/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: "AxMinions" main: "com.artillexstudios.axminions.AxMinionsPlugin" -version: "1.0" +version: "$version" api-version: 1.18 folia-supported: true softdepend: