diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomenus/components/ConfigurableSlot.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomenus/components/ConfigurableSlot.kt index 1e53c2d..185b7ad 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomenus/components/ConfigurableSlot.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomenus/components/ConfigurableSlot.kt @@ -28,7 +28,7 @@ class ConfigurableSlot( override val column: Int = config.getInt("location.column") val page: Int = config.getInt("location.page") - override val layer = runCatching { enumValueOf(config.getString("layer")) } + override val layer = runCatching { enumValueOf(config.getString("location.layer").uppercase()) } .getOrElse { MenuLayer.MIDDLE } private val context = baseContext.with("slot at row ${row}, column $column, page $page") @@ -84,13 +84,11 @@ class ConfigurableSlot( return slot } - fun add(builder: T): T { + fun add(builder: PageBuilder) { try { builder.addComponent(this) } catch (e: Exception) { context.log(ConfigViolation("location", "Invalid location!")) } - - return builder } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomenus/menus/Menu.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomenus/menus/Menu.kt index 52b4c62..6269199 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomenus/menus/Menu.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecomenus/menus/Menu.kt @@ -39,7 +39,7 @@ fun buildMenu(plugin: EcoPlugin, menu: EcoMenu, config: Config): Menu { val slots = mutableListOf() - for (slotConfig in config.getSubsections("slot_templates")) { + for (slotConfig in config.getSubsections("slots")) { val slot = ConfigurableSlot( plugin, ViolationContext(plugin, "menu ${menu.id}"), @@ -93,7 +93,7 @@ fun buildMenu(plugin: EcoPlugin, menu: EcoMenu, config: Config): Menu { onClose { event, menu -> val player = event.player as Player - menu.close(player) + menu.previousMenus[player].popOrNull()?.open(player) } } } diff --git a/gradle.properties b/gradle.properties index e34db91..e3dc98b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ #Sat Jun 03 15:45:10 BST 2023 kotlin.code.style=official libreforge-version=4.17.2 -version=1.0.0 \ No newline at end of file +version=0.0.1-ALPHA \ No newline at end of file