Open container from type & some fixes

src/main/java/org/spongepowered/api/entity/living/player/server/ServerPlayer.java

@@ -46,6 +46,7 @@
 import org.spongepowered.api.entity.living.player.tab.TabList;
 import org.spongepowered.api.event.Cause;
 import org.spongepowered.api.item.inventory.Container;
+import org.spongepowered.api.item.inventory.ContainerType;
 import org.spongepowered.api.item.inventory.Inventory;
 import org.spongepowered.api.network.ServerSideConnection;
 import org.spongepowered.api.scoreboard.Scoreboard;
@@ -58,6 +59,7 @@
 import java.time.Instant;
 import java.util.Collection;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 public interface ServerPlayer extends Player, Subject {
 
@@ -116,6 +118,31 @@ default boolean isViewingInventory() {
      */
     Optional<Container> openInventory(Inventory inventory, Component displayName);
 
+    /**
+     * Constructs Container from a given type and opens it for player to view.
+     *
+     * @param type The container type to construct and view
+     * @return The opened Container if it was constructed and opened, otherwise {@link Optional#empty()}
+     */
+    Optional<Container> openInventory(ContainerType type);
+
+    default Optional<Container> openInventory(Supplier<ContainerType> type) {
+        return this.openInventory(type.get());
+    }
+
+    /**
+     * Constructs Container from a given type and opens it for player to view with a custom displayName.
+     *
+     * @param type The container type to construct and view
+     * @param displayName The display name to set
+     * @return The opened Container if it was constructed and opened, otherwise {@link Optional#empty()}
+     */
+    Optional<Container> openInventory(ContainerType type, Component displayName);
+
+    default Optional<Container> openInventory(Supplier<ContainerType> type, Component displayName) {
+        return this.openInventory(type.get(), displayName);
+    }
+
     /**
      * Closes the currently viewed entity of this player, if it is currently
      * viewing one.

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

@@ -61,6 +61,8 @@ public final class ContainerTypes {
      */
     public static final DefaultedRegistryReference<ContainerType> GENERIC_3X3 = ContainerTypes.key(ResourceKey.minecraft("generic_3x3"));
 
+    public static final DefaultedRegistryReference<ContainerType> CRAFTER_3X3 = ContainerTypes.key(ResourceKey.minecraft("crafter_3x3"));
+
     public static final DefaultedRegistryReference<ContainerType> GENERIC_9X1 = ContainerTypes.key(ResourceKey.minecraft("generic_9x1"));
 
     public static final DefaultedRegistryReference<ContainerType> GENERIC_9X2 = ContainerTypes.key(ResourceKey.minecraft("generic_9x2"));

src/main/java/org/spongepowered/api/item/recipe/crafting/Ingredient.java

@@ -30,7 +30,6 @@
 import org.spongepowered.api.item.ItemType;
 import org.spongepowered.api.item.inventory.ItemStack;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
-import org.spongepowered.api.registry.DefaultedRegistryReference;
 
 import java.util.List;
 import java.util.function.Predicate;
@@ -119,7 +118,7 @@ static Ingredient of(ItemStackSnapshot @Nullable ... items) {
      * @return The new ingredient
      */
     @SafeVarargs
-    static Ingredient of(DefaultedRegistryReference<? extends ItemType> @Nullable ... itemTypes) {
+    static Ingredient of(Supplier<? extends ItemType> @Nullable ... itemTypes) {
         if (itemTypes == null || itemTypes.length == 0) {
             return Ingredient.empty();
         }