Skip to content

Commit 22a4705

Browse files
WantToBeeMeWantToBeeMe
committed
little bit of a cleanup
1 parent 9e55f33 commit 22a4705

17 files changed

+149
-159
lines changed

‎src/main/java/me/wanttobee/commandTree/ICommandNamespace.kt‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,44 +29,44 @@ interface ICommandNamespace : IPlayerCommands {
2929
// it will then check all the different CommandObjects if there is one that is assigned to "say"
3030
// if so it will enter the next arguments to that object
3131
// so in this case, SayObject.onCommand(player, ["143","5"])
32-
override fun onCommand(sender: Player, args: Array<String>): Boolean {
32+
override fun onCommand(commander: Player, args: Array<String>): Boolean {
3333
var ranCommand = false
3434
if(hasOnlyOneGroupMember){
35-
systemCommands.first().baseTree.onCommand(sender,args)
35+
systemCommands.first().baseTree.onCommand(commander,args)
3636
return true
3737
}
3838
for(sysCom in systemCommands){
3939
if (sysCom.baseTree.argName == args.first()) {
40-
sysCom.baseTree.onCommand(sender, args.copyOfRange(1, args.size))
40+
sysCom.baseTree.onCommand(commander, args.copyOfRange(1, args.size))
4141
ranCommand = true
4242
break
4343
}
4444
}
4545
if(!ranCommand){
46-
WTBMCommands.sendErrorToSender(sender, "that is not a valid command.", args.joinToString(" "))
46+
WTBMCommands.sendErrorToCommander(commander, "that is not a valid command.", args.joinToString(" "))
4747
}
4848

4949
return true
5050
}
5151

52-
override fun help(sender: Player, page : Int){
52+
override fun help(commander: Player, page : Int){
5353
val amountPerPage = 8
5454
val totalPages = (systemCommands.size/amountPerPage)+1
5555
val page = Math.min(page,totalPages)
5656
val helperTab : (String)-> String = { h -> "${ChatColor.YELLOW}$h${ChatColor.WHITE}"}
57-
sender.sendMessage("${ChatColor.GRAY}-========= ${ChatColor.WHITE}$page/$totalPages ${ChatColor.GRAY}=========-")
57+
commander.sendMessage("${ChatColor.GRAY}-========= ${ChatColor.WHITE}$page/$totalPages ${ChatColor.GRAY}=========-")
5858
if(page == 1) {
59-
if(WTBMCommands.title != null) sender.sendMessage(
59+
if(WTBMCommands.title != null) commander.sendMessage(
6060
"${WTBMCommands.title} ${ChatColor.YELLOW}/$commandName${ChatColor.WHITE} $commandSummary"
6161
)
62-
else sender.sendMessage("[${ChatColor.YELLOW}$commandName${ChatColor.RESET}] $commandSummary")
62+
else commander.sendMessage("[${ChatColor.YELLOW}$commandName${ChatColor.RESET}] $commandSummary")
6363
}
6464

6565
// when there is only 1 group member we don't have to display each object as a different command, because there is only 1 possibility
6666
if(hasOnlyOneGroupMember){
6767
if(!isZeroParameterCommand) // if there are parameters, there is no need of showing this command again
68-
sender.sendMessage("${ChatColor.GRAY}/$commandName ${systemCommands.first().baseTree.commandParam}")
69-
sender.sendMessage("${ChatColor.GRAY}-========= ${ChatColor.WHITE}$page/$totalPages ${ChatColor.GRAY}=========-")
68+
commander.sendMessage("${ChatColor.GRAY}/$commandName ${systemCommands.first().baseTree.commandParam}")
69+
commander.sendMessage("${ChatColor.GRAY}-========= ${ChatColor.WHITE}$page/$totalPages ${ChatColor.GRAY}=========-")
7070
return
7171
}
7272

@@ -75,16 +75,16 @@ interface ICommandNamespace : IPlayerCommands {
7575
if(systemCommands.size <= index) break
7676
val command = systemCommands[sysCom]
7777
val commandExample = "${ChatColor.GRAY}/$commandName ${command.baseTree.argName} ${command.baseTree.commandParam}"
78-
sender.sendMessage("- ${helperTab(command.baseTree.argName + ":")} ${command.helpText} $commandExample")
78+
commander.sendMessage("- ${helperTab(command.baseTree.argName + ":")} ${command.helpText} $commandExample")
7979
}
80-
sender.sendMessage("${ChatColor.GRAY}-========= ${ChatColor.WHITE}$page/$totalPages ${ChatColor.GRAY}=========-")
80+
commander.sendMessage("${ChatColor.GRAY}-========= ${ChatColor.WHITE}$page/$totalPages ${ChatColor.GRAY}=========-")
8181
}
8282

83-
override fun onTabComplete(sender: Player, args: Array<String>): List<String> {
83+
override fun onTabComplete(commander: Player, args: Array<String>): List<String> {
8484
val list : MutableList<String> = mutableListOf();
8585

8686
if(hasOnlyOneGroupMember)
87-
return systemCommands.first().baseTree.getTabComplete(sender, args)
87+
return systemCommands.first().baseTree.getTabComplete(commander, args)
8888

8989
// we don't want to annoy people with accidentally having caps on, so the tab complete
9090
// will still work when you write the capitalisation wrong
@@ -103,9 +103,8 @@ interface ICommandNamespace : IPlayerCommands {
103103
// we find the command object that is the first argument, and let that
104104
// object handle the tab complete from there
105105
if(sysCom.baseTree.argName == args.first())
106-
return sysCom.baseTree.getTabComplete(sender, args.copyOfRange(1, args.size) )
106+
return sysCom.baseTree.getTabComplete(commander, args.copyOfRange(1, args.size) )
107107
}
108108
return list
109109
}
110-
111-
}
110+
}

‎src/main/java/me/wanttobee/commandTree/ICommandObject.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@ interface ICommandObject {
88
val helpText : String
99
val baseTree : ICommandNode
1010
}
11-
12-
13-

‎src/main/java/me/wanttobee/commandTree/IPlayerCommands.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ interface IPlayerCommands : CommandExecutor, TabCompleter {
3434
}
3535
return onCommand(sender, Array(args.size) { index -> args[index] })
3636
}
37-
fun onCommand(sender: Player, args : Array<String>) : Boolean
37+
fun onCommand(commander: Player, args : Array<String>) : Boolean
3838

3939
override fun onTabComplete(sender: CommandSender, command: Command, label: String, args: Array<out String>): List<String> {
4040
val list : MutableList<String> = mutableListOf();
@@ -48,7 +48,7 @@ interface IPlayerCommands : CommandExecutor, TabCompleter {
4848

4949
return onTabComplete(sender, args)
5050
}
51-
fun onTabComplete(sender: Player, args : Array<String>) : List<String>
51+
fun onTabComplete(commander: Player, args : Array<String>) : List<String>
5252

53-
fun help(sender: Player, page : Int = 1)
54-
}
53+
fun help(commander: Player, page : Int = 1)
54+
}

‎src/main/java/me/wanttobee/commandTree/WTBMCommands.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ object WTBMCommands {
1818
minecraftPlugin.getCommand(command)?.setExecutor(commandObject)
1919
minecraftPlugin.getCommand(command)?.tabCompleter = commandObject
2020
}
21+
2122
fun createCommand(commandObject : ICommandNamespace){
2223
minecraftPlugin.getCommand(commandObject.commandName)?.setExecutor(commandObject)
2324
minecraftPlugin.getCommand(commandObject.commandName)?.tabCompleter = commandObject
2425
}
2526

26-
fun sendErrorToSender(sender: Player, errorMessage: String, extraInfo : String = ""){
27+
fun sendErrorToCommander(commander: Player, errorMessage: String, extraInfo : String = ""){
2728
val titleBit = title ?: ""
28-
sender.sendMessage("$titleBit ${ChatColor.RED}$errorMessage ${ChatColor.GRAY}$extraInfo")
29+
commander.sendMessage("$titleBit ${ChatColor.RED}$errorMessage ${ChatColor.GRAY}$extraInfo")
2930
}
30-
31-
}
31+
}

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandBoolLeaf.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@ import me.wanttobee.commandTree.WTBMCommands
44
import org.bukkit.entity.Player
55

66
class CommandBoolLeaf(argName : String, effect : (Player, Boolean) -> Unit, emptyEffect : ((Player) -> Unit)? = null ) : ICommandLeaf<Boolean>(argName,effect, emptyEffect) {
7-
87
override val commandParam: String = "(true/false)"
98

10-
override fun validateValue(sender: Player, tailArgs: Array<String>): Boolean? {
9+
override fun validateValue(commander: Player, tailArgs: Array<String>): Boolean? {
1110
if(tailArgs.isEmpty()) return null
1211
val bool = tailArgs.first().toBooleanStrictOrNull() ?: run {
13-
WTBMCommands.sendErrorToSender(sender,"${tailArgs.first()} is not a valid boolean", "(true/false)" )
12+
WTBMCommands.sendErrorToCommander(commander,"${tailArgs.first()} is not a valid boolean", "(true/false)" )
1413
return null
1514
}
1615
return bool
1716
}
1817

19-
override fun thisTabComplete(sender: Player, currentlyTyping: String): List<String> {
18+
override fun thisTabComplete(commander: Player, currentlyTyping: String): List<String> {
2019
val list = mutableListOf<String>()
2120
if("true".startsWith(currentlyTyping.lowercase())) list.add("true")
2221
if("false".startsWith(currentlyTyping.lowercase())) list.add("false")
2322
return list
2423
}
25-
}
24+
}

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandBranch.kt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,34 @@ import org.bukkit.entity.Player
1111
// branched: a way of sorting the leaves in groups
1212
// leaves: the parameters which are eventually going to be used for the thing you are trying to do
1313
class CommandBranch(argName: String, private val branches : Array<ICommandNode> ) : ICommandNode(argName) {
14-
1514
override val commandParam: String = "..."
1615

17-
override fun onCommand(sender: Player, tailArgs: Array<String>) {
16+
override fun onCommand(commander: Player, tailArgs: Array<String>) {
1817
if(tailArgs.isEmpty()){
19-
WTBMCommands.sendErrorToSender(sender,"not enough arguments found")
18+
WTBMCommands.sendErrorToCommander(commander,"not enough arguments found")
2019
return
2120
}
2221
for(branch in branches) {
2322
if (branch.argName.lowercase() == tailArgs.first().lowercase()){
24-
branch.onCommand(sender, tailArgs.copyOfRange(1, tailArgs.size) )
23+
branch.onCommand(commander, tailArgs.copyOfRange(1, tailArgs.size) )
2524
return
2625
}
2726
}
28-
WTBMCommands.sendErrorToSender(sender,"${tailArgs.first()} is not a valid argument")
27+
WTBMCommands.sendErrorToCommander(commander,"${tailArgs.first()} is not a valid argument")
2928
}
3029

31-
override fun nextTabComplete(sender: Player, fromArg:String, tailArgs: Array<String>): List<String> {
30+
override fun nextTabComplete(commander: Player, fromArg:String, tailArgs: Array<String>): List<String> {
3231
for(branch in branches){
3332
if(branch.argName.lowercase() == fromArg.lowercase())
34-
return branch.getTabComplete(sender, tailArgs)
33+
return branch.getTabComplete(commander, tailArgs)
3534
}
3635
return emptyList()
3736
}
3837

39-
override fun thisTabComplete(sender: Player, currentlyTyping: String) : List<String> {
38+
override fun thisTabComplete(commander: Player, currentlyTyping: String) : List<String> {
4039
val list = mutableListOf<String>()
4140
for(branch in branches)
4241
if(branch.argName.lowercase().contains(currentlyTyping.lowercase())) list.add(branch.argName)
4342
return list
4443
}
45-
}
44+
}

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandDoubleLeaf.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ class CommandDoubleLeaf private constructor(argName : String, private val realTi
1010

1111
override val commandParam: String = "(Number)"
1212

13-
override fun validateValue(sender: Player, tailArgs: Array<String>): Double? {
13+
override fun validateValue(commander: Player, tailArgs: Array<String>): Double? {
1414
if(tailArgs.isEmpty()) return null
1515
if(tailArgs.first() == ".."){
16-
if(emptyEffect != null) emptyEffect.invoke(sender)
17-
else WTBMCommands.sendErrorToSender(sender,
16+
if(emptyEffect != null) emptyEffect.invoke(commander)
17+
else WTBMCommands.sendErrorToCommander(commander,
1818
"${ChatColor.RED}these ${ChatColor.GRAY}..${ChatColor.RED} are there to convey that you could type any number ${ChatColor.DARK_RED}(Int)${ChatColor.RED}, but not literally ${ChatColor.GRAY}.." )
1919
return null
2020
}
2121
var number = tailArgs.first().toDoubleOrNull() ?: run {
22-
WTBMCommands.sendErrorToSender(sender,
22+
WTBMCommands.sendErrorToCommander(commander,
2323
"${tailArgs.first()} is not a valid number.",
2424
"should be a Double")
2525
return null
@@ -30,32 +30,32 @@ class CommandDoubleLeaf private constructor(argName : String, private val realTi
3030
// from here on, the number is correct, but we only need to make sure the number is not too big or small due to the given clamps
3131
if(min != null && number < min){
3232
number = min
33-
WTBMCommands.sendErrorToSender(sender,
33+
WTBMCommands.sendErrorToCommander(commander,
3434
"${tailArgs.first()} has been clamped to $min.",
3535
"number can only be from $min to $max")
3636
}
3737
else if(max != null && number > max){
3838
number = max
39-
WTBMCommands.sendErrorToSender(sender,
39+
WTBMCommands.sendErrorToCommander(commander,
4040
"${tailArgs.first()} has been clamped to $max.",
4141
"number can only be from $min to $max")
4242
}
4343
else if(realTimeMinValue != null && number < realTimeMinValue){
4444
number = realTimeMinValue
45-
WTBMCommands.sendErrorToSender(sender,
45+
WTBMCommands.sendErrorToCommander(commander,
4646
"${tailArgs.first()} has been clamped to $realTimeMinValue.",
4747
"number cant be lower than $realTimeMinValue")
4848
}
4949
else if(realTimeMaxValue != null && number > realTimeMaxValue){
5050
number = realTimeMaxValue
51-
WTBMCommands.sendErrorToSender(sender,
51+
WTBMCommands.sendErrorToCommander(commander,
5252
"${tailArgs.first()} has been clamped to $realTimeMaxValue.",
5353
"number cant be higher than $realTimeMaxValue")
5454
}
5555
return number
5656
}
5757

58-
override fun thisTabComplete(sender: Player, currentlyTyping: String): List<String> {
58+
override fun thisTabComplete(commander: Player, currentlyTyping: String): List<String> {
5959
val list = mutableListOf<String>()
6060
if (min == null && max == null && realTimeMin == null && realTimeMax == null) {
6161
if ("" == currentlyTyping)
@@ -98,4 +98,4 @@ class CommandDoubleLeaf private constructor(argName : String, private val realTi
9898
}
9999
return list
100100
}
101-
}
101+
}

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandEmptyLeaf.kt‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ import org.bukkit.entity.Player
66
// its only has its own argument name and no other parameters
77
// in other words, this leave is finished when you enter the argument name without anything else
88
class CommandEmptyLeaf(argName : String, emptyEffect : ((Player) -> Unit) ) : ICommandLeaf<Unit>(argName,{ _, _->}, emptyEffect) {
9-
109
override val commandParam: String = ""
1110
override val argumentsNeeded: Int = 0
1211

13-
override fun onCommand(sender: Player, tailArgs: Array<String>) {
14-
emptyEffect!!.invoke(sender)
12+
override fun onCommand(commander: Player, tailArgs: Array<String>) {
13+
emptyEffect!!.invoke(commander)
1514
}
1615

17-
override fun validateValue(sender: Player, tailArgs: Array<String>) {}
16+
override fun validateValue(commander: Player, tailArgs: Array<String>) {}
1817

19-
override fun thisTabComplete(sender: Player, currentlyTyping: String): List<String> {
18+
override fun thisTabComplete(commander: Player, currentlyTyping: String): List<String> {
2019
return emptyList()
2120
}
22-
}
21+
}

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandIntLeaf.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,29 @@ class CommandIntLeaf private constructor(argName : String, private val realTimeM
1616

1717
override val commandParam: String = "(Number)"
1818

19-
override fun validateValue(sender: Player, tailArgs: Array<String>): Int? {
19+
override fun validateValue(commander: Player, tailArgs: Array<String>): Int? {
2020
if(tailArgs.isEmpty()) return null
2121
if(tailArgs.first() == ".."){
22-
if(emptyEffect != null) emptyEffect.invoke(sender)
23-
else WTBMCommands.sendErrorToSender(sender,
22+
if(emptyEffect != null) emptyEffect.invoke(commander)
23+
else WTBMCommands.sendErrorToCommander(commander,
2424
"${ChatColor.RED}these ${ChatColor.GRAY}..${ChatColor.RED} are there to convey that you could type any number ${ChatColor.DARK_RED}(Int)${ChatColor.RED}, but not literally ${ChatColor.GRAY}.." )
2525
return null
2626
}
2727
var number = tailArgs.first().toIntOrNull() ?: run {
28-
WTBMCommands.sendErrorToSender(sender,
28+
WTBMCommands.sendErrorToCommander(commander,
2929
"${tailArgs.first()} is not a valid number.",
3030
"should be an Integer (Int)")
3131
return null
3232
}
3333

3434
if(possibilities != null && !possibilities.contains(number)){
35-
WTBMCommands.sendErrorToSender(sender,
35+
WTBMCommands.sendErrorToCommander(commander,
3636
"${tailArgs.first()} is not a valid number.",
3737
"you must chose from one of the suggested once")
3838
return null
3939
}
4040
if(realTimePossibilities != null && !realTimePossibilities.invoke().contains(number)){
41-
WTBMCommands.sendErrorToSender(sender,
41+
WTBMCommands.sendErrorToCommander(commander,
4242
"${tailArgs.first()} is not a valid number.",
4343
"you must chose from one of the suggested once")
4444
return null
@@ -49,25 +49,25 @@ class CommandIntLeaf private constructor(argName : String, private val realTimeM
4949
// from here on, the number is correct, but we only need to make sure the number is not too big or small due to the given clamps
5050
if(min != null && number < min && (possibilities == null && realTimePossibilities == null)){
5151
number = min
52-
WTBMCommands.sendErrorToSender(sender,
52+
WTBMCommands.sendErrorToCommander(commander,
5353
"${tailArgs.first()} has been clamped to $min.",
5454
"number can only be from $min to $max")
5555
}
5656
else if(max != null && number > max && (possibilities == null && realTimePossibilities == null)){
5757
number = max
58-
WTBMCommands.sendErrorToSender(sender,
58+
WTBMCommands.sendErrorToCommander(commander,
5959
"${tailArgs.first()} has been clamped to $max.",
6060
"number can only be from $min to $max")
6161
}
6262
else if(realTimeMinValue != null && number < realTimeMinValue && (possibilities == null && realTimePossibilities == null)){
6363
number = realTimeMinValue
64-
WTBMCommands.sendErrorToSender(sender,
64+
WTBMCommands.sendErrorToCommander(commander,
6565
"${tailArgs.first()} has been clamped to $realTimeMinValue.",
6666
"number cant be lower than $realTimeMinValue")
6767
}
6868
else if(realTimeMaxValue != null && number > realTimeMaxValue && (possibilities == null && realTimePossibilities == null)){
6969
number = realTimeMaxValue
70-
WTBMCommands.sendErrorToSender(sender,
70+
WTBMCommands.sendErrorToCommander(commander,
7171
"${tailArgs.first()} has been clamped to $realTimeMaxValue.",
7272
"number cant be higher than $realTimeMaxValue")
7373
}
@@ -76,7 +76,7 @@ class CommandIntLeaf private constructor(argName : String, private val realTimeM
7676
}
7777

7878

79-
override fun thisTabComplete(sender: Player, currentlyTyping: String): List<String> {
79+
override fun thisTabComplete(commander: Player, currentlyTyping: String): List<String> {
8080
val list = mutableListOf<String>()
8181
if(possibilities != null){
8282
for(p in possibilities)
@@ -125,4 +125,4 @@ class CommandIntLeaf private constructor(argName : String, private val realTimeM
125125
}
126126
return list
127127
}
128-
}
128+
}

0 commit comments

Comments
 (0)