Merge pull request #77 from nicholasgrose/develop-1.6.0

.github/workflows/pull_request_check.yml

@@ -42,7 +42,7 @@ jobs:
             -   uses: actions/checkout@v3
 
             # https://github.com/marketplace/actions/run-ktlint-with-reviewdog
-            -   uses: ScaCap/action-ktlint@1.5.1
+            -   uses: ScaCap/action-ktlint@v1.7
                 with:
                     github_token: ${{ secrets.GITHUB_TOKEN }}
                     ktlint_version: '0.45.2'

build.gradle.kts

@@ -1,14 +1,14 @@
 plugins {
     // https://kotlinlang.org/
-    kotlin("jvm") version "1.8.10"
+    kotlin("jvm") version "1.8.21"
     // https://kotlinlang.org/docs/serialization.html
-    kotlin("plugin.serialization") version "1.8.10"
+    kotlin("plugin.serialization") version "1.8.21"
     // https://github.com/johnrengelman/shadow
     id("com.github.johnrengelman.shadow") version "8.1.1"
     // https://github.com/jpenilla/run-paper
-    id("xyz.jpenilla.run-paper") version "2.0.1"
+    id("xyz.jpenilla.run-paper") version "2.1.0"
     // https://github.com/jlleitschuh/ktlint-gradle
-    id("org.jlleitschuh.gradle.ktlint") version "11.3.1"
+    id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
     // https://detekt.dev/
     id("io.gitlab.arturbosch.detekt") version "1.22.0"
 }

gradle.properties

@@ -1,24 +1,23 @@
 # Project info
-version=1.6.0-alpha-1
+version=1.6.0-alpha-2
 group=com.rose.gateway
 # Plugin configuration
 # https://github.com/pinterest/ktlint
-# Must use 0.45.2 until https://github.com/JLLeitschuh/ktlint-gradle/pull/595 is closed and plugin updated
 ktlintVersion=0.45.2
 # Dependencies
 minecraftVersion=1.19.4
 # https://docs.papermc.io/paper/dev/project-setup
 paperApiRevision=R0.1
 # https://github.com/sksamuel/hoplite
-hopliteVersion=2.7.3
+hopliteVersion=2.7.4
 # https://github.com/charleskorn/kaml
 kamlVersion=0.53.0
 # https://kordex.kotlindiscord.com/
 kordexVersion=1.5.7-SNAPSHOT
 # https://github.com/utybo/Lixy
 lixyVersion=master-SNAPSHOT
 # https://ktor.io/
-ktorVersion=2.2.4
+ktorVersion=2.3.0
 # Compilation options for Kotlin
 jvmVersion=17
 kotlinLanguageVersion=1.8

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

src/main/kotlin/com/rose/gateway/discord/bot/DiscordBot.kt

@@ -15,6 +15,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
+import java.nio.file.Path
 
 /**
  * The Discord bot that the plugin runs
@@ -96,9 +97,15 @@ class DiscordBot : KoinComponent {
         }
         extensions {
             extensions.addAll(
-                DiscordBotConstants.BOT_EXTENSIONS.map { extension -> extension.extensionConstructor() }
+                DiscordBotConstants.BOT_EXTENSIONS.map { extension -> extension.extensionConstructor() },
             )
         }
+        plugins {
+            // The default path of "plugins/" is problematic on a Minecraft server, so we'll remove it and
+            // redirect the plugin search to "plugins/Gateway/plugins/".
+            pluginPaths.clear()
+            pluginPath(Path.of(plugin.dataFolder.path, "plugins"))
+        }
     }
 
     /**