From 9f148d3ed182a5a74423612623e734d310b4b9c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vebj=C3=B8rn?= <vebjorn.elvekrok@gmail.com>
Date: Fri, 27 Jan 2023 20:53:14 +0100
Subject: [PATCH] Refactor to make ready for release

---
 pom.xml                                       |  2 +-
 .../net/bestemor/villagermarket/VMPlugin.java | 33 +++++++++++--------
 .../listener/PlayerListener.java              |  5 +--
 src/main/resources/config.yml                 |  4 +--
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index eb6d6e7..f5ad2d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>com.github.Bestem0r</groupId>
             <artifactId>BestemorCore</artifactId>
-            <version>58279fde88</version>
+            <version>b2ac48137e</version>
             <scope>compile</scope>
         </dependency>
 
diff --git a/src/main/java/net/bestemor/villagermarket/VMPlugin.java b/src/main/java/net/bestemor/villagermarket/VMPlugin.java
index 8df03c8..a3a61fd 100644
--- a/src/main/java/net/bestemor/villagermarket/VMPlugin.java
+++ b/src/main/java/net/bestemor/villagermarket/VMPlugin.java
@@ -51,7 +51,7 @@ protected void onPluginEnable() {
         this.playerListener = new PlayerListener(this);
         registerEvents();
 
-        Bukkit.getLogger().warning("[VillagerMarket] §cYou are running a §aBETA 1.11.5-#8 of VillagerMarket! Please expect and report all bugs in my discord server");
+        //Bukkit.getLogger().warning("[VillagerMarket] §cYou are running a §aBETA 1.11.5-#8 of VillagerMarket! Please expect and report all bugs in my discord server");
 
         Bukkit.getScheduler().runTaskLater(this, () -> {
             if (Bukkit.getPluginManager().getPlugin("VillagerBank") != null) {
@@ -63,17 +63,7 @@ protected void onPluginEnable() {
         if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null){
             new PlaceholderManager(this).register();
         }
-
-        File materials = new File(getDataFolder(), "materials.yml");
-        if (materials.exists()) {
-            FileConfiguration config = YamlConfiguration.loadConfiguration(materials);
-            ConfigurationSection section = config.getConfigurationSection("materials");
-            if (section != null) {
-                for (String key : section.getKeys(false)) {
-                    localizedMaterials.put(key, section.getString(key));
-                }
-            }
-        }
+        loadMappings();
 
         VillagerMarketAPI.init(this);
     }
@@ -95,6 +85,20 @@ protected void onPluginDisable() {
         if (getConfig().getBoolean("auto_log")) saveLog();
     }
 
+    private void loadMappings() {
+        localizedMaterials.clear();
+        File materials = new File(getDataFolder(), "materials.yml");
+        if (materials.exists()) {
+            FileConfiguration config = YamlConfiguration.loadConfiguration(materials);
+            ConfigurationSection section = config.getConfigurationSection("materials");
+            if (section != null) {
+                for (String key : section.getKeys(false)) {
+                    localizedMaterials.put(key, section.getString(key));
+                }
+            }
+        }
+    }
+
     private void setupCommands() {
         CommandModule module = new CommandModule.Builder(this)
                 .addSubCommand("create", new CreateCommand(this))
@@ -118,6 +122,7 @@ private void setupCommands() {
 
     public void reloadConfiguration() {
         reloadConfig();
+        loadMappings();
     }
 
     /** Setup Vault integration */
@@ -137,11 +142,11 @@ private void registerEvents() {
         pluginManager.registerEvents(playerListener, this);
         pluginManager.registerEvents(chatListener, this);
     }
-/*
+
     @Override
     protected int getSpigotResourceID() {
         return 82965;
-    }*/
+    }
 
     /** Saves log to /log/ folder and clears log */
     public void saveLog() {
diff --git a/src/main/java/net/bestemor/villagermarket/listener/PlayerListener.java b/src/main/java/net/bestemor/villagermarket/listener/PlayerListener.java
index a757307..b82567e 100644
--- a/src/main/java/net/bestemor/villagermarket/listener/PlayerListener.java
+++ b/src/main/java/net/bestemor/villagermarket/listener/PlayerListener.java
@@ -14,6 +14,7 @@
 import de.tr7zw.nbtapi.NBTItem;
 import net.bestemor.core.config.ConfigManager;
 import net.bestemor.core.config.VersionUtils;
+import net.bestemor.core.utils.UpdateChecker;
 import net.bestemor.villagermarket.VMPlugin;
 import net.bestemor.villagermarket.event.PlaceShopEggEvent;
 import net.bestemor.villagermarket.menu.Shopfront;
@@ -256,7 +257,7 @@ public void onItemClick(PlayerInteractEvent event) {
     public void onJoin(PlayerJoinEvent event) {
 
         Player player = event.getPlayer();
-        /*if (player.hasPermission("villagermarket.admin") && !ConfigManager.getBoolean("disable_update_announce")) {
+        if (player.hasPermission("villagermarket.admin") && !ConfigManager.getBoolean("disable_update_announce")) {
             new UpdateChecker(plugin, 82965).getVersion(version -> {
                 String currentVersion = plugin.getDescription().getVersion();
                 if (!currentVersion.equalsIgnoreCase(version)) {
@@ -267,7 +268,7 @@ public void onJoin(PlayerJoinEvent event) {
                     player.sendMessage(ConfigManager.getString("plugin_prefix") + " " + downloadVersion);
                 }
             });
-        }*/
+        }
         if (plugin.getShopManager().getExpiredStorages().containsKey(player.getUniqueId())) {
             player.sendMessage(ConfigManager.getMessage("messages.expired"));
         }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index a1f364f..effec41 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -100,9 +100,9 @@ auto_discount:
     min: 10
     max: 20
   #Duration of discount
-  duration: 1m
+  duration: 1h
   #How often new discounts should be added
-  interval: 2m
+  interval: 12h
   #Amount of items which should have discounts
   item_amount: 3
   #Amount of random shops which should have discounts applied