diff options
author | Fabian Faßbender <fabian.fassbender42@googlemail.com> | 2014-12-02 00:13:25 +0100 |
---|---|---|
committer | Fabian Faßbender <fabian.fassbender42@googlemail.com> | 2014-12-02 00:13:25 +0100 |
commit | 0d5693dec5451045871487b7f80920ce96a9dad3 (patch) | |
tree | ec07b4073d87a36de0877b5c239e4b8fa03be011 /src | |
parent | d2c263030739df5529e0fb1c29469c052eacd484 (diff) | |
download | craftbukkit-0d5693dec5451045871487b7f80920ce96a9dad3.tar craftbukkit-0d5693dec5451045871487b7f80920ce96a9dad3.tar.gz craftbukkit-0d5693dec5451045871487b7f80920ce96a9dad3.tar.lz craftbukkit-0d5693dec5451045871487b7f80920ce96a9dad3.tar.xz craftbukkit-0d5693dec5451045871487b7f80920ce96a9dad3.zip |
Implementation for the new rotation values. Fixes SPIGOT-93
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java | 56 |
1 files changed, 36 insertions, 20 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java index 3f4e1ae6..0533f168 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -49,16 +49,24 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { Rotation toBukkitRotation(int value) { // Translate NMS rotation integer to Bukkit API switch (value) { - case 0: - return Rotation.NONE; - case 1: - return Rotation.CLOCKWISE; - case 2: - return Rotation.FLIPPED; - case 3: - return Rotation.COUNTER_CLOCKWISE; - default: - throw new AssertionError("Unknown rotation " + value + " for " + getHandle()); + case 0: + return Rotation.NONE; + case 1: + return Rotation.CLOCKWISE_45; + case 2: + return Rotation.CLOCKWISE; + case 3: + return Rotation.CLOCKWISE_135; + case 4: + return Rotation.FLIPPED; + case 5: + return Rotation.FLIPPED_45; + case 6: + return Rotation.COUNTER_CLOCKWISE; + case 7: + return Rotation.COUNTER_CLOCKWISE_45; + default: + throw new AssertionError("Unknown rotation " + value + " for " + getHandle()); } } @@ -70,16 +78,24 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { static int toInteger(Rotation rotation) { // Translate Bukkit API rotation to NMS integer switch (rotation) { - case NONE: - return 0; - case CLOCKWISE: - return 1; - case FLIPPED: - return 2; - case COUNTER_CLOCKWISE: - return 3; - default: - throw new IllegalArgumentException(rotation + " is not applicable to an ItemFrame"); + case NONE: + return 0; + case CLOCKWISE_45: + return 1; + case CLOCKWISE: + return 2; + case CLOCKWISE_135: + return 3; + case FLIPPED: + return 4; + case FLIPPED_45: + return 5; + case COUNTER_CLOCKWISE: + return 6; + case COUNTER_CLOCKWISE_45: + return 7; + default: + throw new IllegalArgumentException(rotation + " is not applicable to an ItemFrame"); } } |