Merge branch 'release/v5.3.0'

Author: Valandur

README.md

@@ -70,3 +70,4 @@ supported routes. You can also find the same documentation [here](https://valand
 - [kawahara](https://github.com/kawahara)
 - [Lantcoder](https://github.com/Lantcoder)
 - [crymates](https://github.com/crymates)
+- [DosMike](https://github.com/DosMike)

Web-API.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="Web-API" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="valandur.webapi" external.system.module.version="5.2.2-S7.1" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

build.gradle

@@ -94,6 +94,7 @@ dependencies {
     compileOnly name: "Nucleus-1.3.3-S7.0-api"
     compileOnly name: "RedProtect-7.3.0-b68-Universal"
     compileOnly name: "UniversalMarket-1.12.2-v1.1"
+    compileOnly name: "VillagerShops"
     compileOnly name: "WebBooks"
 }
 

gradle.properties

@@ -1,4 +1,4 @@
-version=5.2.2
+version=5.3.0
 minecraftVersion=1.12.2
 spongeVersion=7.1
 jacksonVersion=2.9.4

lib/VillagerShops.jar

@@ -94,6 +94,9 @@ public static class ServletsIntegrationConfig {
         @Setting
         public boolean UniversalMarket = true;
 
+        @Setting
+        public boolean VillagerShops = true;
+
         @Setting
         public boolean WebBooks = true;
     }

src/main/java/valandur/webapi/config/ServletsConfig.java

@@ -0,0 +1,108 @@
+package valandur.webapi.integration.villagershops;
+
+import com.flowpowered.math.vector.Vector3d;
+import de.dosmike.sponge.vshop.*;
+import org.spongepowered.api.entity.Entity;
+import org.spongepowered.api.entity.EntityType;
+import org.spongepowered.api.text.serializer.TextSerializers;
+import org.spongepowered.api.world.Location;
+import valandur.webapi.integration.villagershops.wrapper.CachedStockItem;
+import valandur.webapi.integration.villagershops.wrapper.CachedVShop;
+
+import javax.ws.rs.BadRequestException;
+import javax.ws.rs.NotFoundException;
+import java.util.Optional;
+
+class VShopCompareUtils {
+
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    static void applyDiv(CachedVShop update, NPCguard shop) {
+        Entity rep = shop.getLe();
+        boolean respawnShop = false; //if the entity changed a new entity / mob has to be spawned
+        if (update.getEntityType() != null && !update.getEntityType().getId().equalsIgnoreCase(shop.getNpcType().toString())) {
+            EntityType et = update.getEntityType().getLive(EntityType.class).orElse(null);
+            if (et == null)
+                throw new BadRequestException("EntityType " + update.getEntityType() + " is unknown");
+            respawnShop = true;
+            shop.setNpcType(et);
+        }
+        if (update.getEntityVariant() != null && !update.getEntityVariant().equalsIgnoreCase(shop.getVariantName())) {
+            respawnShop = true;
+            shop.setVariant(update.getEntityVariant());
+        }
+        if (update.getLocation() != null) {
+            Optional<Location> ol = update.getLocation().getLive();
+            if (!ol.isPresent())
+                throw new BadRequestException("Could not get Live version of Location");
+            shop.move(ol.get());
+        }
+        if (update.getName() != null && !update.getName().equals(TextSerializers.FORMATTING_CODE.serialize(shop.getDisplayName()))) {
+            shop.setDisplayName(TextSerializers.FORMATTING_CODE.deserialize(update.getName()));
+        }
+        if (update.getOwner() != null && !update.getOwner().equals(shop.getShopOwner().orElse(null))) {
+//			if (update.isPlayerShop() == null)
+//				throw new BadRequestException("Missing flag playershop");
+//			if (!update.isPlayerShop()) {
+//				throw new BadRequestException("Can't set owner of non player-shops");
+//			} else {
+            shop.setPlayerShop(update.getOwner());
+//			}
+//		} else if (!update.isPlayerShop()) {
+        } else if (update.getOwner() == null && shop.getShopOwner().isPresent()) {
+            shop.setPlayerShop(null);
+//		} else {
+//			throw new BadRequestException("Missing owner UUID for player-shop");
+        }
+        if (update.getRotation() != null && update.getRotation() != shop.getRot().getY()) {
+            shop.setRot(new Vector3d(0.0, update.getRotation(), 0.0));
+        }
+        if (update.getStockContainer() == null && shop.getStockContainer().isPresent()) {
+            API.playershop(shop, null, null);
+        } else if (update.getStockContainer() != null) {
+            Optional<Location> ol = update.getLocation().getLive();
+            if (!ol.isPresent())
+                throw new BadRequestException("Could not get Live version of Stock Location");
+            if (!ol.get().equals(shop.getStockContainer().orElse(null))) {
+                API.playershop(shop, shop.getShopOwner().get(), ol.get());
+            }
+        }
+
+        if (update.getStockItems() != null) {
+            VillagerShops.closeShopInventories(shop.getIdentifier());
+            Optional<NPCguard> npc = VillagerShops.getNPCfromShopUUID(shop.getIdentifier());
+            if (!npc.isPresent()) {
+                throw new NotFoundException("Shop with id " + shop.getIdentifier() + " not found");
+            }
+            InvPrep inv = npc.get().getPreparator();
+            int s = inv.size();
+            int newS = update.getStockItems().size();
+            for (int i = 0; i < Math.max(s, newS); i++) {
+                if (i >= s) {
+                    CachedStockItem item = update.getStockItems().get(i);
+                    inv.addItem(new StockItem(
+                            item.getItem().createStack(),
+                            item.getSellPrice(),
+                            item.getBuyPrice(),
+                            VillagerShops.getInstance().CurrencyByName(item.getCurrency().getId()),
+                            item.getMaxStock()));
+                } else if (i >= newS) {
+                    inv.removeIndex(i);
+                } else {
+                    CachedStockItem item = update.getStockItems().get(i);
+                    inv.setItem(i, new StockItem(
+                            item.getItem().createStack(),
+                            item.getSellPrice(),
+                            item.getBuyPrice(),
+                            VillagerShops.getInstance().CurrencyByName(item.getCurrency().getId()),
+                            item.getMaxStock()));
+                }
+            }
+        }
+
+        if (respawnShop && rep != null && !rep.isRemoved()) {
+            rep.remove();
+            //tick will respawn the new entity
+        }
+    }
+
+}