From b654b843935b759569b5404fe2a93e3b84f37691 Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 24 May 2018 18:37:05 -0700 Subject: [PATCH] Add potential support for models defining 'vanilla like' rotations in Forge's Modified Blockstate format. --- .../client/ForgeHooksClient.java | 25 +------------------ .../client/model/ForgeBlockStateV1.java | 10 +++++--- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 308883cc61..fb34d2f211 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -387,29 +387,6 @@ public class ForgeHooksClient modelLoader.onPostBakeEvent(modelRegistry); } - @SuppressWarnings("deprecation") - public static Matrix4f getMatrix(ItemTransformVec3f transform) - { - javax.vecmath.Matrix4f m = new javax.vecmath.Matrix4f(), t = new javax.vecmath.Matrix4f(); - m.setIdentity(); - m.setTranslation(TRSRTransformation.toVecmath(transform.translation)); - t.setIdentity(); - t.rotY(transform.rotation.y); - m.mul(t); - t.setIdentity(); - t.rotX(transform.rotation.x); - m.mul(t); - t.setIdentity(); - t.rotZ(transform.rotation.z); - m.mul(t); - t.setIdentity(); - t.m00 = transform.scale.x; - t.m11 = transform.scale.y; - t.m22 = transform.scale.z; - m.mul(t); - return m; - } - private static final Matrix4f flipX; static { flipX = new Matrix4f(); @@ -762,7 +739,7 @@ public class ForgeHooksClient { MinecraftForge.EVENT_BUS.post(new InputUpdateEvent(player, movementInput)); } - + public static String getHorseArmorTexture(EntityHorse horse, ItemStack armorStack) { String texture = armorStack.getItem().getHorseArmorTexture(horse, armorStack); diff --git a/src/main/java/net/minecraftforge/client/model/ForgeBlockStateV1.java b/src/main/java/net/minecraftforge/client/model/ForgeBlockStateV1.java index 2d79ad7fc5..cee9f0074c 100644 --- a/src/main/java/net/minecraftforge/client/model/ForgeBlockStateV1.java +++ b/src/main/java/net/minecraftforge/client/model/ForgeBlockStateV1.java @@ -945,11 +945,15 @@ public class ForgeBlockStateV1 extends Marker } return ret; } - else + else if (e.isJsonArray()) { - // quaternion - return new Quat4f(parseFloatArray(e, 4, "Rotation")); + JsonArray array = e.getAsJsonArray(); + if (array.size() == 3) //Vanilla rotation + return TRSRTransformation.quatFromXYZDegrees(new Vector3f(parseFloatArray(e, 3, "Rotation"))); + else // quaternion + return new Quat4f(parseFloatArray(e, 4, "Rotation")); } + else throw new JsonParseException("Rotation: expected array or object, got: " + e); } else if (e.isJsonObject()) {