From 5fbb05365cd126426149e7c8d0f44db38ed13d68 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sat, 23 Sep 2023 21:29:07 -0700 Subject: [PATCH] 1.20.2 --- build-logic/src/main/kotlin/tabtps.base.gradle.kts | 2 +- .../src/main/kotlin/tabtps.parent.gradle.kts | 2 +- .../xyz/jpenilla/tabtps/fabric/FabricUser.java | 2 +- gradle/libs.versions.yml | 14 +++++++------- settings.gradle.kts | 3 --- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/build-logic/src/main/kotlin/tabtps.base.gradle.kts b/build-logic/src/main/kotlin/tabtps.base.gradle.kts index 0518f962..e402d5d7 100644 --- a/build-logic/src/main/kotlin/tabtps.base.gradle.kts +++ b/build-logic/src/main/kotlin/tabtps.base.gradle.kts @@ -4,7 +4,7 @@ import org.gradle.kotlin.dsl.withType plugins { id("net.kyori.indra") id("net.kyori.indra.checkstyle") - id("net.kyori.indra.license-header") + id("net.kyori.indra.licenser.spotless") id("net.kyori.indra.git") } diff --git a/build-logic/src/main/kotlin/tabtps.parent.gradle.kts b/build-logic/src/main/kotlin/tabtps.parent.gradle.kts index 65c6a922..124637e9 100644 --- a/build-logic/src/main/kotlin/tabtps.parent.gradle.kts +++ b/build-logic/src/main/kotlin/tabtps.parent.gradle.kts @@ -7,7 +7,7 @@ plugins { hangarPublish.publications.register("plugin") { version.set(project.version as String) - namespace("jmp", "TabTPS") + id.set("TabTPS") channel.set("Release") changelog.set(releaseNotes) apiKey.set(providers.environmentVariable("HANGAR_UPLOAD_KEY")) diff --git a/fabric/src/main/java/xyz/jpenilla/tabtps/fabric/FabricUser.java b/fabric/src/main/java/xyz/jpenilla/tabtps/fabric/FabricUser.java index 2b5049ac..95355e9f 100644 --- a/fabric/src/main/java/xyz/jpenilla/tabtps/fabric/FabricUser.java +++ b/fabric/src/main/java/xyz/jpenilla/tabtps/fabric/FabricUser.java @@ -56,7 +56,7 @@ public boolean online() { @Override public int ping() { - return this.base().latency; + return this.base().connection.latency(); } @Override diff --git a/gradle/libs.versions.yml b/gradle/libs.versions.yml index a2c701a6..d0af7321 100644 --- a/gradle/libs.versions.yml +++ b/gradle/libs.versions.yml @@ -7,7 +7,7 @@ plugins: net.kyori.blossom: 2.1.0 ca.stellardrift.localization: 6.1.0 net.minecrell.plugin-yml.bukkit: 0.5.3 - xyz.jpenilla.run-paper: 2.1.0 + xyz.jpenilla.run-paper: 2.2.0 org.spongepowered.gradle.plugin: 2.2.0 versions: @@ -27,17 +27,17 @@ versions: bstats: 3.0.2 paperApi: 1.16.5-R0.1-SNAPSHOT paperLib: 1.0.8-SNAPSHOT - fabricApi: 0.84.0+1.20.1 - fabricLoader: 0.14.21 - minecraft: 1.20.1 - adventurePlatformFabric: 5.9.0 + fabricApi: 0.89.2+1.20.2 + fabricLoader: 0.14.22 + minecraft: 1.20.2 + adventurePlatformFabric: 5.10.0 mixin: 0.8.5 # buildSrc indra: 3.1.3 shadow: 8.1.1 minotaur: 2.7.5 - hangarPublishPlugin: 0.0.5 + hangarPublishPlugin: 0.1.0 dependencies: adventureBom: @@ -184,7 +184,7 @@ dependencies: version: { ref: indra } build-indraLicenser: group: net.kyori - name: indra-licenser-cadix + name: indra-licenser-spotless version: { ref: indra } build-shadow: group: com.github.johnrengelman diff --git a/settings.gradle.kts b/settings.gradle.kts index 366cee09..39223b36 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,9 +22,6 @@ pluginManagement { repositories { gradlePluginPortal() maven("https://maven.fabricmc.net/") - maven("https://maven.quiltmc.org/repository/release/") { - mavenContent { releasesOnly() } - } maven("https://repo.jpenilla.xyz/snapshots/") { mavenContent { snapshotsOnly() } }