Fix registerThing throwing at startup

paulikauro · Jun 14, 2020 · d92b6d8 · d92b6d8
1 parent 8134f3a
commit d92b6d8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -52,7 +52,7 @@ tasks.withType<KotlinCompile> {
     kotlinOptions {
         jvmTarget = "1.8"
         javaParameters = true
-        freeCompilerArgs = listOf("-Xinline-classes", "-XXLanguage:+NewInference" , "-Xopt-in=kotlin.ExperimentalStdlibApi")
+        freeCompilerArgs = listOf("-Xopt-in=kotlin.ExperimentalStdlibApi")
     }
 }
 

diff --git a/src/main/kotlin/NbtUtil.kt b/src/main/kotlin/NbtUtil.kt
@@ -14,6 +14,8 @@ fun NBTItem.addFakeEnchant() {
     setInteger("HideFlags", 1)
 }
 
+// 😎
+@Suppress("UNCHECKED_CAST")
 inline fun <T: ItemMeta> ItemStack.modifyMeta(action: T.() -> Unit) {
     itemMeta = (itemMeta as T).apply(action)
 }
diff --git a/src/main/kotlin/RStack.kt b/src/main/kotlin/RStack.kt
@@ -72,6 +72,7 @@ class RStack(private val worldEdit: WorldEdit) : BaseCommand() {
     private fun doStack(player: WEPlayer, count: Int, spacing: Int, expand: Boolean, direction: String): Int {
         val session = worldEdit.sessionManager.get(player)
         val selection = try {
+            // TODO: null check session.selectionWorld
             session.getSelection(session.selectionWorld)
         } catch (e: IncompleteRegionException) {
             throw ConditionFailedException("You do not have a selection!")

diff --git a/src/main/kotlin/RedstoneTools.kt b/src/main/kotlin/RedstoneTools.kt
@@ -37,15 +37,15 @@ class RedstoneTools : JavaPlugin() {
         val worldEdit = wePlugin.worldEdit
         server.pluginManager.registerEvents(WorldEditHelper(this, worldEdit), this)
         PaperCommandManager(this).apply {
+            commandCompletions.registerCompletion("slabs", SlabCompletionHandler())
+            registerThing<SignalStrength>("Signal strength", { SignalStrength.of(it) }, SignalStrength.values)
+            registerThing<SignalContainer>("Container", { SignalContainer.of(it) }, SignalContainer.values)
+            setDefaultExceptionHandler(::handleCommandException, false)
             registerCommands(
                 RStack(worldEdit),
                 Container(),
                 Slab()
             )
-            commandCompletions.registerCompletion("slabs", SlabCompletionHandler())
-            registerThing("Signal strength", SignalStrength::of, SignalStrength.values)
-            registerThing("Container", SignalContainer::of, SignalContainer.values)
-            setDefaultExceptionHandler(::handleCommandException, false)
         }
     }
 }
@@ -69,7 +69,7 @@ inline fun <reified T> PaperCommandManager.registerThing(
     commandCompletions.setDefaultCompletion(name, T::class.java)
 }
 
-inline class SignalStrength(val value: Int) {
+class SignalStrength(val value: Int) {
     companion object {
         fun of(arg: String): SignalStrength? = when (arg) {
             in hexValues -> SignalStrength(arg.toInt(16))
@@ -82,7 +82,7 @@ inline class SignalStrength(val value: Int) {
     }
 }
 
-inline class SignalContainer(val material: Material) {
+class SignalContainer(val material: Material) {
     companion object {
         // Not a map [yet] cuz we want shortcuts
         // maybe possible to just check first letter (like WorldEdit does with directions)