From 08406782411afcdd63268fd40ef5ed1f444040da Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 4 Dec 2019 12:42:13 +0200 Subject: [PATCH] Fixed texture mirroring on planes --- .../minelittlepony/models/armour_inner.json | 2 +- .../models/components/bat_wings.json | 2 +- .../models/components/bug_wings.json | 8 +++--- .../models/components/snout.json | 6 ++-- .../models/gear/saddlebags.json | 28 +++++++++---------- .../models/races/steve/sea_pony.json | 6 ++-- .../minelittlepony/models/steve_pony.json | 21 +++++++------- 7 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/main/resources/assets/minelittlepony/models/armour_inner.json b/src/main/resources/assets/minelittlepony/models/armour_inner.json index 6c1061c8..c95f9160 100644 --- a/src/main/resources/assets/minelittlepony/models/armour_inner.json +++ b/src/main/resources/assets/minelittlepony/models/armour_inner.json @@ -20,7 +20,7 @@ "type": "mson:planar", "texture": {"u": 24, "v": 0}, "east": [4, 4, 2, 8, 8, 32, 32], - "west": [-4, 4, 2, 8, 8, 32, 23], + "west": [-4, 4, 2, 8, 8, 23, 32], "south": [-4, 4,10, 8, 8, 32, 23], "up": [-4, 4, -2, 8, 12, 32, 23], "__comment": "it's a little short, so the butt tends to show. :/" 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 6360529a..a6ab71bf 100644 --- a/src/main/resources/assets/minelittlepony/models/components/bat_wings.json +++ b/src/main/resources/assets/minelittlepony/models/components/bat_wings.json @@ -46,7 +46,7 @@ }, { "type": "mson:planar", - "west": [0, 0, -7, 16, 8, 56, 32] + "west": [0, 0, -7, 16, 8, 32, 56] } ] } 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 de97f3f9..7f90d340 100644 --- a/src/main/resources/assets/minelittlepony/models/components/bug_wings.json +++ b/src/main/resources/assets/minelittlepony/models/components/bug_wings.json @@ -13,13 +13,13 @@ { "type": "mson:planar", "texture": {"u": 56, "v": 16}, - "west": [-0.5, 0, -7, 16, 8] + "west": [-0.5, 0, -7, 8, 16] }, { "type": "mson:planar", "texture": {"u": 56, "v": 32}, "rotate": [-0.5, 0.3, 0.3333], - "west": [1, 0, -5, 16, 8] + "west": [1, 0, -5, 8, 16] } ] } @@ -41,14 +41,14 @@ "type": "mson:planar", "texture": {"u": 56, "v": 16}, "mirror": true, - "west": [0.5, 0, -7, 16, 8] + "west": [0.5, 0, -7, 8, 16] }, { "type": "mson:planar", "texture": {"u": 56, "v": 32}, "rotate": [-0.5, -0.3, -0.3333], "mirror": true, - "west": [-1, 0, -5, 16, 8] + "west": [-1, 0, -5, 8, 16] } ] } diff --git a/src/main/resources/assets/minelittlepony/models/components/snout.json b/src/main/resources/assets/minelittlepony/models/components/snout.json index 44448631..c45e0026 100644 --- a/src/main/resources/assets/minelittlepony/models/components/snout.json +++ b/src/main/resources/assets/minelittlepony/models/components/snout.json @@ -11,7 +11,7 @@ "north": [-2, -1, -7, 4, 3, 10, 13], "up": [-2, -1, -7, 4, 1, 10, 13], "down": [-2, 2, -7, 4, 1, 18, 7], - "west": [-2, -1, -7, 3, 1, 10, 13], + "west": [-2, -1, -7, 3, 1, 13, 10], "east": [ 2, -1, -7, 3, 1, 13, 13] }, "mare": { @@ -28,8 +28,8 @@ ], "down": [-2, 2, -7, 4, 1, 18, 7], "west": [ - [-2, 0, -7, 2, 1, 9, 14], - [-1, -1, -7, 1, 1, 11, 12] + [-2, 0, -7, 2, 1, 14, 9], + [-1, -1, -7, 1, 1, 12, 11] ], "east": [ [ 2, 0, -7, 2, 1, 14, 14], diff --git a/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json b/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json index 7afaa1f9..bea9f0e5 100644 --- a/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json +++ b/src/main/resources/assets/minelittlepony/models/gear/saddlebags.json @@ -5,12 +5,12 @@ "texture": {"u": 56, "v": 19}, "center": [0, 4, 4], "south": [ - [4, -0.5, -1, 3, 6, 56, 25], - [4, -0.5, 7, 3, 6, 59, 25] + [4, -0.5, -1, 3, 6, 25, 56], + [4, -0.5, 7, 3, 6, 25, 59] ], "west": [ - [7, -0.5, -1, 6, 8, 56, 19], - [4, -0.5, -1, 6, 8, 56, 19] + [7, -0.5, -1, 6, 8, 19, 56], + [4, -0.5, -1, 6, 8, 19, 56] ], "children": [ { @@ -20,8 +20,8 @@ { "type": "mson:plane", "face": "down", - "from": [-3, 5, -8], "size": [-3, 8, 3], - "mirror": [false, false, true] + "from": [-3, 5, -8], "size": [-3, 8], + "mirror": [false, true] } ] } @@ -36,8 +36,8 @@ [-7, -0.5, 7, 3, 6, 59, 25] ], "west": [ - [-4, -0.5, -1, 6, 8, 56, 19], - [-7, -0.5, -1, 6, 8, 56, 19] + [-4, -0.5, -1, 6, 8, 19, 56], + [-7, -0.5, -1, 6, 8, 19, 56] ], "children": [ { @@ -47,8 +47,8 @@ { "type": "mson:plane", "face": "down", - "from": [-8, 5, 3], "size": [-3, 8, 3], - "mirror": [false, false, true] + "from": [-8, 5, 3], "size": [-3, 8], + "mirror": [false, true] } ] } @@ -71,10 +71,10 @@ "texture": {"u": 56, "v": 31}, "rotate": [270, 0, 0], "west": [ - [ 4.0002, -3, -0.305, 1, 3], - [ 4.0002, -4, -0.305, 1, 3], - [-3.9998, -3, -0.305, 1, 3], - [-3.9998, -4, -0.305, 1, 3] + [ 4.0002, -3, -0.305, 3, 1], + [ 4.0002, -4, -0.305, 3, 1], + [-3.9998, -3, -0.305, 3, 1], + [-3.9998, -4, -0.305, 3, 1] ] } ] 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 6ef14757..ee491fe2 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 @@ -6,21 +6,21 @@ "mirror": [false, false, true], "rotate": [0, 30, 0], "center": [3, -6, 3], - "east": [0, 0, 0, 12, 8] + "east": [0, 0, 0, 8, 12] }, "right_fin": { "type": "mson:planar", "texture": {"u": 56, "v": 16}, "rotate": [0, -30, 0], "center": [-3, -6, 3], - "west": [0, 0, 0, 12, 8] + "west": [0, 0, 0, 8, 12] }, "center_fin": { "type": "mson:planar", "texture": {"u": 58, "v": 28}, "rotate": [84, 0, 0], "center": [0, 6, 9], - "east": [0, -6, 0, 12, 6] + "east": [0, -6, 0, 6, 12] }, "abdomin": { "texture": {"u": 0, "v": 48}, diff --git a/src/main/resources/assets/minelittlepony/models/steve_pony.json b/src/main/resources/assets/minelittlepony/models/steve_pony.json index ef451a16..ca486e5d 100644 --- a/src/main/resources/assets/minelittlepony/models/steve_pony.json +++ b/src/main/resources/assets/minelittlepony/models/steve_pony.json @@ -61,20 +61,21 @@ "texture": { "u": 24, "v": 0 }, "mirror": [ false, false, true ], "face": "west", + "mirror": [ true ], "position": [ -4, 4, 2 ], "size": [ 8, 8 ] }, { "type": "mson:plane", "__comment": "cutie mark", "texture": { "u": 4, "v": 0 }, "face": "east", - "position": [ 4, 4, 10 ], "size": [ 8, 4 ] + "position": [ 4, 4, 10 ], "size": [ 4, 8 ] }, { "type": "mson:plane", "__comment": "cutie mark", "texture": { "u": 4, "v": 0 }, - "mirror": [ false, false, true ], + "mirror": [ true ], "face": "west", - "position": [ -4, 4, 10 ], "size": [ 8, 4 ] + "position": [ -4, 4, 10 ], "size": [ 4, 8 ] }, { "type": "mson:plane", "__comment": "stomach", @@ -117,14 +118,14 @@ "rotate": [29, 0, 0], "up": [-1, 10, 10, 2, 6], "down": [-1, 12, 10, 2, 6], - "east": [ 1, 10, 10, 2, 6], + "east": [ 1, 10, 10, 6, 2], "south":[-1, 10, 16, 2, 2], "cubes": [ { "type": "mson:plane", - "mirror": [ false, false, true ], + "mirror": [ true, false ], "face": "west", - "position": [ -1, 10, 10 ], "size": [ 2, 6 ] + "position": [ -1, 10, 10 ], "size": [ 6, 2 ] } ] } @@ -153,27 +154,27 @@ "type": "mson:plane", "__comment": "body sides a", "texture": { "u": 12, "v": 32 }, "face": "east", - "position": [ 4, 4, 2 ], "size": [ 4, 8 ], "stretch": 0.25 + "position": [ 4, 4, 2 ], "size": [ 8, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "body sides a", "texture": { "u": 12, "v": 32 }, "mirror": [ false, false, true ], "face": "west", - "position": [ -4, 4, 2 ], "size": [ 4, 8 ], "stretch": 0.25 + "position": [ -4, 4, 2 ], "size": [ 8, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "body sides b", "texture": { "u": 12, "v": 48 }, "face": "east", - "position": [ 4, 8, 2 ], "size": [ 4, 8 ], "stretch": 0.25 + "position": [ 4, 8, 2 ], "size": [ 8, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "body sides b", "mirror": [ false, false, true ], "texture": { "u": 12, "v": 48 }, "face": "west", - "position": [ -4, 8, 2 ], "size": [ 4, 8 ], "stretch": 0.25 + "position": [ -4, 8, 2 ], "size": [ 8, 4 ], "stretch": 0.25 }, { "type": "mson:plane", "__comment": "qt mark a",