Merge branch 'development'

This update splits the vshop.conf into per world configurations, allowing
to skip loading shops in unloaded worlds. This should prevent shops from
breaking on multi-world servers.

Author: DosMike

src/main/java/de/dosmike/sponge/vshop/CommandRegistra.java

@@ -408,7 +408,7 @@ static void register() {
                 .arguments(
                         GenericArguments.none()
                 ).executor((src, args) -> {
-                    VillagerShops.getInstance().saveShops();
+                    VillagerShops.getInstance().saveConfigs();
                     src.sendMessage(Text.of(TextColors.GREEN, "[vShop] ",
                             lang.local("cmd.saved").resolve(src).orElse("[saved]")));
                     VillagerShops.audit("%s saved the shops", Utilities.toString(src));

src/main/java/de/dosmike/sponge/vshop/EventListeners.java

@@ -13,12 +13,16 @@
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.Order;
 import org.spongepowered.api.event.block.ChangeBlockEvent;
 import org.spongepowered.api.event.block.InteractBlockEvent;
 import org.spongepowered.api.event.entity.DamageEntityEvent;
 import org.spongepowered.api.event.entity.InteractEntityEvent;
 import org.spongepowered.api.event.network.ClientConnectionEvent;
 import org.spongepowered.api.event.world.ExplosionEvent;
+import org.spongepowered.api.event.world.LoadWorldEvent;
+import org.spongepowered.api.event.world.SaveWorldEvent;
+import org.spongepowered.api.event.world.UnloadWorldEvent;
 import org.spongepowered.api.world.Location;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.extent.Extent;
@@ -30,7 +34,7 @@
 
 public class EventListeners {
 
-    @Listener
+    @Listener(order= Order.EARLY) //as kind-of protection, run early
     public void onAttackEntity(DamageEntityEvent event) {
         if (event.isCancelled()) return;
         if (!(event.getTargetEntity() instanceof Living)) return;
@@ -132,6 +136,22 @@ public void onPlayerDisconnect(ClientConnectionEvent.Disconnect event) {
                 .forEach(m->m.clearPlayerState(event.getTargetEntity().getUniqueId()));
     }
 
+    @Listener
+    public void onWorldSave(SaveWorldEvent event) {
+        VillagerShops.instance.saveShops();
+    }
+    @Listener
+    public void onWorldUnload(UnloadWorldEvent event) {
+        if (!event.isCancelled()) {
+            VillagerShops.instance.saveShops();
+            VillagerShops.instance.unloadShops(event.getTargetWorld().getUniqueId());
+        }
+    }
+    @Listener
+    public void onWorldLoad(LoadWorldEvent event) {
+        VillagerShops.instance.loadShops(event.getTargetWorld().getUniqueId());
+    }
+
 
 //    @Listener //someone that knows how to do that please :D
 //    public void onAiTargetEntity(AITaskEvent event) {

src/main/java/de/dosmike/sponge/vshop/Utilities.java

@@ -1,8 +1,6 @@
 package de.dosmike.sponge.vshop;
 
-import ninja.leaping.configurate.ConfigurationNode;
 import org.jetbrains.annotations.Nullable;
-import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.data.DataQuery;
 import org.spongepowered.api.data.key.Keys;
@@ -11,16 +9,12 @@
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.service.economy.Currency;
-import org.spongepowered.api.text.Text;
 import org.spongepowered.api.world.Location;
 import org.spongepowered.api.world.World;
 
-import javax.swing.text.NumberFormatter;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
-import java.text.NumberFormat;
 import java.util.*;
 import java.util.stream.Collectors;