Merge branch 'release/v5.2.2'

Author: Valandur

build.gradle

@@ -16,8 +16,10 @@ blossom {
 spongestart {
     eula true
     minecraft project.minecraftVersion
-    spongeForgeVersion "1.12.2-2705-7.1.0-BETA-3243"
-    spongeVanillaVersion "1.12.2-7.1.0-BETA-75"
+    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"
 }
 
 configurations.all {
@@ -87,7 +89,7 @@ dependencies {
     compileOnly name: "GWMLibrary 1.3.2"
     compileOnly name: "GWMCrates beta-3.1.2"
     compileOnly name: "HuskyCrates-v1.8.0PRE2-API7"
-    compileOnly name: "MMCRestrict-1.4.2-API-7"
+    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"

gradle.properties

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

lib/MMCRestrict-1.4.2-API-7.jar lib/MMCRestrict-1.5.1-API-7.jarlib/MMCRestrict-1.4.2-API-7.jar renamed to lib/MMCRestrict-1.5.1-API-7.jar

@@ -46,12 +46,12 @@ private static Map<String, CommandWebHook> defaultCommandHooks() {
 
     @Setting(comment = "The following are event hooks which are all called when the specified event happens. They get passed various data\n" +
             "in the body (if method != GET, described below for each event). The format of the hooks is described in the \"all\"\n" +
-            "event hook. This format can be used anywhere marked with \"HOOKS\".\n" +
+            "event hook. This format can be used for any of the hook lists.\n" +
             "Please note that the hooks don't get called in any particular order, and might even be called concurrently.")
     public HookEvents events = new HookEvents();
 
     @Setting(comment = "These hooks can be used to bind to custom events. You have to use the fully qualified class name as the key, and then\n" +
-            "a hook list just like for the event hooks above. These hooks work just like the event hooks, although the data\n" +
+            "a hook list just like for the event hooks. These hooks work just like the event hooks, although the data\n" +
             "depends on the event you subscribe to.")
     public Map<String, List<WebHook>> custom = new HashMap<>();
 
@@ -63,7 +63,7 @@ private static Map<String, CommandWebHook> defaultCommandHooks() {
 
     @ConfigSerializable
     public static class HookEvents {
-        @Setting(comment = "This event is fired for all other events. The \"X-WebAPI-Event\" header specifies the exact event.")
+        @Setting(comment = "This event is fired for all events. The \"X-WebAPI-Event\" header specifies the exact event.")
         public List<WebHook> all = Lists.newArrayList(new WebHook(
                 "http://localhost/test",
                 false,
@@ -78,7 +78,7 @@ public static class HookEvents {
         @Setting(comment = "This event is fired when a player earns an achievement / advancement")
         public List<WebHook> achievement = new ArrayList<>();
 
-        @Setting(comment = "This event is fired when a block operations changes status")
+        @Setting(comment = "This event is fired when a block operation changes status")
         public List<WebHook> block_operation_status = new ArrayList<>();
 
         @Setting(comment = "This event is fired when a chat message is sent on the server")

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

@@ -25,7 +25,7 @@ public List<String> getAliases() {
 
     @Setting(comment = "Here you have to specify what parameters are used.\n" +
             "These parameters must be included when running the command. So the example command below would have to be\n" +
-            "run using the following syntax: /webapi notfy test {player} {world}\n" +
+            "run using the following syntax: /webapi notify test {player} {world}\n" +
             "\n" +
             "The body automatically contains all the parameters that are listed here. The parameters are expected to\n" +
             "show up in this order when calling the command. There is a special parameter 'source' which is always\n" +

src/main/java/valandur/webapi/hook/CommandWebHook.java

@@ -21,6 +21,7 @@
 import org.spongepowered.api.event.filter.cause.First;
 import org.spongepowered.api.event.game.state.GameStartedServerEvent;
 import org.spongepowered.api.event.game.state.GameStoppedServerEvent;
+import org.spongepowered.api.event.game.state.GameStoppingEvent;
 import org.spongepowered.api.event.item.inventory.InteractInventoryEvent;
 import org.spongepowered.api.event.message.MessageChannelEvent;
 import org.spongepowered.api.event.network.ClientConnectionEvent;
@@ -321,7 +322,7 @@ public void onServerStart(GameStartedServerEvent event) {
         notifyHooks(WebHookService.WebHookType.SERVER_START, event);
     }
     @Listener(order = Order.PRE)
-    public void onServerStop(GameStoppedServerEvent event) {
+    public void onServerStop(GameStoppingEvent event) {
         notifyHooks(WebHookService.WebHookType.SERVER_STOP, event);
     }
 

src/main/java/valandur/webapi/hook/WebHookService.java

@@ -59,6 +59,12 @@ public Boolean getDropBanned() {
         return dropBanned;
     }
 
+    private Boolean craftBanned;
+    @ApiModelProperty(value = "True if crafting this item is banned, false otherwise", required = true)
+    public Boolean getCraftBanned() {
+        return craftBanned;
+    }
+
     private Boolean worldBanned;
     @ApiModelProperty(value = "True if this item is banned from the world, false otherwise?", required = true)
     public Boolean getWorldBanned() {
@@ -79,6 +85,7 @@ public CachedItemData(ItemData value) {
         this.breakingBanned = value.getBreakingbanned();
         this.placingBanned = value.getPlacingbanned();
         this.dropBanned = value.getDropbanned();
+        this.craftBanned = value.getCraftbanned();
         this.worldBanned = value.getWorldbanned();
     }
 
@@ -93,6 +100,7 @@ public Optional<ItemData> getLive() {
                 placingBanned != null ? placingBanned : false,
                 ownershipBanned != null ? ownershipBanned : true,
                 dropBanned != null ? dropBanned : false,
+                craftBanned != null ? craftBanned : false,
                 worldBanned != null ? worldBanned : false));
     }
 

src/main/java/valandur/webapi/integration/mmcrestrict/CachedItemData.java

@@ -35,7 +35,7 @@ public UUID getUUID() {
      * The id of the message. Useful to identify it in the response.
      * @return The id of the message.
      */
-    @ApiModelProperty(value = "The id of the message. Used for sender of the message to identify responses.", required = true)
+    @ApiModelProperty(value = "The id of the message. Used to identify responses.", required = true)
     public String getId() {
         return id;
     }
@@ -81,8 +81,8 @@ public Text getMessage() {
      */
     @ApiModelProperty("True if this message can only be replied to once per target, false otherwise")
     @JsonDetails
-    public Boolean isOnce() {
-        return once;
+    public boolean isOnce() {
+        return once != null && once;
     }
 
     private List<InteractiveMessageOption> options;

src/main/java/valandur/webapi/message/InteractiveMessage.java

@@ -42,7 +42,7 @@ public void sendMessage(InteractiveMessage msg) {
             builder.append(msg.getMessage());
         }
 
-        if (msg.isOnce() != null && msg.isOnce()) {
+        if (msg.isOnce()) {
             replied.put(msg.getUUID(), new ConcurrentSkipListSet<>());
         }
 
@@ -57,7 +57,7 @@ public void sendMessage(InteractiveMessage msg) {
                         Collection<String> replies = replied.get(msg.getUUID());
                         if (replies.contains(source.getIdentifier())) {
                             source.sendMessage(Text
-                                    .builder("You have already replied to this messsage")
+                                    .builder("You have already replied to this message")
                                     .color(TextColors.RED)
                                     .build()
                             );
@@ -66,7 +66,8 @@ public void sendMessage(InteractiveMessage msg) {
                         replies.add(source.getIdentifier());
                     }
 
-                    InteractiveMessageResponse response = new InteractiveMessageResponse(msg.getId(), data, source.getIdentifier());
+                    InteractiveMessageResponse response = new InteractiveMessageResponse(
+                            msg.getId(), data, source.getIdentifier());
                     WebAPI.getWebHookService().notifyHooks(WebHookService.WebHookType.INTERACTIVE_MESSAGE, response);
                 })).build();
 

src/main/java/valandur/webapi/message/InteractiveMessageService.java

@@ -25,11 +25,13 @@ public BlockStateDeserializer() {
     @Override
     public BlockState deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
         JsonNode root = p.readValueAsTree();
-        if (root.path("type").path("id").isMissingNode()) {
-            return null;
+        if (root.path("type").isMissingNode()) {
+            throw new IOException("Missing block type");
         }
 
-        String typeStr = root.path("type").path("id").asText();
+        String typeStr = root.path("type").isTextual()
+                ? root.path("type").asText()
+                : root.path("type").path("id").asText();
         Optional<BlockType> optType = Sponge.getRegistry().getType(BlockType.class, typeStr);
         if (!optType.isPresent()) {
             throw new IOException("Invalid block type " + typeStr);