From 0f280da3851a1b9ee8e6441a24fd15ac1d1c7c3c Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 22 Dec 2013 16:58:49 +1300 Subject: [PATCH] Some working code for apple --- .../libraryaddict/disguise/LibsDisguises.java | 1 - .../disguise/utilities/FakeBoundingBox.java | 6 +- .../disguise/utilities/ReflectionManager.java | 57 +++++++++++++++---- 3 files changed, 49 insertions(+), 15 deletions(-) diff --git a/src/me/libraryaddict/disguise/LibsDisguises.java b/src/me/libraryaddict/disguise/LibsDisguises.java index c8fa56e8..a2229de7 100644 --- a/src/me/libraryaddict/disguise/LibsDisguises.java +++ b/src/me/libraryaddict/disguise/LibsDisguises.java @@ -211,7 +211,6 @@ public class LibsDisguises extends JavaPlugin { } // Get the bounding box - disguiseValues.setAdultBox(ReflectionManager.getBoundingBox(bukkitEntity)); if (bukkitEntity instanceof Ageable) { ((Ageable) bukkitEntity).setBaby(); diff --git a/src/me/libraryaddict/disguise/utilities/FakeBoundingBox.java b/src/me/libraryaddict/disguise/utilities/FakeBoundingBox.java index 5c516af7..59bb3e37 100644 --- a/src/me/libraryaddict/disguise/utilities/FakeBoundingBox.java +++ b/src/me/libraryaddict/disguise/utilities/FakeBoundingBox.java @@ -12,15 +12,15 @@ public class FakeBoundingBox { } public double getX() { - return xMod; + return xMod / 2; } public double getY() { - return yMod; + return yMod / 2; } public double getZ() { - return zMod; + return zMod / 2; } } diff --git a/src/me/libraryaddict/disguise/utilities/ReflectionManager.java b/src/me/libraryaddict/disguise/utilities/ReflectionManager.java index 6f40d914..41208b9c 100644 --- a/src/me/libraryaddict/disguise/utilities/ReflectionManager.java +++ b/src/me/libraryaddict/disguise/utilities/ReflectionManager.java @@ -87,10 +87,38 @@ public class ReflectionManager { public static FakeBoundingBox getBoundingBox(Entity entity) { try { - float length = getNmsClass("Entity").getField("length").getFloat(getNmsEntity(entity)); - float width = getNmsClass("Entity").getField("width").getFloat(getNmsEntity(entity)); - float height = getNmsClass("Entity").getField("height").getFloat(getNmsEntity(entity)); - return new FakeBoundingBox(length, width, height); + Object boundingBox = getNmsClass("Entity").getField("boundingBox").get(getNmsEntity(entity)); + double x = 0, y = 0, z = 0; + int stage = 0; + for (Field field : boundingBox.getClass().getFields()) { + if (field.getType().getSimpleName().equals("double")) { + stage++; + switch (stage) { + case 1: + x -= field.getDouble(boundingBox); + break; + case 2: + y -= field.getDouble(boundingBox); + break; + case 3: + z -= field.getDouble(boundingBox); + break; + case 4: + x += field.getDouble(boundingBox); + break; + case 5: + y += field.getDouble(boundingBox); + break; + case 6: + z += field.getDouble(boundingBox); + break; + default: + throw new Exception("Error while setting the bounding box, more doubles than I thought??"); + } + } + } + return new FakeBoundingBox(x, y, z); + } catch (Exception ex) { ex.printStackTrace(); } @@ -213,34 +241,41 @@ public class ReflectionManager { try { Object boundingBox = getNmsClass("Entity").getField("boundingBox").get(getNmsEntity(entity)); int stage = 0; - double x = newBox.getX(), y = newBox.getY(), z = newBox.getZ(); + double x = 0, y = 0, z = 0; for (Field field : boundingBox.getClass().getFields()) { if (field.getType().getSimpleName().equals("double")) { stage++; switch (stage) { case 1: - x += field.getDouble(boundingBox); + x = field.getDouble(boundingBox) + oldBox.getX(); + field.setDouble(boundingBox, x - newBox.getX()); break; case 2: - y += field.getDouble(boundingBox); + y = field.getDouble(boundingBox) + oldBox.getY(); + field.setDouble(boundingBox, y - newBox.getY()); break; case 3: - z += field.getDouble(boundingBox); + z = field.getDouble(boundingBox) + oldBox.getZ(); + field.setDouble(boundingBox, z - newBox.getZ()); break; case 4: - field.setDouble(boundingBox, x); + field.setDouble(boundingBox, x + newBox.getX()); break; case 5: - field.setDouble(boundingBox, y); + field.setDouble(boundingBox, y + newBox.getY()); break; case 6: - field.setDouble(boundingBox, z); + field.setDouble(boundingBox, z + newBox.getZ()); break; default: throw new Exception("Error while setting the bounding box, more doubles than I thought??"); } } } + if (entity.getType() != EntityType.PLAYER) { + // entity.teleport(entity.getLocation().clone() + // .subtract(oldBox.getX() - newBox.getX(), oldBox.getY() - newBox.getY(), oldBox.getZ() - newBox.getZ())); + } } catch (Exception ex) { ex.printStackTrace(); }