Merge branch 'release/v3.3.1'

Author: Valandur

gradle.properties

@@ -1,4 +1,4 @@
 group=valandur.webapi
-version=3.3.0
+version=3.3.1
 minecraftVersion=1.11.2
 spongeVersion=7.0

src/main/java/valandur/webapi/WebAPI.java

@@ -27,6 +27,7 @@
 import org.spongepowered.api.event.Listener;
 import org.spongepowered.api.event.Order;
 import org.spongepowered.api.event.achievement.GrantAchievementEvent;
+import org.spongepowered.api.event.block.InteractBlockEvent;
 import org.spongepowered.api.event.command.SendCommandEvent;
 import org.spongepowered.api.event.entity.DestructEntityEvent;
 import org.spongepowered.api.event.entity.SpawnEntityEvent;
@@ -426,6 +427,10 @@ public void onPlayerChat(MessageChannelEvent.Chat event, @First Player player) {
         WebHooks.notifyHooks(WebHooks.WebHookType.CHAT, msg);
     }
 
+    @Listener(order = Order.POST)
+    public void onBlockInteract(InteractBlockEvent event) {
+        WebHooks.notifyHooks(WebHooks.WebHookType.INTERACT_BLOCK, event);
+    }
     @Listener(order = Order.POST)
     public void onInteractInventory(InteractInventoryEvent.Open event) {
         WebHooks.notifyHooks(WebHooks.WebHookType.INVENTORY_OPEN, event);

src/main/java/valandur/webapi/cache/entity/CachedEntity.java

@@ -66,7 +66,7 @@ public CachedEntity(Entity entity) {
             try {
                 Inventory inv = ((Carrier) entity).getInventory();
                 this.inventory = Inventory.builder().from(inv).build(inv.getPlugin());
-            } catch (AbstractMethodError ignored) {
+            } catch (Exception | AbstractMethodError ignored) {
             }
         }
     }

src/main/java/valandur/webapi/hooks/WebHooks.java

@@ -23,8 +23,8 @@ public class WebHooks {
 
     public enum WebHookType {
         ALL, CUSTOM_COMMAND, CUSTOM_EVENT, ACHIEVEMENT, BLOCK_UPDATE_STATUS, CHAT, COMMAND, GENERATE_CHUNK, EXPLOSION,
-        INVENTORY_OPEN, INVENTORY_CLOSE, PLAYER_JOIN, PLAYER_LEAVE, PLAYER_DEATH, PLAYER_KICK, PLAYER_BAN, SERVER_START, SERVER_STOP,
-        WORLD_SAVE, WORLD_LOAD, WORLD_UNLOAD
+        INTERACT_BLOCK, INVENTORY_OPEN, INVENTORY_CLOSE, PLAYER_JOIN, PLAYER_LEAVE, PLAYER_DEATH, PLAYER_KICK,
+        PLAYER_BAN, SERVER_START, SERVER_STOP, WORLD_SAVE, WORLD_LOAD, WORLD_UNLOAD
     }
 
     private static Map<String, CommandWebHook> commandHooks = new HashMap<>();

src/main/java/valandur/webapi/json/JsonConverter.java

@@ -298,7 +298,7 @@ public static void loadExtraSerializers() {
                 }
 
                 // Write back to file
-                Files.write(file.toPath(), fileContent.getBytes(), StandardOpenOption.CREATE);
+                Files.write(file.toPath(), fileContent.getBytes(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
 
                 // Compile the file
                 Iterable<? extends JavaFileObject> compilationUnits = fm.getJavaFileObjectsFromFiles(Collections.singletonList(file));

src/main/java/valandur/webapi/json/serializers/event/EventSerializer.java

@@ -5,6 +5,7 @@
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.event.Event;
 import org.spongepowered.api.event.achievement.GrantAchievementEvent;
+import org.spongepowered.api.event.block.TargetBlockEvent;
 import org.spongepowered.api.event.entity.TargetEntityEvent;
 import org.spongepowered.api.event.entity.living.humanoid.player.KickPlayerEvent;
 import org.spongepowered.api.event.item.inventory.InteractInventoryEvent;
@@ -65,6 +66,10 @@ public void serialize(Event value, JsonGenerator gen, SerializerProvider provide
             writeField(provider, "world", ((TargetWorldEvent)value).getTargetWorld());
         }
 
+        if (value instanceof TargetBlockEvent) {
+            writeField(provider, "block", ((TargetBlockEvent)value).getTargetBlock());
+        }
+
         try {
             writeField(provider, "cause", value.getCause());
         } catch (AbstractMethodError ignored) {}

src/main/resources/assets/webapi/defaults/hooks.conf

@@ -1,5 +1,5 @@
 # Config file version, used to update correctly
-version = 3
+version = 4
 
 # Web hooks are used to send certain events on minecraft to other endpoints.
 # This can be used for example to log chat or react to certain commands.
@@ -10,7 +10,6 @@ version = 3
 # Please note that the hooks don't get called in any particular order, and might even be called concurrently.
 events {
     # This event is fired for all other events. The "X-WebAPI-Event" header specifies the exact event.
-    # Data: See below, depends on hook
     all=[{
         # This is the address of the endpoint. It may contain parameters that are replaced when being called.
         # Parameters have to be placed in curly braces, { and }, and will be a simple string (uuid of object
@@ -42,76 +41,100 @@ events {
     }]
 
     # This event is fired when a player earns an achievement
-    # Data: { target: <player>, achievement: <achievement> }
     achievement=[
         # HOOKS
     ]
 
+    # This event is fired when a block update changes status
+    # NOTE: These are not actual minecraft blocks updating, these are the WebAPI block updates
+    block_update_status=[
+        # HOOKS
+    ]
+
     # This event is fired when a chat message is sent on the server
-    # Data: <message>
     chat=[
         # HOOKS
     ]
 
     # This event is fired when a command is executed
-    # Data: <command>
     command=[
         # HOOKS
     ]
 
+    # This event is fired when a chunk is generated
+    generate_chunk=[
+        # HOOKS
+    ]
+
+    # This event is fired when an explosion occurs
+    explosion=[
+        # HOOKS
+    ]
+
+    # This event is fired when a player interacts with a block
+    interact_block=[
+        # HOOKS
+    ]
+
     # This event is fired when an inventory is opened
-    # Data: { inventory: <inventory>, cause: { source: <player> } }
     inventory_open=[
         # HOOKS
     ]
 
     # This event is fired when an inventory is closed
-    # Data: { inventory: <inventory>, cause: { source: <player } }
     inventory_close=[
         # HOOKS
     ]
 
     # This event is fired when a player joins the server
-    # Data: { target: <player> }
     player_join=[
         # HOOKS
     ]
 
     # This event is fired when a player leaves the server
-    # Data: { target: <player> }
     player_leave=[
         # HOOKS
     ]
 
     # This event is fired when a player dies
-    # Data: { killer: <player|entity>, target: <player> }
     player_death=[
         # HOOKS
     ]
 
     # This event is fired when a player gets kicked
-    # Data: { target: <player>, message: <string> }
     player_kick=[
         # HOOKS
     ]
 
     # This event is fired when a player gets banned
-    # Data: { target: <player>, ban: { createdOn: <epoch seconds>, expires: <epoch seconds>, source: <string> } }
     player_ban=[
         # HOOKS
     ]
 
     # This event is fired when the server starts
-    # Data: { }
     server_start=[
         # HOOKS
     ]
 
     # This event is fired when the server stops
-    # Data: { }
     server_stop=[
         # HOOKS
     ]
+
+    # This event is fired when the world is saved
+    world_save=[
+        # HOOKS
+    ]
+
+    # This event is fired when a world is loaded
+    world_load=[
+        # HOOKS
+    ]
+
+    # This event is fired when a world is unloaded
+    world_unload=[
+        # HOOKS
+    ]
 }
 
 # These hooks can be used to bind to custom events. You have to use the fully qualified class name as the key, and then