Merge pull request #17 from SLNE-Development/feat/fully-implement-world-system

feat: conditionally enable special commands based on server type

Author: TheBjoRedCraft

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=1.21.10-2.0.5-SNAPSHOT
+version=1.21.10-2.0.6-SNAPSHOT

src/main/kotlin/dev/slne/surf/essentials/PaperCommandManager.kt

@@ -25,7 +25,6 @@ object PaperCommandManager {
         giveCommand()
         infoCommand()
         itemEditCommand()
-        signCommand()
         teleportCommand()
         teleportOfflineCommand()
         teleportRandomCommand()
@@ -62,7 +61,12 @@ object PaperCommandManager {
         soundCommand()
         stopCommand()
         restartCommand()
-        makeSpecialCommand()
+
+        if (!plugin.isSurvivalServer()) {
+            makeSpecialCommand()
+            signCommand()
+        }
+
         knightCommand()
         toolCommand()
         experienceCommand()

src/main/kotlin/dev/slne/surf/essentials/PaperMain.kt

@@ -1,6 +1,7 @@
 package dev.slne.surf.essentials
 
 import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
+import dev.slne.surf.surfapi.bukkit.api.extensions.pluginManager
 import org.bukkit.plugin.java.JavaPlugin
 
 val plugin get() = JavaPlugin.getPlugin(PaperMain::class.java)
@@ -18,4 +19,6 @@ class PaperMain : SuspendingJavaPlugin() {
     override fun onDisable() {
         super.onDisable()
     }
+
+    fun isSurvivalServer() = pluginManager.isPluginEnabled("surf-freebuild-bukkit")
 }

src/main/kotlin/dev/slne/surf/essentials/listener/SpecialItemListener.kt

@@ -1,5 +1,6 @@
 package dev.slne.surf.essentials.listener
 
+import dev.slne.surf.essentials.plugin
 import dev.slne.surf.essentials.service.specialItemService
 import dev.slne.surf.essentials.util.util.appendNewLineArrow
 import dev.slne.surf.essentials.util.util.translatable
@@ -28,6 +29,10 @@ object SpecialItemListener : Listener {
         val player = event.entity as? Player ?: return
         val itemStack = event.item.itemStack
 
+        if (plugin.isSurvivalServer()) {
+            return
+        }
+
         if (!specialItemService.isSpecial(itemStack)) {
             return
         }