1.0.0-SNAPSHOT-U87

+ Cleaned up the config.yml, removed one of the TODOs from the MainMenu
2024-12-23 16:38:52 +01:00 · 2018-11-27 22:51:34 +08:00 · 2018-11-27 22:51:34 +08:00 · 0121b96788
commit 0121b96788
parent 943fbdc5e8
10 changed files with 54 additions and 49 deletions
--- a/plugin-modules/Core/resources-json/items.json
+++ b/plugin-modules/Core/resources-json/items.json
@ -1,4 +1,8 @@
 {
+  "DefaultTextMenuItem": {
+    "type": "BOOK",
+    "name": "&c&lDefault Text Menu Item"
+  },
  "DefaultBossMenuItem": {
    "type": "BARRIER",
    "name": "&c&lDefault Boss Menu Item"
--- a/plugin-modules/Core/resources-yml/config.yml
+++ b/plugin-modules/Core/resources-yml/config.yml
@ -33,28 +33,41 @@ Hooks:
    - 'blocked_region1'
    - 'blocked_region2'
 Display:
-  EntityTypeEditor:
-    menuName: '&b&l{name} Editor'
-    selectedName: '&f{name} Entity &a&l** Selected **'
-    name: '&f{name} Entity'
-  BossListEditor:
-    name: '&3{position} Entity'
-    lore:
-    - '&3Left Click &8»'
-    - '&7Edit the {targetType} for this'
-    - '&7entity in the section.'
-    - '&7'
-    - '&3Right Click &8»'
-    - '&7Remove this section, can be done'
-    - '&7to anything above the first one.'
-  EquipmentEditor:
-    name: '{name} &a&l** Selected **'
-  EditDrops:
-    lore:
-    - '&3Type: &7{type}'
-    - '&7'
-    - '&7Click here to select this drop'
-    - '&7table as the current one.'
+  Boss:
+    Drops:
+      lore:
+      - '&3Type: &7{type}'
+      - '&7'
+      - '&7Click here to select this drop'
+      - '&7table as the current one.'
+    Equipment:
+      name: '{name} &a&l** Selected **'
+    EntityType:
+      menuName: '&b&l{name} Editor'
+      selectedName: '&f{name} Entity &a&l** Selected **'
+      name: '&f{name} Entity'
+    List:
+      name: '&3{position} Entity'
+      lore:
+      - '&3Left Click &8»'
+      - '&7Edit the {targetType} for this'
+      - '&7entity in the section.'
+      - '&7'
+      - '&3Right Click &8»'
+      - '&7Remove this section, can be done'
+      - '&7to anything above the first one.'
+    Skills:
+      menuName: '&b&l{name} Editor'
+      selectedName: '&b&l{name} Skill &a&l** Selected **'
+      name: '&b&l{name} Skill'
+      lore:
+      - '&3Type: &7{type}'
+      - '&3Display Name: &7{displayName}'
+      - '&3Custom Message: &7{customMessage}'
+      - '&3Radius: &7{radius}'
+      - '&7'
+      - '&7Click to add/remove the skill to'
+      - '&7or from the boss skill list.'
  AutoSpawns:
    menuName: '&b&lEpicBosses &3&lAutoSpawns'
  Bosses:
@ -92,16 +105,4 @@ Display:
    - '&3Custom Message: &7{customMessage}'
    - '&3Radius: &7{radius}'
    - '&7'
-    - '&7Click to edit the custom skill.'
-  BossSkills:
-    menuName: '&b&l{name} Editor'
-    selectedName: '&b&l{name} Skill &a&l** Selected **'
-    name: '&b&l{name} Skill'
-    lore:
-    - '&3Type: &7{type}'
-    - '&3Display Name: &7{displayName}'
-    - '&3Custom Message: &7{customMessage}'
-    - '&3Radius: &7{radius}'
-    - '&7'
-    - '&7Click to add/remove the skill to'
-    - '&7or from the boss skill list.'
+    - '&7Click to edit the custom skill.'
--- a/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossPanelManager.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossPanelManager.java
@ -213,14 +213,14 @@ public class BossPanelManager implements ILoadable, IReloadable {
        PanelBuilder panelBuilder = new PanelBuilder(this.customBosses.getEditor().getConfigurationSection("SkillMainEditorPanel"));

        this.skillsBossEditMenu = new SkillMainEditorPanel(this, panelBuilder, this.customBosses);
-        this.skillListBossEditMenu = new SkillListEditorPanel(this, getListMenu("BossSkills"), this.customBosses);
+        this.skillListBossEditMenu = new SkillListEditorPanel(this, getListMenu("Boss.Skills"), this.customBosses);
    }

    private void reloadSkillsEditMenu() {
        PanelBuilder panelBuilder = new PanelBuilder(this.customBosses.getEditor().getConfigurationSection("SkillMainEditorPanel"));

        this.skillsBossEditMenu.initializePanel(panelBuilder);
-        this.skillListBossEditMenu.initializePanel(getListMenu("BossSkills"));
+        this.skillListBossEditMenu.initializePanel(getListMenu("Boss.Skills"));
    }

    //---------------------------------------------
--- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/EntityTypeEditorPanel.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/panel/EntityTypeEditorPanel.java
@ -111,7 +111,7 @@ public class EntityTypeEditorPanel extends SubVariablePanelHandler<BossEntity, E
                    if (entityFinder != null) {
                        for (String s : entityFinder.getNames()) {
                            if (s.equalsIgnoreCase(entityType.name())) {
-                                ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.EntityTypeEditor.selectedName"), replaceMap);
+                                ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.Boss.EntityType.selectedName"), replaceMap);
                                found = true;
                                break;
                            }
@ -120,7 +120,7 @@ public class EntityTypeEditorPanel extends SubVariablePanelHandler<BossEntity, E
                }

                if(!found) {
-                    ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.EntityTypeEditor.name"), replaceMap);
+                    ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.Boss.EntityType.name"), replaceMap);
                }

                panel.setItem(realisticSlot, itemStack, e -> {
--- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/MainMenuPanel.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/panel/MainMenuPanel.java
@ -94,7 +94,7 @@ public class MainMenuPanel extends PanelHandler {
            if(event.getClick() == ClickType.LEFT || event.getClick() == ClickType.SHIFT_LEFT) {
                this.bossPanelManager.getDropTables().openFor(player);
            } else if(event.getClick() == ClickType.RIGHT || event.getClick() == ClickType.SHIFT_RIGHT) {
-                //TODO: Set up create drop table command
+                Message.Boss_New_CreateArgumentsDropTable.msg(player);
                player.closeInventory();
            }
        };
--- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/bosses/BossListEditorPanel.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/panel/bosses/BossListEditorPanel.java
@ -64,8 +64,8 @@ public abstract class BossListEditorPanel extends VariablePanelHandler<BossEntit
            replaceMap.put("{position}", "" + entityStatsElement.getMainStats().getPosition());
            replaceMap.put("{targetType}", this.type);

-            ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.BossListEditor.name"), replaceMap);
-            ItemStackUtils.applyDisplayLore(itemStack, this.plugin.getConfig().getStringList("Display.BossListEditor.lore"), replaceMap);
+            ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.Boss.List.name"), replaceMap);
+            ItemStackUtils.applyDisplayLore(itemStack, this.plugin.getConfig().getStringList("Display.Boss.List.lore"), replaceMap);

            panel.setItem(slot, itemStack, event -> {
                ClickType click = event.getClick();
--- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/bosses/DropsEditorPanel.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/panel/bosses/DropsEditorPanel.java
@ -126,8 +126,8 @@ public class DropsEditorPanel extends VariablePanelHandler<BossEntity> {
                replaceMap.put("{name}", name);
                replaceMap.put("{type}", StringUtils.get().formatString(dropTable.getDropType()));

-                ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.DropTable.name"), replaceMap);
-                ItemStackUtils.applyDisplayLore(itemStack, this.plugin.getConfig().getStringList("Display.EditDrops.lore"), replaceMap);
+                ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.Boss.Drops.name"), replaceMap);
+                ItemStackUtils.applyDisplayLore(itemStack, this.plugin.getConfig().getStringList("Display.Boss.Drops.lore"), replaceMap);

                panel.setItem(realisticSlot, itemStack, e -> {
                    if(!bossEntity.isEditing()) {
--- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/bosses/SkillListEditorPanel.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/panel/bosses/SkillListEditorPanel.java
@ -101,12 +101,12 @@ public class SkillListEditorPanel extends VariablePanelHandler<BossEntity> {
                replaceMap.put("{radius}", NumberUtils.get().formatDouble(skill.getRadius()));

                if(bossEntity.getSkills().getSkills().contains(name)) {
-                    ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.BossSkills.selectedName"), replaceMap);
+                    ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.Boss.Skills.selectedName"), replaceMap);
                } else {
-                    ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.BossSkills.name"), replaceMap);
+                    ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.Boss.Skills.name"), replaceMap);
                }

-                ItemStackUtils.applyDisplayLore(itemStack, this.plugin.getConfig().getStringList("Display.BossSkills.lore"), replaceMap);
+                ItemStackUtils.applyDisplayLore(itemStack, this.plugin.getConfig().getStringList("Display.Boss.Skills.lore"), replaceMap);

                panel.setItem(realisticSlot, itemStack, e -> {
                    List<String> currentSkillList = bossEntity.getSkills().getSkills();
--- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/handlers/ItemStackSubListPanelHandler.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/panel/handlers/ItemStackSubListPanelHandler.java
@ -133,7 +133,7 @@ public abstract class ItemStackSubListPanelHandler extends SubVariablePanelHandl

                    replaceMap.put("{name}", ItemStackUtils.getName(itemStack));

-                    ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.EquipmentEditor.name"), replaceMap);
+                    ItemStackUtils.applyDisplayName(itemStack, this.plugin.getConfig().getString("Display.Boss.Equipment.name"), replaceMap);
                }

                panel.setItem(realisticSlot, itemStack, e -> {
--- a/pom.xml
+++ b/pom.xml
@ -19,7 +19,7 @@
    </modules>

    <properties>
-        <plugin.version>maven-version-number-SNAPSHOT-U86</plugin.version>
+        <plugin.version>maven-version-number-SNAPSHOT-U87</plugin.version>
        <plugin.name>EpicBosses</plugin.name>
        <plugin.main>com.songoda.epicbosses.CustomBosses</plugin.main>
        <plugin.author>AMinecraftDev</plugin.author>