fix models for embeddium compat

aesefficio · Nov 13, 2023 · 2a89e96 · 2a89e96
1 parent 5c48014
commit 2a89e96
Show file tree

Hide file tree

Showing 17 changed files with 361 additions and 73 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -21,7 +21,7 @@ vineflower_version = 1.11.0
     parchment_version=2022.08.14
 
 # Mod Properties
-    mod_version=0.5
+mod_version=0.5.2
     maven_group=com.sudolev.interiors
     archives_base_name=interiors
     mod_id=interiors

diff --git a/src/main/resources/assets/interiors/models/block/chair/both.json b/src/main/resources/assets/interiors/models/block/chair/both.json
@@ -13,8 +13,16 @@
   "elements": [
     {
       "name": "seat",
-      "from": [-0.002, 5, 0.001],
-      "to": [16.002, 13, 16.003],
+      "from": [
+        -0.02,
+        5,
+        0.01
+      ],
+      "to": [
+        16.02,
+        13,
+        16.03
+      ],
       "rotation": {
         "angle": 0,
         "axis": "y",
@@ -51,8 +59,16 @@
     },
     {
       "name": "leg",
-      "from": [-0.002, 0, 4],
-      "to": [16.002, 5, 12],
+      "from": [
+        -0.02,
+        0,
+        4
+      ],
+      "to": [
+        16.02,
+        5,
+        12
+      ],
       "rotation": {
         "angle": 0,
         "axis": "y",
@@ -89,8 +105,16 @@
     },
     {
       "name": "armrest_right",
-      "from": [14.001, 11.001, 2],
-      "to": [19.001, 16.001, 14],
+      "from": [
+        14.01,
+        11.01,
+        2
+      ],
+      "to": [
+        19.01,
+        16.01,
+        14
+      ],
       "rotation": {
         "angle": 0,
         "axis": "y",
@@ -126,8 +150,16 @@
     },
     {
       "name": "armrest_left",
-      "from": [-3.001, 11.001, 2],
-      "to": [1.999, 16.001, 14],
+      "from": [
+        -3.01,
+        11.01,
+        2
+      ],
+      "to": [
+        1.999,
+        16.01,
+        14
+      ],
       "rotation": {
         "angle": 0,
         "axis": "y",
@@ -163,8 +195,16 @@
     },
     {
       "name": "Back",
-      "from": [-0.001, 8.6, 9.5],
-      "to": [16.001, 24.6, 17.5],
+      "from": [
+        -0.01,
+        8.6,
+        9.5
+      ],
+      "to": [
+        16.01,
+        24.6,
+        17.5
+      ],
       "rotation": {
         "angle": 22.5,
         "axis": "x",

diff --git a/src/main/resources/assets/interiors/models/block/chair/both_cropped.json b/src/main/resources/assets/interiors/models/block/chair/both_cropped.json
@@ -27,8 +27,16 @@
 		},
 		{
 			"name": "seat",
-			"from": [-0.002, 5, 0.001],
-			"to": [16.002, 13, 16.003],
+          "from": [
+            -0.02,
+            5,
+            0.01
+          ],
+          "to": [
+            16.02,
+            13,
+            16.03
+          ],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
 				"north": {"uv": [0, 8, 16, 16], "texture": "#side_front"},
@@ -41,8 +49,16 @@
 		},
 		{
 			"name": "leg",
-			"from": [-0.002, 0, 4],
-			"to": [16.002, 5, 12],
+          "from": [
+            -0.02,
+            0,
+            4
+          ],
+          "to": [
+            16.02,
+            5,
+            12
+          ],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
 				"north": {"uv": [0, 11, 16, 16], "texture": "#0"},
@@ -55,8 +71,16 @@
 		},
 		{
 			"name": "armrest_right",
-			"from": [14.001, 11.001, 2],
-			"to": [19.001, 16.001, 14],
+          "from": [
+            14.01,
+            11.01,
+            2
+          ],
+          "to": [
+            19.01,
+            16.01,
+            14
+          ],
 			"rotation": {"angle": 0, "axis": "y", "origin": [18.5, 13.5, 7.5]},
 			"faces": {
 				"north": {"uv": [5, 8, 11, 13], "texture": "#side_front"},
@@ -69,8 +93,16 @@
 		},
 		{
 			"name": "armrest_left",
-			"from": [-3.001, 11.001, 2],
-			"to": [1.999, 16.001, 14],
+          "from": [
+            -3.01,
+            11.01,
+            2
+          ],
+          "to": [
+            1.999,
+            16.01,
+            14
+          ],
 			"rotation": {"angle": 0, "axis": "y", "origin": [18.5, 13.5, 7.5]},
 			"faces": {
 				"north": {"uv": [5, 8, 11, 13], "texture": "#side_front"},

diff --git a/src/main/resources/assets/interiors/models/block/chair/left.json b/src/main/resources/assets/interiors/models/block/chair/left.json
@@ -13,8 +13,16 @@
   "elements": [
     {
       "name": "seat",
-      "from": [-0.002, 5, 0.001],
-      "to": [16.002, 13, 16.003],
+      "from": [
+        -0.02,
+        5,
+        0.01
+      ],
+      "to": [
+        16.02,
+        13,
+        16.03
+      ],
       "rotation": {
         "angle": 0,
         "axis": "y",
@@ -51,8 +59,16 @@
     },
     {
       "name": "leg",
-      "from": [-0.002, 0, 4],
-      "to": [16.002, 5, 12],
+      "from": [
+        -0.02,
+        0,
+        4
+      ],
+      "to": [
+        16.02,
+        5,
+        12
+      ],
       "rotation": {
         "angle": 0,
         "axis": "y",
@@ -89,8 +105,16 @@
     },
     {
       "name": "armrest_left",
-      "from": [-3.001, 11.001, 2],
-      "to": [1.999, 16.001, 14],
+      "from": [
+        -3.01,
+        11.01,
+        2
+      ],
+      "to": [
+        1.999,
+        16.01,
+        14
+      ],
       "rotation": {
         "angle": 0,
         "axis": "y",
@@ -126,8 +150,16 @@
     },
     {
       "name": "Back",
-      "from": [-0.001, 8.6, 9.5],
-      "to": [16.001, 24.6, 17.5],
+      "from": [
+        -0.01,
+        8.6,
+        9.5
+      ],
+      "to": [
+        16.01,
+        24.6,
+        17.5
+      ],
       "rotation": {
         "angle": 22.5,
         "axis": "x",

diff --git a/src/main/resources/assets/interiors/models/block/chair/left_cropped.json b/src/main/resources/assets/interiors/models/block/chair/left_cropped.json
@@ -13,8 +13,16 @@
 	"elements": [
 		{
 			"name": "seat",
-			"from": [-0.002, 5, 0.001],
-			"to": [16.002, 13, 16.003],
+          "from": [
+            -0.02,
+            5,
+            0.01
+          ],
+          "to": [
+            16.02,
+            13,
+            16.03
+          ],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
 				"north": {"uv": [0, 8, 16, 16], "texture": "#side_front"},
@@ -27,8 +35,16 @@
 		},
 		{
 			"name": "leg",
-			"from": [-0.002, 0, 4],
-			"to": [16.002, 5, 12],
+          "from": [
+            -0.02,
+            0,
+            4
+          ],
+          "to": [
+            16.02,
+            5,
+            12
+          ],
 			"rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16]},
 			"faces": {
 				"north": {"uv": [0, 11, 16, 16], "texture": "#0"},
@@ -41,8 +57,16 @@
 		},
 		{
 			"name": "armrest_left",
-			"from": [-3.001, 11.001, 2],
-			"to": [1.999, 16.001, 14],
+          "from": [
+            -3.01,
+            11.01,
+            2
+          ],
+          "to": [
+            1.999,
+            16.01,
+            14
+          ],
 			"rotation": {"angle": 0, "axis": "y", "origin": [18.5, 13.5, 7.5]},
 			"faces": {
 				"north": {"uv": [5, 8, 11, 13], "texture": "#side_front"},

diff --git a/src/main/resources/assets/interiors/models/block/chair/none.json b/src/main/resources/assets/interiors/models/block/chair/none.json
@@ -13,8 +13,16 @@
   "elements": [
     {
       "name": "seat",
-      "from": [-0.002, 5, 0.001],
-      "to": [16.002, 13, 16.003],
+      "from": [
+        -0.02,
+        5,
+        0.01
+      ],
+      "to": [
+        16.02,
+        13,
+        16.03
+      ],
       "rotation": {
         "angle": 0,
         "axis": "y",
@@ -51,8 +59,16 @@
     },
     {
       "name": "leg",
-      "from": [-0.002, 0, 4],
-      "to": [16.002, 5, 12],
+      "from": [
+        -0.02,
+        0,
+        4
+      ],
+      "to": [
+        16.02,
+        5,
+        12
+      ],
       "rotation": {
         "angle": 0,
         "axis": "y",
@@ -89,8 +105,16 @@
     },
     {
       "name": "Back",
-      "from": [-0.001, 8.6, 9.5],
-      "to": [16.001, 24.6, 17.5],
+      "from": [
+        -0.01,
+        8.6,
+        9.5
+      ],
+      "to": [
+        16.01,
+        24.6,
+        17.5
+      ],
       "rotation": {
         "angle": 22.5,
         "axis": "x",