From 0d5693dec5451045871487b7f80920ce96a9dad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Fa=C3=9Fbender?= Date: Tue, 2 Dec 2014 00:13:25 +0100 Subject: [PATCH 1/2] Implementation for the new rotation values. Fixes SPIGOT-93 --- .../craftbukkit/entity/CraftItemFrame.java | 56 ++++++++++++------- 1 file 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 3f4e1ae62a..0533f1684e 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"); } } From 7371301edb1c44ab9153e1fba3722ba2f4e3c411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Fa=C3=9Fbender?= Date: Tue, 2 Dec 2014 00:20:31 +0100 Subject: [PATCH 2/2] Forgot that i work in Bukkit... Screw sun conventions --- .../craftbukkit/entity/CraftItemFrame.java | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java index 0533f1684e..8237093974 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -49,24 +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_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()); + 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()); } } @@ -78,24 +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_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"); + 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"); } }