Fix CNF error

QuiltServerTools · Dec 23, 2022 · 4a09a4d · 4a09a4d
1 parent 1c31444
commit 4a09a4d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,7 +52,6 @@ allprojects {
 
         // Optional deps
         modRuntimeOnly(rootProject.libs.permission.api)
-        modImplementation(rootProject.libs.vanish.api)
     }
 
     // Produce a sources distribution
@@ -110,6 +109,9 @@ dependencies {
     shadow(libs.konf.base)
     shadow(libs.konf.toml)
 
+    // Optional deps
+    modCompileOnly(rootProject.libs.vanish.api)
+
     subprojects.forEach {
         implementation(project(":${it.name}", "namedElements"))
         include(project("${it.name}:")) // nest within distribution

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -17,7 +17,7 @@ adventure-gson = "4.11.0"
 
 placeholder-api = "2.0.0-pre.2+1.19.3"
 permission-api = "0.2-SNAPSHOT"
-vanish-api = "1.0.2"
+vanish-api = "1.3.0"
 konf = "1.1.2"
 
 [libraries]

diff --git a/src/main/kotlin/io/github/quiltservertools/blockbotdiscord/config/PresenceSpec.kt b/src/main/kotlin/io/github/quiltservertools/blockbotdiscord/config/PresenceSpec.kt
@@ -2,7 +2,6 @@ package io.github.quiltservertools.blockbotdiscord.config
 
 import com.uchuhimo.konf.Config
 import com.uchuhimo.konf.ConfigSpec
-import dev.kord.common.entity.ActivityType
 import eu.pb4.placeholders.api.PlaceholderContext
 import eu.pb4.placeholders.api.Placeholders
 import eu.pb4.placeholders.api.TextParserUtils
@@ -13,6 +12,14 @@ object PresenceSpec : ConfigSpec() {
     val activityText by required<String>()
 }
 
+enum class ActivityType {
+    Disabled,
+    Game,
+    Listening,
+    Watching,
+    Competing;
+}
+
 fun Config.formatPresenceText(
     server: MinecraftServer
 ): String = Placeholders.parseText(

diff --git a/...main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/BlockBotApiExtension.kt b/...main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/BlockBotApiExtension.kt
@@ -8,7 +8,6 @@ import com.kotlindiscord.kord.extensions.utils.ensureWebhook
 import com.kotlindiscord.kord.extensions.utils.getTopRole
 import com.kotlindiscord.kord.extensions.utils.hasPermission
 import com.vdurmont.emoji.EmojiParser
-import dev.kord.common.entity.ActivityType
 import dev.kord.common.entity.AllowedMentionType
 import dev.kord.common.entity.Permission
 import dev.kord.common.entity.Snowflake
@@ -125,8 +124,8 @@ class BlockBotApiExtension : Extension(), Bot {
         // Vanish fake join/leave messages
         if (FabricLoader.getInstance().isModLoaded("melius-vanish")) {
             VanishEvents.VANISH_EVENT.register {player, vanished ->
-                if (vanished) sendPlayerLeaveMessage(player);
-                else sendPlayerJoinMessage(player);
+                if (vanished) sendPlayerLeaveMessage(player)
+                else sendPlayerJoinMessage(player)
             }
         }
 
@@ -405,7 +404,7 @@ class BlockBotApiExtension : Extension(), Bot {
                         ActivityType.Listening -> listening(config.formatPresenceText(server))
                         ActivityType.Watching -> watching(config.formatPresenceText(server))
                         ActivityType.Competing -> competing(config.formatPresenceText(server))
-                        else -> Unit
+                        ActivityType.Disabled -> Unit
                     }
                 }
             }

diff --git a/src/main/resources/blockbot-discord.toml b/src/main/resources/blockbot-discord.toml
@@ -93,7 +93,7 @@ allowedRoles = []
 opLevel = 3
 
 [Presence]
-# The type of presence. Can be "Game", "Listening", "Watching", "Competing"
+# The type of presence. Can be "Game", "Listening", "Watching", "Competing", "Disabled"
 # Updates every 400 ticks (20 seconds)
 activityType = "Game"
 activityText = "Minecraft | %server:online%/%server:max_players%"