chore: merge api-14 for updates

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

Author: gabizou

src/main/java/org/spongepowered/api/command/registrar/tree/CommandTreeNodeTypes.java

@@ -37,7 +37,7 @@
  * The known {@link CommandTreeNodeType types} available on the vanilla client.
  */
 @SuppressWarnings("unused")
-@RegistryScopes(scopes = RegistryScope.GAME)
+@RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class CommandTreeNodeTypes {
 
     // @formatter:off
@@ -134,10 +134,10 @@ private CommandTreeNodeTypes() {
     }
 
     public static Registry<CommandTreeNodeType<?>> registry() {
-        return Sponge.game().registry(RegistryTypes.COMMAND_TREE_NODE_TYPE);
+        return Sponge.server().registry(RegistryTypes.COMMAND_TREE_NODE_TYPE);
     }
 
     private static <T extends CommandTreeNode<T>> DefaultedRegistryReference<CommandTreeNodeType<T>> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.COMMAND_TREE_NODE_TYPE, location).asDefaultedReference(Sponge::game);
+        return RegistryKey.of(RegistryTypes.COMMAND_TREE_NODE_TYPE, location).asDefaultedReference(Sponge::server);
     }
 }

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

@@ -558,7 +558,7 @@ public final class Keys {
     public static final Key<Value<Integer>> BLOCK_LIGHT = Keys.key(ResourceKey.sponge("block_light"), Integer.class);
 
     /**
-     * The {@link BlockState} of a {@link BlockOccupiedMinecart} or {@link FallingBlock}.
+     * The {@link BlockState} of a {@link BlockOccupiedMinecart}, {@link FallingBlock} or {@link Piston moving Piston}.
      */
     public static final Key<Value<BlockState>> BLOCK_STATE = Keys.key(ResourceKey.sponge("block_state"), BlockState.class);
 
@@ -1770,8 +1770,8 @@ public final class Keys {
     public static final Key<Value<Boolean>> IS_ELYTRA_FLYING = Keys.key(ResourceKey.sponge("is_elytra_flying"), Boolean.class);
 
     /**
-     * Whether a piston {@link BlockState} is currently extended.
-     * TODO {@link Piston}?
+     * Whether a piston {@link BlockState} is currently extended or
+     * {@link Piston moving Piston} is extending.
      */
     public static final Key<Value<Boolean>> IS_EXTENDED = Keys.key(ResourceKey.sponge("is_extended"), Boolean.class);
 

src/main/java/org/spongepowered/api/event/item/inventory/container/InteractContainerEvent.java

@@ -56,7 +56,27 @@ public interface InteractContainerEvent extends Event, Cancellable {
     interface Open extends InteractContainerEvent {}
 
     /**
-     * The target container was closed.
+     * Base event when a {@link Container} is closed.
      */
-    interface Close extends ChangeInventoryEvent, InteractContainerEvent {}
+    interface Close extends InteractContainerEvent {
+
+        /**
+         * Fired before the {@link Container} is closed.
+         *
+         * <p>Cancelling this event will prevent the {@link Container}
+         * from being closed.</p>
+         */
+        interface Pre extends Close {
+        }
+
+        /**
+         * Fired after the {@link Container} was closed.
+         *
+         * <p>Cancelling this event will rollback the content
+         * of the {@link Container} that was mutated during
+         * the close.</p>
+         */
+        interface Post extends Close, ChangeInventoryEvent {
+        }
+    }
 }

src/main/java/org/spongepowered/api/registry/RegistryTypes.java

@@ -208,7 +208,7 @@ public final class RegistryTypes {
 
     // @formatter:off
 
-    public static final DefaultedRegistryType<Advancement> ADVANCEMENT = RegistryTypes.spongeKeyInGame("advancement");
+    public static final DefaultedRegistryType<Advancement> ADVANCEMENT = RegistryTypes.spongeKeyInServer("advancement");
 
     public static final DefaultedRegistryType<ArtType> ART_TYPE = RegistryTypes.minecraftKeyInServer("painting_variant");
 
@@ -487,7 +487,7 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<RailDirection> RAIL_DIRECTION = RegistryTypes.spongeKeyInGame("rail_direction");
 
-    public static final DefaultedRegistryType<Recipe<?>> RECIPE = RegistryTypes.spongeKeyInGame("recipe");
+    public static final DefaultedRegistryType<Recipe<?>> RECIPE = RegistryTypes.spongeKeyInServer("recipe");
 
     public static final DefaultedRegistryType<ValueParameter<?>> REGISTRY_KEYED_VALUE_PARAMETER = RegistryTypes.spongeKeyInGame("value_parameter");
 

src/main/java/org/spongepowered/api/world/generation/config/flat/FlatGeneratorConfigs.java

@@ -37,7 +37,7 @@
  * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
  */
 @SuppressWarnings("unused")
-@RegistryScopes(scopes = RegistryScope.GAME)
+@RegistryScopes(scopes = RegistryScope.ENGINE)
 public final class FlatGeneratorConfigs {
 
     public static final DefaultedRegistryReference<FlatGeneratorConfig> BOTTOMLESS_PIT = FlatGeneratorConfigs.key(ResourceKey.minecraft("bottomless_pit"));
@@ -62,10 +62,10 @@ private FlatGeneratorConfigs() {
     }
 
     public static Registry<FlatGeneratorConfig> registry() {
-        return Sponge.game().registry(RegistryTypes.FLAT_GENERATOR_CONFIG);
+        return Sponge.server().registry(RegistryTypes.FLAT_GENERATOR_CONFIG);
     }
 
     private static DefaultedRegistryReference<FlatGeneratorConfig> key(final ResourceKey location) {
-        return RegistryKey.of(RegistryTypes.FLAT_GENERATOR_CONFIG, location).asDefaultedReference(Sponge::game);
+        return RegistryKey.of(RegistryTypes.FLAT_GENERATOR_CONFIG, location).asDefaultedReference(Sponge::server);
     }
 }

src/main/java/org/spongepowered/api/world/volume/entity/EntityVolume.java

@@ -397,6 +397,74 @@ default <E extends Entity> E createEntityNaturally(Supplier<EntityType<E>> type,
          */
         Collection<Entity> spawnEntities(Iterable<? extends Entity> entities);
 
+        /**
+         * Applies the provided {@link Predicate} to the
+         * {@link Entity entities} such that any time that
+         * {@link Predicate#test(Object)} returns {@code false} on the
+         * {@link Entity}, the storage performs implementation dependant
+         * removal of it.
+         *
+         * @param predicate The predicate to use for filtering
+         */
+        default void filterEntities(Predicate<? super Entity> predicate) {
+            this.entities().forEach(e -> {
+                if (!predicate.test(e)) {
+                    e.remove();
+                }
+            });
+        }
+
+        /**
+         * Performs implementation dependant removal of all
+         * the {@link Entity entities} that intersect the
+         * bounding box.
+         *
+         * @param box The intersection box
+         */
+        default void filterEntities(AABB box) {
+            this.filterEntities(box, e -> false);
+        }
+
+        /**
+         * Applies the provided {@link Predicate} to the {@link Entity entities}
+         * that intersect the bounding box such that any time that
+         * {@link Predicate#test(Object)} returns {@code false} on the
+         * {@link Entity}, the storage performs implementation dependant
+         * removal of it.
+         *
+         * @param box The intersection box
+         * @param predicate The predicate to use for filtering
+         */
+        default void filterEntities(AABB box, Predicate<? super Entity> predicate) {
+            this.entities(box, predicate.negate()).forEach(Entity::remove);
+        }
+
+        /**
+         * Performs implementation dependant removal of all
+         * the {@link Entity entities} that match the given type
+         * and intersect the bounding box.
+         *
+         * @param entityClass The entity type
+         * @param box The intersection box
+         */
+        default <T extends Entity> void filterEntities(Class<? extends T> entityClass, AABB box) {
+            this.filterEntities(entityClass, box, null);
+        }
+
+        /**
+         * Applies the provided {@link Predicate} to the {@link Entity entities}
+         * that match the given type and intersect the bounding box such that
+         * any time that {@link Predicate#test(Object)} returns {@code false}
+         * on the {@link Entity}, the storage performs implementation dependant
+         * removal of it.
+         *
+         * @param entityClass The entity type
+         * @param box The intersection box
+         * @param predicate The predicate to use for filtering
+         */
+        default <T extends Entity> void filterEntities(Class<? extends T> entityClass, AABB box, @Nullable Predicate<? super T> predicate) {
+            this.entities(entityClass, box, predicate != null ? predicate.negate() : null).forEach(Entity::remove);
+        }
     }
 
     interface Mutable extends Modifiable<Mutable> {