From 8f8efed413f1e115fb02fb00f6983f28b2f2c15d Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 28 Nov 2019 14:17:45 +0200 Subject: [PATCH] Convert all the angles from radians to degrees --- .../assets/minelittlepony/models/breezie.json | 14 ++++----- .../models/components/bat_wings.json | 22 +++++++------- .../models/components/bug_wings.json | 4 +-- .../models/components/fish_tail.json | 2 +- .../models/components/horn.json | 4 +-- .../models/components/pegasus_wings.json | 30 +++++++++---------- .../models/components/stetson.json | 4 +-- .../minelittlepony/models/enderman.json | 8 ++--- .../models/races/steve/sea_pony.json | 6 ++-- .../models/races/steve/zebra.json | 4 +-- .../minelittlepony/models/steve_pony.json | 4 +-- 11 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/main/resources/assets/minelittlepony/models/breezie.json b/src/main/resources/assets/minelittlepony/models/breezie.json index 0ac5ce07..76ede168 100644 --- a/src/main/resources/assets/minelittlepony/models/breezie.json +++ b/src/main/resources/assets/minelittlepony/models/breezie.json @@ -15,7 +15,7 @@ ] }, { - "rotate": [-0.2617994, 0, 0], + "rotate": [-15, 0, 0], "cubes": [ {"from": [ 1, -11, -3], "size": [1, 6, 1], "texture": {"u": 28, "v": 2} }, {"from": [-2, -11, -2], "size": [1, 6, 1], "texture": {"u": 24, "v": 2} } @@ -25,7 +25,7 @@ }, "neck": { "texture": {"u": 40, "v": 0}, - "rotate": [0.0872665, 0, 0], + "rotate": [5, 0, 0], "center": [-1, -2, -4], "cubes": [ {"from": [0, 0, 0], "size": [2, 5, 2] } @@ -33,21 +33,21 @@ }, "torso": { "texture": {"u": 2, "v": 12}, - "rotate": [-0.5235988, 0, 0], + "rotate": [-30, 0, 0], "cubes": [ {"from": [0, 0, 0], "size": [6, 7, 14] } ] }, "tail": { "texture": {"u": 32, "v": 0 }, - "rotate": [-1, 7, 10], + "rotate": [-57, 41, 212], "cubes": [ {"from": [0, 0, 1], "size": [2, 9, 2] } ] }, "tail_stub": { "texture": {"u": 40, "v": 7 }, - "rotate": [-0.5, 8, 8], + "rotate": [-28, 98, 98], "cubes": [ {"from": [0, 0, 0], "size": [1, 1, 3] } ] @@ -84,7 +84,7 @@ }, "left_wing": { "center": [2, 3, 1], - "rotate": [0, -0.6981317, 0], + "rotate": [0, -40, 0], "texture": { "u": 0, "v": 40 }, "cubes": [ { "from": [0, -12, 0], "size": [ 24, 24, 0] } @@ -92,7 +92,7 @@ }, "right_wing": { "center": [-2, 3, 1], - "rotate": [0, 0.6981317, 0], + "rotate": [0, 40, 0], "texture": { "u": 0, "v": 40 }, "mirror": true, "cubes": [ diff --git a/src/main/resources/assets/minelittlepony/models/components/bat_wings.json b/src/main/resources/assets/minelittlepony/models/components/bat_wings.json index 80261d50..acac4804 100644 --- a/src/main/resources/assets/minelittlepony/models/components/bat_wings.json +++ b/src/main/resources/assets/minelittlepony/models/components/bat_wings.json @@ -1,12 +1,12 @@ { "left_wing": { "type": "mson:slot", - "name": "wings", + "name": "left_wing", "implementation": "com.minelittlepony.client.model.part.BatWings$Wing", "content": { "folded": { "texture": {"u": 56, "v": 16}, - "rotate": [1.571, 0, 0], + "rotate": [90, 0, 0], "center": [-0.5, 13, -4], "cubes": [ { "from": [3.15, 5, 4], "size": [1, 4, 1] }, @@ -17,8 +17,8 @@ }, "extended": { "texture": {"u": 56, "v": 19}, + "rotate": [3, 180, 0], "center": [2.5, 5.3, 3], - "rotate": [3, 0, 0], "children": [ { "texture": {"u": 60, "v": 16}, @@ -29,7 +29,7 @@ "children": [ { "texture": {"u": 60, "v": 16}, - "rotate": [-0.5, 0, 0], + "rotate": [-28, 0, 0], "center": [0, -1, -2], "cubes": [ { "from": [-0.5, 0, 2], "size": [1, 7, 1] } @@ -37,7 +37,7 @@ }, { "texture": {"u": 60, "v": 16}, - "rotate": [-0.5, 0, 0], + "rotate": [-28, 0, 0], "center": [0, 4, -2.4], "cubes": [ { "from": [-0.5, 0, 3], "size": [1, 7, 1] } @@ -56,12 +56,12 @@ }, "right_wing": { "type": "mson:slot", - "name": "wings", + "name": "right_wing", "implementation": "com.minelittlepony.client.model.part.BatWings$Wing", "content": { "folded": { "texture": {"u": 56, "v": 16}, - "rotate": [1.571, 0, 0], + "rotate": [90, 0, 0], "center": [-0.5, 13, -4], "mirror": true, "cubes": [ @@ -74,19 +74,19 @@ "extended": { "texture": {"u": 56, "v": 19}, "center": [-2.5, 5.3, 3], - "rotate": [-3, 0, 0], + "rotate": [-3, 180, 0], "mirror": true, "children": [ { "texture": {"u": 60, "v": 16}, - "rotate": [0.1, 0, 0], + "rotate": [5.7, 0, 0], "cubes": [ { "from": [-0.5, -1, 0], "size": [1, 8, 1], "stretch": 0.001 } ], "children": [ { "texture": {"u": 60, "v": 16}, - "rotate": [-0.5, 0, 0], + "rotate": [-28, 0, 0], "center": [0, -1, -2], "mirror": true, "cubes": [ @@ -95,7 +95,7 @@ }, { "texture": {"u": 60, "v": 16}, - "rotate": [-0.5, 0, 0], + "rotate": [-28, 0, 0], "center": [0, 4, -2.4], "mirror": true, "cubes": [ diff --git a/src/main/resources/assets/minelittlepony/models/components/bug_wings.json b/src/main/resources/assets/minelittlepony/models/components/bug_wings.json index 3919cc0f..de97f3f9 100644 --- a/src/main/resources/assets/minelittlepony/models/components/bug_wings.json +++ b/src/main/resources/assets/minelittlepony/models/components/bug_wings.json @@ -7,7 +7,7 @@ "folded": { "visible": false }, "extended": { "texture": {"u": 56, "v": 19}, - "center": [2.5, 5.3, 4], + "center": [143, 303, 229], "rotate": [30, 0, 0], "children": [ { @@ -33,7 +33,7 @@ "folded": { "visible": false }, "extended": { "texture": {"u": 56, "v": 19}, - "center": [-2.5, 5.3, 4], + "center": [-143, 303, 229], "rotate": [-30, 0, 0], "mirror": true, "children": [ diff --git a/src/main/resources/assets/minelittlepony/models/components/fish_tail.json b/src/main/resources/assets/minelittlepony/models/components/fish_tail.json index edad8636..416964de 100644 --- a/src/main/resources/assets/minelittlepony/models/components/fish_tail.json +++ b/src/main/resources/assets/minelittlepony/models/components/fish_tail.json @@ -1,7 +1,7 @@ { "texture": {"w": 64, "h": 64}, "locals": { - "tail_rot_x": 1.57, + "tail_rot_x": 90, "tail_rot_x_neg": [0, "-", "#tail_rot_x"] }, "base": { diff --git a/src/main/resources/assets/minelittlepony/models/components/horn.json b/src/main/resources/assets/minelittlepony/models/components/horn.json index 1406a3dc..ff6f9993 100644 --- a/src/main/resources/assets/minelittlepony/models/components/horn.json +++ b/src/main/resources/assets/minelittlepony/models/components/horn.json @@ -7,14 +7,14 @@ }, "bone": { "offset": ["#horn_x", "#horn_y", "#horn_z"], - "rotate": [0.5, 0, 0], + "rotate": [29, 0, 0], "cubes": [ { "size": [1, 4, 1] } ] }, "corona": { "offset": ["#horn_x", "#horn_y", "#horn_z"], - "rotate": [0.5, 0, 0], + "rotate": [29, 0, 0], "cubes": [ { "type": "mson:cone", diff --git a/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json b/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json index 59c84300..bf0fc342 100644 --- a/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json +++ b/src/main/resources/assets/minelittlepony/models/components/pegasus_wings.json @@ -15,16 +15,16 @@ ] }, "extended": { - "texture": {"u": 57, "v": 35}, + "texture": {"u": 57, "v": 35, "w": 64, "h": 64}, "center": [4.5, 5.3, 6], "rotate": [30, 0, 0], "children": [ { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "stretch": 0.1 } ] }, - { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-0.85, 0, 0] }, - { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-0.75, 0, 0] }, - { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-0.5 , 0, 0] }, + { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-48, 0, 0] }, + { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-42, 0, 0] }, + { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "stretch": 0.3 } ] }, - { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-0.85, 0, 0] } + { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-48, 0, 0] } ] } } @@ -45,16 +45,16 @@ ] }, "extended": { - "texture": {"u": 56, "v": 19}, + "texture": {"u": 56, "v": 19, "w": 64, "h": 64}, "center": [-4.5, 5.3, 6], "rotate": [-30, 0, 0], "children": [ { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "stretch": 0.1 } ] }, - { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-0.85, 0, 0] }, - { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-0.75, 0, 0] }, - { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-0.5 , 0, 0] }, + { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-48, 0, 0] }, + { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-42, 0, 0] }, + { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28, 0, 0] }, { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "stretch": 0.3 } ] }, - { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-0.85, 0, 0] } + { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-48, 0, 0] } ] } } @@ -75,16 +75,16 @@ ] }, "extended": { - "texture": {"u": 57, "v": 19}, + "texture": {"u": 57, "v": 19, "w": 64, "h": 64}, "center": [-4.5, 5.3, 6], "rotate": [-30, 0, 0], "children": [ { "cubes": [ {"from": [-0.5, 6, 0], "size": [1, 9, 2], "stretch": 0.1 } ], "mirror": true }, - { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-0.85, 0, 0], "mirror": true }, - { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-0.75, 0, 0], "mirror": true }, - { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-0.5 , 0, 0], "mirror": true }, + { "cubes": [ {"from": [-0.5,-1, -0.3], "size": [1, 8, 2], "stretch": 0.1 } ], "rotate": [-48, 0, 0], "mirror": true }, + { "cubes": [ {"from": [-0.5, 1.8, 1.3], "size": [1, 8, 2], "stretch": -0.1 } ], "rotate": [-42, 0, 0], "mirror": true }, + { "cubes": [ {"from": [-0.5, 5, 2], "size": [1, 8, 2] } ], "rotate": [-28 , 0, 0], "mirror": true }, { "cubes": [ {"from": [-0.5, 0, -0.2], "size": [1, 6, 2], "stretch": 0.3 } ] }, - { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-0.85, 0, 0], "mirror": true } + { "cubes": [ {"from": [-0.5, 0, 0], "size": [1, 3, 2], "stretch": 0.19 } ], "rotate": [-48, 0, 0], "mirror": true } ] } } diff --git a/src/main/resources/assets/minelittlepony/models/components/stetson.json b/src/main/resources/assets/minelittlepony/models/components/stetson.json index 52c27b50..eac961e6 100644 --- a/src/main/resources/assets/minelittlepony/models/components/stetson.json +++ b/src/main/resources/assets/minelittlepony/models/components/stetson.json @@ -2,7 +2,7 @@ "texture": {"w": 64, "h": 64}, "rim": { "texture": {"u": 16, "v": 33}, - "rotate": [-0.3, 0, 0.1], + "rotate": [-17, 0, 5.7], "cubes": [ { "type": "mson:plane", @@ -26,7 +26,7 @@ }, { "center": [-9, -4, -12 ], - "rotate": [0.4, 0, 0], + "rotate": [23, 0, 0], "cubes": [ { "type": "mson:plane", diff --git a/src/main/resources/assets/minelittlepony/models/enderman.json b/src/main/resources/assets/minelittlepony/models/enderman.json index 68db2ae9..d360e9e4 100644 --- a/src/main/resources/assets/minelittlepony/models/enderman.json +++ b/src/main/resources/assets/minelittlepony/models/enderman.json @@ -36,12 +36,12 @@ "name": "left_horn", "texture": {"u": 0, "v": 52}, "rotate": [0.1, 0, -0.8], - "offset": [-2, -10, -3], + "offset": [-6, -213, -172], "cubes": [ {"size": [2, 6, 2]} ], "children": [ { "rotate": [0, 0, 0.9], - "center": [-3.9, -6, 0.001], + "center": [-223, -343, 0.057], "cubes": [ {"size": [2, 6, 2]} ] } ] @@ -50,11 +50,11 @@ "name": "right_horn", "texture": {"u": 8, "v": 52}, "rotate": [0.1, 0, 0.8], - "offset": [0, -10, -3], + "offset": [0, -147, -172], "cubes": [ {"size": [2, 6, 2]} ], "children": [ { - "rotate": [0, 0, -0.9], + "rotate": [0, 0, -51], "center": [3.9, -6, 0.001], "cubes": [ {"size": [2, 6, 2]} ] } diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json b/src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json index 4687912d..6ef14757 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/sea_pony.json @@ -4,21 +4,21 @@ "type": "mson:planar", "texture": {"u": 56, "v": 16}, "mirror": [false, false, true], - "rotate": [0, 0.52, 0], + "rotate": [0, 30, 0], "center": [3, -6, 3], "east": [0, 0, 0, 12, 8] }, "right_fin": { "type": "mson:planar", "texture": {"u": 56, "v": 16}, - "rotate": [0, -0.52, 0], + "rotate": [0, -30, 0], "center": [-3, -6, 3], "west": [0, 0, 0, 12, 8] }, "center_fin": { "type": "mson:planar", "texture": {"u": 58, "v": 28}, - "rotate": [1.47, 0, 0], + "rotate": [84, 0, 0], "center": [0, 6, 9], "east": [0, -6, 0, 12, 6] }, diff --git a/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json b/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json index c7103d9f..816f073b 100644 --- a/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json +++ b/src/main/resources/assets/minelittlepony/models/races/steve/zebra.json @@ -21,7 +21,7 @@ }, { "name": "bristles", - "rotate": [0.3, 0, 0], + "rotate": [17, 0, 0], "offset": [-1, -1, -3], "cubes": [ { "from": [ 0, -10, 2], "size": [2, 6, 2]}, @@ -31,7 +31,7 @@ "children": [ { "rotate": [-1, 0, 0], - "offset": [-1.01, 2, -7], + "offset": [-58, 114, -318], "cubes": [ { "from": [ 0, -10, 4], "size": [2, 8, 2]}, { "from": [ 0, -8, 6], "size": [2, 6, 2]} diff --git a/src/main/resources/assets/minelittlepony/models/steve_pony.json b/src/main/resources/assets/minelittlepony/models/steve_pony.json index 81bec048..8236ee38 100644 --- a/src/main/resources/assets/minelittlepony/models/steve_pony.json +++ b/src/main/resources/assets/minelittlepony/models/steve_pony.json @@ -117,7 +117,7 @@ { "type": "mson:planar", "texture": { "u": 32, "v": 0 }, - "rotate": [0.5, 0, 0], + "rotate": [29, 0, 0], "up": [-1, 2, 2, 2, 6], "down": [-1, 4, 2, 2, 6], "east": [ 1, 2, 2, 2, 6], @@ -136,7 +136,7 @@ "neck": { "type": "mson:planar", "texture": { "u": 0, "v": 16 }, - "rotate": [0.166, 0, 0], + "rotate": [9, 0, 0], "north": [-2, 1.199998, -2.8, 4, 4], "south": [-2, 1.199998, 1.2, 4, 4], "east": [ 2, 1.199998, -2.8, 4, 4],