feat(bukkit): add /sayanvanish feature <feature> reset command

Syrent · Jun 2, 2024 · 4f79a11 · 4f79a11
1 parent 96f3002
commit 4f79a11
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 21 deletions.
diff --git a/...nish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/command/SayanVanishCommand.kt b/...nish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/command/SayanVanishCommand.kt
@@ -1,11 +1,8 @@
 package org.sayandev.sayanvanish.bukkit.command
 
-import org.bukkit.Bukkit
-import org.bukkit.GameMode
 import org.bukkit.OfflinePlayer
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
-import org.sayandev.sayanvanish.api.SayanVanishAPI
 import org.sayandev.sayanvanish.api.VanishOptions
 import org.sayandev.sayanvanish.api.database.DatabaseConfig
 import org.sayandev.sayanvanish.api.database.databaseConfig
@@ -20,21 +17,17 @@ import org.sayandev.sayanvanish.bukkit.config.SettingsConfig
 import org.sayandev.sayanvanish.bukkit.config.language
 import org.sayandev.sayanvanish.bukkit.config.settings
 import org.sayandev.sayanvanish.bukkit.utils.ServerUtils
-import org.sayandev.stickynote.bukkit.NMSUtils
-import org.sayandev.stickynote.bukkit.PacketUtils
 import org.sayandev.stickynote.bukkit.command.StickyCommand
 import org.sayandev.stickynote.bukkit.command.interfaces.SenderExtension
 import org.sayandev.stickynote.bukkit.pluginDirectory
 import org.sayandev.stickynote.bukkit.runAsync
 import org.sayandev.stickynote.bukkit.runSync
 import org.sayandev.stickynote.bukkit.utils.AdventureUtils.component
 import org.sayandev.stickynote.bukkit.utils.AdventureUtils.sendMessage
-import org.sayandev.stickynote.core.math.Vector3
 import org.sayandev.stickynote.lib.incendo.cloud.bukkit.parser.OfflinePlayerParser
 import org.sayandev.stickynote.lib.incendo.cloud.component.CommandComponent
 import org.sayandev.stickynote.lib.incendo.cloud.parser.flag.CommandFlag
 import org.sayandev.stickynote.lib.incendo.cloud.parser.standard.IntegerParser
-import org.sayandev.stickynote.lib.incendo.cloud.parser.standard.StringArrayParser
 import org.sayandev.stickynote.lib.incendo.cloud.parser.standard.StringParser
 import org.sayandev.stickynote.lib.incendo.cloud.suggestion.Suggestion
 import org.sayandev.stickynote.lib.kyori.adventure.text.minimessage.tag.resolver.Placeholder
@@ -141,7 +134,6 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
                 val sender = context.sender().bukkitSender()
                 language = LanguageConfig.fromConfig() ?: LanguageConfig.defaultConfig()
                 Features.features.forEach { feature ->
-                    feature.enabled = false
                     feature.disable()
                 }
                 Features.features.clear()
@@ -214,7 +206,7 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
             .handler { context ->
                 val sender = context.sender().bukkitSender()
                 val feature = Features.features.find { it.id == context.get<String>("feature") } ?: let {
-                    sender.sendMessage(language.feature.featureNotFound.component())
+                    sender.sendMessage(language.feature.notFound.component())
                     return@handler
                 }
 
@@ -225,7 +217,7 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
 
                 feature.disable()
                 feature.save()
-                sender.sendMessage(language.feature.featureDisabled.component(Placeholder.unparsed("feature", feature.id)))
+                sender.sendMessage(language.feature.disabled.component(Placeholder.unparsed("feature", feature.id)))
             }
             .build())
 
@@ -235,7 +227,7 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
             .handler { context ->
                 val sender = context.sender().bukkitSender()
                 val feature = Features.features.find { it.id == context.get<String>("feature") } ?: let {
-                    sender.sendMessage(language.feature.featureNotFound.component())
+                    sender.sendMessage(language.feature.notFound.component())
                     return@handler
                 }
 
@@ -246,7 +238,29 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
 
                 feature.enable()
                 feature.save()
-                sender.sendMessage(language.feature.featureEnabled.component(Placeholder.unparsed("feature", feature.id)))
+                sender.sendMessage(language.feature.enabled.component(Placeholder.unparsed("feature", feature.id)))
+            }
+            .build())
+
+        manager.command(featureLiteral
+            .literal("reset")
+            .permission(constructBasePermission("feature.reset"))
+            .handler { context ->
+                val sender = context.sender().bukkitSender()
+                val feature = Features.features.find { it.id == context.get<String>("feature") } ?: let {
+                    sender.sendMessage(language.feature.notFound.component())
+                    return@handler
+                }
+
+                feature.disable()
+                Features.features.remove(feature)
+                val freshFeature = feature::class.java.getDeclaredConstructor().newInstance()
+                if (freshFeature.enabled) {
+                    freshFeature.enable()
+                }
+                freshFeature.save()
+                Features.features.add(freshFeature)
+                sender.sendMessage(language.feature.reset.component(Placeholder.unparsed("feature", feature.id)))
             }
             .build())
 
@@ -285,7 +299,7 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
             .handler { context ->
                 val sender = context.sender().bukkitSender()
                 val feature = Features.features.find { it.id == context.get<String>("feature") } ?: let {
-                    sender.sendMessage(language.feature.featureNotFound.component())
+                    sender.sendMessage(language.feature.notFound.component())
                     return@handler
                 }
 
@@ -305,11 +319,7 @@ class SayanVanishCommand : StickyCommand("sayanvanish", "vanish", "v") {
                 }
                 feature.save()
 
-                sender.sendMessage(language.feature.updated.component(
-                    Placeholder.unparsed("feature", feature.id),
-                    Placeholder.unparsed("option", field.name),
-                    Placeholder.unparsed("state", value)
-                ))
+                sender.sendMessage(language.feature.updated.component(Placeholder.unparsed("feature", feature.id), Placeholder.unparsed("option", field.name), Placeholder.unparsed("state", value)))
             }
             .build())
     }

diff --git a/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/config/LanguageConfig.kt b/sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/config/LanguageConfig.kt
@@ -27,14 +27,15 @@ data class LanguageConfig(
 
     @ConfigSerializable
     data class Feature(
-        val featureNotFound: String = "<red>Feature not found",
-        val featureEnabled: String = "<gray><gold><feature></gold> has been enabled.",
-        val featureDisabled: String = "<gray><gold><feature></gold> has been disabled.",
+        val notFound: String = "<red>Feature not found",
+        val enabled: String = "<gray><gold><feature></gold> has been enabled.",
+        val disabled: String = "<gray><gold><feature></gold> has been disabled.",
         val alreadyDisabled: String = "<gray><gold><feature></gold> is already disabled.",
         val alreadyEnabled: String = "<gray><gold><feature></gold> is already enabled.",
         val updated: String = "<gray><gold><feature> <option></gold> has been updated to <gold><state></gold>.",
         val invalidOption: String = "<red>Invalid option, valid options are <gold><options></gold>.",
         val invalidValue: String = "<red>Invalid value, valid values are <gold><values></gold>.",
+        val reset: String = "<gray><gold><feature></gold> has been reset.",
     )
 
     @ConfigSerializable