From 958cf4ab5d9655557e01a63e42f6ac4a55de24e4 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Wed, 28 Jun 2023 12:34:01 -0700 Subject: [PATCH] 1.20.1 --- README.md | 4 ++-- build-logic/src/main/kotlin/ext.kt | 3 ++- fabric/src/main/resources/fabric.mod.json | 2 +- gradle/libs.versions.yml | 18 +++++++++--------- spigot/build.gradle.kts | 1 + .../jpenilla/tabtps/spigot/TabTPSPlugin.java | 2 +- sponge/build.gradle.kts | 3 ++- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 17a9854b..a7807d22 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ Minecraft server mod/plugin to show TPS, MSPT, and other information in the tab menu, boss bar, and action bar. Current supported platforms: -- [Paper](https://papermc.io)/Spigot API (Minecraft versions 1.8.8-1.19.4+) +- [Paper](https://papermc.io)/Spigot API (Minecraft versions 1.8.8-1.20.1+) - [Sponge](https://spongepowered.org) 8+ -- Fabric (Minecraft 1.19.4, requires [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api)) +- Fabric (Minecraft 1.20.1, requires [Fabric API](https://modrinth.com/mod/fabric-api)) ## Features diff --git a/build-logic/src/main/kotlin/ext.kt b/build-logic/src/main/kotlin/ext.kt index 43f0fb49..2a8b20e8 100644 --- a/build-logic/src/main/kotlin/ext.kt +++ b/build-logic/src/main/kotlin/ext.kt @@ -32,5 +32,6 @@ val bukkitVersions = listOf( "1.16.5", "1.17.1", "1.18.2", - "1.19.4" + "1.19.4", + "1.20.1" ) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index b23e04a6..57513b92 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -29,6 +29,6 @@ "fabricloader": ">=0.14.7", "fabric": "*", "fabric-permissions-api-v0": "*", - "minecraft": "1.19.x" + "minecraft": "~1.20.1" } } diff --git a/gradle/libs.versions.yml b/gradle/libs.versions.yml index b8283f33..0996317f 100644 --- a/gradle/libs.versions.yml +++ b/gradle/libs.versions.yml @@ -6,12 +6,12 @@ metadata: plugins: net.kyori.blossom: 1.3.1 ca.stellardrift.localization: 5.0.1 - net.minecrell.plugin-yml.bukkit: 0.5.2 + net.minecrell.plugin-yml.bukkit: 0.5.3 xyz.jpenilla.run-paper: 2.1.0 org.spongepowered.gradle.plugin: 2.0.2 versions: - adventure: 4.13.1 + adventure: 4.14.0 adventurePagination: 4.0.0-SNAPSHOT adventurePlatform: 4.3.0 cloud: 1.8.3 @@ -19,7 +19,7 @@ versions: commodore: 2.2 configurate: 4.1.2 typesafeConfig: 1.+ - checkerQual: 3.33.0 + checkerQual: 3.35.0 slf4j: 1.7.32 log4jSlf4jImpl: 2.8.1 gson: 2.8.0 @@ -27,17 +27,17 @@ versions: bstats: 3.0.0 paperApi: 1.16.5-R0.1-SNAPSHOT paperLib: 1.0.8-SNAPSHOT - fabricApi: 0.78.0+1.19.4 - fabricLoader: 0.14.19 - minecraft: 1.19.4 - adventurePlatformFabric: 5.8.0 + fabricApi: 0.84.0+1.20.1 + fabricLoader: 0.14.21 + minecraft: 1.20.1 + adventurePlatformFabric: 5.10.0-SNAPSHOT mixin: 0.8.5 # buildSrc indra: 2.1.1 shadow: 7.1.2 minotaur: 2.7.5 - hangarPublishPlugin: 0.0.4 + hangarPublishPlugin: 0.0.5 dependencies: adventureBom: @@ -139,7 +139,7 @@ dependencies: legacyPluginBase: group: xyz.jpenilla name: legacy-plugin-base - version: 0.0.1+73-SNAPSHOT + version: 0.0.1+83-SNAPSHOT gson: group: com.google.code.gson diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts index 3769f120..b2cff176 100644 --- a/spigot/build.gradle.kts +++ b/spigot/build.gradle.kts @@ -69,6 +69,7 @@ tasks { "1.16.5", "1.17.1", "1.18.2", + "1.19.4", mcVer, ), ).forEach { (javaVersion, minecraftVersions) -> diff --git a/spigot/src/main/java/xyz/jpenilla/tabtps/spigot/TabTPSPlugin.java b/spigot/src/main/java/xyz/jpenilla/tabtps/spigot/TabTPSPlugin.java index d6df3ebe..ea99c50b 100644 --- a/spigot/src/main/java/xyz/jpenilla/tabtps/spigot/TabTPSPlugin.java +++ b/spigot/src/main/java/xyz/jpenilla/tabtps/spigot/TabTPSPlugin.java @@ -93,7 +93,7 @@ public void enable() { } @Override - public void onDisable() { + public void disable() { if (this.tabTPS != null) { // don't shutdown if we have an exception before init completes this.tabTPS.shutdown(); } diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts index 5db0a856..53bc2965 100644 --- a/sponge/build.gradle.kts +++ b/sponge/build.gradle.kts @@ -99,6 +99,7 @@ modrinth { "1.16.5", "1.17.1", "1.18.2", - "1.19.4" + "1.19.4", + "1.20.1" ) }