SPIGOT-3000: MaterialData for Observers

2 files changed, 119 insertions, 1 deletions

diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index 32ea7d01..681c5de6 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -63,6 +63,7 @@ import org.bukkit.material.Wool;
 import com.google.common.collect.Maps;
 
 import org.bukkit.material.Banner;
+import org.bukkit.material.Observer;
 
 /**
  * An enum of all material IDs accepted by the official server and client
@@ -286,7 +287,7 @@ public enum Material {
     RED_NETHER_BRICK(215),
     BONE_BLOCK(216),
     STRUCTURE_VOID(217),
-    OBSERVER(218),
+    OBSERVER(218, Observer.class),
     WHITE_SHULKER_BOX(219, 1),
     ORANGE_SHULKER_BOX(220, 1),
     MAGENTA_SHULKER_BOX(221, 1),
diff --git a/src/main/java/org/bukkit/material/Observer.java b/src/main/java/org/bukkit/material/Observer.java
new file mode 100644
index 00000000..fc3a7b17
--- /dev/null
+++ b/src/main/java/org/bukkit/material/Observer.java
@@ -0,0 +1,117 @@
+package org.bukkit.material;
+
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
+
+/**
+ * Represents an observer.
+ */
+public class Observer extends MaterialData implements Directional, Redstone {
+
+    public Observer() {
+        super(Material.OBSERVER);
+    }
+
+    public Observer(BlockFace direction) {
+        this();
+        setFacingDirection(direction);
+    }
+
+    /**
+     * @param type the raw type id
+     * @deprecated Magic value
+     */
+    @Deprecated
+    public Observer(final int type) {
+        super(type);
+    }
+
+    public Observer(final Material type) {
+        super(type);
+    }
+
+    /**
+     * @param type the raw type id
+     * @param data the raw data value
+     * @deprecated Magic value
+     */
+    @Deprecated
+    public Observer(final int type, final byte data) {
+        super(type, data);
+    }
+
+    /**
+     * @param type the type
+     * @param data the raw data value
+     * @deprecated Magic value
+     */
+    @Deprecated
+    public Observer(final Material type, final byte data) {
+        super(type, data);
+    }
+
+    @Override
+    public boolean isPowered() {
+        return (getData() & 0x8) == 0x8;
+    }
+
+    @Override
+    public void setFacingDirection(BlockFace face) {
+        byte data = (byte) (getData() & 0x8);
+
+        switch (face) {
+            case DOWN:
+                data |= 0x0;
+                break;
+            case UP:
+                data |= 0x1;
+                break;
+            case SOUTH:
+                data |= 0x2;
+                break;
+            case NORTH:
+                data |= 0x3;
+                break;
+            case EAST:
+                data |= 0x4;
+                break;
+            case WEST:
+                data |= 0x5;
+                break;
+        }
+
+        setData(data);
+    }
+
+    @Override
+    public BlockFace getFacing() {
+        int data = getData() & 0x7;
+
+        switch (data) {
+            case 0x0:
+                return BlockFace.DOWN;
+            case 0x1:
+                return BlockFace.UP;
+            case 0x2:
+                return BlockFace.SOUTH;
+            case 0x3:
+                return BlockFace.NORTH;
+            case 0x4:
+                return BlockFace.EAST;
+            case 0x5:
+                return BlockFace.WEST;
+            default:
+                throw new IllegalArgumentException("Illegal facing direction " + data);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return super.toString() + " facing " + getFacing();
+    }
+
+    @Override
+    public Observer clone() {
+        return (Observer) super.clone();
+    }
+}