Merge branch 'release/v4.6.1'

Author: Valandur

gradle.properties

@@ -1,3 +1,3 @@
-version=4.6.0
+version=4.6.1
 minecraftVersion=1.11.2
 spongeVersion=6.1

src/main/java/valandur/webapi/json/request/player/UpdatePlayerRequest.java

@@ -41,4 +41,16 @@ public Integer getLevel() {
     public Integer getExperienceSinceLevel() {
         return experienceSinceLevel;
     }
+
+    @JsonDeserialize
+    private Double health;
+    public Double getHealth() {
+        return health;
+    }
+
+    @JsonDeserialize
+    private Double maxHealth;
+    public Double getMaxHealth() {
+        return maxHealth;
+    }
 }

src/main/java/valandur/webapi/servlet/EntityServlet.java

@@ -9,6 +9,7 @@
 import org.spongepowered.api.item.inventory.Inventory;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.util.Tuple;
+import org.spongepowered.api.world.Location;
 import org.spongepowered.api.world.World;
 import valandur.webapi.WebAPI;
 import valandur.webapi.api.annotation.WebAPIEndpoint;
@@ -67,10 +68,22 @@ public void updateEntity(ServletData data, CachedEntity entity) {
 
             Entity live = (Entity)optLive.get();
 
+            if (req.getWorld().isPresent()) {
+                Optional<?> optWorld = req.getWorld().get().getLive();
+                if (!optWorld.isPresent())
+                    return null;
+
+                if (req.getPosition() != null) {
+                    live.transferToWorld((World)optWorld.get(), req.getPosition());
+                } else {
+                    live.transferToWorld((World)optWorld.get());
+                }
+            } else if (req.getPosition() != null) {
+                live.setLocation(new Location<World>(live.getWorld(), req.getPosition()));
+            }
             if (req.getVelocity() != null) {
                 live.setVelocity(req.getVelocity());
             }
-
             if (req.getRotation() != null) {
                 live.setRotation(req.getRotation());
             }

src/main/java/valandur/webapi/servlet/PlayerServlet.java

@@ -3,12 +3,15 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import org.eclipse.jetty.http.HttpMethod;
 import org.spongepowered.api.data.manipulator.mutable.entity.ExperienceHolderData;
+import org.spongepowered.api.data.manipulator.mutable.entity.HealthData;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.event.cause.entity.damage.source.DamageSource;
 import org.spongepowered.api.item.inventory.Carrier;
 import org.spongepowered.api.item.inventory.Inventory;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.util.Tuple;
+import org.spongepowered.api.world.Location;
+import org.spongepowered.api.world.World;
 import valandur.webapi.WebAPI;
 import valandur.webapi.api.annotation.WebAPIEndpoint;
 import valandur.webapi.api.annotation.WebAPIServlet;
@@ -66,10 +69,22 @@ public void updatePlayer(ServletData data, CachedPlayer player) {
 
             Player live = (Player)optLive.get();
 
+            if (req.getWorld().isPresent()) {
+                Optional<?> optWorld = req.getWorld().get().getLive();
+                if (!optWorld.isPresent())
+                    return null;
+
+                if (req.getPosition() != null) {
+                    live.transferToWorld((World)optWorld.get(), req.getPosition());
+                } else {
+                    live.transferToWorld((World)optWorld.get());
+                }
+            } else if (req.getPosition() != null) {
+                live.setLocation(new Location<World>(live.getWorld(), req.getPosition()));
+            }
             if (req.getVelocity() != null) {
                 live.setVelocity(req.getVelocity());
             }
-
             if (req.getRotation() != null) {
                 live.setRotation(req.getRotation());
             }
@@ -98,6 +113,13 @@ public void updatePlayer(ServletData data, CachedPlayer player) {
                 live.get(ExperienceHolderData.class).map(exp -> exp.experienceSinceLevel().set(req.getExperienceSinceLevel()));
             }
 
+            if (req.getHealth() != null) {
+                live.get(HealthData.class).map(h -> h.health().set(req.getHealth()));
+            }
+            if (req.getMaxHealth() != null) {
+                live.get(HealthData.class).map(h -> h.maxHealth().set(req.getMaxHealth()));
+            }
+
             if (req.getDamage() != null) {
                 DamageRequest dmgReq = req.getDamage();
                 DamageSource.Builder builder = DamageSource.builder();

src/main/resources/assets/webapi/swagger/definitions/CommandRequest.yaml

@@ -11,10 +11,12 @@ properties:
     type: string
     description: The command and it's arguments that are sent to the server.
   waitLines:
-    type: integer
+    type: number
+    format: integer
     description: The minimum amount of lines of text to wait for before returning the response.
     default: 0
   waitTime:
-    type: integer
+    type: number
+    format: integer
     description: The amount of time in milliseconds to wait for response messages from the server.
     default: 0

src/main/resources/assets/webapi/swagger/definitions/Inventory.yaml

@@ -6,10 +6,12 @@ properties:
     type: string
     description: The name of the inventory.
   stackCount:
-    type: integer
+    type: number
+    format: integer
     description: The amount of different stacks in the inventory.
   itemCount:
-    type: integer
+    type: number
+    format: integer
     description: The total amount of items in the inventory.
   items:
     type: array

src/main/resources/assets/webapi/swagger/definitions/PlayerFull.yaml

@@ -18,7 +18,8 @@ allOf:
             type: string
             description: The address the player is connecting from
           latency:
-            type: integer
+            type: number
+            format: integer
             description: The delay between the player and server
       armour:
         type: object
@@ -53,13 +54,16 @@ allOf:
         type: object
         properties:
           level:
-            type: integer
+            type: number
+            format: integer
             description: The current level of the player
           experience:
-            type: integer
+            type: number
+            format: integer
             description: The amount of experience SINCE THE LAST LEVEL.
           totalExperience:
-            type: integer
+            type: number
+            format: integer
             description: The total amount of experience earned.
       gameMode:
         type: string

src/main/resources/assets/webapi/swagger/definitions/ServerInfo.yaml

@@ -5,13 +5,16 @@ properties:
     type: string
     description: The message of the day set on the server.
   players:
-    type: integer
+    type: number
+    format: integer
     description: The amount of players currently playing on the server
   maxPlayers:
-    type: integer
+    type: number
+    format: integer
     description: The maximum amount of players allowed on the server
   uptimeTicks:
-    type: integer
+    type: number
+    format: integer
     description: The number of ticks the server has been running
   tps:
     type: number

src/main/resources/assets/webapi/swagger/definitions/UpdatePlayerRequest.yaml

@@ -0,0 +1,56 @@
+title: UpdatePlayerRequest
+type: object
+properties:
+  world:
+    type: string
+    description: The UUID or name of the world that the player is moved to.
+  position:
+    $ref: "./Vector3.yaml"
+  velocity:
+    $ref: "./Vector3.yaml"
+  rotation:
+    $ref: "./Vector3.yaml"
+  scale:
+    $ref: "./Vector3.yaml"
+  foodLevel:
+    type: number
+    format: integer
+    description: The new food level of the player.
+  exhaustion:
+    type: number
+    format: double
+    description: The new exhaustion level of the player.
+  saturation:
+    type: number
+    format: double
+    description: The new saturation level of the player.
+  totalExperience:
+    type: number
+    format: integer
+    description: The total amount of experience the player has. This implicitly also sets the level.
+  level:
+    type: number
+    format: integer
+    description: The current level of the player. This is also defined by the total amount of experience the player has.
+  experienceSinceLevel:
+    type: number
+    format: integer
+    description: The amount of experience since the last level up that the player has collected.
+  health:
+    type: number
+    format: double
+    description: The current amount of health the player has.
+  maxHealth:
+    type: number
+    format: double
+    description: The total amount of health the player can have at maximum.
+  damage:
+    title: DamageRequest
+    type: object
+    properties:
+      amount:
+        type: number
+        description: The amount of damage to deal to the player.
+      type:
+        type: string
+        description: The type of damage being dealt. Check `/registry/org.spongepowered.api.event.cause.entity.damage`.

src/main/resources/assets/webapi/swagger/paths/block_one.yaml

@@ -12,17 +12,17 @@ get:
       required: true
     - name: x
       in: path
-      type: integer
+      type: string
       description: The x-coordinate of the block.
       required: true
     - name: y
       in: path
-      type: integer
+      type: string
       description: The y-coordinate of the block.
       required: true
     - name: z
       in: path
-      type: integer
+      type: string
       description: The z-coordinate of the block.
       required: true
   tags: