Merge branch 'api-8' into api-9

Author: dualspiral

src/main/java/org/spongepowered/api/ResourceKey.java

@@ -120,7 +120,7 @@ static Builder builder() {
      * @return A new resource key
      */
     static ResourceKey of(final String namespace, final String value) {
-        return Sponge.game().factoryProvider().provide(Factory.class).of(Objects.requireNonNull(namespace, "mamespace"), Objects.requireNonNull(value, "value"));
+        return Sponge.game().factoryProvider().provide(Factory.class).of(Objects.requireNonNull(namespace, "namespace"), Objects.requireNonNull(value, "value"));
     }
 
     /**

src/main/java/org/spongepowered/api/block/BlockState.java

@@ -157,6 +157,14 @@ default BlockState mirror(final Supplier<? extends Mirror> mirror) {
         return this.mirror(mirror.get());
     }
 
+    /**
+     * Gets a string representation of this block state, including the block type and the properties.
+     * Do not confuse with {@link #toString} which is implementation specific.
+     *
+     * @return A string representation of this block state.
+     */
+    String asString();
+
     /**
      * An {@link org.spongepowered.api.data.DataHolderBuilder.Immutable} for a {@link BlockState}. Just like the
      * {@link org.spongepowered.api.data.DataHolderBuilder.Immutable}, the {@link Value}s passed in to

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

@@ -764,6 +764,28 @@ public final class Keys {
      */
     public static final Key<Value<Ticks>> END_GATEWAY_AGE = Keys.key(ResourceKey.sponge("end_gateway_age"), Ticks.class);
 
+    /**
+     * The {@link EntityType entity type} of a spawn egg, which may be one of
+     * several based on {@link ItemTypes#ZOMBIE_SPAWN_EGG}, etc. It is not
+     * guaranteed that the type of entity is the same as the one that will be
+     * spawned when used. It is likely unable to change the type of entity on
+     * an {@link ItemStack}, but it is possible to change the
+     * {@link EntityArchetype archetype} by using {@link #ENTITY_TO_SPAWN}.
+     *
+     * @see #ENTITY_TO_SPAWN
+     */
+    @SuppressWarnings("unchecked")
+    public static final Key<Value<EntityType<?>>> ENTITY_TYPE = Keys.key(ResourceKey.sponge("entity_type"), (Class) EntityType.class);
+
+    /**
+     * The {@link EntityArchetype} to spawn from any spawn egg, such as a
+     * {@link ItemTypes#ZOMBIE_SPAWN_EGG} or {@link ItemTypes#CREEPER_SPAWN_EGG}.
+     * <p>The {@link #ENTITY_TYPE} is not guaranteed to be the same as the
+     * {@link EntityArchetype#type()} returned, but the spawned entity will be
+     * based on the {@link EntityArchetype} returned here.
+     */
+    public static final Key<Value<EntityArchetype>> ENTITY_TO_SPAWN = Keys.key(ResourceKey.sponge("entity_to_spawn"), EntityArchetype.class);
+
     /**
      * The {@link EquipmentType} that the target inventory supports. This usually applies to {@link EquipmentSlot}s.
      * or

src/main/java/org/spongepowered/api/item/inventory/Container.java

@@ -24,8 +24,8 @@
  */
 package org.spongepowered.api.item.inventory;
 
-import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.item.inventory.menu.InventoryMenu;
 
 import java.util.List;
 import java.util.Optional;
@@ -98,4 +98,11 @@ public interface Container extends Inventory {
      */
     ContainerType type();
 
+    /**
+     * Returns the {@link InventoryMenu} if this container has been opened by one.
+     *
+     * @return the current InventoryMenu if present
+     */
+    Optional<InventoryMenu> currentMenu();
+
 }

src/main/java/org/spongepowered/api/item/inventory/menu/InventoryMenu.java

@@ -78,6 +78,13 @@ static InventoryMenu of(ViewableInventory inventory) {
      */
     void setTitle(Component title);
 
+    /**
+     * Returns the title of this menu if set.
+     *
+     * @return the title of this menu if set.
+     */
+    Optional<Component> title();
+
     /**
      * Registers click callbacks. Unregisters previously registered handler of the same type.
      * <p>Return false in the handler to prevent changes.</p>