Merge remote-tracking branch 'origin/api-12' into api-13

Author: aromaa

src/main/java/org/spongepowered/api/data/Keys.java

@@ -289,6 +289,7 @@
 import org.spongepowered.api.world.weather.Weather;
 import org.spongepowered.api.world.weather.WeatherType;
 import org.spongepowered.api.world.weather.WeatherTypes;
+import org.spongepowered.math.matrix.Matrix4d;
 import org.spongepowered.math.vector.Vector2i;
 import org.spongepowered.math.vector.Vector3d;
 import org.spongepowered.math.vector.Vector3i;
@@ -576,6 +577,24 @@ public final class Keys {
      */
     public static final Key<Value<BossBar>> BOSS_BAR = Keys.key(ResourceKey.sponge("boss_bar"), BossBar.class);
 
+    /**
+     * The width of the interactable form of an {@link Entity}.
+     *
+     * <p>Together with {@link #BOUNDING_BOX_HEIGHT} this defines
+     * the size of the {@link Entity}'s bounding box.</p>
+     * Readonly(Entity.class) expect Interaction
+     */
+    public static final Key<Value<Double>> BOUNDING_BOX_BASE_SIZE = Keys.key(ResourceKey.sponge("bounding_box_base_size"), Double.class);
+
+    /**
+     * The height of the interactable form of an {@link Entity}.
+     *
+     * <p>Together with {@link #BOUNDING_BOX_BASE_SIZE} this defines
+     * the size of the {@link Entity}'s bounding box.</p>
+     * Readonly(Entity.class) expect Interaction
+     */
+    public static final Key<Value<Double>> BOUNDING_BOX_HEIGHT = Keys.key(ResourceKey.sponge("bounding_box_height"), Double.class);
+
     /**
      * The {@link BlockType}s able to be broken by an {@link ItemStack}.
      */
@@ -2323,6 +2342,11 @@ public final class Keys {
      */
     public static final Key<Value<ResourceKey>> MAP_WORLD = Keys.key(ResourceKey.sponge("map_world"), ResourceKey.class);
 
+    /**
+     * The {@link Matrix4d} of a {@link DisplayEntity}
+     */
+    public static final Key<Value<Matrix4d>> MATRIX = Keys.key(ResourceKey.sponge("matrix"), Matrix4d.class);
+
     /**
      * The matter state of a {@link BlockState}
      * Readonly

src/main/java/org/spongepowered/api/entity/Entity.java

@@ -659,4 +659,22 @@ default Optional<Value.Mutable<Double>> swiftness() {
 
     @Override
     HoverEvent<HoverEvent.ShowEntity> asHoverEvent(final UnaryOperator<HoverEvent.ShowEntity> op);
+
+    /**
+     * {@link Keys#BOUNDING_BOX_BASE_SIZE}
+     *
+     * @return The bounding box base size of the entity
+     */
+    default Value.Mutable<Double> boundingBoxBaseSize() {
+        return this.requireValue(Keys.BOUNDING_BOX_BASE_SIZE).asMutable();
+    }
+
+    /**
+     * {@link Keys#BOUNDING_BOX_HEIGHT}
+     *
+     * @return The bounding box height of the entity
+     */
+    default Value.Mutable<Double> boundingBoxHeight() {
+        return this.requireValue(Keys.BOUNDING_BOX_HEIGHT).asMutable();
+    }
 }

src/main/java/org/spongepowered/api/entity/display/DisplayEntity.java

@@ -28,6 +28,7 @@
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.util.Ticks;
 import org.spongepowered.api.util.Transform;
+import org.spongepowered.math.matrix.Matrix4d;
 
 import java.util.Optional;
 
@@ -125,6 +126,15 @@ default Double viewRange() {
         return this.require(Keys.VIEW_RANGE);
     }
 
+    /**
+     * Returns the matrix.
+     *
+     * @return the matrix.
+     */
+    default Matrix4d matrix() {
+        return this.require(Keys.MATRIX);
+    }
+
     // TODO bounding box (maybe BASE_SIZE if this is not smth. else in the entity)
     // TODO glow_color_override -1 = use team color