Merge branch 'release/v5.4.0'

Valandur · Feb 23, 2019 · 6ed56f9 · 6ed56f9
2 parents c45445e + b68bb04
commit 6ed56f9
Show file tree

Hide file tree

Showing 114 changed files with 206 additions and 766 deletions.
diff --git a/Web-API.iml b/Web-API.iml
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "com.qixalite.spongestart" version "1.6.2"
+    id "com.qixalite.spongestart2" version "4.0.0"
     id "ninja.miserable.blossom" version "1.0.1"
     id "com.github.johnrengelman.shadow" version "2.0.1"
 }
@@ -14,10 +14,7 @@ blossom {
 }
 
 spongestart {
-    eula true
     minecraft project.minecraftVersion
-    spongeForgeVersion "1.12.2-2705-7.1.0-BETA-3399"
-    spongeVanillaVersion "1.12.2-7.1.0-BETA-105"
     //spongeForgeVersion "1.12.2-2705-8.0.0-BETA-3398"
     //spongeVanillaVersion "1.12.2-8.0.0-BETA-444"
 }
@@ -76,25 +73,24 @@ dependencies {
     compile group: "org.mindrot", name: "jbcrypt", version: "0.4"
     compile group: "org.glassfish.jersey.containers", name: "jersey-container-servlet", version: "2.26"
     compile group: "org.glassfish.jersey.inject", name: "jersey-hk2", version: "2.26"
-    compile group: "org.bstats", name: "bstats-sponge", version: "1.2"
+    compile group: "org.bstats", name: "bstats-sponge", version: "1.4"
 
     compileOnly group: "org.spongepowered", name: "spongeapi", version: "${project.spongeVersion}.0-SNAPSHOT"
 
     compile group: 'redis.clients', name: 'jedis', version: '2.9.0'
     compile group: 'com.rabbitmq', name: 'amqp-client', version: '5.3.0'
 
     // Integrations
-    compileOnly name: "ActiveTime-s7.1-v1.4.0"
-    compileOnly name: "CmdScheduler-s7.1-v1.1.0"
-    compileOnly name: "GWMLibrary 1.3.2"
-    compileOnly name: "GWMCrates beta-3.1.2"
-    compileOnly name: "HuskyCrates-v1.8.0PRE2-API7"
-    compileOnly name: "MMCRestrict-1.5.1-API-7"
-    compileOnly name: "MMCTickets-1.4.1-API-7"
-    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: "ActiveTime-s7.1-v1.4.3"
+    compileOnly name: "CmdScheduler-s7.1-v1.1.1"
+    compileOnly name: "GWMLibrary 1.3.4"
+    compileOnly name: "GWMCrates 3.1.13"
+    compileOnly name: "MMCRestrict-1.6.2-API-7"
+    compileOnly name: "MMCTickets-2.0.4-API-7"
+    compileOnly name: "Nucleus-1.8.0-S7.1-api"
+    compileOnly name: "RedProtect-7.5.5-b130-Universal"
+    compileOnly name: "UniversalMarket-1.12.2-v1.3"
+    compileOnly name: "VillagerShops-1.9.1"
     compileOnly name: "WebBooks"
 }
 
@@ -135,7 +131,6 @@ shadowJar {
     relocate "net.jcip.annotations", "valandur.webapi.shadow.net.jcip.annotations"
 
     relocate "org.aopalliance", "valandur.webapi.shadow.org.aopalliance"
-    relocate "org.bstats", "valandur.webapi.shadow.org.bstats"
     relocate "org.codehaus", "valandur.webapi.shadow.org.codehaus"
     relocate "org.threeten", "valandur.webapi.shadow.org.threeten"
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.3.0
+version=5.4.0
 minecraftVersion=1.12.2
 spongeVersion=7.1
 jacksonVersion=2.9.4

diff --git a/lib/ActiveTime-s7.1-v1.4.0.jar b/lib/ActiveTime-s7.1-v1.4.0.jar
diff --git a/lib/ActiveTime-s7.1-v1.4.3.jar b/lib/ActiveTime-s7.1-v1.4.3.jar
diff --git a/lib/CmdScheduler-s7.1-v1.1.0.jar b/lib/CmdScheduler-s7.1-v1.1.0.jar
diff --git a/lib/CmdScheduler-s7.1-v1.1.1.jar b/lib/CmdScheduler-s7.1-v1.1.1.jar
diff --git a/lib/GWMCrates 3.1.13.jar b/lib/GWMCrates 3.1.13.jar
diff --git a/lib/GWMCrates beta-3.1.2.jar b/lib/GWMCrates beta-3.1.2.jar
diff --git a/lib/GWMLibrary 1.3.2.jar b/lib/GWMLibrary 1.3.2.jar
diff --git a/lib/GWMLibrary 1.3.4.jar b/lib/GWMLibrary 1.3.4.jar
diff --git a/lib/HuskyCrates-v1.8.0PRE2-API7.jar b/lib/HuskyCrates-v1.8.0PRE2-API7.jar
diff --git a/lib/MMCRestrict-1.5.1-API-7.jar b/lib/MMCRestrict-1.5.1-API-7.jar
diff --git a/lib/MMCRestrict-1.6.2-API-7.jar b/lib/MMCRestrict-1.6.2-API-7.jar
diff --git a/lib/MMCTickets-1.4.1-API-7.jar b/lib/MMCTickets-1.4.1-API-7.jar
diff --git a/lib/MMCTickets-2.0.4-API-7.jar b/lib/MMCTickets-2.0.4-API-7.jar
diff --git a/lib/Nucleus-1.3.3-S7.0-api.jar → lib/Nucleus-1.8.0-S7.1-api.jar b/lib/Nucleus-1.3.3-S7.0-api.jar → lib/Nucleus-1.8.0-S7.1-api.jar
diff --git a/lib/RedProtect-7.3.0-b68-Universal.jar b/lib/RedProtect-7.3.0-b68-Universal.jar
diff --git a/lib/RedProtect-7.5.5-b130-Universal.jar b/lib/RedProtect-7.5.5-b130-Universal.jar
diff --git a/lib/UniversalMarket-1.12.2-v1.1.jar b/lib/UniversalMarket-1.12.2-v1.1.jar
diff --git a/lib/UniversalMarket-1.12.2-v1.3.jar b/lib/UniversalMarket-1.12.2-v1.3.jar
diff --git a/lib/VillagerShops-1.9.1.jar b/lib/VillagerShops-1.9.1.jar
diff --git a/lib/VillagerShops.jar b/lib/VillagerShops.jar
diff --git a/lib/WebBooks.jar b/lib/WebBooks.jar
diff --git a/src/main/java/valandur/webapi/WebAPI.java b/src/main/java/valandur/webapi/WebAPI.java
@@ -8,7 +8,7 @@
 import io.sentry.context.Context;
 import io.swagger.converter.ModelConverters;
 import ninja.leaping.configurate.objectmapping.serialize.TypeSerializers;
-import org.bstats.sponge.Metrics;
+import org.bstats.sponge.Metrics2;
 import org.eclipse.jetty.util.log.Log;
 import org.slf4j.Logger;
 import org.spongepowered.api.Platform;
@@ -93,6 +93,10 @@
 )
 public class WebAPI {
 
+    static {
+        System.out.println("Static initialized");
+    }
+
     private static WebAPI instance;
     public static WebAPI getInstance() {
         return WebAPI.instance;
@@ -119,7 +123,7 @@ public static boolean isAdminPanelEnabled() {
     private static WebServer server;
 
     @Inject
-    private Metrics metrics;
+    private Metrics2 metrics;
 
     @Inject
     private Logger logger;
@@ -442,7 +446,7 @@ public void onServerStart(GameStartedServerEvent event) {
         checkForUpdates();
 
         // Add custom bstats metrics
-        metrics.addCustomChart(new Metrics.DrilldownPie("plugin_version", () -> {
+        metrics.addCustomChart(new Metrics2.DrilldownPie("plugin_version", () -> {
             String[] vers = Constants.VERSION.split("-");
 
             Map<String, Integer> entry = new HashMap<>();
@@ -453,9 +457,9 @@ public void onServerStart(GameStartedServerEvent event) {
 
             return map;
         }));
-        metrics.addCustomChart(new Metrics.SimplePie("report_errors", () -> reportErrors ? "Yes" : "No"));
-        metrics.addCustomChart(new Metrics.SimplePie("admin_panel", () -> adminPanelEnabled ? "Yes" : "No"));
-        metrics.addCustomChart(new Metrics.SimpleBarChart("servlets", () -> {
+        metrics.addCustomChart(new Metrics2.SimplePie("report_errors", () -> reportErrors ? "Yes" : "No"));
+        metrics.addCustomChart(new Metrics2.SimplePie("admin_panel", () -> adminPanelEnabled ? "Yes" : "No"));
+        metrics.addCustomChart(new Metrics2.SimpleBarChart("servlets", () -> {
             Map<String, Integer> map = new HashMap<>();
             Collection<Class<? extends BaseServlet>> servlets = servletService.getRegisteredServlets().values();
             for (Class<? extends BaseServlet> servlet : servlets) {

diff --git a/src/main/java/valandur/webapi/WebServer.java b/src/main/java/valandur/webapi/WebServer.java
@@ -122,9 +122,11 @@ public void start(Player player) {
                 String loc = config.customKeyStore;
                 String pw = config.customKeyStorePassword;
                 String mgrPw = config.customKeyStoreManagerPassword;
+
                 if (loc == null || loc.isEmpty()) {
                     loc = Sponge.getAssetManager().getAsset(WebAPI.getInstance(), "keystore.jks")
-                            .map(a -> a.getUrl().toString()).orElse("");
+                            .map(a -> a.getUrl().toString())
+                            .orElse("../../src/main/resources/assets/webapi/keystore.jks");
                     pw = "mX4z%&uJ2E6VN#5f";
                     mgrPw = "mX4z%&uJ2E6VN#5f";
                 }

diff --git a/src/main/java/valandur/webapi/integration/cmdscheduler/CommandTaskView.java b/src/main/java/valandur/webapi/integration/cmdscheduler/CommandTaskView.java
@@ -6,6 +6,8 @@
 import io.swagger.annotations.ApiModelProperty;
 import valandur.webapi.serialize.BaseView;
 
+import java.util.List;
+
 @ApiModel("CommandTask")
 public class CommandTaskView extends BaseView<CommandTask> {
 
@@ -14,9 +16,9 @@ public String getName() {
         return value.getName();
     }
 
-    @ApiModelProperty("The command that is executed")
-    public String getCommand() {
-        return value.getCommand();
+    @ApiModelProperty("The list of commands that are executed")
+    public List<String> getCommands() {
+        return value.getCommands();
     }
 
     @ApiModelProperty("The command that is executed")

diff --git a/src/main/java/valandur/webapi/integration/huskycrates/CachedCrateReward.java b/src/main/java/valandur/webapi/integration/huskycrates/CachedCrateReward.java
@@ -1,4 +1,4 @@
-package valandur.webapi.integration.huskycrates;
+/*package valandur.webapi.integration.huskycrates;
 
 import com.codehusky.huskycrates.crate.config.CrateReward;
 import com.fasterxml.jackson.annotation.JsonGetter;
@@ -89,3 +89,4 @@ public String getLink() {
         return null;
     }
 }
+*/
diff --git a/src/main/java/valandur/webapi/integration/huskycrates/CachedVirtualCrate.java b/src/main/java/valandur/webapi/integration/huskycrates/CachedVirtualCrate.java
@@ -1,4 +1,4 @@
-package valandur.webapi.integration.huskycrates;
+/*package valandur.webapi.integration.huskycrates;
 
 import com.codehusky.huskycrates.crate.VirtualCrate;
 import com.codehusky.huskycrates.crate.config.CrateReward;
@@ -96,3 +96,4 @@ public String getLink() {
         return Constants.BASE_PATH + "/husky-crates/crate/" + id;
     }
 }
+*/
diff --git a/src/main/java/valandur/webapi/integration/huskycrates/CommandCrateReward.java b/src/main/java/valandur/webapi/integration/huskycrates/CommandCrateReward.java
@@ -1,4 +1,4 @@
-package valandur.webapi.integration.huskycrates;
+/*package valandur.webapi.integration.huskycrates;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.annotations.ApiModel;
@@ -32,3 +32,4 @@ public void saveToNode(ConfigurationNode node) {
         node.getNode("command").setValue(command);
     }
 }
+*/
diff --git a/src/main/java/valandur/webapi/integration/huskycrates/CrateRewardObject.java b/src/main/java/valandur/webapi/integration/huskycrates/CrateRewardObject.java
@@ -1,4 +1,4 @@
-package valandur.webapi.integration.huskycrates;
+/*package valandur.webapi.integration.huskycrates;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
@@ -37,3 +37,4 @@ public void saveToNode(ConfigurationNode node) {
         node.getNode("type").setValue(getType().toString().toLowerCase());
     }
 }
+*/
diff --git a/src/main/java/valandur/webapi/integration/huskycrates/HuskyCratesServlet.java b/src/main/java/valandur/webapi/integration/huskycrates/HuskyCratesServlet.java
@@ -1,4 +1,4 @@
-package valandur.webapi.integration.huskycrates;
+/*package valandur.webapi.integration.huskycrates;
 
 import com.codehusky.huskycrates.HuskyCrates;
 import com.codehusky.huskycrates.crate.VirtualCrate;
@@ -224,3 +224,4 @@ private void saveCrate(ConfigurationLoader loader, CachedVirtualCrate crate) {
         }
     }
 }
+*/
diff --git a/src/main/java/valandur/webapi/integration/huskycrates/ItemCrateReward.java b/src/main/java/valandur/webapi/integration/huskycrates/ItemCrateReward.java
@@ -1,4 +1,4 @@
-package valandur.webapi.integration.huskycrates;
+/*package valandur.webapi.integration.huskycrates;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.swagger.annotations.ApiModel;
@@ -36,3 +36,4 @@ public void saveToNode(ConfigurationNode node) {
         node.getNode("overrideItem", "count").setValue(item.getQuantity());
     }
 }
+*/
diff --git a/src/main/java/valandur/webapi/integration/redprotect/CachedRegion.java b/src/main/java/valandur/webapi/integration/redprotect/CachedRegion.java
@@ -146,8 +146,8 @@ public CachedRegion(Region region) {
             optPlayer.ifPresent(player -> this.members.add(player));
         }
 
-        this.flags = new HashMap<>(region.flags.size());
-        for (Map.Entry<String, Object> entry : region.flags.entrySet()) {
+        this.flags = new HashMap<>(region.getFlags().size());
+        for (Map.Entry<String, Object> entry : region.getFlags().entrySet()) {
             this.flags.put(entry.getKey(), cacheService.asCachedObject(entry.getValue()));
         }
     }

diff --git a/src/main/java/valandur/webapi/integration/redprotect/RedProtectServlet.java b/src/main/java/valandur/webapi/integration/redprotect/RedProtectServlet.java
@@ -5,6 +5,8 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.spongepowered.api.Sponge;
+import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.cause.EventContext;
 import org.spongepowered.api.world.Location;
 import org.spongepowered.api.world.World;
 import valandur.webapi.WebAPI;
@@ -230,8 +232,10 @@ public CachedRegion modifyRegion(@PathParam("id") String id, CachedRegion req)
             }
 
             if (req.getFlags() != null) {
+                EventContext ctx = EventContext.builder().build();
+                Cause cause = Cause.builder().append(WebAPI.getInstance()).build(ctx);
                 for (Map.Entry<String, Object> entry : req.getFlags().entrySet()) {
-                    region.setFlag(entry.getKey(), entry.getValue());
+                    region.setFlag(cause, entry.getKey(), entry.getValue());
                 }
             }
 

diff --git a/src/main/java/valandur/webapi/message/InteractiveMessage.java b/src/main/java/valandur/webapi/message/InteractiveMessage.java
@@ -120,7 +120,7 @@ public InteractiveMessage() {
 
     @Override
     public String getLink() {
-        return Constants.BASE_PATH + "/message/" + uuid;
+        return Constants.BASE_PATH + "/interactive-message/" + uuid;
     }
 
     @Override

diff --git a/src/main/java/valandur/webapi/servlet/base/ServletService.java b/src/main/java/valandur/webapi/servlet/base/ServletService.java
@@ -7,7 +7,6 @@
 import valandur.webapi.integration.activetime.ActiveTimeServlet;
 import valandur.webapi.integration.cmdscheduler.CmdSchedulerServlet;
 import valandur.webapi.integration.gwmcrates.GWMCratesServlet;
-import valandur.webapi.integration.huskycrates.HuskyCratesServlet;
 import valandur.webapi.integration.mmcrestrict.MMCRestrictServlet;
 import valandur.webapi.integration.mmctickets.MMCTicketsServlet;
 import valandur.webapi.integration.nucleus.NucleusServlet;
@@ -91,13 +90,13 @@ public void init() {
             }
         }
 
-        if (config.integrations.HuskyCrates) {
+        /*if (config.integrations.HuskyCrates) {
             try {
                 Class.forName("com.codehusky.huskycrates.HuskyCrates");
                 logger.info("  Integrating with HuskyCrates...");
                 registerServlet(HuskyCratesServlet.class);
             } catch (ClassNotFoundException ignored) { }
-        }
+        }*/
 
         if (config.integrations.MMCRestrict) {
             try {