From 9d396befea4f6d4be6d3add4e4431946b2def1b2 Mon Sep 17 00:00:00 2001 From: aro Date: Sun, 15 Jan 2023 13:02:01 +0100 Subject: [PATCH] fix: text blocks are not supported by lib --- .../java/net/artelnatif/nicko/gui/MainGUI.java | 16 +++++++--------- .../gui/items/admin/SkinInvalidatorItem.java | 4 ++++ .../nicko/gui/items/main/AdminItem.java | 8 ++++++-- .../nicko/gui/items/main/SettingsItem.java | 2 +- .../nicko/gui/items/main/SkinItem.java | 2 +- .../artelnatif/nicko/gui/sub/AdminPanelGUI.java | 10 +++++----- .../artelnatif/nicko/gui/sub/AppearanceGUI.java | 13 ++++++------- .../artelnatif/nicko/gui/sub/SettingsGUI.java | 13 ++++++------- 8 files changed, 36 insertions(+), 32 deletions(-) create mode 100644 nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/SkinInvalidatorItem.java diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/MainGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/MainGUI.java index 0f881dd..cec905c 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/MainGUI.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/gui/MainGUI.java @@ -14,18 +14,16 @@ import org.bukkit.entity.Player; public class MainGUI { private final Player player; private final GUI gui; - private final String structure = """ - # # # # # # # # # - # % % % % % % % # - # % # R S P # % # - # % % % A % % % # - E # # # # # # # # - """; + private final String[] structure = new String[]{ + "# # # # # # # # #", + "# % % % A % % % #", + "# % # R S P # % #", + "# % % % % % % % #", + "E # # # # # # # #"}; public MainGUI(Player player) { if (!player.hasPermission("nicko.admin") || !player.isOp()) { - final String[] rows = structure.split("\n"); - rows[3] = rows[3].replace("A", "#"); + structure[3] = structure[3].replace("A", "#"); } this.gui = new GUIBuilder<>(GUIType.NORMAL) diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/SkinInvalidatorItem.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/SkinInvalidatorItem.java new file mode 100644 index 0000000..ec3d55c --- /dev/null +++ b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/admin/SkinInvalidatorItem.java @@ -0,0 +1,4 @@ +package net.artelnatif.nicko.gui.items.admin; + +public class SkinInvalidatorItem { +} diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminItem.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminItem.java index 011e7dd..39cccc8 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminItem.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/AdminItem.java @@ -3,17 +3,21 @@ package net.artelnatif.nicko.gui.items.main; import de.studiocode.invui.item.ItemProvider; import de.studiocode.invui.item.builder.ItemBuilder; import de.studiocode.invui.item.impl.BaseItem; -import net.artelnatif.nicko.gui.AdminPanelGUI; +import net.artelnatif.nicko.gui.sub.AdminPanelGUI; import org.bukkit.Material; +import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.inventory.ItemFlag; import org.jetbrains.annotations.NotNull; public class AdminItem extends BaseItem { @Override public ItemProvider getItemProvider() { - final ItemBuilder builder = new ItemBuilder(Material.REDSTONE_TORCH); + final ItemBuilder builder = new ItemBuilder(Material.COMMAND_BLOCK); + builder.addEnchantment(Enchantment.DAMAGE_ALL, 1, false); + builder.addItemFlags(ItemFlag.HIDE_ENCHANTS); builder.setDisplayName("§cAdministration panel..."); builder.addLoreLines("§7Access the administration panel."); return builder; diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsItem.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsItem.java index 7d94ffa..0085122 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsItem.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SettingsItem.java @@ -3,7 +3,7 @@ package net.artelnatif.nicko.gui.items.main; import de.studiocode.invui.item.ItemProvider; import de.studiocode.invui.item.builder.ItemBuilder; import de.studiocode.invui.item.impl.BaseItem; -import net.artelnatif.nicko.gui.SettingsGUI; +import net.artelnatif.nicko.gui.sub.SettingsGUI; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SkinItem.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SkinItem.java index 21374ab..9bf5fb7 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SkinItem.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/gui/items/main/SkinItem.java @@ -3,7 +3,7 @@ package net.artelnatif.nicko.gui.items.main; import de.studiocode.invui.item.ItemProvider; import de.studiocode.invui.item.builder.ItemBuilder; import de.studiocode.invui.item.impl.BaseItem; -import net.artelnatif.nicko.gui.AppearanceGUI; +import net.artelnatif.nicko.gui.sub.AppearanceGUI; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/AdminPanelGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/AdminPanelGUI.java index 1187a8c..4ac665b 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/AdminPanelGUI.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/AdminPanelGUI.java @@ -11,11 +11,11 @@ import org.bukkit.entity.Player; public class AdminPanelGUI { private final Player player; private final GUI gui; - private final String structure = """ - # # # # # # # # # - # % % X X X % % # - B # # # # # # # # - """; + private final String[] structure = new String[]{ + "# # # # # # # # #", + "# % % X X X % % #", + "B # # # # # # # #" + }; public AdminPanelGUI(Player player) { this.gui = new GUIBuilder<>(GUIType.NORMAL) diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/AppearanceGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/AppearanceGUI.java index 518bf57..56e4f10 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/AppearanceGUI.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/AppearanceGUI.java @@ -15,13 +15,12 @@ import org.bukkit.entity.Player; public class AppearanceGUI { private final Player player; private final GUI gui; - private final String structure = """ - # # # # # # # # # - # % % % % % % % # - # % # N A S # % # - # % % % % % % % # - B # # # # # # # # - """; + private final String[] structure = new String[]{ + "# # # # # # # # #", + "# % % % % % % % #", + "# % # N A S # % #", + "# % % % % % % % #", + "B # # # # # # # #"}; public AppearanceGUI(Player player) { this.gui = new GUIBuilder<>(GUIType.NORMAL) diff --git a/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/SettingsGUI.java b/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/SettingsGUI.java index 49c0904..0a7e6fe 100644 --- a/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/SettingsGUI.java +++ b/nicko-core/src/main/java/net/artelnatif/nicko/gui/sub/SettingsGUI.java @@ -14,16 +14,15 @@ import org.bukkit.entity.Player; public class SettingsGUI { private final Player player; private final GUI gui; - private final String structure = """ - # # # # # # # # # - # % % L # T % % # - B # # # # # # # # - """; + private final String[] structure = new String[]{ + "# # # # # # # # #", + "# % % L # T % % #", + "B # # # # # # # #" + }; public SettingsGUI(Player player) { if (!NickoBukkit.getInstance().getNickoConfig().isBungeecordSupport()) { - final String[] rows = structure.split("\n"); - rows[1] = rows[1].replace("T", "#"); + structure[1] = structure[1].replace("T", "#"); } this.gui = new GUIBuilder<>(GUIType.NORMAL)