2.6.2 - Fix JsonShopConfiguration saves

.gitignore

@@ -29,4 +29,6 @@ dependency-reduced-pom.xml
 
 # Temporary and log files
 **/temp.**
-*.log
+*.log
+/.run/Run Test Server.run.xml
+/.vscode/settings.json

pom.xml

@@ -63,7 +63,7 @@
 
     <groupId>org.shanerx</groupId>
     <artifactId>tradeshop</artifactId>
-    <version>2.6.1-STABLE</version>
+    <version>2.6.2-DEV</version>
     <packaging>jar</packaging>
     <name>TradeShop</name>
     <url>https://tradeshop.github.io/</url>
@@ -179,12 +179,17 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.3.0</version>
                 <configuration>
-                    <outputDirectory>${outputDir}/PreShade</outputDirectory>
+                    <minimizeJar>true</minimizeJar>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <outputDirectory>${outputDir}/shade</outputDirectory>
+                    <outputFile>target/server/plugins/${build.finalName}.jar
+                    </outputFile>
                     <artifactSet>
                         <includes>
                             <include>org.bstats:*</include>
                             <include>de.themoep:*</include>
+                            <include>com.bergerkiller.bukkit:*</include>
+                            <include>com.github.simplix-softworks:*</include>
                         </includes>
                     </artifactSet>
                     <relocations>
@@ -246,6 +251,12 @@
     </build>
 
     <repositories>
+
+        <repository>
+            <id>MG-Dev Jenkins CI Maven Repository</id>
+            <url>https://ci.mg-dev.eu/plugin/repository/everything</url>
+        </repository>
+
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@@ -265,6 +276,11 @@
             <id>papermc</id>
             <url>https://repo.papermc.io/repository/maven-public/</url>
         </repository>
+
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -307,6 +323,27 @@
             <artifactId>paper-api</artifactId>
             <version>1.20.1-R0.1-20230627.215235-38</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.bergerkiller.bukkit</groupId>
+            <artifactId>BKCommonLib</artifactId>
+            <version>1.20.2-v1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.26</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.simplix-softworks</groupId>
+            <artifactId>SimplixStorage</artifactId>
+            <version>3.2.7</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

src/main/java/org/shanerx/tradeshop/TradeShop.java

@@ -41,6 +41,7 @@
 import org.shanerx.tradeshop.player.Permissions;
 import org.shanerx.tradeshop.shop.ShopSign;
 import org.shanerx.tradeshop.shop.ShopStorage;
+import org.shanerx.tradeshop.shop.listeners.ChunkUnloadListener;
 import org.shanerx.tradeshop.shop.listeners.PaperShopProtectionListener;
 import org.shanerx.tradeshop.shop.listeners.ShopCreateListener;
 import org.shanerx.tradeshop.shop.listeners.ShopProtectionListener;
@@ -90,18 +91,18 @@ public void onEnable() {
 
         registration();
 
-        getSettingManager().updateSkipHoppers();
+        getVarManager().getSettingManager().updateSkipHoppers();
 
-        getSigns();
-        getStorages();
-        getListManager();
+        getVarManager().getSigns();
+        getVarManager().getStorages();
+        getVarManager().getListManager();
 
         if (Setting.CHECK_UPDATES.getBoolean()) {
             new Thread(() -> getUpdater().checkCurrentVersion()).start();
         }
 
         if (Setting.ALLOW_METRICS.getBoolean()) {
-            getMetricsManager();
+            getVarManager().getMetricsManager();
             getLogger().info("Metrics successfully initialized!");
         } else {
             getLogger().warning("Metrics are disabled! Please consider enabling them to support the authors!");
@@ -112,6 +113,8 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
+        varManager.getDataStorage().ensureFinalSave();
+
         if (getListManager() != null)
             getListManager().clearManager();
     }
@@ -137,21 +140,27 @@ private boolean loadChecks() {
         getSettingManager().reload();
         getMessageManager().reload();
 
-        return getDataStorage() != null;
+        String lockout = "§a§3§c§2§f§6";
+        if (Setting.MESSAGE_PREFIX.getString().startsWith(lockout)) { //TODO remove for release if old data will not be lost
+            getLogger().log(Level.SEVERE, "This version will most likely break existing data. To continue, please add `" + lockout + "` before the message prefix in the config and restart the server.");
+            return false;
+        }
+
+        return getVarManager().getDataStorage() != null;
     }
 
     private void registration() {
 
         Permissions.registerPermissions();
 
-
         PluginManager pm = getServer().getPluginManager();
         pm.registerEvents(new JoinEventListener(this), this);
         pm.registerEvents(new ShopProtectionListener(this), this);
         pm.registerEvents(new ShopCreateListener(), this);
         pm.registerEvents(new ShopTradeListener(), this);
         pm.registerEvents(new ShopRestockListener(this), this);
         pm.registerEvents(new SuccessfulTradeEventListener(this), this);
+        pm.registerEvents(new ChunkUnloadListener(this), this);
 
         if (getServer().getVersion().toLowerCase().contains("paper")) {
             pm.registerEvents(new PaperShopProtectionListener(), this);

src/main/java/org/shanerx/tradeshop/commands/CommandTabCompleter.java

@@ -41,11 +41,11 @@
 import java.util.Collections;
 import java.util.List;
 
-public class CommandTabCompleter extends Utils {
+public class CommandTabCompleter {
 
     private final TradeShop plugin;
-    private CommandSender sender;
-    private String[] args;
+    private final CommandSender sender;
+    private final String[] args;
     private Player pSender;
 
 
@@ -97,7 +97,7 @@ public List<String> fillShopPlayer() {
         Sign s;
 
         if (plugin.getListManager().isInventory(b)) {
-            s = findShopSign(b);
+            s = new Utils().findShopSign(b);
         } else if (ShopType.isShop(b)) {
             s = (Sign) b.getState();
         } else {

src/main/java/org/shanerx/tradeshop/commands/SubCommand.java

@@ -26,12 +26,19 @@
 package org.shanerx.tradeshop.commands;
 
 import com.google.common.collect.Lists;
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.shanerx.tradeshop.TradeShop;
-import org.shanerx.tradeshop.commands.commandrunners.*;
-import org.shanerx.tradeshop.data.config.Message;
+import org.shanerx.tradeshop.commands.commandrunners.AdminSubCommand;
+import org.shanerx.tradeshop.commands.commandrunners.BasicTextSubCommand;
+import org.shanerx.tradeshop.commands.commandrunners.CreateSubCommand;
+import org.shanerx.tradeshop.commands.commandrunners.EditSubCommand;
+import org.shanerx.tradeshop.commands.commandrunners.GeneralPlayerSubCommand;
+import org.shanerx.tradeshop.commands.commandrunners.ShopFindSubCommand;
+import org.shanerx.tradeshop.commands.commandrunners.ShopItemSubCommand;
+import org.shanerx.tradeshop.commands.commandrunners.ShopSubCommand;
+import org.shanerx.tradeshop.commands.commandrunners.ShopUserSubCommand;
+import org.shanerx.tradeshop.commands.commandrunners.WhatSubCommand;
 import org.shanerx.tradeshop.framework.ShopChange;
 import org.shanerx.tradeshop.item.ShopItemSide;
 import org.shanerx.tradeshop.player.ShopRole;
@@ -40,7 +47,7 @@
 
 import java.util.ArrayList;
 
-public abstract class SubCommand extends Utils {
+public abstract class SubCommand {
 
     protected final TradeShop plugin;
 
@@ -190,7 +197,7 @@ public String getArgAt(int index) {
         }
     }
 
-    public static String getArgAt(String args[], int index) {
+    public static String getArgAt(String[] args, int index) {
         if (index < args.length) {
             return args[index];
         }

src/main/java/org/shanerx/tradeshop/commands/commandrunners/AdminSubCommand.java

@@ -26,7 +26,6 @@
 package org.shanerx.tradeshop.commands.commandrunners;
 
 import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.shanerx.tradeshop.TradeShop;
 import org.shanerx.tradeshop.commands.SubCommand;

src/main/java/org/shanerx/tradeshop/commands/commandrunners/BasicTextSubCommand.java

@@ -25,7 +25,6 @@
 
 package org.shanerx.tradeshop.commands.commandrunners;
 
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.shanerx.tradeshop.TradeShop;
 import org.shanerx.tradeshop.commands.CommandType;
@@ -34,6 +33,7 @@
 import org.shanerx.tradeshop.data.config.Setting;
 import org.shanerx.tradeshop.data.config.Variable;
 import org.shanerx.tradeshop.player.PermStatus;
+import org.shanerx.tradeshop.utils.Utils;
 import org.shanerx.tradeshop.utils.objects.Tuple;
 
 /**
@@ -59,10 +59,10 @@ public void help() {
         StringBuilder sb = new StringBuilder();
 
         sb.append("\n&2")
-                .append(getPluginName())
+            .append(new Utils().getPluginName())
                 .append(" ")
-                .append(getVersion())
-                .append(" by ").append(pdf.getAuthors().get(0)).append(" & ").append(pdf.getAuthors().get(1))
+            .append(new Utils().getVersion())
+            .append(" by ").append(new Utils().getAuthors().get(0)).append(" & ").append(new Utils().getAuthors().get(1))
                 .append("\n\n&b/tradeshop &f &f Display help message\n");
 
         for (CommandType c : CommandType.values()) {
@@ -72,7 +72,7 @@ public void help() {
         }
 
         sb.append("\n ");
-        sendMessage(colorize(sb.toString()));
+        sendMessage(new Utils().colorize(sb.toString()));
     }
 
     /**

src/main/java/org/shanerx/tradeshop/commands/commandrunners/CreateSubCommand.java

@@ -26,12 +26,12 @@
 package org.shanerx.tradeshop.commands.commandrunners;
 
 import org.bukkit.block.Sign;
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.shanerx.tradeshop.TradeShop;
 import org.shanerx.tradeshop.commands.SubCommand;
 import org.shanerx.tradeshop.player.ShopUser;
 import org.shanerx.tradeshop.shop.ShopType;
+import org.shanerx.tradeshop.utils.Utils;
 
 /**
  * Implementation of CommandRunner for plugin commands that create new shops
@@ -53,6 +53,6 @@ public void createShop(ShopType shopType) {
         if (sign == null)
             return;
 
-        createShop(sign, getPlayerSender(), shopType);
+        new Utils().createShop(sign, getPlayerSender(), shopType);
     }
 }

src/main/java/org/shanerx/tradeshop/commands/commandrunners/EditSubCommand.java

@@ -31,7 +31,6 @@
 import de.themoep.inventorygui.InventoryGui;
 import de.themoep.inventorygui.StaticGuiElement;
 import org.bukkit.Material;
-import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.ItemStack;
 import org.shanerx.tradeshop.TradeShop;
@@ -43,6 +42,7 @@
 import org.shanerx.tradeshop.player.ShopUser;
 import org.shanerx.tradeshop.shop.Shop;
 import org.shanerx.tradeshop.shop.ShopSettingKeys;
+import org.shanerx.tradeshop.utils.Utils;
 import org.shanerx.tradeshop.utils.objects.ObjectHolder;
 
 import java.util.HashMap;
@@ -83,7 +83,7 @@ public void edit() {
             return;
         }
 
-        mainMenu = new InventoryGui(plugin, "Edit Menu-" + shop.getShopLocationAsSL().serialize(), MENU_LAYOUT);
+        mainMenu = new InventoryGui(plugin, "Edit Menu-" + shop.getShopLocationAsSL().toString(), MENU_LAYOUT);
 
         mainMenu.setFiller(new ItemStack(Material.LIGHT_GRAY_STAINED_GLASS_PANE, 1));
 
@@ -164,7 +164,7 @@ private GuiElement editSettingsMenu(char slotChar) {
 
             settingEdit.show(getPlayerSender());
             return true;
-        }, colorize("&eEdit Shop Settings"));
+        }, new Utils().colorize("&eEdit Shop Settings"));
     }
 
     private GuiElement editUserMenu(char slotChar) {
@@ -241,7 +241,7 @@ private GuiElement editUserMenu(char slotChar) {
             userEdit.addElement(userGroup);
             userEdit.show(getPlayerSender());
             return true;
-        }, colorize("&eEdit Shop Users"));
+        }, new Utils().colorize("&eEdit Shop Users"));
     }
 
     private GuiElement editCostMenu(char slotChar) {
@@ -270,7 +270,7 @@ private GuiElement editCostMenu(char slotChar) {
                     if (costItemsRemoval.get(i))
                         costItems.remove(i);
                 }
-                shop.updateSide(ShopItemSide.COST, costItems);
+                shop.updateSide(ShopItemSide.COST, costItems, false);
                 shop.saveShop();
                 InventoryGui.goBack(getPlayerSender());
                 return true;
@@ -285,7 +285,7 @@ private GuiElement editCostMenu(char slotChar) {
             costEdit.addElement(costGroup);
             costEdit.show(getPlayerSender());
             return true;
-        }, colorize("&eEdit Shop Costs"));
+        }, new Utils().colorize("&eEdit Shop Costs"));
     }
 
     private GuiElement editProductMenu(char slotChar) {
@@ -314,7 +314,7 @@ private GuiElement editProductMenu(char slotChar) {
                     if (productItemsRemoval.get(i))
                         productItems.remove(i);
                 }
-                shop.updateSide(ShopItemSide.PRODUCT, productItems);
+                shop.updateSide(ShopItemSide.PRODUCT, productItems, false);
                 shop.saveShop();
                 InventoryGui.goBack(getPlayerSender());
                 return true;
@@ -329,6 +329,6 @@ private GuiElement editProductMenu(char slotChar) {
             productEdit.addElement(productGroup);
             productEdit.show(getPlayerSender());
             return true;
-        }, colorize("&eEdit Shop Products"));
+        }, new Utils().colorize("&eEdit Shop Products"));
     }
 }