diff --git a/src/main/kotlin/com/dansplugins/factionsystem/command/faction/MfFactionCommand.kt b/src/main/kotlin/com/dansplugins/factionsystem/command/faction/MfFactionCommand.kt index 36f27cd1..8b9d6253 100644 --- a/src/main/kotlin/com/dansplugins/factionsystem/command/faction/MfFactionCommand.kt +++ b/src/main/kotlin/com/dansplugins/factionsystem/command/faction/MfFactionCommand.kt @@ -7,10 +7,7 @@ import com.dansplugins.factionsystem.command.faction.bonuspower.MfFactionBonusPo import com.dansplugins.factionsystem.command.faction.breakalliance.MfFactionBreakAllianceCommand import com.dansplugins.factionsystem.command.faction.bypass.MfFactionBypassCommand import com.dansplugins.factionsystem.command.faction.chat.MfFactionChatCommand -import com.dansplugins.factionsystem.command.faction.claim.MfFactionClaimAutoCommand -import com.dansplugins.factionsystem.command.faction.claim.MfFactionClaimCheckCommand import com.dansplugins.factionsystem.command.faction.claim.MfFactionClaimCommand -import com.dansplugins.factionsystem.command.faction.claim.MfFactionClaimFillCommand import com.dansplugins.factionsystem.command.faction.create.MfFactionCreateCommand import com.dansplugins.factionsystem.command.faction.declareindependence.MfFactionDeclareIndependenceCommand import com.dansplugins.factionsystem.command.faction.declarewar.MfFactionDeclareWarCommand @@ -44,7 +41,6 @@ import com.dansplugins.factionsystem.command.faction.vassalize.MfFactionVassaliz import com.dansplugins.factionsystem.command.faction.who.MfFactionWhoCommand import org.bukkit.ChatColor.AQUA import org.bukkit.ChatColor.GRAY -import org.bukkit.ChatColor.RED import org.bukkit.ChatColor.YELLOW import org.bukkit.command.Command import org.bukkit.command.CommandExecutor @@ -92,11 +88,6 @@ class MfFactionCommand(private val plugin: MedievalFactions) : CommandExecutor, private val factionAddMemberCommand = MfFactionAddMemberCommand(plugin) private val factionDevCommand = MfFactionDevCommand(plugin) - // Backwards compatibility: - private val factionClaimAutoCommand = MfFactionClaimAutoCommand(plugin) - private val factionClaimFillCommand = MfFactionClaimFillCommand(plugin) - private val factionClaimCheckCommand = MfFactionClaimCheckCommand(plugin) - private val helpAliases = listOf("help", plugin.language["CmdFactionHelp"]) private val createAliases = listOf("create", plugin.language["CmdFactionCreate"]) private val claimAliases = listOf("claim", plugin.language["CmdFactionClaim"]) @@ -136,11 +127,6 @@ class MfFactionCommand(private val plugin: MedievalFactions) : CommandExecutor, private val addMemberAliases = listOf("addmember", plugin.language["CmdFactionAddMember"]) private val devAliases = if (plugin.config.getBoolean("dev.enableDevCommands")) listOf("dev") else emptyList() - // Backwards compatibility: - private val claimAutoAliases = listOf("autoclaim") - private val claimFillAliases = listOf("claimfill") - private val claimCheckAliases = listOf("checkclaim") - private val subcommands = helpAliases + createAliases + claimAliases + @@ -178,11 +164,7 @@ class MfFactionCommand(private val plugin: MedievalFactions) : CommandExecutor, bonusPowerAliases + relationshipAliases + addMemberAliases + - devAliases + - // Backwards compatibility aliases: - claimAutoAliases + - claimFillAliases + - claimCheckAliases + devAliases override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array): Boolean { return when (args.firstOrNull()?.lowercase()) { @@ -224,19 +206,6 @@ class MfFactionCommand(private val plugin: MedievalFactions) : CommandExecutor, in relationshipAliases -> factionRelationshipCommand.onCommand(sender, command, label, args.drop(1).toTypedArray()) in addMemberAliases -> factionAddMemberCommand.onCommand(sender, command, label, args.drop(1).toTypedArray()) in devAliases -> factionDevCommand.onCommand(sender, command, label, args.drop(1).toTypedArray()) - // Backwards compatibility: - in claimAutoAliases -> { - sender.sendMessage("${RED}${plugin.language["DeprecationWarningAutoclaim"]}") - false - } - in claimFillAliases -> { - sender.sendMessage("${RED}${plugin.language["DeprecationWarningFillclaim"]}") - false - } - in claimCheckAliases -> { - sender.sendMessage("${RED}${plugin.language["DeprecationWarningCheckclaim"]}") - false - } else -> { sender.sendMessage("$AQUA${plugin.language["MedievalFactionsTitle", plugin.description.version]}") sender.sendMessage("$GRAY${plugin.language["DeveloperList", plugin.description.authors.joinToString()]}") @@ -295,10 +264,6 @@ class MfFactionCommand(private val plugin: MedievalFactions) : CommandExecutor, in relationshipAliases -> factionRelationshipCommand.onTabComplete(sender, command, label, args.drop(1).toTypedArray()) in addMemberAliases -> factionAddMemberCommand.onTabComplete(sender, command, label, args.drop(1).toTypedArray()) in devAliases -> factionDevCommand.onTabComplete(sender, command, label, args.drop(1).toTypedArray()) - // Backwards compatibility: - in claimAutoAliases -> factionClaimAutoCommand.onTabComplete(sender, command, label, args.drop(1).toTypedArray()) - in claimFillAliases -> factionClaimFillCommand.onTabComplete(sender, command, label, args.drop(1).toTypedArray()) - in claimCheckAliases -> factionClaimCheckCommand.onTabComplete(sender, command, label, args.drop(1).toTypedArray()) else -> emptyList() } } diff --git a/src/main/kotlin/com/dansplugins/factionsystem/command/faction/claim/MfFactionClaimCommand.kt b/src/main/kotlin/com/dansplugins/factionsystem/command/faction/claim/MfFactionClaimCommand.kt index 9aa955cb..59aaff7c 100644 --- a/src/main/kotlin/com/dansplugins/factionsystem/command/faction/claim/MfFactionClaimCommand.kt +++ b/src/main/kotlin/com/dansplugins/factionsystem/command/faction/claim/MfFactionClaimCommand.kt @@ -16,8 +16,6 @@ class MfFactionClaimCommand(private val plugin: MedievalFactions) : CommandExecu private val fillAliases = listOf("fill", plugin.language["CmdFactionClaimFill"]) private val checkAliases = listOf("check", plugin.language["CmdFactionClaimCheck"]) private val circleAliases = listOf("circle", plugin.language["CmdFactionClaimCircle"]) - // private val squareAliases = listOf("square", plugin.language["CmdFactionClaimSquare"]) - // private val rectangleAliases = listOf("rectangle", plugin.language["CmdFactionClaimRectangle"]) private val subcommands = autoAliases + fillAliases + checkAliases + circleAliases @@ -27,8 +25,6 @@ class MfFactionClaimCommand(private val plugin: MedievalFactions) : CommandExecu in fillAliases -> factionClaimFillCommand.onCommand(sender, command, label, args.drop(1).toTypedArray()) in checkAliases -> factionClaimCheckCommand.onCommand(sender, command, label, args.drop(1).toTypedArray()) in circleAliases -> factionClaimCircleCommand.onCommand(sender, command, label, args.drop(1).toTypedArray()) - // in squareAliases -> FactionClaimSquareCommand.onCommand(sender, command, label, args.drop(1).toTypedArray()) - // in rectangleAliases -> FactionClaimRectangleCommand.onCommand(sender, command, label, args.drop(1).toTypedArray()) else -> { return factionClaimCircleCommand.onCommand(sender, command, label, args) } diff --git a/src/main/resources/lang/lang_en_GB.properties b/src/main/resources/lang/lang_en_GB.properties index 37076580..9fb4f48e 100644 --- a/src/main/resources/lang/lang_en_GB.properties +++ b/src/main/resources/lang/lang_en_GB.properties @@ -1068,9 +1068,6 @@ 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. diff --git a/src/main/resources/lang/lang_en_US.properties b/src/main/resources/lang/lang_en_US.properties index 3ab8a1bb..11532971 100644 --- a/src/main/resources/lang/lang_en_US.properties +++ b/src/main/resources/lang/lang_en_US.properties @@ -1068,9 +1068,6 @@ 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.