Merge commit '49c3b8f9f1483e3d7b8e513b17dcaf17623b87bb' into api-9

Author: Zidane

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

@@ -28,14 +28,15 @@
 import org.spongepowered.api.entity.living.player.client.ClientPlayer;
 import org.spongepowered.api.entity.living.player.client.LocalPlayer;
 import org.spongepowered.api.network.ClientSideConnection;
+import org.spongepowered.api.util.locale.LocaleSource;
 import org.spongepowered.api.world.client.ClientWorld;
 
 import java.util.Optional;
 
 /**
  * Represents a typical Minecraft Client.
  */
-public interface Client extends Engine {
+public interface Client extends Engine, LocaleSource {
 
     /**
      * Gets the {@link ClientPlayer player} responsible

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

@@ -39,6 +39,6 @@
  * should be directed to a system visible location, such as a log or a
  * console.</p>
  */
-public interface SystemSubject extends Subject, Audience {
+public interface SystemSubject extends Subject, Audience, LocaleSource {
 
 }

src/main/java/org/spongepowered/api/event/EventContextKeys.java

@@ -49,6 +49,7 @@
 import org.spongepowered.api.world.Location;
 import org.spongepowered.api.world.World;
 import org.spongepowered.api.world.explosion.Explosion;
+import org.spongepowered.api.world.portal.Portal;
 import org.spongepowered.api.world.server.ServerLocation;
 import org.spongepowered.api.world.server.ServerWorld;
 import org.spongepowered.math.vector.Vector3d;
@@ -232,6 +233,11 @@ public final class EventContextKeys {
      */
     public static final EventContextKey<PluginContainer> PLUGIN = EventContextKeys.key(ResourceKey.sponge("plugin"), PluginContainer.class);
 
+    /**
+     * Represents a {@link Portal}.
+     */
+    public static final EventContextKey<Portal> PORTAL = EventContextKeys.key(ResourceKey.sponge("portal"), Portal.class);
+
     /**
      * Represents a {@link ProjectileSource}.
      */

src/main/java/org/spongepowered/api/world/portal/TwoDimensionalPortal.java

@@ -0,0 +1,52 @@
+/*
+ * This file is part of SpongeAPI, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.api.world.portal;
+
+import org.spongepowered.api.util.annotation.DoNotStore;
+import org.spongepowered.api.world.server.ServerLocation;
+
+/**
+ * Represents a {@link Portal} with a known shape.
+ */
+@DoNotStore
+public interface TwoDimensionalPortal extends Portal {
+
+    /**
+     * One corner of the portal.
+     *
+     * @return A location with the corner
+     */
+    default ServerLocation minCorner() {
+        return this.origin();
+    }
+
+    /**
+     * One corner of the portal.
+     *
+     * @return A location with the corner
+     */
+    ServerLocation maxCorner();
+
+}

src/main/java/org/spongepowered/api/world/server/ServerLocation.java

@@ -31,6 +31,7 @@
 import org.spongepowered.api.block.BlockTypes;
 import org.spongepowered.api.data.DataHolder;
 import org.spongepowered.api.data.DirectionRelativeDataHolder;
+import org.spongepowered.api.data.persistence.DataSerializable;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.entity.Entity;
 import org.spongepowered.api.entity.EntityType;
@@ -64,7 +65,7 @@
  * <p>Locations are immutable. Methods that change the properties of the
  * location create a new instance.</p>
  */
-public interface ServerLocation extends DataHolder.Mutable, DirectionRelativeDataHolder.Mutable, Location<ServerWorld, ServerLocation> {
+public interface ServerLocation extends DataHolder.Mutable, DirectionRelativeDataHolder.Mutable, Location<ServerWorld, ServerLocation>, DataSerializable {
 
     static ServerLocation of(final ServerWorld world, final double x, final double y, final double z) {
         return Sponge.game().factoryProvider().provide(Factory.class).create(world, new Vector3d(x, y, z));