Skip to content

Commit 61cb38c

Browse files
WantToBeeMeWantToBeeMe
committed
renaming
1 parent 22a4705 commit 61cb38c

17 files changed

+60
-60
lines changed

‎src/main/java/me/wanttobee/commandTree/WTBMCommands.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/CommandTreeSystem.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package me.wanttobee.commandTree
1+
package me.wanttobee.commandtree
22

33
import org.bukkit.ChatColor
44
import org.bukkit.entity.Player
55
import org.bukkit.plugin.java.JavaPlugin
66

7-
object WTBMCommands {
7+
object CommandTreeSystem {
88
private lateinit var minecraftPlugin : JavaPlugin
99
var title : String? = null
1010
private set
1111

1212
fun initialize(plugin: JavaPlugin, title: String?){
1313
minecraftPlugin = plugin
14-
WTBMCommands.title = title
14+
CommandTreeSystem.title = title
1515
}
1616

1717
fun createCommand(command : String, commandObject : IPlayerCommands){

‎src/main/java/me/wanttobee/commandTree/ICommandNamespace.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/ICommandNamespace.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.wanttobee.commandTree
1+
package me.wanttobee.commandtree
22

33
import org.bukkit.ChatColor
44
import org.bukkit.entity.Player
@@ -43,7 +43,7 @@ interface ICommandNamespace : IPlayerCommands {
4343
}
4444
}
4545
if(!ranCommand){
46-
WTBMCommands.sendErrorToCommander(commander, "that is not a valid command.", args.joinToString(" "))
46+
CommandTreeSystem.sendErrorToCommander(commander, "that is not a valid command.", args.joinToString(" "))
4747
}
4848

4949
return true
@@ -56,8 +56,8 @@ interface ICommandNamespace : IPlayerCommands {
5656
val helperTab : (String)-> String = { h -> "${ChatColor.YELLOW}$h${ChatColor.WHITE}"}
5757
commander.sendMessage("${ChatColor.GRAY}-========= ${ChatColor.WHITE}$page/$totalPages ${ChatColor.GRAY}=========-")
5858
if(page == 1) {
59-
if(WTBMCommands.title != null) commander.sendMessage(
60-
"${WTBMCommands.title} ${ChatColor.YELLOW}/$commandName${ChatColor.WHITE} $commandSummary"
59+
if(CommandTreeSystem.title != null) commander.sendMessage(
60+
"${CommandTreeSystem.title} ${ChatColor.YELLOW}/$commandName${ChatColor.WHITE} $commandSummary"
6161
)
6262
else commander.sendMessage("[${ChatColor.YELLOW}$commandName${ChatColor.RESET}] $commandSummary")
6363
}

‎src/main/java/me/wanttobee/commandTree/ICommandObject.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/ICommandObject.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package me.wanttobee.commandTree
1+
package me.wanttobee.commandtree
22

3-
import me.wanttobee.commandTree.commandTree.ICommandNode
3+
import me.wanttobee.commandtree.nodes.ICommandNode
44

55
//an interface to build your command tree from
66
interface ICommandObject {

‎src/main/java/me/wanttobee/commandTree/IPlayerCommands.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/IPlayerCommands.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.wanttobee.commandTree
1+
package me.wanttobee.commandtree
22

33
import org.bukkit.command.Command
44
import org.bukkit.command.CommandExecutor

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandBoolLeaf.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/nodes/CommandBoolLeaf.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package me.wanttobee.commandTree.commandTree
1+
package me.wanttobee.commandtree.nodes
22

3-
import me.wanttobee.commandTree.WTBMCommands
3+
import me.wanttobee.commandtree.CommandTreeSystem
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) {
@@ -9,7 +9,7 @@ class CommandBoolLeaf(argName : String, effect : (Player, Boolean) -> Unit, empt
99
override fun validateValue(commander: Player, tailArgs: Array<String>): Boolean? {
1010
if(tailArgs.isEmpty()) return null
1111
val bool = tailArgs.first().toBooleanStrictOrNull() ?: run {
12-
WTBMCommands.sendErrorToCommander(commander,"${tailArgs.first()} is not a valid boolean", "(true/false)" )
12+
CommandTreeSystem.sendErrorToCommander(commander,"${tailArgs.first()} is not a valid boolean", "(true/false)" )
1313
return null
1414
}
1515
return bool

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandBranch.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/nodes/CommandBranch.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package me.wanttobee.commandTree.commandTree
1+
package me.wanttobee.commandtree.nodes
22

3-
import me.wanttobee.commandTree.WTBMCommands
3+
import me.wanttobee.commandtree.CommandTreeSystem
44
import org.bukkit.entity.Player
55

66
// We are using a composite design
@@ -15,7 +15,7 @@ class CommandBranch(argName: String, private val branches : Array<ICommandNode>
1515

1616
override fun onCommand(commander: Player, tailArgs: Array<String>) {
1717
if(tailArgs.isEmpty()){
18-
WTBMCommands.sendErrorToCommander(commander,"not enough arguments found")
18+
CommandTreeSystem.sendErrorToCommander(commander,"not enough arguments found")
1919
return
2020
}
2121
for(branch in branches) {
@@ -24,7 +24,7 @@ class CommandBranch(argName: String, private val branches : Array<ICommandNode>
2424
return
2525
}
2626
}
27-
WTBMCommands.sendErrorToCommander(commander,"${tailArgs.first()} is not a valid argument")
27+
CommandTreeSystem.sendErrorToCommander(commander,"${tailArgs.first()} is not a valid argument")
2828
}
2929

3030
override fun nextTabComplete(commander: Player, fromArg:String, tailArgs: Array<String>): List<String> {

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandDoubleLeaf.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/nodes/CommandDoubleLeaf.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package me.wanttobee.commandTree.commandTree
1+
package me.wanttobee.commandtree.nodes
22

3-
import me.wanttobee.commandTree.WTBMCommands
3+
import me.wanttobee.commandtree.CommandTreeSystem
44
import org.bukkit.ChatColor
55
import org.bukkit.entity.Player
66

@@ -14,12 +14,12 @@ class CommandDoubleLeaf private constructor(argName : String, private val realTi
1414
if(tailArgs.isEmpty()) return null
1515
if(tailArgs.first() == ".."){
1616
if(emptyEffect != null) emptyEffect.invoke(commander)
17-
else WTBMCommands.sendErrorToCommander(commander,
17+
else CommandTreeSystem.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.sendErrorToCommander(commander,
22+
CommandTreeSystem.sendErrorToCommander(commander,
2323
"${tailArgs.first()} is not a valid number.",
2424
"should be a Double")
2525
return null
@@ -30,25 +30,25 @@ 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.sendErrorToCommander(commander,
33+
CommandTreeSystem.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.sendErrorToCommander(commander,
39+
CommandTreeSystem.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.sendErrorToCommander(commander,
45+
CommandTreeSystem.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.sendErrorToCommander(commander,
51+
CommandTreeSystem.sendErrorToCommander(commander,
5252
"${tailArgs.first()} has been clamped to $realTimeMaxValue.",
5353
"number cant be higher than $realTimeMaxValue")
5454
}

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandEmptyLeaf.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/nodes/CommandEmptyLeaf.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.wanttobee.commandTree.commandTree
1+
package me.wanttobee.commandtree.nodes
22

33
import org.bukkit.entity.Player
44

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandIntLeaf.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/nodes/CommandIntLeaf.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package me.wanttobee.commandTree.commandTree
1+
package me.wanttobee.commandtree.nodes
22

3-
import me.wanttobee.commandTree.WTBMCommands
3+
import me.wanttobee.commandtree.CommandTreeSystem
44
import org.bukkit.ChatColor
55
import org.bukkit.entity.Player
66

@@ -20,25 +20,25 @@ class CommandIntLeaf private constructor(argName : String, private val realTimeM
2020
if(tailArgs.isEmpty()) return null
2121
if(tailArgs.first() == ".."){
2222
if(emptyEffect != null) emptyEffect.invoke(commander)
23-
else WTBMCommands.sendErrorToCommander(commander,
23+
else CommandTreeSystem.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.sendErrorToCommander(commander,
28+
CommandTreeSystem.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.sendErrorToCommander(commander,
35+
CommandTreeSystem.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.sendErrorToCommander(commander,
41+
CommandTreeSystem.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.sendErrorToCommander(commander,
52+
CommandTreeSystem.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.sendErrorToCommander(commander,
58+
CommandTreeSystem.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.sendErrorToCommander(commander,
64+
CommandTreeSystem.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.sendErrorToCommander(commander,
70+
CommandTreeSystem.sendErrorToCommander(commander,
7171
"${tailArgs.first()} has been clamped to $realTimeMaxValue.",
7272
"number cant be higher than $realTimeMaxValue")
7373
}

‎src/main/java/me/wanttobee/commandTree/commandTree/CommandLocationLeaf.kt‎ renamed to ‎src/main/java/me/wanttobee/commandtree/nodes/CommandLocationLeaf.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package me.wanttobee.commandTree.commandTree
1+
package me.wanttobee.commandtree.nodes
22

3-
import me.wanttobee.commandTree.WTBMCommands
3+
import me.wanttobee.commandtree.CommandTreeSystem
44
import org.bukkit.Location
55
import org.bukkit.entity.Player
66

@@ -11,15 +11,15 @@ class CommandLocationLeaf(argName : String, effect : (Player, Location) -> Unit,
1111
override fun validateValue(commander: Player, tailArgs: Array<String>): Location? {
1212
if(tailArgs.size < 3) return null
1313
val x = toLocation(commander, "x", tailArgs[0]) ?: run {
14-
WTBMCommands.sendErrorToCommander(commander,"${tailArgs[0]} is not a valid number","(x)" )
14+
CommandTreeSystem.sendErrorToCommander(commander,"${tailArgs[0]} is not a valid number","(x)" )
1515
return null
1616
}
1717
val y = toLocation(commander, "y", tailArgs[1]) ?: run {
18-
WTBMCommands.sendErrorToCommander(commander,"${tailArgs[1]} is not a valid number","(y)" )
18+
CommandTreeSystem.sendErrorToCommander(commander,"${tailArgs[1]} is not a valid number","(y)" )
1919
return null
2020
}
2121
val z = toLocation(commander, "z", tailArgs[2]) ?: run {
22-
WTBMCommands.sendErrorToCommander(commander,"${tailArgs[2]} is not a valid number","(z)" )
22+
CommandTreeSystem.sendErrorToCommander(commander,"${tailArgs[2]} is not a valid number","(z)" )
2323
return null
2424
}
2525
return Location(commander.world,x,y,z)

0 commit comments

Comments
 (0)