Merge remote branch 'upstream/master'

By: durron597 <martin.jared@gmail.com>

paper-api/src/main/java/org/bukkit/ArrowEntity.java

@@ -0,0 +1,9 @@
+package org.bukkit;
+
+/**
+ * Represents an arrow.
+ * 
+ * @author sk89q
+ */
+public interface ArrowEntity extends Entity {
+}

paper-api/src/main/java/org/bukkit/Location.java

@@ -179,6 +179,10 @@ public class Location implements Cloneable {
     public String toString() {
         return "Location{" + "world=" + world + "x=" + x + "y=" + y + "z=" + z + "pitch=" + pitch + "yaw=" + yaw + '}';
     }
+    
+    public Vector toVector() {
+        return new Vector(x, y, z);
+    }
 
     @Override
     protected Location clone() {

paper-api/src/main/java/org/bukkit/Vector.java

@@ -0,0 +1,352 @@
+package org.bukkit;
+
+/**
+ * Represents a mutable vector.
+ * 
+ * @author sk89q
+ */
+public class Vector implements Cloneable {
+    private static final long serialVersionUID = -2657651106777219169L;
+    
+    protected double x;
+    protected double y;
+    protected double z;
+    
+    public Vector(int x, int y, int z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+    
+    public Vector(double x, double y, double z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+    
+    public Vector(float x, float y, float z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    /**
+     * Adds the vector by another.
+     * 
+     * @param vec
+     * @return the same vector
+     */
+    public Vector add(Vector vec) {
+        x += vec.x;
+        y += vec.y;
+        z += vec.z;
+        return this;
+    }
+
+    /**
+     * Subtracts the vector by another.
+     * 
+     * @param vec
+     * @return the same vector
+     */
+    public Vector subtract(Vector vec) {
+        x -= vec.x;
+        y -= vec.y;
+        z -= vec.z;
+        return this;
+    }
+
+    /**
+     * Multiplies the vector by another.
+     * 
+     * @param vec
+     * @return the same vector
+     */
+    public Vector multiply(Vector vec) {
+        x *= vec.x;
+        y *= vec.y;
+        z *= vec.z;
+        return this;
+    }
+    
+    /**
+     * Divides the vector by another.
+     * 
+     * @param vec
+     * @return the same vector
+     */
+    public Vector divide(Vector vec) {
+        x /= vec.x;
+        y /= vec.y;
+        z /= vec.z;
+        return this;
+    }
+    
+    /**
+     * Gets the magnitude of the vector, defined as sqrt(x^2+y^2+z^2). The value
+     * of this method is not cached and uses a costly square-root function, so
+     * do not repeatedly call this method to get the vector's magnitude.
+     * 
+     * @return the magnitude
+     */
+    public double length() {
+        return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2));
+    }
+    
+    /**
+     * Get the distance between this vector and another.  The value
+     * of this method is not cached and uses a costly square-root function, so
+     * do not repeatedly call this method to get the vector's magnitude.
+     * 
+     * @return the distance
+     */
+    public double distance(Vector o) {
+        return Math.sqrt(Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2)
+                + Math.pow(z - o.z, 2));
+    }
+    
+    /**
+     * Performs scalar multiplication, multiplying all components with a scalar.
+     * 
+     * @param m
+     * @return the same vector
+     */
+    public Vector multiply(int m) {
+        x *= m;
+        y *= m;
+        z *= m;
+        return this;
+    }
+    
+    /**
+     * Performs scalar multiplication, multiplying all components with a scalar.
+     * 
+     * @param m
+     * @return the same vector
+     */
+    public Vector multiply(double m) {
+        x *= m;
+        y *= m;
+        z *= m;
+        return this;
+    }
+    
+    /**
+     * Performs scalar multiplication, multiplying all components with a scalar.
+     * 
+     * @param m
+     * @return the same vector
+     */
+    public Vector multiply(float m) {
+        x *= m;
+        y *= m;
+        z *= m;
+        return this;
+    }
+    
+    /**
+     * Calculates the dot product of this vector with another. The dot product
+     * is defined as x1*x2+y1*y2+z1*z2. The returned value is a scalar.
+     * 
+     * @param other
+     * @return dot product
+     */
+    public double getDotProduct(Vector other) {
+        return x * other.x + y * other.y + z * other.z;
+    }
+    
+    /**
+     * Calculates the cross product of this vector with another. The cross
+     * product is defined as:
+     * 
+     * x = y1 * z2 - y2 * z1<br/>
+     * y = z1 * x2 - z2 * x1<br/>
+     * z = x1 * y2 - x2 * y1
+     * 
+     * @param o
+     * @return the same vector
+     */
+    public Vector crossProduct(Vector o) {
+        double newX = y * o.z - o.y * z;
+        double newY = z * o.x - o.z * x;
+        double newZ = x * o.y - o.x * y;
+        x = newX;
+        y = newY;
+        z = newZ;
+        return this;
+    }
+    
+    /**
+     * Converts this vector to a unit vector (a vector with length of 1).
+     * 
+     * @return the same vector
+     */
+    public Vector unitVector() {
+        double length = length();
+        
+        x /= length;
+        y /= length;
+        z /= length;
+        
+        return this;
+    }
+    
+    /**
+     * Gets a unit vector of this vector. This vector will not be chagned.
+     * 
+     * @return a brand new vector
+     */
+    public Vector getUnitVector() {
+        double length = length();
+        return new Vector(x / length, y / length, z / length);
+    }
+    
+    /**
+     * Returns whether this vector is in a cuboid. The minimum and maximum
+     * vectors given must be truly the minimum and maximum X, Y and Z
+     * components.
+     * 
+     * @param min
+     * @param max
+     * @return whether this vector is in the cuboid
+     */
+    public boolean isInCuboid(Vector min, Vector max) {
+        return x >= min.x && x <= max.x
+                && y >= min.y && y <= max.y
+                && z >= min.z && z <= max.z;
+    }
+    
+    /**
+     * Returns whether this vector is within a sphere.
+     * 
+     * @param origin
+     * @param radius
+     * @return whether this vector is in the sphere
+     */
+    public boolean isInSphere(Vector origin, double radius) {
+        return origin.clone().subtract(this).length() <= radius;
+    }
+    
+    public double getX() {
+        return x;
+    }
+    
+    public double getY() {
+        return y;
+    }
+    
+    public double getZ() {
+        return z;
+    }
+    
+    public Vector setX(int x) {
+        this.x = x;
+        return this;
+    }
+    
+    public Vector setX(double x) {
+        this.x = x;
+        return this;
+    }
+    
+    public Vector setX(float x) {
+        this.x = x;
+        return this;
+    }
+    
+    public Vector setY(int y) {
+        this.y = y;
+        return this;
+    }
+    
+    public Vector setY(double y) {
+        this.y = y;
+        return this;
+    }
+    
+    public Vector setY(float y) {
+        this.y = y;
+        return this;
+    }
+    
+    public Vector setZ(int z) {
+        this.z = z;
+        return this;
+    }
+    
+    public Vector setZ(double z) {
+        this.z = z;
+        return this;
+    }
+    
+    public Vector setZ(float z) {
+        this.z = z;
+        return this;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof Vector)) {
+            return false;
+        }
+        
+        Vector other = (Vector)obj;
+        
+        return Double.doubleToLongBits(x) == Double.doubleToLongBits(other.x)
+            && Double.doubleToLongBits(y) == Double.doubleToLongBits(other.y)
+            && Double.doubleToLongBits(z) == Double.doubleToLongBits(other.z);
+    }
+
+    @Override
+    public int hashCode() {
+        return ((int)Double.doubleToLongBits(x) >> 13) ^
+                ((int)Double.doubleToLongBits(y) >> 7) ^
+                (int)Double.doubleToLongBits(z);
+    }
+
+    @Override
+    public Vector clone() {
+        return new Vector(x, y, z);
+    }
+
+    @Override
+    public String toString() {
+        return x + "," + y + "," + z;
+    }
+    
+    public Location toLocation(World world) {
+        return new Location(world, x, y, z);
+    }
+    
+    public Location toLocation(World world, float yaw, float pitch) {
+        return new Location(world, x, y, z, yaw, pitch);
+    }
+    
+    /**
+     * Gets the minimum components of two vectors.
+     * 
+     * @param v1
+     * @param v2
+     * @return minimum
+     */
+    public static Vector getMinimum(Vector v1, Vector v2) {
+        return new Vector(
+                Math.min(v1.x, v2.x),
+                Math.min(v1.y, v2.y),
+                Math.min(v1.z, v2.z));
+    }
+    
+    /**
+     * Gets the maximum components of two vectors.
+     * 
+     * @param v1
+     * @param v2
+     * @return maximum
+     */
+    public static Vector getMaximum(Vector v1, Vector v2) {
+        return new Vector(
+                Math.max(v1.x, v2.x),
+                Math.max(v1.y, v2.y),
+                Math.max(v1.z, v2.z));
+    }
+}

paper-api/src/main/java/org/bukkit/World.java

@@ -15,4 +15,16 @@ public interface World {
     public Chunk getChunkAt(Block block);
 
     public boolean isChunkLoaded();
+    
+    /**
+     * Spawns an arrow.
+     * 
+     * @param loc
+     * @param velocity velocity vector
+     * @param speed a reasonable speed is 0.6
+     * @param spread a reasonable spread is 12
+     * @return the arrow entity
+     */
+    public ArrowEntity spawnArrow(Location loc, Vector velocity,
+            float speed, float spread);
 }

paper-api/src/main/java/org/bukkit/event/CustomEventListener.java

@@ -0,0 +1,5 @@
+package org.bukkit.event;
+
+public interface CustomEventListener {
+    public void onCustomEvent(Event event);
+}

paper-api/src/main/java/org/bukkit/event/Event.java

@@ -6,18 +6,41 @@ package org.bukkit.event;
  */
 public abstract class Event {
     private final Type type;
+    private final String name;
 
     protected Event(final Type type) {
+        exAssert(type != null, "type is null");
+        exAssert(type != Type.CUSTOM_EVENT, "use Event(String) to make custom events");
         this.type = type;
+        this.name = null;
     }
-
+    
+    protected Event(final String name) {
+        exAssert(name != null, "name is null");
+        this.type = Type.CUSTOM_EVENT;
+        this.name = name;
+    }
+    
     /**
      * Gets the Type of this event
-     * @return Server which this event was triggered on
+     * @return Event type that this object represents
      */
-    public Type getType() {
+    public final Type getType() {
         return type;
     }
+    
+    private void exAssert(boolean b, String s) {
+        if(!b) throw new IllegalArgumentException(s);
+    }
+    
+    /**
+     * Gets the event's name. Should only be used if getType returns null.
+     * @return 
+     */
+    public final String getEventName() {
+        if(type!=Type.CUSTOM_EVENT) return type.toString();
+        else return name;
+    }
 
     /**
      * Represents an events priority
@@ -83,7 +106,7 @@ public abstract class Event {
         BLOCK_PHYSICS (Category.BLOCK),
         BLOCK_PLACED (Category.BLOCK),
         BLOCK_RIGHTCLICKED (Category.BLOCK),
-        REDSTONE_CHANGE (Category.BLOCK);
+        REDSTONE_CHANGE (Category.BLOCK),
 
 
         /** 
@@ -124,11 +147,13 @@ public abstract class Event {
          * Sign Events (Item events??)
 
         SIGN_SHOW (Category.SIGN),
-        SIGN_CHANGE (Category.SIGN);
+        SIGN_CHANGE (Category.SIGN)
          */
+        
+        CUSTOM_EVENT (Category.CUSTOM);
 
-        private Category category;
-
+        private final Category category;
+        
         private Type(Category category) {
             this.category = category;
         }

paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java

@@ -12,6 +12,7 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.regex.Pattern;
 import org.bukkit.Server;
+import org.bukkit.event.CustomEventListener;
 import org.bukkit.event.Event;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.*;
@@ -118,6 +119,9 @@ public final class JavaPluginLoader implements PluginLoader {
                 trueListener.onBlockFlow((BlockFromToEvent)event);
                 break;
             }
+        } else if(listener instanceof CustomEventListener) {
+            if(event.getType()==Event.Type.CUSTOM_EVENT) 
+                ((CustomEventListener)listener).onCustomEvent(event);
         }
     }
 }