diff --git a/.idea/misc.xml b/.idea/misc.xml index 9896aeb..a7df3cb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/plugin-modules/Core/resources-yml/editor.yml b/plugin-modules/Core/resources-yml/editor.yml index 0eeb74b..ecf6b60 100644 --- a/plugin-modules/Core/resources-yml/editor.yml +++ b/plugin-modules/Core/resources-yml/editor.yml @@ -104,21 +104,19 @@ ListPanel: name: '&e&l&m<-&e&l Previous Page' lore: - '&7Click here to go to the previous' - - '&7page of custom drops.' + - '&7page.' PreviousPage: true '50': type: REDSTONE name: '&cClick here to go back' lore: - - '&7Click this button to go back to' - - '&7the main page where you can choose' - - '&7to configure blocks or mobs.' + - '&7Click this button to go back.' '51': type: ARROW name: '&e&lNext Page &e&l&m->' lore: - '&7Click here to go to the next' - - '&7page of custom drops.' + - '&7page.' NextPage: true '52': type: GLASS_PANE @@ -1506,7 +1504,7 @@ PotionSkillEditorPanel: name: '&e&l&m<-&e&l Previous Page' lore: - '&7Click here to go to the previous' - - '&7page of custom drops.' + - '&7page of custom potion effects.' PreviousPage: true '50': type: EMERALD_BLOCK @@ -1520,7 +1518,7 @@ PotionSkillEditorPanel: name: '&e&lNext Page &e&l&m->' lore: - '&7Click here to go to the next' - - '&7page of custom drops.' + - '&7page of custom potion effects.' NextPage: true '52': type: GLASS_PANE @@ -1628,7 +1626,7 @@ CommandSkillEditorPanel: name: '&e&l&m<-&e&l Previous Page' lore: - '&7Click here to go to the previous' - - '&7page of custom drops.' + - '&7page of command sections.' PreviousPage: true '50': type: EMERALD_BLOCK @@ -1642,7 +1640,7 @@ CommandSkillEditorPanel: name: '&e&lNext Page &e&l&m->' lore: - '&7Click here to go to the next' - - '&7page of custom drops.' + - '&7page of command sections.' NextPage: true '52': type: GLASS_PANE @@ -1788,7 +1786,7 @@ CustomSkillTypeEditorPanel: name: '&e&l&m<-&e&l Previous Page' lore: - '&7Click here to go to the previous' - - '&7page of custom drops.' + - '&7page of custom skill types.' PreviousPage: true '50': type: EMERALD_BLOCK @@ -1806,7 +1804,7 @@ CustomSkillTypeEditorPanel: name: '&e&lNext Page &e&l&m->' lore: - '&7Click here to go to the next' - - '&7page of custom drops.' + - '&7page of custom skill types.' NextPage: true '52': type: GLASS_PANE @@ -1819,5 +1817,67 @@ CustomSkillTypeEditorPanel: name: '&cClick here to go back' lore: - '&7Click this button to go back to' - - '&7the main page where you can choose' - - '&7to configure blocks or mobs.' \ No newline at end of file + - '&7the skill editor panel to configure' + - '&7the general skill options.' +SpecialSettingsEditorPanel: + name: '&b&l{name} Special Settings' + slots: 54 + Settings: + backButton: true + fillTo: 45 + Buttons: + backButton: 54 + Items: + '46': + type: BOOK + name: '&c&lSpecial Settings Guide' + lore: + - '&7Here any special settings that have' + - '&7been assigned to a skill type will' + - '&7show up. If this GUI is empty then there' + - '&7is no special settings related to the' + - '&7skill.' + '47': + type: GLASS_PANE + name: '&7' + '48': + type: GLASS_PANE + name: '&7' + '49': + type: ARROW + name: '&e&l&m<-&e&l Previous Page' + lore: + - '&7Click here to go to the previous' + - '&7page of special settings.' + PreviousPage: true + '50': + type: EMERALD_BLOCK + name: '&b&lSelected Custom Skill Type' + lore: + - '&bCurrently: &f{selected}' + - '&7' + - '&7This is the currently assigned' + - '&7custom skill type to the skill.' + - '&7If you would like to change this' + - '&7simply click another one in the' + - '&7skill type menu.' + '51': + type: ARROW + name: '&e&lNext Page &e&l&m->' + lore: + - '&7Click here to go to the next' + - '&7page of special settings.' + NextPage: true + '52': + type: GLASS_PANE + name: '&7' + '53': + type: GLASS_PANE + name: '&7' + '54': + type: REDSTONE + name: '&cClick here to go back' + lore: + - '&7Click this button to go back to' + - '&7the skill editor panel to configure' + - '&7the general skill options.' \ No newline at end of file diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossPanelManager.java b/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossPanelManager.java index 81a05ae..00e4b46 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossPanelManager.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossPanelManager.java @@ -28,6 +28,7 @@ import com.songoda.epicbosses.panel.skills.custom.commands.CommandListSkillEdito import com.songoda.epicbosses.panel.skills.custom.commands.ModifyCommandEditorPanel; import com.songoda.epicbosses.panel.skills.custom.custom.CustomSkillTypeEditorPanel; import com.songoda.epicbosses.panel.skills.custom.custom.MaterialTypeEditorPanel; +import com.songoda.epicbosses.panel.skills.custom.custom.SpecialSettingsEditorPanel; import com.songoda.epicbosses.panel.skills.custom.potions.CreatePotionEffectEditorPanel; import com.songoda.epicbosses.panel.skills.custom.potions.PotionEffectTypeEditorPanel; import com.songoda.epicbosses.panel.skills.custom.PotionSkillEditorPanel; @@ -77,7 +78,7 @@ public class BossPanelManager implements ILoadable, IReloadable { @Getter private IVariablePanelHandler mainSkillEditMenu, customMessageEditMenu, skillTypeEditMenu, potionSkillEditorPanel, commandSkillEditorPanel, groupSkillEditorPanel, customSkillEditorPanel; @Getter private ISubVariablePanelHandler createPotionEffectMenu, potionEffectTypeEditMenu; @Getter private ISubVariablePanelHandler modifyCommandEditMenu, commandListSkillEditMenu; - @Getter private ISubVariablePanelHandler customSkillTypeEditorMenu; + @Getter private ISubVariablePanelHandler customSkillTypeEditorMenu, specialSettingsEditorMenu; private final CustomBosses customBosses; @@ -196,6 +197,7 @@ public class BossPanelManager implements ILoadable, IReloadable { PanelBuilder panelBuilder5 = new PanelBuilder(editor.getConfigurationSection("ModifyCommandEditorPanel")); PanelBuilder panelBuilder6 = new PanelBuilder(editor.getConfigurationSection("CustomSkillEditorPanel")); PanelBuilder panelBuilder7 = new PanelBuilder(editor.getConfigurationSection("CustomSkillTypeEditorPanel")); + PanelBuilder panelBuilder8 = new PanelBuilder(editor.getConfigurationSection("CustomSkillTypeEditorPanel")); this.mainSkillEditMenu = new MainSkillEditorPanel(this, panelBuilder, this.customBosses); this.customMessageEditMenu = new SingleMessageListEditor(this, getListMenu("Skills.MainEdit"), this.customBosses) { @@ -231,6 +233,7 @@ public class BossPanelManager implements ILoadable, IReloadable { this.groupSkillEditorPanel = new GroupSkillEditorPanel(this, getListMenu("Skills.Group"), this.customBosses); this.customSkillEditorPanel = new CustomSkillEditorPanel(this, panelBuilder6, this.customBosses); this.customSkillTypeEditorMenu = new CustomSkillTypeEditorPanel(this, panelBuilder7, this.customBosses); + this.specialSettingsEditorMenu = new SpecialSettingsEditorPanel(this, panelBuilder8, this.customBosses); } private void reloadSkillEditMenus() { @@ -243,6 +246,7 @@ public class BossPanelManager implements ILoadable, IReloadable { PanelBuilder panelBuilder5 = new PanelBuilder(editor.getConfigurationSection("ModifyCommandEditorPanel")); PanelBuilder panelBuilder6 = new PanelBuilder(editor.getConfigurationSection("CustomSkillEditorPanel")); PanelBuilder panelBuilder7 = new PanelBuilder(editor.getConfigurationSection("CustomSkillTypeEditorPanel")); + PanelBuilder panelBuilder8 = new PanelBuilder(editor.getConfigurationSection("CustomSkillTypeEditorPanel")); this.mainSkillEditMenu.initializePanel(panelBuilder); this.customMessageEditMenu.initializePanel(getListMenu("Skills.MainEdit")); @@ -256,6 +260,7 @@ public class BossPanelManager implements ILoadable, IReloadable { this.groupSkillEditorPanel.initializePanel(getListMenu("Skills.Group")); this.customSkillEditorPanel.initializePanel(panelBuilder6); this.customSkillTypeEditorMenu.initializePanel(panelBuilder7); + this.specialSettingsEditorMenu.initializePanel(panelBuilder8); } //--------------------------------------------- diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/managers/files/SkillsFileManager.java b/plugin-modules/Core/src/com/songoda/epicbosses/managers/files/SkillsFileManager.java index 86e4ed2..75a733b 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/managers/files/SkillsFileManager.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/managers/files/SkillsFileManager.java @@ -6,6 +6,7 @@ import com.songoda.epicbosses.skills.Skill; import com.songoda.epicbosses.utils.ILoadable; import com.songoda.epicbosses.utils.IReloadable; import com.songoda.epicbosses.utils.ISavable; +import lombok.var; import java.io.File; import java.util.HashMap; diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/panel/skills/custom/CustomSkillEditorPanel.java b/plugin-modules/Core/src/com/songoda/epicbosses/panel/skills/custom/CustomSkillEditorPanel.java index dab1996..3ba0d67 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/skills/custom/CustomSkillEditorPanel.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/panel/skills/custom/CustomSkillEditorPanel.java @@ -58,7 +58,7 @@ public class CustomSkillEditorPanel extends VariablePanelHandler { .setParentPanelHandler(this.bossPanelManager.getMainSkillEditMenu(), skill); counter.getSlotsWith("Type").forEach(slot -> panel.setOnClick(slot, event -> this.bossPanelManager.getCustomSkillTypeEditorMenu().openFor((Player) event.getWhoClicked(), skill, customSkillElement))); - counter.getSlotsWith("SpecialSettings").forEach(slot -> panel.setOnClick(slot, event -> {})); + counter.getSlotsWith("SpecialSettings").forEach(slot -> panel.setOnClick(slot, event -> this.bossPanelManager.getSpecialSettingsEditorMenu().openFor((Player) event.getWhoClicked(), skill, customSkillElement))); counter.getSlotsWith("Multiplier").forEach(slot -> panel.setOnClick(slot, getMultiplierAction(skill, customSkillElement))); panel.openFor(player); diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/panel/skills/custom/custom/CustomMinionSkillListEditorPanel.java b/plugin-modules/Core/src/com/songoda/epicbosses/panel/skills/custom/custom/CustomMinionSkillListEditorPanel.java deleted file mode 100644 index 58274fa..0000000 --- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/skills/custom/custom/CustomMinionSkillListEditorPanel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.songoda.epicbosses.panel.skills.custom.custom; - -/** - * @author Charles Cullen - * @version 1.0.0 - * @since 16-Dec-18 - */ -public class CustomMinionSkillListEditorPanel { -} diff --git a/pom.xml b/pom.xml index 2ca41d0..695211a 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ - 1.0.0-U131 + 1.0.0-U132 EpicBosses com.songoda.epicbosses.CustomBosses AMinecraftDev