From b677ebace80fdedf39aea3fe0872c8989f6be20f Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Fri, 2 Sep 2022 03:31:42 +0200 Subject: [PATCH] Fixed Message Config and reloading --- .../playershops/commands/ShopCommand.java | 4 ++++ .../playershops/config/MessageConfig.java | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/alttd/playershops/commands/ShopCommand.java b/src/main/java/com/alttd/playershops/commands/ShopCommand.java index 2e6c1d2..cfb9a66 100644 --- a/src/main/java/com/alttd/playershops/commands/ShopCommand.java +++ b/src/main/java/com/alttd/playershops/commands/ShopCommand.java @@ -1,5 +1,8 @@ package com.alttd.playershops.commands; +import com.alttd.playershops.PlayerShops; +import com.alttd.playershops.config.Config; +import com.alttd.playershops.config.MessageConfig; import com.alttd.playershops.gui.HomeGui; import com.alttd.playershops.gui.ShopManagementGui; import com.alttd.playershops.shop.PlayerShop; @@ -24,6 +27,7 @@ public class ShopCommand implements CommandExecutor, TabCompleter { } switch (args[0].toLowerCase()) { case "reload": + PlayerShops.getInstance().reloadConfigs(); break; case "open": HomeGui gui = new HomeGui(player.getUniqueId()); diff --git a/src/main/java/com/alttd/playershops/config/MessageConfig.java b/src/main/java/com/alttd/playershops/config/MessageConfig.java index dd8fa7d..8ecd16b 100644 --- a/src/main/java/com/alttd/playershops/config/MessageConfig.java +++ b/src/main/java/com/alttd/playershops/config/MessageConfig.java @@ -17,7 +17,7 @@ public class MessageConfig extends AbstractConfiguration { version = config.getInt("config-version", 1); config.set("config-version", 1); - config.readConfig(Config.class, null); + config.readConfig(MessageConfig.class, null); } public static String SHOP_ALREADY_EXISTS = "This block is already a Shop"; @@ -25,15 +25,15 @@ public class MessageConfig extends AbstractConfiguration { public static String SHOP_LIMIT_REACHED = "You cannot create this shop as you already have reached the limit ()."; public static String BREAK_SHOP_WHILE_CONVERSING = "You can not break shop signs while editing them."; - void loadErrorMessages() { - SHOP_ALREADY_EXISTS = getString("errors.shop-already-exists", SHOP_ALREADY_EXISTS); - NO_SHOP_CREATE_PERMISSION = getString("errors.no-shop-create-permission", NO_SHOP_CREATE_PERMISSION); - SHOP_LIMIT_REACHED = getString("errors.shop-limit-reached", SHOP_LIMIT_REACHED); - BREAK_SHOP_WHILE_CONVERSING = getString("errors.break-shop-while-conversing", BREAK_SHOP_WHILE_CONVERSING); + private static void loadErrorMessages() { + SHOP_ALREADY_EXISTS = config.getString("errors.shop-already-exists", SHOP_ALREADY_EXISTS); + NO_SHOP_CREATE_PERMISSION = config.getString("errors.no-shop-create-permission", NO_SHOP_CREATE_PERMISSION); + SHOP_LIMIT_REACHED = config.getString("errors.shop-limit-reached", SHOP_LIMIT_REACHED); + BREAK_SHOP_WHILE_CONVERSING = config.getString("errors.break-shop-while-conversing", BREAK_SHOP_WHILE_CONVERSING); } - public static String SHOP_INFO = "This shop for ."; - void otherMessages() { - SHOP_INFO = getString("messages.shop-info", SHOP_INFO); + public static String SHOP_INFO = "This shop for ."; + private static void otherMessages() { + SHOP_INFO = config.getString("messages.shop-info", SHOP_INFO); } }