Merge pull request #71 from myth-MC/dev/1.2

1.2.1

Author: U8092

VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>banco-api</artifactId>

api/src/main/java/ovh/mythmc/banco/api/configuration/BancoSettings.java

@@ -34,7 +34,7 @@ public class BancoSettings {
     @Comment({"", "Configuration for commands"})
     private CommandsConfig commands = new CommandsConfig();
 
-    @Comment({"", "Configuration for menus/GUIs"})
-    private MenusConfig menus = new MenusConfig();
+    @Comment({"", "Configuration for dialogs (or chest-based GUIs in Bukkit)"})
+    private DialogsConfig dialogs = new DialogsConfig();
 
 }

…/configuration/sections/MenusConfig.java …onfiguration/sections/DialogsConfig.javaapi/src/main/java/ovh/mythmc/banco/api/configuration/sections/MenusConfig.java renamed to api/src/main/java/ovh/mythmc/banco/api/configuration/sections/DialogsConfig.java api/src/main/java/ovh/mythmc/banco/api/configuration/sections/MenusConfig.java renamed to api/src/main/java/ovh/mythmc/banco/api/configuration/sections/DialogsConfig.java

@@ -5,7 +5,7 @@
 
 @Configuration
 @Getter
-public class MenusConfig {
+public class DialogsConfig {
 
     private InfoMenu info = new InfoMenu("ʙᴀɴᴄᴏ", "Displays detailed information about the plugin and server environment.", "<yellow><bold>%s</bold></yellow>", "<gray>%s</gray>");
 

platform-bukkit/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>banco-platform-bukkit</artifactId>

platform-bukkit/src/main/java/ovh/mythmc/banco/bukkit/menu/impl/BalanceTopMenu.java

@@ -20,7 +20,7 @@ public final class BalanceTopMenu extends BasicMenu {
 
     @Override
     protected Inventory createInventory() {
-        return Bukkit.createInventory(null, 9, Banco.get().getSettings().get().getMenus().getBalanceTop().title());
+        return Bukkit.createInventory(null, 9, Banco.get().getSettings().get().getDialogs().getBalanceTop().title());
     }
 
     @Override
@@ -39,7 +39,7 @@ public void decorate() {
                 final OfflinePlayer player = optPlayerReference.get().toOfflinePlayer();
                 String balance = MessageUtil.format(entry.getValue()) + Banco.get().getSettings().get().getCurrency().getSymbol();
 
-                String itemName = String.format(Banco.get().getSettings().get().getMenus().getBalanceTop().format(),
+                String itemName = String.format(Banco.get().getSettings().get().getDialogs().getBalanceTop().format(),
                         slot+1,
                         player.getName(),
                         balance

platform-bukkit/src/main/java/ovh/mythmc/banco/bukkit/menu/impl/InfoMenu.java

@@ -27,7 +27,7 @@ public final class InfoMenu extends BasicMenu {
 
     @Override
     protected Inventory createInventory() {
-        return Bukkit.createInventory(null, 9, Banco.get().getSettings().get().getMenus().getInfo().title());
+        return Bukkit.createInventory(null, 9, Banco.get().getSettings().get().getDialogs().getInfo().title());
     }
 
     @Override
@@ -59,8 +59,8 @@ private MenuButton getInfoButton(Material material, String key, String value) {
     }
 
     private MenuButton getButton(ItemStack itemStack, String key, String value) {
-        String name = String.format(Banco.get().getSettings().get().getMenus().getInfo().keyFormat(), key);
-        String lore = String.format(Banco.get().getSettings().get().getMenus().getInfo().valueFormat(), value);
+        String name = String.format(Banco.get().getSettings().get().getDialogs().getInfo().keyFormat(), key);
+        String lore = String.format(Banco.get().getSettings().get().getDialogs().getInfo().valueFormat(), value);
 
         ItemMeta itemMeta = itemStack.getItemMeta();
         itemMeta.setDisplayName(name);

platform-common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>banco-common</artifactId>

platform-paper/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1</version>
     </parent>
 
     <artifactId>banco-platform-paper</artifactId>

platform-paper/src/main/java/ovh/mythmc/banco/paper/dialog/BalanceTopDialog.java

@@ -25,7 +25,7 @@ public final class BalanceTopDialog {
     public void open(@NotNull Player player) {
         Banco.get().getAccountManager().getTopAsync(1024000).thenAccept(map -> {
             final List<DialogBody> dialogBodyList = new ArrayList<>();
-            dialogBodyList.add(DialogBody.plainMessage(Component.text(Banco.get().getSettings().get().getMenus().getBalanceTop().description())));
+            dialogBodyList.add(DialogBody.plainMessage(Component.text(Banco.get().getSettings().get().getDialogs().getBalanceTop().description())));
 
             int index = 0;
 
@@ -38,7 +38,7 @@ public void open(@NotNull Player player) {
                     continue;
 
                 final String balance = MessageUtil.format(entry.getValue()) + Banco.get().getSettings().get().getCurrency().getSymbol();
-                final String formattedText = String.format(Banco.get().getSettings().get().getMenus().getBalanceTop().format(),
+                final String formattedText = String.format(Banco.get().getSettings().get().getDialogs().getBalanceTop().format(),
                         index+1,
                         optPlayerReference.get().toOfflinePlayer().getName(),
                         balance
@@ -52,7 +52,7 @@ public void open(@NotNull Player player) {
             }
 
             final Dialog dialog = Dialog.create(builder -> builder.empty()
-                .base(DialogBase.builder(MiniMessage.miniMessage().deserialize(Banco.get().getSettings().get().getMenus().getBalanceTop().title()))
+                .base(DialogBase.builder(MiniMessage.miniMessage().deserialize(Banco.get().getSettings().get().getDialogs().getBalanceTop().title()))
                     .body(dialogBodyList)
                     .build())
                 .type(DialogType.notice())