From a532b76d377e0082ed2fe7a4d4e1a3ec6987f5a2 Mon Sep 17 00:00:00 2001 From: BlitzOffline <52609756+BlitzOffline@users.noreply.github.com> Date: Wed, 29 Dec 2021 21:07:59 +0200 Subject: [PATCH 1/3] made the forzenjoin papi expansion version match the plugin version --- .../kotlin/com/github/frcsty/placeholder/PositionPlaceholder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/github/frcsty/placeholder/PositionPlaceholder.kt b/src/main/kotlin/com/github/frcsty/placeholder/PositionPlaceholder.kt index f8ed1bd..56bfd3d 100644 --- a/src/main/kotlin/com/github/frcsty/placeholder/PositionPlaceholder.kt +++ b/src/main/kotlin/com/github/frcsty/placeholder/PositionPlaceholder.kt @@ -16,7 +16,7 @@ class PositionPlaceholder(private val loader: Loader) : PlaceholderExpansion() { } override fun getVersion(): String { - return "2.1.2" + return "2.3.0" } override fun getAuthor(): String { From 4e1e20e35f085ec840734488dd52129f87cfdd7a Mon Sep 17 00:00:00 2001 From: BlitzOffline <52609756+BlitzOffline@users.noreply.github.com> Date: Wed, 29 Dec 2021 21:20:22 +0200 Subject: [PATCH 2/3] updated dependencies --- build.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index add2881..9f59648 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,8 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id("com.github.johnrengelman.shadow") version "7.0.0" - kotlin("jvm") version "1.5.31" + id("com.github.johnrengelman.shadow") version "7.1.2" + kotlin("jvm") version "1.6.10" } group = "com.github.frcsty" @@ -24,7 +24,7 @@ dependencies { implementation("me.mattstudios.utils:matt-framework:1.4.6") implementation("org.bstats:bstats-bukkit:2.2.1") compileOnly("io.papermc.paper:paper-api:1.17-R0.1-SNAPSHOT") - compileOnly("me.clip:placeholderapi:2.10.10") + compileOnly("me.clip:placeholderapi:2.11.1") } java { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 07fdda7..944d932 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip From 42c136c4aa1ff6fbd97951873de93b4881783299 Mon Sep 17 00:00:00 2001 From: BlitzOffline <52609756+BlitzOffline@users.noreply.github.com> Date: Wed, 29 Dec 2021 21:23:13 +0200 Subject: [PATCH 3/3] optimized imports --- src/main/kotlin/com/github/frcsty/command/FormatCommand.kt | 1 - src/main/kotlin/com/github/frcsty/message/MessageFormatter.kt | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/kotlin/com/github/frcsty/command/FormatCommand.kt b/src/main/kotlin/com/github/frcsty/command/FormatCommand.kt index 8b9fece..4535c8e 100644 --- a/src/main/kotlin/com/github/frcsty/command/FormatCommand.kt +++ b/src/main/kotlin/com/github/frcsty/command/FormatCommand.kt @@ -8,7 +8,6 @@ import me.mattstudios.mf.annotations.Completion import me.mattstudios.mf.annotations.Permission import me.mattstudios.mf.annotations.SubCommand import me.mattstudios.mf.base.CommandBase -import org.bukkit.Bukkit import org.bukkit.command.CommandSender import org.bukkit.entity.Player diff --git a/src/main/kotlin/com/github/frcsty/message/MessageFormatter.kt b/src/main/kotlin/com/github/frcsty/message/MessageFormatter.kt index 5a5e930..eed904b 100644 --- a/src/main/kotlin/com/github/frcsty/message/MessageFormatter.kt +++ b/src/main/kotlin/com/github/frcsty/message/MessageFormatter.kt @@ -11,7 +11,6 @@ import java.util.concurrent.TimeUnit import org.bukkit.Bukkit import org.bukkit.entity.Player import org.bukkit.plugin.Plugin -import org.bukkit.scheduler.BukkitRunnable object MessageFormatter {