Old Claim Commands Deprecation (Phase 2)

src/main/kotlin/com/dansplugins/factionsystem/claim/MfClaimService.kt

@@ -95,9 +95,13 @@ class MfClaimService(private val plugin: MedievalFactions, private val repositor
                                     val subtitle = "${ChatColor.of(faction.flags[plugin.flags.color])}${faction.description}"
                                     if (plugin.config.getBoolean("factions.titleTerritoryIndicator")) {
                                         player.resetTitle()
-                                        player.sendTitle(title, subtitle, plugin.config.getInt("factions.titleTerritoryFadeInLength"),
+                                        player.sendTitle(
+                                            title,
+                                            subtitle,
+                                            plugin.config.getInt("factions.titleTerritoryFadeInLength"),
                                             plugin.config.getInt("factions.titleTerritoryDuration"),
-                                            plugin.config.getInt("factions.titleTerritoryFadeOutLength"))
+                                            plugin.config.getInt("factions.titleTerritoryFadeOutLength")
+                                        )
                                     }
                                     if (plugin.config.getBoolean("factions.actionBarTerritoryIndicator")) {
                                         player.spigot().sendMessage(ACTION_BAR, *TextComponent.fromLegacyText(title))
@@ -141,9 +145,13 @@ class MfClaimService(private val plugin: MedievalFactions, private val repositor
                                 "${ChatColor.of(plugin.config.getString("wilderness.color"))}${plugin.language["Wilderness"]}"
                             if (plugin.config.getBoolean("factions.titleTerritoryIndicator")) {
                                 player.resetTitle()
-                                player.sendTitle(title, null, plugin.config.getInt("factions.titleTerritoryFadeInLength"),
+                                player.sendTitle(
+                                    title,
+                                    null,
+                                    plugin.config.getInt("factions.titleTerritoryFadeInLength"),
                                     plugin.config.getInt("factions.titleTerritoryDuration"),
-                                    plugin.config.getInt("factions.titleTerritoryFadeOutLength"))
+                                    plugin.config.getInt("factions.titleTerritoryFadeOutLength")
+                                )
                             }
                             if (plugin.config.getBoolean("factions.actionBarTerritoryIndicator")) {
                                 player.spigot().sendMessage(ACTION_BAR, *TextComponent.fromLegacyText(title))

src/main/kotlin/com/dansplugins/factionsystem/command/faction/MfFactionCommand.kt

@@ -226,16 +226,16 @@ class MfFactionCommand(private val plugin: MedievalFactions) : CommandExecutor,
             in devAliases -> factionDevCommand.onCommand(sender, command, label, args.drop(1).toTypedArray())
             // Backwards compatibility:
             in claimAutoAliases -> {
-                sender.sendMessage("${RED}Command deprecated, use \"/mf claim auto\" instead")
-                factionClaimAutoCommand.onCommand(sender, command, label, args.drop(1).toTypedArray())
+                sender.sendMessage("${RED}${plugin.language["DeprecationWarningAutoclaim"]}")
+                false
             }
             in claimFillAliases -> {
-                sender.sendMessage("${RED}Command deprecated, use \"/mf claim fill\" instead")
-                factionClaimFillCommand.onCommand(sender, command, label, args.drop(1).toTypedArray())
+                sender.sendMessage("${RED}${plugin.language["DeprecationWarningFillclaim"]}")
+                false
             }
             in claimCheckAliases -> {
-                sender.sendMessage("${RED}Command deprecated, use \"/mf claim check\" instead")
-                factionClaimCheckCommand.onCommand(sender, command, label, args.drop(1).toTypedArray())
+                sender.sendMessage("${RED}${plugin.language["DeprecationWarningCheckclaim"]}")
+                false
             }
             else -> {
                 sender.sendMessage("$AQUA${plugin.language["MedievalFactionsTitle", plugin.description.version]}")

src/main/kotlin/com/dansplugins/factionsystem/command/faction/set/name/MfFactionSetNameCommand.kt

@@ -131,9 +131,13 @@ class MfFactionSetNameCommand(private val plugin: MedievalFactions) : CommandExe
                         val subtitle = "${ChatColor.of(updatedFaction.flags[plugin.flags.color])}${updatedFaction.description}"
                         if (plugin.config.getBoolean("factions.titleTerritoryIndicator")) {
                             player.resetTitle()
-                            player.sendTitle(title, subtitle, plugin.config.getInt("factions.titleTerritoryFadeInLength"),
+                            player.sendTitle(
+                                title,
+                                subtitle,
+                                plugin.config.getInt("factions.titleTerritoryFadeInLength"),
                                 plugin.config.getInt("factions.titleTerritoryDuration"),
-                                plugin.config.getInt("factions.titleTerritoryFadeOutLength"))
+                                plugin.config.getInt("factions.titleTerritoryFadeOutLength")
+                            )
                         }
                         if (plugin.config.getBoolean("factions.actionBarTerritoryIndicator")) {
                             player.spigot().sendMessage(ACTION_BAR, *TextComponent.fromLegacyText(title))

src/main/kotlin/com/dansplugins/factionsystem/listener/PlayerJoinListener.kt

@@ -36,9 +36,13 @@ class PlayerJoinListener(private val plugin: MedievalFactions) : Listener {
 
                         if (plugin.config.getBoolean("factions.titleTerritoryIndicator")) {
                             event.player.resetTitle()
-                            event.player.sendTitle(title, subtitle, plugin.config.getInt("factions.titleTerritoryFadeInLength"),
+                            event.player.sendTitle(
+                                title,
+                                subtitle,
+                                plugin.config.getInt("factions.titleTerritoryFadeInLength"),
                                 plugin.config.getInt("factions.titleTerritoryDuration"),
-                                plugin.config.getInt("factions.titleTerritoryFadeOutLength"))
+                                plugin.config.getInt("factions.titleTerritoryFadeOutLength")
+                            )
                         }
                         if (plugin.config.getBoolean("factions.actionBarTerritoryIndicator")) {
                             event.player.spigot().sendMessage(ACTION_BAR, *TextComponent.fromLegacyText(title))

src/main/kotlin/com/dansplugins/factionsystem/listener/PlayerMoveListener.kt

@@ -93,9 +93,13 @@ class PlayerMoveListener(private val plugin: MedievalFactions) : Listener {
                         }
                         if (plugin.config.getBoolean("factions.titleTerritoryIndicator")) {
                             event.player.resetTitle()
-                            event.player.sendTitle(title, subtitle, plugin.config.getInt("factions.titleTerritoryFadeInLength"),
+                            event.player.sendTitle(
+                                title,
+                                subtitle,
+                                plugin.config.getInt("factions.titleTerritoryFadeInLength"),
                                 plugin.config.getInt("factions.titleTerritoryDuration"),
-                                plugin.config.getInt("factions.titleTerritoryFadeOutLength"))
+                                plugin.config.getInt("factions.titleTerritoryFadeOutLength")
+                            )
                         }
                         if (plugin.config.getBoolean("factions.actionBarTerritoryIndicator")) {
                             event.player.spigot().sendMessage(ACTION_BAR, *TextComponent.fromLegacyText(title))

src/main/resources/lang/lang_de_DE.properties

@@ -1066,6 +1066,9 @@ CommandFactionAddMemberUnknownNewPlayerFaction=Unbekanntes neues Mitglied
 CommandFactionAddMemberSuccess=Dieser Spieler ist jetzt Mitglied der angegebenen Fraktion.
 CommandFactionHelpAddMember=/faction addmember <player> <faction> - F�gt zwangsweise ein Mitglied zu einer Fraktion hinzu.
 CommandFactionRoleSetPermissionCannotModifyRolePermissionToModifyOwnRolePermission=Du kannst die Berechtigung deiner Rolle nicht �ndern, um die Berechtigungen deiner eigenen Rolle zu �ndern.
+DeprecationWarningAutoclaim=Befehl veraltet. Verwendest du stattdessen /f claim auto. 
+DeprecationWarningFillclaim=Befehl veraltet. Verwendest du stattdessen /f claim fill.
+DeprecationWarningCheckclaim=Befehl veraltet. Verwendest du stattdessen /f claim check.
 CommandFactionInviteFactionFull=Die Fraktion, zu der du diesen Spieler einladen m�chtest, ist voll.
 CommandFactionJoinFactionFull=Die Fraktion, der du beitreten m�chtest, ist voll.
 CommandFactionAddMemberTargetFactionFull=Die Fraktion, zu der du diesen Spieler hinzuf�gen m�chtest, ist voll.

src/main/resources/lang/lang_en_GB.properties

@@ -1068,6 +1068,9 @@ CommandFactionInfoAlliesTitle=Allies:
 CommandFactionInfoEnemiesTitle=Enemies:
 BlockNotLocked=That block is not locked.
 CommandFactionRoleSetPermissionCannotModifyRolePermissionToModifyOwnRolePermission=You cannot modify your role''s permission to modify your own role''s permissions.
+DeprecationWarningAutoclaim=Command deprecated. Use /f claim auto instead.
+DeprecationWarningFillclaim=Command deprecated. Use /f claim fill instead.
+DeprecationWarningCheckclaim=Command deprecated. Use /f claim check instead.
 CommandFactionInviteFactionFull=You cannot invite any more members to your faction.
 CommandFactionJoinFactionFull=The faction you are trying to join is full.
 CommandFactionAddMemberTargetFactionFull=The faction you are trying to add a member to is full.

src/main/resources/lang/lang_en_US.properties

@@ -1068,9 +1068,11 @@ CommandFactionInfoVassalsTitle=Vassals:
 CommandFactionInfoAlliesTitle=Allies:
 CommandFactionInfoEnemiesTitle=Enemies:
 CommandFactionRoleSetPermissionCannotModifyRolePermissionToModifyOwnRolePermission=You cannot modify your role''s permission to modify your own role''s permissions.
+DeprecationWarningAutoclaim=Command deprecated. Use /f claim auto instead.
+DeprecationWarningFillclaim=Command deprecated. Use /f claim fill instead.
+DeprecationWarningCheckclaim=Command deprecated. Use /f claim check instead.
 CommandFactionInviteFactionFull=You cannot invite any more members to your faction.
 CommandFactionJoinFactionFull=The faction you are trying to join is full.
 CommandFactionAddMemberTargetFactionFull=The faction you are trying to add a member to is full.
-
 PlayerInteractEntityFailedToSavePlayer=Failed to save player.
-PlayerInteractEntityCannotTradeWithVillager=You cannot trade with this villager.
+PlayerInteractEntityCannotTradeWithVillager=You cannot trade with this villager.

src/main/resources/lang/lang_fr_FR.properties

@@ -1068,6 +1068,9 @@ CommandFactionAddMemberSuccess=Ce joueur est maintenant membre de la faction sp
 CommandFactionHelpAddMember=/faction addmember <joueur> <faction> - Ajoute de force un membre � une faction.
 BlockNotLocked=Ce bloc n'est pas verrouill�.
 CommandFactionRoleSetPermissionCannotModifyRolePermissionToModifyOwnRolePermission=Vous ne pouvez pas modifier les autorisations de votre r\u00e9le pour modifier les autorisations de votre propre r\u00e9le.
+DeprecationWarningAutoclaim=La commande /f autoclaim est obsol�te. Utilisez /f claim auto � la place.
+DeprecationWarningFillclaim=La commande /f fillclaim est obsol�te. Utilisez /f claim fill � la place.
+DeprecationWarningCheckclaim=La commande /f checkclaim est obsol�te. Utilisez /f claim check � la place.
 CommandFactionInviteFactionFull=La faction est pleine.
 CommandFactionJoinFactionFull=La faction est pleine.
 CommandFactionAddMemberTargetFactionFull=La faction est pleine.