Assembly table changes

Author: LordIdra

rebar/src/main/kotlin/io/github/pylonmc/rebar/config/ConfigSection.kt

@@ -28,8 +28,8 @@ open class ConfigSection(val internalSection: ConfigurationSection) {
      * Gets all the values in the section that are themselves sections.
      * @throws NullPointerException if any top level keys do not correspond to a section
      */
-    fun getSections(): Set<ConfigSection> {
-        val configSections: MutableSet<ConfigSection> = mutableSetOf()
+    fun getSections(): List<ConfigSection> {
+        val configSections: MutableList<ConfigSection> = mutableListOf()
         for (key in internalSection.getKeys(false)) {
             configSections.add(getSection(key)!!)
         }

rebar/src/main/kotlin/io/github/pylonmc/rebar/config/adapter/ConfigAdapter.kt

@@ -7,6 +7,12 @@ import net.kyori.adventure.sound.Sound
 import org.bukkit.Bukkit
 import org.bukkit.NamespacedKey
 import org.bukkit.Registry
+import org.joml.Vector2d
+import org.joml.Vector2f
+import org.joml.Vector2i
+import org.joml.Vector3d
+import org.joml.Vector3f
+import org.joml.Vector3i
 import java.lang.reflect.Type
 
 interface ConfigAdapter<T> {
@@ -44,6 +50,37 @@ interface ConfigAdapter<T> {
         @JvmField val ITEM_STACK = ItemStackConfigAdapter
         @JvmField val BLOCK_DATA = ConfigAdapter { Bukkit.createBlockData(STRING.convert(it)) }
 
+         @JvmField val VECTOR_2I = ConfigAdapter {
+            val list = (it as List<*>).filterIsInstance<Int>()
+            check(list.size == 2) { "List must be of size 2" }
+            Vector2i(list[0], list[1])
+        }
+        @JvmField val VECTOR_2F = ConfigAdapter {
+            val list = (it as List<*>).filterIsInstance<Float>()
+            check(list.size == 2) { "List must be of size 2" }
+            Vector2f(list[0], list[1])
+        }
+        @JvmField val VECTOR_2D = ConfigAdapter {
+            val list = (it as List<*>).filterIsInstance<Double>()
+            check(list.size == 2) { "List must be of size 2" }
+            Vector2d(list[0], list[1])
+        }
+        @JvmField val VECTOR_3I = ConfigAdapter {
+            val list = (it as List<*>).filterIsInstance<Int>()
+            check(list.size == 3) { "List must be of size 3" }
+            Vector3i(list[0], list[1], list[2])
+        }
+        @JvmField val VECTOR_3F = ConfigAdapter {
+            val list = (it as List<*>).filterIsInstance<Float>()
+            check(list.size == 3) { "List must be of size 3" }
+            Vector3f(list[0], list[1], list[2])
+        }
+        @JvmField val VECTOR_3D = ConfigAdapter {
+            val list = (it as List<*>).filterIsInstance<Double>()
+            check(list.size == 3) { "List must be of size 3" }
+            Vector3d(list[0], list[1], list[2])
+        }
+
         /**
          * A [ConfigAdapter] for in game [Sound]s,
          * comprised of a key, source, volume and pitch.

rebar/src/main/kotlin/io/github/pylonmc/rebar/i18n/RebarArgument.kt

@@ -21,6 +21,10 @@ class RebarArgument private constructor(val name: String, val value: ComponentLi
         )
     }
 
+    override fun fallbackString(): String {
+        return "rebar:${name}"
+    }
+
     companion object {
         @JvmStatic
         fun of(name: String, value: ComponentLike): RebarArgument {

rebar/src/main/kotlin/io/github/pylonmc/rebar/i18n/RebarTranslator.kt

@@ -86,13 +86,20 @@ class RebarTranslator private constructor(private val addon: RebarAddon) : Trans
     override fun translate(component: TranslatableComponent, locale: Locale): Component? {
         var translation = getRawTranslation(component.key(), locale, warn = true) ?: return null
         for (arg in component.arguments()) {
-            val componentArg = arg.asComponent()
+            var componentArg = arg.asComponent()
+            if (componentArg is TextComponent && componentArg.content().startsWith("rebar:")) {
+                // was a rebar argument that got serialized to vanilla
+                val argName = componentArg.content().removePrefix("rebar:")
+                val argValue = componentArg.children().firstOrNull() ?: Component.empty()
+                componentArg = RebarArgument.of(argName, argValue).asComponent()
+            }
+
             if (componentArg !is VirtualComponent) continue
-            val argument = componentArg.renderer()
-            if (argument !is RebarArgument) continue
+            val renderer = componentArg.renderer()
+            if (renderer !is RebarArgument) continue
             val replacer = TextReplacementConfig.builder()
-                .match("%${argument.name}%")
-                .replacement(GlobalTranslator.render(argument.value.asComponent(), locale))
+                .match("%${renderer.name}%")
+                .replacement(GlobalTranslator.render(renderer.value.asComponent(), locale))
                 .build()
             translation = translation.replaceText(replacer)
         }
@@ -217,12 +224,18 @@ class RebarTranslator private constructor(private val addon: RebarAddon) : Trans
                     }
                 }
 
-                val translated = GlobalTranslator.render(it.withArguments(arguments), locale)
+                val concatenatedArguments: MutableList<TranslationArgumentLike> = arguments.toMutableList()
+                if (it is TranslatableComponent) {
+                    concatenatedArguments.addAll(it.arguments())
+                }
+
+                val translated = GlobalTranslator.render(it.withArguments(concatenatedArguments), locale)
                 if (translated is TranslatableComponent && translated.fallback() != null) {
                     Component.text(translated.fallback()!!)
                 } else {
                     translated
                 }
+
             }
             editData(DataComponentTypes.LORE) { lore ->
                 val newLore = lore.lines().flatMap { line ->

rebar/src/main/kotlin/io/github/pylonmc/rebar/util/gui/GuiItems.kt

@@ -167,7 +167,7 @@ private class RebarPageItem(private val forward: Boolean) : AbstractPagedGuiBoun
             .name(
                 name.arguments(
                     RebarArgument.of("current", gui.page + 1),
-                    RebarArgument.of("total", gui.page),
+                    RebarArgument.of("total", gui.pageCount),
                 )
             )
     }