Merge pull request #200 from DockyardMC/pika/some-random-fixes

Some random fixes

Author: p1k0chu

src/main/kotlin/io/github/dockyardmc/advancement/Advancement.kt

@@ -59,7 +59,7 @@ class Advancement(
     private val eventPool = EventPool()
 
     init {
-        if (icon.material == Items.AIR) throw IllegalArgumentException("advancement icon can't be air")
+        require(icon.material != Items.AIR) { "advancement icon can't be air" }
 
         parent?.innerChildren?.let {
             synchronized(it) {

src/main/kotlin/io/github/dockyardmc/advancement/AdvancementBuilder.kt

@@ -106,7 +106,7 @@ class AdvancementBuilder(val id: String) {
     }
 }
 
-fun advancement(id: String, builder: AdvancementBuilder.() -> Unit): Advancement {
+inline fun advancement(id: String, builder: AdvancementBuilder.() -> Unit): Advancement {
     val adv = AdvancementBuilder(id)
     builder.invoke(adv)
     return adv.build()

src/main/kotlin/io/github/dockyardmc/apis/Hologram.kt

@@ -27,7 +27,7 @@ class HologramBuilder {
     }
 }
 
-fun hologram(location: Location, unit: HologramBuilder.() -> Unit): Hologram {
+inline fun hologram(location: Location, unit: HologramBuilder.() -> Unit): Hologram {
     val builder = HologramBuilder()
     unit.invoke(builder)
     return location.world.spawnEntity(Hologram(location, builder)) as Hologram

src/main/kotlin/io/github/dockyardmc/apis/bounds/Bound.kt

@@ -92,12 +92,13 @@ class Bound(
     }
 
     fun resize(newFirstLocation: Location, newSecondLocation: Location) {
-        if (newFirstLocation.world != newSecondLocation.world) throw IllegalArgumentException("The two locations cannot be in different worlds (${firstLocation.world.name} - ${secondLocation.world.name})")
+        require(newFirstLocation.world == newSecondLocation.world) { "The two locations cannot be in different worlds (${firstLocation.world.name} - ${secondLocation.world.name})" }
+
         this.firstLocation = getBoundPositionRelative(newFirstLocation, newSecondLocation)
         this.secondLocation = getBoundPositionRelative(newSecondLocation, newFirstLocation)
 
         getEntities().filterIsInstance<Player>().forEach { player ->
-            if(members.contains(player)) return@forEach
+            if (members.contains(player)) return@forEach
             val event = PlayerEnterBoundEvent(player, this)
             Events.dispatch(event)
 

src/main/kotlin/io/github/dockyardmc/apis/sidebar/Sidebar.kt

@@ -142,7 +142,7 @@ class Sidebar(initialTitle: String, initialLines: Map<Int, SidebarLine>) : Viewa
     }
 }
 
-fun sidebar(unit: Sidebar.Builder.() -> Unit): Sidebar {
+inline fun sidebar(unit: Sidebar.Builder.() -> Unit): Sidebar {
     val builder = Sidebar.Builder()
     unit.invoke(builder)
     return builder.build()

src/main/kotlin/io/github/dockyardmc/commands/Command.kt

@@ -5,7 +5,7 @@ import io.github.dockyardmc.scroll.LegacyTextColor
 import io.github.dockyardmc.utils.Console
 
 @Suppress("UNCHECKED_CAST")
-class Command: Cloneable {
+class Command : Cloneable {
     lateinit var internalExecutorDoNotUse: (CommandExecutor) -> Unit
     var arguments: MutableMap<String, CommandArgumentData> = mutableMapOf()
     var permission: String = ""
@@ -33,11 +33,12 @@ class Command: Cloneable {
 
 
     inline fun <reified T> getArgument(argumentName: String): T {
-        if(T::class.java.isEnum && T::class != LegacyTextColor::class) throw IllegalStateException("Supplied generic is of type enum, please use getEnumArgument method instead.")
-        if(arguments[argumentName] == null) throw IllegalStateException("Argument with name $argumentName does not exist")
-        if(arguments[argumentName]!!.returnedValue == null) throw IllegalStateException("Argument value of $argumentName is null. Use getOrNull to get nullable value")
+        require(!T::class.java.isEnum || T::class == LegacyTextColor::class) { "Supplied generic is of type enum, please use getEnumArgument method instead." }
 
-        return arguments[argumentName]!!.returnedValue as T
+        return requireNotNull(arguments[argumentName]) { "Argument with name $argumentName does not exist" }
+            .let { argument ->
+                requireNotNull(argument.returnedValue) { "Argument value of $argumentName is null. Use getOrNull to get nullable value" } as T
+            }
     }
 
     inline fun <reified T : Enum<T>> getEnumArgument(argumentName: String): T {
@@ -46,30 +47,31 @@ class Command: Cloneable {
     }
 
     inline fun <reified T : Enum<T>> getEnumArgumentOrNull(argumentName: String): T? {
-        if(arguments[argumentName] == null) return null
+        if (arguments[argumentName] == null) return null
         val value = getArgumentOrNull<String>(argumentName) ?: return null
         return T::class.java.enumConstants.firstOrNull { it.name == value.uppercase() } ?: throw Exception("Enum ${T::class.simpleName} does not contain \"${value.uppercase()}\"")
     }
 
     inline fun <reified T> getArgumentOrNull(argumentName: String): T? {
-        if(T::class.java.isEnum && T::class != LegacyTextColor::class) throw IllegalStateException("Supplied generic is of type enum, please use getEnumArgumentOrNull method instead.")
-        if(arguments[argumentName] == null) return null
-        if(arguments[argumentName]!!.returnedValue == null) return null
-        return arguments[argumentName]!!.returnedValue as T
+        require(!T::class.java.isEnum || T::class == LegacyTextColor::class) { "Supplied generic is of type enum, please use getEnumArgumentOrNull method instead." }
+
+        return arguments[argumentName]?.returnedValue as T?
     }
 
     fun addArgument(name: String, argument: CommandArgument, suggestions: ((Player) -> Collection<String>)? = null) {
-        if(subcommands.isNotEmpty()) throw IllegalStateException("Command cannot have both arguments and subcommands!")
+        check(subcommands.isEmpty()) { "Command cannot have both arguments and subcommands!" }
+
         val data = CommandArgumentData(argument, false, expectedReturnValueType = argument.expectedType, suggestions = suggestions)
         arguments[name] = data
         val before = arguments.values.indexOf(data) - 1
-        if(before <= 0 ) return
-        if(arguments.values.toList()[before].optional) throw IllegalStateException("Cannot put argument after optional argument!")
+        if (before <= 0) return
 
+        check(!arguments.values.toList()[before].optional) { "Cannot put argument after optional argument!" }
     }
 
     fun addOptionalArgument(name: String, argument: CommandArgument, suggestions: ((Player) -> Collection<String>)? = null) {
-        if(subcommands.isNotEmpty()) throw IllegalStateException("Command cannot have both arguments and subcommands at the same time!")
+        check(subcommands.isEmpty()) { "Command cannot have both arguments and subcommands at the same time!" }
+
         arguments[name] = CommandArgumentData(argument, true, expectedReturnValueType = argument.expectedType, suggestions = suggestions)
     }
 
@@ -81,7 +83,8 @@ class Command: Cloneable {
     fun build(): Command = this
 
     fun addSubcommand(name: String, builder: Command.() -> Unit) {
-        if(arguments.isNotEmpty()) throw IllegalStateException("Command cannot have both arguments and subcommands at the same time!")
+        check(arguments.isEmpty()) { "Command cannot have both arguments and subcommands at the same time!" }
+
         val sanitizedName = name.lowercase().removePrefix("/")
         val subcommand = Command()
         builder.invoke(subcommand)
@@ -110,14 +113,14 @@ data class CommandExecutor(
 ) {
 
     fun getPlayerOrThrow(): Player {
-        if(player == null) throw CommandException("Command was not executed by player")
+        if (player == null) throw CommandException("Command was not executed by player")
         return player
     }
 
     fun sendMessage(message: String, isSystem: Boolean = false) {
-        if(this.isPlayer) this.player!!.sendMessage(message, isSystem) else this.console.sendMessage(message)
+        if (this.isPlayer) this.player!!.sendMessage(message, isSystem) else this.console.sendMessage(message)
     }
 
     fun hasPermission(permission: String): Boolean =
-        if(this.isPlayer) this.player!!.hasPermission(permission) else true
+        if (this.isPlayer) this.player!!.hasPermission(permission) else true
 }

src/main/kotlin/io/github/dockyardmc/commands/Commands.kt

@@ -8,11 +8,15 @@ object Commands {
     var warnAboutCaseSensitivity: Boolean = true
     var warnWithClosestMatchToInvalidCommand: Boolean = false
 
-    fun add(name: String, builder: Command.() -> Unit): Command {
+    inline fun add(name: String, builder: Command.() -> Unit): Command {
         val command = Command()
+        builder.invoke(command)
+        return add(name, command)
+    }
+
+    fun add(name: String, command: Command): Command {
         val sanitizedName = name.lowercase().removePrefix("/")
         command.name = sanitizedName
-        builder.invoke(command)
 
         commands[sanitizedName] = command
         command.aliases.forEach {

src/main/kotlin/io/github/dockyardmc/config/Config.kt

@@ -41,7 +41,7 @@ class Config {
         this.maxPlayers = maxPlayers
     }
 
-    fun withImplementations(implementationConfigBuilder: ImplementationConfig.() -> Unit) {
+    inline fun withImplementations(implementationConfigBuilder: ImplementationConfig.() -> Unit) {
         implementationConfigBuilder.invoke(implementationConfig)
     }
 

src/main/kotlin/io/github/dockyardmc/data/CRC32CHasher.kt

@@ -126,7 +126,7 @@ object CRC32CHasher {
         return EMPTY_MAP
     }
 
-    fun of(unit: HashStruct.Builder.() -> Unit): HashStruct {
+    inline fun of(unit: HashStruct.Builder.() -> Unit): HashStruct {
         val builder = HashStruct.Builder()
         unit.invoke(builder)
         return HashStruct(builder.fields)

src/main/kotlin/io/github/dockyardmc/data/DataComponentPatch.kt

@@ -211,7 +211,7 @@ class DataComponentPatch(internal val components: Int2ObjectMap<DataComponent?>,
                 entry.value!!.write(buffer)
             } else {
                 // Need to length prefix it, so write to another buffer first then copy.
-                val componentData = Buffer.makeArray { b -> entry.value!!.write(b) }
+                val componentData = byteBufBytes { b -> entry.value!!.write(b) }
                 buffer.writeByteArray(componentData)
             }
         }