From b4b235f1b541302babcf020b907c5a60b47095b1 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 28 Sep 2022 12:40:05 +0100 Subject: [PATCH] Added custom GUI slots --- build.gradle | 2 +- .../main/kotlin/com/willfp/ecojobs/jobs/JobLevelGUI.kt | 10 ++++++++++ .../src/main/kotlin/com/willfp/ecojobs/jobs/JobsGUI.kt | 9 +++++++++ eco-core/core-plugin/src/main/resources/config.yml | 6 ++++++ 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6eeba8c..e1f1505 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:6.37.1' + compileOnly 'com.willfp:eco:6.42.0' implementation 'com.willfp:libreforge:3.105.0' implementation 'org.joml:joml:1.10.4' diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevelGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevelGUI.kt index 960664d..9230e94 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevelGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobLevelGUI.kt @@ -4,6 +4,7 @@ import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.gui.menu import com.willfp.eco.core.gui.menu.Menu import com.willfp.eco.core.gui.slot +import com.willfp.eco.core.gui.slot.ConfigSlot import com.willfp.eco.core.gui.slot.FillerMask import com.willfp.eco.core.gui.slot.MaskItems import com.willfp.eco.core.items.Items @@ -165,6 +166,7 @@ class JobLevelGUI( } } ) + setSlot( plugin.configYml.getInt("level-gui.progression-slots.close.location.row"), plugin.configYml.getInt("level-gui.progression-slots.close.location.column"), @@ -178,6 +180,14 @@ class JobLevelGUI( } } ) + + for (config in plugin.configYml.getSubsections("level-gui.custom-slots")) { + setSlot( + config.getInt("row"), + config.getInt("column"), + ConfigSlot(config) + ) + } } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobsGUI.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobsGUI.kt index 400c827..1da2134 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobsGUI.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecojobs/jobs/JobsGUI.kt @@ -4,6 +4,7 @@ import com.willfp.eco.core.config.updating.ConfigUpdater import com.willfp.eco.core.gui.menu import com.willfp.eco.core.gui.menu.Menu import com.willfp.eco.core.gui.slot +import com.willfp.eco.core.gui.slot.ConfigSlot import com.willfp.eco.core.gui.slot.FillerMask import com.willfp.eco.core.gui.slot.MaskItems import com.willfp.eco.core.items.Items @@ -197,6 +198,14 @@ object JobsGUI { } } ) + + for (config in plugin.configYml.getSubsections("gui.custom-slots")) { + setSlot( + config.getInt("row"), + config.getInt("column"), + ConfigSlot(config) + ) + } } } diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml index bdb123b..b95b0d4 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -116,6 +116,9 @@ gui: row: 4 column: 2 + # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots + custom-slots: [] + level-gui: rows: 6 @@ -210,6 +213,9 @@ level-gui: row: 6 column: 5 + # Custom GUI slots; see here for a how-to: https://plugins.auxilor.io/all-plugins/custom-gui-slots + custom-slots: [] + level-up: message: enabled: true