From 12cc7f70793eb1ba75e1c0e6dc9d20afa6be0771 Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Tue, 12 Nov 2019 18:23:57 +0100 Subject: [PATCH] Renamed 'Element' to 'Menu' --- .../usercontent/example/example.json | 2 +- .../worldhandler/gui/container/Container.java | 10 +++--- .../gui/container/IContainer.java | 4 +-- .../gui/container/impl/GuiWorldHandler.java | 20 +++++------ .../gui/content/impl/ContentAdvancements.java | 4 +-- .../content/impl/ContentButcherSettings.java | 4 +-- .../gui/content/impl/ContentCustomItem.java | 10 +++--- .../gui/content/impl/ContentEnchantment.java | 4 +-- .../gui/content/impl/ContentGamerules.java | 4 +-- .../gui/content/impl/ContentPotions.java | 4 +-- .../gui/content/impl/ContentRecipes.java | 4 +-- .../impl/ContentScoreboardObjectives.java | 6 ++-- .../content/impl/ContentScoreboardTeams.java | 4 +-- .../gui/content/impl/ContentSettings.java | 4 +-- .../gui/content/impl/ContentSignEditor.java | 4 +-- .../gui/content/impl/ContentSummon.java | 4 +-- .../gui/content/impl/ContentUsercontent.java | 12 +++---- .../IElement.java => menu/IMenu.java} | 4 +-- .../{element/Element.java => menu/Menu.java} | 6 ++-- .../impl/MenuButtonList.java} | 36 +++++++++---------- .../impl/MenuColorField.java} | 14 ++++---- .../impl/MenuPageList.java} | 8 ++--- .../usercontent/UsercontentLoader.java | 4 +-- .../{ElementFactory.java => MenuFactory.java} | 30 ++++++++-------- .../usercontent/model/JsonGui.java | 16 ++++----- .../model/{JsonElement.java => JsonMenu.java} | 18 +++++----- 26 files changed, 120 insertions(+), 120 deletions(-) rename src/main/java/exopandora/worldhandler/gui/{element/IElement.java => menu/IMenu.java} (82%) rename src/main/java/exopandora/worldhandler/gui/{element/Element.java => menu/Menu.java} (60%) rename src/main/java/exopandora/worldhandler/gui/{element/impl/ElementMultiButtonList.java => menu/impl/MenuButtonList.java} (68%) rename src/main/java/exopandora/worldhandler/gui/{element/impl/ElementColorMenu.java => menu/impl/MenuColorField.java} (90%) rename src/main/java/exopandora/worldhandler/gui/{element/impl/ElementPageList.java => menu/impl/MenuPageList.java} (90%) rename src/main/java/exopandora/worldhandler/usercontent/factory/{ElementFactory.java => MenuFactory.java} (65%) rename src/main/java/exopandora/worldhandler/usercontent/model/{JsonElement.java => JsonMenu.java} (62%) diff --git a/run/config/worldhandler/usercontent/example/example.json b/run/config/worldhandler/usercontent/example/example.json index 1338b1a..9415a37 100644 --- a/run/config/worldhandler/usercontent/example/example.json +++ b/run/config/worldhandler/usercontent/example/example.json @@ -299,7 +299,7 @@ } } ], - "elements": [ + "menus": [ { "type": "page_list", "dimensions": { diff --git a/src/main/java/exopandora/worldhandler/gui/container/Container.java b/src/main/java/exopandora/worldhandler/gui/container/Container.java index 86cd6e7..4f812e2 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/Container.java +++ b/src/main/java/exopandora/worldhandler/gui/container/Container.java @@ -3,8 +3,8 @@ package exopandora.worldhandler.gui.container; import java.util.ArrayList; import java.util.List; -import exopandora.worldhandler.gui.element.Element; -import exopandora.worldhandler.gui.element.IElement; +import exopandora.worldhandler.gui.menu.Menu; +import exopandora.worldhandler.gui.menu.IMenu; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.Widget; @@ -20,7 +20,7 @@ public abstract class Container extends Screen implements IContainer super(title); } - protected final List elements = new ArrayList(); + protected final List menus = new ArrayList(); @Override public T add(T button) @@ -41,8 +41,8 @@ public abstract class Container extends Screen implements IContainer } @Override - public void add(Element element) + public void add(Menu menu) { - this.elements.add(element); + this.menus.add(menu); } } diff --git a/src/main/java/exopandora/worldhandler/gui/container/IContainer.java b/src/main/java/exopandora/worldhandler/gui/container/IContainer.java index a524adf..f6cf096 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/IContainer.java +++ b/src/main/java/exopandora/worldhandler/gui/container/IContainer.java @@ -1,7 +1,7 @@ package exopandora.worldhandler.gui.container; import exopandora.worldhandler.gui.content.Content; -import exopandora.worldhandler.gui.element.Element; +import exopandora.worldhandler.gui.menu.Menu; import net.minecraft.client.gui.widget.Widget; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -12,7 +12,7 @@ public interface IContainer T add(T button); void initButtons(); - void add(Element element); + void add(Menu menu); String getPlayer(); diff --git a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java index 0b688ba..cb97ea4 100644 --- a/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java +++ b/src/main/java/exopandora/worldhandler/gui/container/impl/GuiWorldHandler.java @@ -23,7 +23,7 @@ import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.IContent; -import exopandora.worldhandler.gui.element.IElement; +import exopandora.worldhandler.gui.menu.IMenu; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.ResourceHelper; import exopandora.worldhandler.util.TextFormatting; @@ -80,7 +80,7 @@ public class GuiWorldHandler extends Container ActionHelper.tryRun(() -> { this.finalButtons.clear(); - this.elements.clear(); + this.menus.clear(); this.buttons.clear(); this.children.clear(); @@ -90,9 +90,9 @@ public class GuiWorldHandler extends Container //ELEMENTS - for(IElement element : this.elements) + for(IMenu menu : this.menus) { - element.initGui(this); + menu.initGui(this); } //SHORTCUTS @@ -184,9 +184,9 @@ public class GuiWorldHandler extends Container this.add(this.nameField); - for(IElement element : this.elements) + for(IMenu menu : this.menus) { - element.initButtons(this); + menu.initButtons(this); } } @@ -220,9 +220,9 @@ public class GuiWorldHandler extends Container { this.content.tick(this); - for(IElement element : this.elements) + for(IMenu menu : this.menus) { - element.tick(); + menu.tick(); } this.updateSyntax(); @@ -430,9 +430,9 @@ public class GuiWorldHandler extends Container //CONTAINER ELEMENTS - for(IElement element : this.elements) + for(IMenu menu : this.menus) { - element.draw(mouseX, mouseY, partialTicks); + menu.draw(mouseX, mouseY, partialTicks); } //SYNTAX diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java index 1a106f1..9077d71 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentAdvancements.java @@ -17,9 +17,9 @@ import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.container.impl.GuiWorldHandler; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicMapped; import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.AdvancementHelper; import exopandora.worldhandler.helper.CommandHelper; @@ -50,7 +50,7 @@ public class ContentAdvancements extends Content .filter(advancement -> advancement.getDisplay() != null) .collect(Collectors.toList()); - ElementPageList list = new ElementPageList(x, y, advancements, 114, 20, 3, container, new ILogicPageList() + MenuPageList list = new MenuPageList(x, y, advancements, 114, 20, 3, container, new ILogicPageList() { @Override public String translate(Advancement item) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java index 65a94e0..e946b58 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentButcherSettings.java @@ -7,8 +7,8 @@ import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.util.ActionHandler; import net.minecraft.client.resources.I18n; @@ -28,7 +28,7 @@ public class ContentButcherSettings extends ContentChild { List> list = ForgeRegistries.ENTITIES.getValues().stream().filter(EntityType::isSummonable).collect(Collectors.toList()); - ElementPageList> entities = new ElementPageList>(x, y, list, 114, 20, 3, container, new ILogicPageList>() + MenuPageList> entities = new MenuPageList>(x, y, list, 114, 20, 3, container, new ILogicPageList>() { @Override public String translate(EntityType item) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java index 87ed67f..1e911c9 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java @@ -20,11 +20,11 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.element.impl.ElementColorMenu; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicPageList; import exopandora.worldhandler.gui.logic.LogicSliderAttribute; import exopandora.worldhandler.gui.logic.LogicSliderSimple; +import exopandora.worldhandler.gui.menu.impl.MenuColorField; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.helper.ResourceHelper; @@ -116,12 +116,12 @@ public class ContentCustomItem extends Content { if(this.startPage == 1) { - container.add(new ElementColorMenu(x, y, "gui.worldhandler.items.custom_item.start.custom_name", this.builderCutomItem.getName())); + container.add(new MenuColorField(x, y, "gui.worldhandler.items.custom_item.start.custom_name", this.builderCutomItem.getName())); } } else if(Page.ENCHANT.equals(this.page)) { - ElementPageList enchantments = new ElementPageList(x + 118, y, new ArrayList(ForgeRegistries.ENCHANTMENTS.getValues()), 114, 20, 3, container, new ILogicPageList() + MenuPageList enchantments = new MenuPageList(x + 118, y, new ArrayList(ForgeRegistries.ENCHANTMENTS.getValues()), 114, 20, 3, container, new ILogicPageList() { @Override public String translate(Enchantment item) @@ -166,7 +166,7 @@ public class ContentCustomItem extends Content } else if(Page.ATTRIBUTES.equals(this.page)) { - ElementPageList attributes = new ElementPageList(x + 118, y, this.attributes, 114, 20, 3, container, new ILogicPageList() + MenuPageList attributes = new MenuPageList(x + 118, y, this.attributes, 114, 20, 3, container, new ILogicPageList() { @Override public String translate(EnumAttributes item) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java index 429868c..5048306 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentEnchantment.java @@ -12,9 +12,9 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicPageList; import exopandora.worldhandler.gui.logic.LogicSliderSimple; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; @@ -38,7 +38,7 @@ public class ContentEnchantment extends Content @Override public void initGui(Container container, int x, int y) { - ElementPageList enchantments = new ElementPageList(x, y, new ArrayList(ForgeRegistries.ENCHANTMENTS.getValues()), 114, 20, 3, container, new ILogicPageList() + MenuPageList enchantments = new MenuPageList(x, y, new ArrayList(ForgeRegistries.ENCHANTMENTS.getValues()), 114, 20, 3, container, new ILogicPageList() { @Override public String translate(Enchantment item) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java index b012c95..bad9cb6 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentGamerules.java @@ -18,8 +18,8 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; @@ -72,7 +72,7 @@ public class ContentGamerules extends Content } }); - ElementPageList rules = new ElementPageList(x, y, new ArrayList(map.keySet()), 114, 20, 3, container, new ILogicPageList() + MenuPageList rules = new MenuPageList(x, y, new ArrayList(map.keySet()), 114, 20, 3, container, new ILogicPageList() { @Override public String translate(String item) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java index e1de982..6aafa3d 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentPotions.java @@ -11,9 +11,9 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.button.GuiSlider; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicPageList; import exopandora.worldhandler.gui.logic.LogicSliderSimple; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; @@ -60,7 +60,7 @@ public class ContentPotions extends ContentChild @Override public void initGui(Container container, int x, int y) { - ElementPageList potions = new ElementPageList(x, y, new ArrayList(ForgeRegistries.POTIONS.getValues()), 114, 20, 3, container, new ILogicPageList() + MenuPageList potions = new MenuPageList(x, y, new ArrayList(ForgeRegistries.POTIONS.getValues()), 114, 20, 3, container, new ILogicPageList() { @Override public String translate(Effect item) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java index af3fe9a..fedcf75 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentRecipes.java @@ -13,8 +13,8 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; @@ -44,7 +44,7 @@ public class ContentRecipes extends Content .filter(recipe -> !recipe.isDynamic()) .collect(Collectors.toList()); - ElementPageList> list = new ElementPageList>(x, y, recipes, 114, 20, 3, container, new ILogicPageList>() + MenuPageList> list = new MenuPageList>(x, y, recipes, 114, 20, 3, container, new ILogicPageList>() { @Override public String translate(IRecipe item) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java index f196e03..194f2bd 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardObjectives.java @@ -15,8 +15,8 @@ import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.element.impl.ElementMultiButtonList; import exopandora.worldhandler.gui.logic.ILogicClickList; +import exopandora.worldhandler.gui.menu.impl.MenuButtonList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.helper.RegistryHelper; @@ -59,7 +59,7 @@ public class ContentScoreboardObjectives extends ContentScoreboard if(Page.CREATE.equals(this.page)) { - ElementMultiButtonList objectives = new ElementMultiButtonList(x + 118, y + 24, HELPER.getObjectives(), 2, new ILogicClickList() + MenuButtonList objectives = new MenuButtonList(x + 118, y + 24, HELPER.getObjectives(), 2, new ILogicClickList() { @Override public String translate(String key, int depth) @@ -160,7 +160,7 @@ public class ContentScoreboardObjectives extends ContentScoreboard } else if(Page.DISPLAY.equals(this.page) || Page.UNDISPLAY.equals(this.page)) { - ElementMultiButtonList slots = new ElementMultiButtonList(x + 118, y + 24 - this.page.getShift(), HELPER.getSlots(), 2, new ILogicClickList() + MenuButtonList slots = new MenuButtonList(x + 118, y + 24 - this.page.getShift(), HELPER.getSlots(), 2, new ILogicClickList() { @Override public String translate(String key, int depth) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java index 008cfbb..5985676 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentScoreboardTeams.java @@ -13,8 +13,8 @@ import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.element.impl.ElementMultiButtonList; import exopandora.worldhandler.gui.logic.ILogicClickList; +import exopandora.worldhandler.gui.menu.impl.MenuButtonList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.CommandHelper; import net.minecraft.client.resources.I18n; @@ -53,7 +53,7 @@ public class ContentScoreboardTeams extends ContentScoreboard if(Page.OPTION.equals(this.page)) { - ElementMultiButtonList options = new ElementMultiButtonList(x + 118, y + 24, HELPER.getOptions(), 2, new ILogicClickList() + MenuButtonList options = new MenuButtonList(x + 118, y + 24, HELPER.getOptions(), 2, new ILogicClickList() { @Override public String translate(String key, int depth) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java index c20319f..ce626d0 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSettings.java @@ -12,8 +12,8 @@ import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.impl.ContentSettings.Setting.BooleanSetting; import exopandora.worldhandler.gui.content.impl.ContentSettings.Setting.IntegerSetting; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.util.ActionHandler; import net.minecraft.client.resources.I18n; @@ -49,7 +49,7 @@ public class ContentSettings extends ContentChild @Override public void initGui(Container container, int x, int y) { - ElementPageList> settings = new ElementPageList>(x, y, SETTINGS, 114, 20, 3, container, new ILogicPageList>() + MenuPageList> settings = new MenuPageList>(x, y, SETTINGS, 114, 20, 3, container, new ILogicPageList>() { @Override public String translate(Setting item) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java index 2ca5445..7b3a83f 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSignEditor.java @@ -15,8 +15,8 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.element.impl.ElementColorMenu; import exopandora.worldhandler.gui.logic.ILogicColorMenu; +import exopandora.worldhandler.gui.menu.impl.MenuColorField; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.BlockHelper; import exopandora.worldhandler.helper.CommandHelper; @@ -70,7 +70,7 @@ public class ContentSignEditor extends Content container.initButtons(); }); - ElementColorMenu colors = new ElementColorMenu(x, y, "gui.worldhandler.blocks.sign_editor.text_line_" + (this.selectedLine + 1), this.builderSignEditor.getColoredString(this.selectedLine), new ILogicColorMenu() + MenuColorField colors = new MenuColorField(x, y, "gui.worldhandler.blocks.sign_editor.text_line_" + (this.selectedLine + 1), this.builderSignEditor.getColoredString(this.selectedLine), new ILogicColorMenu() { @Override public boolean validate(String text) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java index cad7ff0..4c562b8 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java @@ -22,10 +22,10 @@ import exopandora.worldhandler.gui.category.Category; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; import exopandora.worldhandler.gui.content.Contents; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicPageList; import exopandora.worldhandler.gui.logic.LogicSliderAttribute; import exopandora.worldhandler.gui.logic.LogicSliderSimple; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.helper.ActionHelper; import exopandora.worldhandler.helper.CommandHelper; import exopandora.worldhandler.util.ActionHandler; @@ -132,7 +132,7 @@ public class ContentSummon extends Content if(Page.ATTRIBUTES.equals(this.page)) { - ElementPageList attributes = new ElementPageList(x + 118, y, this.attributes, 114, 20, 3, container, new ILogicPageList() + MenuPageList attributes = new MenuPageList(x + 118, y, this.attributes, 114, 20, 3, container, new ILogicPageList() { @Override public String translate(EnumAttributes item) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentUsercontent.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentUsercontent.java index 0a50b72..d2fa3df 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentUsercontent.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentUsercontent.java @@ -23,10 +23,10 @@ import exopandora.worldhandler.usercontent.VisibleActiveObject; import exopandora.worldhandler.usercontent.VisibleObject; import exopandora.worldhandler.usercontent.factory.ActionHandlerFactory; import exopandora.worldhandler.usercontent.factory.ButtonFactory; -import exopandora.worldhandler.usercontent.factory.ElementFactory; +import exopandora.worldhandler.usercontent.factory.MenuFactory; import exopandora.worldhandler.usercontent.model.JsonButton; import exopandora.worldhandler.usercontent.model.JsonCommand; -import exopandora.worldhandler.usercontent.model.JsonElement; +import exopandora.worldhandler.usercontent.model.JsonMenu; import exopandora.worldhandler.usercontent.model.JsonModel; import exopandora.worldhandler.usercontent.model.JsonText; import exopandora.worldhandler.usercontent.model.JsonUsercontent; @@ -52,7 +52,7 @@ public class ContentUsercontent extends Content private final List> buttons = new ArrayList>(); private UsercontentAPI api; private ButtonFactory buttonFactory; - private ElementFactory elementFactory; + private MenuFactory menuFactory; public ContentUsercontent(UsercontentConfig config) throws Exception { @@ -63,7 +63,7 @@ public class ContentUsercontent extends Content this.api = new UsercontentAPI(this.builders.stream().map(VisibleObject::getObject).collect(Collectors.toList())); ActionHandlerFactory actionHandlerFactory = new ActionHandlerFactory(this.api,this. builders, this.engineAdapter); this.buttonFactory = new ButtonFactory(this.api, actionHandlerFactory); - this.elementFactory = new ElementFactory(this.api, actionHandlerFactory); + this.menuFactory = new MenuFactory(this.api, actionHandlerFactory); this.engineAdapter.addObject("api", this.api); this.engineAdapter.eval(config.getJs()); } @@ -100,9 +100,9 @@ public class ContentUsercontent extends Content } } - for(JsonElement element : this.getWidgets(this.content.getGui().getElements(), JsonWidget.Type.ELEMENT)) + for(JsonMenu menu : this.getWidgets(this.content.getGui().getMenus(), JsonWidget.Type.ELEMENT)) { - container.add(this.elementFactory.createElement(element, this, container, x, y)); + container.add(this.menuFactory.createMenu(menu, this, container, x, y)); } this.updateTextfields(); diff --git a/src/main/java/exopandora/worldhandler/gui/element/IElement.java b/src/main/java/exopandora/worldhandler/gui/menu/IMenu.java similarity index 82% rename from src/main/java/exopandora/worldhandler/gui/element/IElement.java rename to src/main/java/exopandora/worldhandler/gui/menu/IMenu.java index 31263d4..3c736f7 100644 --- a/src/main/java/exopandora/worldhandler/gui/element/IElement.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/IMenu.java @@ -1,11 +1,11 @@ -package exopandora.worldhandler.gui.element; +package exopandora.worldhandler.gui.menu; import exopandora.worldhandler.gui.container.Container; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public interface IElement +public interface IMenu { void initGui(Container container); void initButtons(Container container); diff --git a/src/main/java/exopandora/worldhandler/gui/element/Element.java b/src/main/java/exopandora/worldhandler/gui/menu/Menu.java similarity index 60% rename from src/main/java/exopandora/worldhandler/gui/element/Element.java rename to src/main/java/exopandora/worldhandler/gui/menu/Menu.java index b02d7ef..2a12ce4 100644 --- a/src/main/java/exopandora/worldhandler/gui/element/Element.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/Menu.java @@ -1,15 +1,15 @@ -package exopandora.worldhandler.gui.element; +package exopandora.worldhandler.gui.menu; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public abstract class Element implements IElement +public abstract class Menu implements IMenu { protected int x; protected int y; - public Element(int x, int y) + public Menu(int x, int y) { this.x = x; this.y = y; diff --git a/src/main/java/exopandora/worldhandler/gui/element/impl/ElementMultiButtonList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java similarity index 68% rename from src/main/java/exopandora/worldhandler/gui/element/impl/ElementMultiButtonList.java rename to src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java index 8976b54..ceaf7d8 100644 --- a/src/main/java/exopandora/worldhandler/gui/element/impl/ElementMultiButtonList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuButtonList.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.gui.element.impl; +package exopandora.worldhandler.gui.menu.impl; import java.util.ArrayList; import java.util.Collections; @@ -11,28 +11,28 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonList; import exopandora.worldhandler.gui.button.GuiButtonList.Persistence; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.element.Element; import exopandora.worldhandler.gui.logic.ILogicClickList; import exopandora.worldhandler.gui.logic.ILogicMapped; +import exopandora.worldhandler.gui.menu.Menu; import exopandora.worldhandler.helper.Node; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class ElementMultiButtonList extends Element +public class MenuButtonList extends Menu { private final List items; private final ILogicClickList logic; - private final ElementMultiButtonList parent; + private final MenuButtonList parent; private final int depth; private final int maxDepth; - public ElementMultiButtonList(int x, int y, List list, int maxDepth, ILogicClickList logic) + public MenuButtonList(int x, int y, List list, int maxDepth, ILogicClickList logic) { this(x, y, list, maxDepth, logic, null); } - private ElementMultiButtonList(int x, int y, List list, int maxDepth, ILogicClickList logic, ElementMultiButtonList parent) + private MenuButtonList(int x, int y, List list, int maxDepth, ILogicClickList logic, MenuButtonList parent) { super(x, y); this.items = list; @@ -56,7 +56,7 @@ public class ElementMultiButtonList extends Element @Override public String translate(Node item) { - return ElementMultiButtonList.this.logic.translate(ElementMultiButtonList.this.buildKey(container, ElementMultiButtonList.this.logic::buildTranslationKey), ElementMultiButtonList.this.getDepth()); + return MenuButtonList.this.logic.translate(MenuButtonList.this.buildKey(container, MenuButtonList.this.logic::buildTranslationKey), MenuButtonList.this.getDepth()); } @Override @@ -74,14 +74,14 @@ public class ElementMultiButtonList extends Element @Override public void onClick(Node item) { - ElementMultiButtonList.this.getPersistence(container, 1).setIndex(0); + MenuButtonList.this.getPersistence(container, 1).setIndex(0); container.init(); } @Override public String getId() { - return ElementMultiButtonList.this.getId(); + return MenuButtonList.this.getId(); } })); @@ -90,7 +90,7 @@ public class ElementMultiButtonList extends Element if(node.getEntries() != null) { - ElementMultiButtonList child = new ElementMultiButtonList(this.x, this.y + 24, node.getEntries(), this.maxDepth, this.logic, this); + MenuButtonList child = new MenuButtonList(this.x, this.y + 24, node.getEntries(), this.maxDepth, this.logic, this); child.initButtons(container); } else @@ -122,7 +122,7 @@ public class ElementMultiButtonList extends Element } @Nullable - protected ElementMultiButtonList getParent() + protected MenuButtonList getParent() { return this.parent; } @@ -134,7 +134,7 @@ public class ElementMultiButtonList extends Element protected String getId(int offset) { - return String.format("%s%d", ElementMultiButtonList.this.logic.getId(), ElementMultiButtonList.this.depth + offset); + return String.format("%s%d", MenuButtonList.this.logic.getId(), MenuButtonList.this.depth + offset); } protected Persistence getPersistence(Container container) @@ -154,16 +154,16 @@ public class ElementMultiButtonList extends Element protected String buildKey(Container container, BiFunction, Integer, String> factory) { - List nodes = new ArrayList(ElementMultiButtonList.this.depth + 1); - ElementMultiButtonList element = ElementMultiButtonList.this; + List nodes = new ArrayList(MenuButtonList.this.depth + 1); + MenuButtonList menu = MenuButtonList.this; - while(element != null) + while(menu != null) { - nodes.add(element.getNode(container).getKey()); - element = element.getParent(); + nodes.add(menu.getNode(container).getKey()); + menu = menu.getParent(); } Collections.reverse(nodes); - return factory.apply(nodes, ElementMultiButtonList.this.depth); + return factory.apply(nodes, MenuButtonList.this.depth); } } diff --git a/src/main/java/exopandora/worldhandler/gui/element/impl/ElementColorMenu.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java similarity index 90% rename from src/main/java/exopandora/worldhandler/gui/element/impl/ElementColorMenu.java rename to src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java index db594d2..ed442df 100644 --- a/src/main/java/exopandora/worldhandler/gui/element/impl/ElementColorMenu.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuColorField.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.gui.element.impl; +package exopandora.worldhandler.gui.menu.impl; import java.util.ArrayList; import java.util.List; @@ -7,9 +7,9 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonList; import exopandora.worldhandler.gui.button.GuiTextFieldTooltip; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.element.Element; import exopandora.worldhandler.gui.logic.ILogicColorMenu; import exopandora.worldhandler.gui.logic.ILogicMapped; +import exopandora.worldhandler.gui.menu.Menu; import exopandora.worldhandler.util.MutableStringTextComponent; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; @@ -17,7 +17,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class ElementColorMenu extends Element +public class MenuColorField extends Menu { private static final List COLORS = new ArrayList(); @@ -47,12 +47,12 @@ public class ElementColorMenu extends Element private final ILogicColorMenu logic; private final String translationKey; - public ElementColorMenu(int x, int y, String translationKey, MutableStringTextComponent string) + public MenuColorField(int x, int y, String translationKey, MutableStringTextComponent string) { this(x, y, translationKey, string, new ILogicColorMenu(){}); } - public ElementColorMenu(int x, int y, String translationKey, MutableStringTextComponent string, ILogicColorMenu logic) + public MenuColorField(int x, int y, String translationKey, MutableStringTextComponent string, ILogicColorMenu logic) { super(x, y); this.translationKey = translationKey; @@ -103,13 +103,13 @@ public class ElementColorMenu extends Element @Override public void onClick(TextFormatting item) { - ElementColorMenu.this.string.getStyle().setColor(item); + MenuColorField.this.string.getStyle().setColor(item); } @Override public String getId() { - return ElementColorMenu.this.logic.getId(); + return MenuColorField.this.logic.getId(); } })); diff --git a/src/main/java/exopandora/worldhandler/gui/element/impl/ElementPageList.java b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java similarity index 90% rename from src/main/java/exopandora/worldhandler/gui/element/impl/ElementPageList.java rename to src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java index 12d32a6..86128af 100644 --- a/src/main/java/exopandora/worldhandler/gui/element/impl/ElementPageList.java +++ b/src/main/java/exopandora/worldhandler/gui/menu/impl/MenuPageList.java @@ -1,4 +1,4 @@ -package exopandora.worldhandler.gui.element.impl; +package exopandora.worldhandler.gui.menu.impl; import java.util.List; import java.util.Objects; @@ -6,8 +6,8 @@ import java.util.Objects; import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.container.Container; -import exopandora.worldhandler.gui.element.Element; import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.Menu; import exopandora.worldhandler.util.TextFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; @@ -15,7 +15,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class ElementPageList extends Element +public class MenuPageList extends Menu { private final List items; private final ILogicPageList logic; @@ -24,7 +24,7 @@ public class ElementPageList extends Element private final int height; private final int length; - public ElementPageList(int x, int y, List items, int width, int height, int length, Container container, ILogicPageList logic) + public MenuPageList(int x, int y, List items, int width, int height, int length, Container container, ILogicPageList logic) { super(x, y); this.items = Objects.requireNonNull(items); diff --git a/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java b/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java index defbf8e..8c39506 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java +++ b/src/main/java/exopandora/worldhandler/usercontent/UsercontentLoader.java @@ -28,7 +28,7 @@ import exopandora.worldhandler.gui.button.EnumIcon; import exopandora.worldhandler.usercontent.model.Action; import exopandora.worldhandler.usercontent.model.BooleanExpression; import exopandora.worldhandler.usercontent.model.JsonButton; -import exopandora.worldhandler.usercontent.model.JsonElement; +import exopandora.worldhandler.usercontent.model.JsonMenu; import exopandora.worldhandler.usercontent.model.JsonUsercontent; import jdk.nashorn.api.scripting.NashornScriptEngineFactory; import net.minecraft.util.ResourceLocation; @@ -65,7 +65,7 @@ public class UsercontentLoader .registerTypeAdapter(BooleanExpression.Type.class, new EnumTypeAdapter(BooleanExpression.Type.class)) .registerTypeAdapter(JsonButton.Type.class, new EnumTypeAdapter(JsonButton.Type.class)) .registerTypeAdapter(Action.Type.class, new EnumTypeAdapter(Action.Type.class)) - .registerTypeAdapter(JsonElement.Type.class, new EnumTypeAdapter(JsonElement.Type.class)) + .registerTypeAdapter(JsonMenu.Type.class, new EnumTypeAdapter(JsonMenu.Type.class)) .create(); final List folders = Files.list(path) .filter(Files::isDirectory) diff --git a/src/main/java/exopandora/worldhandler/usercontent/factory/ElementFactory.java b/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java similarity index 65% rename from src/main/java/exopandora/worldhandler/usercontent/factory/ElementFactory.java rename to src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java index ace212f..c46a9e1 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/factory/ElementFactory.java +++ b/src/main/java/exopandora/worldhandler/usercontent/factory/MenuFactory.java @@ -6,11 +6,11 @@ import exopandora.worldhandler.gui.button.GuiButtonBase; import exopandora.worldhandler.gui.button.GuiButtonTooltip; import exopandora.worldhandler.gui.container.Container; import exopandora.worldhandler.gui.content.Content; -import exopandora.worldhandler.gui.element.Element; -import exopandora.worldhandler.gui.element.impl.ElementPageList; import exopandora.worldhandler.gui.logic.ILogicPageList; +import exopandora.worldhandler.gui.menu.Menu; +import exopandora.worldhandler.gui.menu.impl.MenuPageList; import exopandora.worldhandler.usercontent.UsercontentAPI; -import exopandora.worldhandler.usercontent.model.JsonElement; +import exopandora.worldhandler.usercontent.model.JsonMenu; import exopandora.worldhandler.usercontent.model.JsonItem; import exopandora.worldhandler.usercontent.model.JsonWidget; import exopandora.worldhandler.util.ActionHandler; @@ -18,28 +18,28 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class ElementFactory extends WidgetFactory +public class MenuFactory extends WidgetFactory { - public ElementFactory(UsercontentAPI api, ActionHandlerFactory actionHandlerFactory) + public MenuFactory(UsercontentAPI api, ActionHandlerFactory actionHandlerFactory) { super(api, actionHandlerFactory); } @Nullable - public Element createElement(JsonElement element, Content content, Container container, int x, int y) + public Menu createMenu(JsonMenu menu, Content content, Container container, int x, int y) { - if(JsonElement.Type.PAGE_LIST.equals(element.getType())) + if(JsonMenu.Type.PAGE_LIST.equals(menu.getType())) { - return new ElementPageList + return new MenuPageList ( - element.getDimensions().getX() + x, - element.getDimensions().getY() + y, - element.getAttributes().getItems(), - element.getDimensions().getWidth(), - element.getDimensions().getHeight(), - element.getAttributes().getLength(), + menu.getDimensions().getX() + x, + menu.getDimensions().getY() + y, + menu.getAttributes().getItems(), + menu.getDimensions().getWidth(), + menu.getDimensions().getHeight(), + menu.getAttributes().getLength(), container, - new UsercontentLogicPageList(this.getApi(), this.getActionHandlerFactory(), content, container, element) + new UsercontentLogicPageList(this.getApi(), this.getActionHandlerFactory(), content, container, menu) ); } diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonGui.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonGui.java index 5412d3e..badf7a3 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonGui.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonGui.java @@ -19,18 +19,18 @@ public class JsonGui @SerializedName("buttons") private List buttons = null; - @SerializedName("elements") - private List elements = null; + @SerializedName("menus") + private List menus = null; @SerializedName("texts") private List texts = null; - public JsonGui(String title, JsonTab tab, List buttons, List elements, List texts) + public JsonGui(String title, JsonTab tab, List buttons, List menus, List texts) { this.title = title; this.tab = tab; this.buttons = buttons; - this.elements = elements; + this.menus = menus; this.texts = texts; } @@ -64,14 +64,14 @@ public class JsonGui this.buttons = buttons; } - public List getElements() + public List getMenus() { - return this.elements; + return this.menus; } - public void setElements(List elements) + public void setMenus(List menus) { - this.elements = elements; + this.menus = menus; } public List getTexts() diff --git a/src/main/java/exopandora/worldhandler/usercontent/model/JsonElement.java b/src/main/java/exopandora/worldhandler/usercontent/model/JsonMenu.java similarity index 62% rename from src/main/java/exopandora/worldhandler/usercontent/model/JsonElement.java rename to src/main/java/exopandora/worldhandler/usercontent/model/JsonMenu.java index 094dfa3..b76d2e1 100644 --- a/src/main/java/exopandora/worldhandler/usercontent/model/JsonElement.java +++ b/src/main/java/exopandora/worldhandler/usercontent/model/JsonMenu.java @@ -2,17 +2,17 @@ package exopandora.worldhandler.usercontent.model; import com.google.gson.annotations.SerializedName; -import exopandora.worldhandler.usercontent.model.JsonElement.Type; +import exopandora.worldhandler.usercontent.model.JsonMenu.Type; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class JsonElement extends JsonWidget +public class JsonMenu extends JsonWidget { @SerializedName("type") private Type type; - public JsonElement(Type type, Action action, JsonDimensions dimensions, Attributes attributes) + public JsonMenu(Type type, Action action, JsonDimensions dimensions, Attributes attributes) { super(action, dimensions, attributes); this.type = type; @@ -39,30 +39,30 @@ public class JsonElement extends JsonWidget { if(this.type == null) { - throw new IllegalStateException("element.type is null"); + throw new IllegalStateException("menu.type is null"); } if(this.type == Type.PAGE_LIST) { if(this.getAttributes() == null) { - throw new IllegalStateException("element.attributes is null"); + throw new IllegalStateException("menu.attributes is null"); } else if(this.getAttributes().getId() == null) { - throw new IllegalStateException("element.attributes.id is null"); + throw new IllegalStateException("menu.attributes.id is null"); } else if(this.getAttributes().getId().isEmpty()) { - throw new IllegalStateException("element.attributes.id is empty"); + throw new IllegalStateException("menu.attributes.id is empty"); } else if(this.getAttributes().getItems() == null) { - throw new IllegalStateException("element.attributes.items is null"); + throw new IllegalStateException("menu.attributes.items is null"); } else if(this.getAttributes().getItems().isEmpty()) { - throw new IllegalStateException("element.attributes.items is empty"); + throw new IllegalStateException("menu.attributes.items is empty"); } this.validateAction(Action.Type.SET, Action.Type.JS);