From 4613b5549e2a00d547cc4d90d28714988cf59966 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Tue, 24 Aug 2021 21:41:59 +0600 Subject: [PATCH 1/2] fixed an error in matter decomposer's model --- .../block/matter_decomposer_working.json | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json index 9052c1821..ca4f126fd 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json @@ -10,72 +10,72 @@ "from": [0, 0, 0], "to": [16, 3, 16], "faces": { - "north": {"uv": [0, 11.25, 4, 12], "texture": "#0"}, - "east": {"uv": [0, 11.25, 4, 12], "texture": "#0"}, - "south": {"uv": [0, 11.25, 4, 12], "texture": "#0"}, - "west": {"uv": [0, 11.25, 4, 12], "texture": "#0"}, - "up": {"uv": [0, 7.25, 4, 11.25], "texture": "#0"}, - "down": {"uv": [0, 12, 4, 16], "texture": "#0"} + "north": {"uv": [0, 11.25, 4, 12], "texture": "#texture"}, + "east": {"uv": [0, 11.25, 4, 12], "texture": "#texture"}, + "south": {"uv": [0, 11.25, 4, 12], "texture": "#texture"}, + "west": {"uv": [0, 11.25, 4, 12], "texture": "#texture"}, + "up": {"uv": [0, 7.25, 4, 11.25], "texture": "#texture"}, + "down": {"uv": [0, 12, 4, 16], "texture": "#texture"} } }, { "from": [8, 3, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [4, 7.25, 6, 10.5], "texture": "#0"}, - "east": {"uv": [4, 10.5, 8, 13.75], "texture": "#0"}, - "south": {"uv": [6, 7.25, 8, 10.5], "texture": "#0"}, - "west": {"uv": [8, 10.5, 12, 13.75], "texture": "#0"}, - "up": {"uv": [4, 13.75, 8, 15.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 7.25, 2, 11.25], "texture": "#0"} + "north": {"uv": [4, 7.25, 6, 10.5], "texture": "#texture"}, + "east": {"uv": [4, 10.5, 8, 13.75], "texture": "#texture"}, + "south": {"uv": [6, 7.25, 8, 10.5], "texture": "#texture"}, + "west": {"uv": [8, 10.5, 12, 13.75], "texture": "#texture"}, + "up": {"uv": [4, 13.75, 8, 15.25], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [0, 7.25, 2, 11.25], "texture": "#texture"} } }, { "from": [1, 3, 1], "to": [7, 14, 7], "faces": { - "north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, - "east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, - "south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, - "west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, - "up": {"uv": [0, 3, 1.5, 4.5], "texture": "#0"}, - "down": {"uv": [0, 3, 1.5, 4.5], "texture": "#0"} + "north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "up": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"}, + "down": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"} } }, { "from": [1, 3, 9], "to": [7, 14, 15], "faces": { - "north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, - "east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, - "south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, - "west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, - "up": {"uv": [0, 3, 1.5, 4.5], "texture": "#0"}, - "down": {"uv": [0, 3, 1.5, 4.5], "texture": "#0"} + "north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "up": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"}, + "down": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"} } }, { "from": [3, 13, 11], "to": [8, 15, 13], "faces": { - "north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#0"}, - "east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#0"}, - "south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#0"}, - "west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#0"}, - "up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#0"} + "north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#texture"}, + "east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#texture"}, + "south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#texture"}, + "west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#texture"} } }, { "from": [3, 13, 3], "to": [8, 15, 5], "faces": { - "north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#0"}, - "east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#0"}, - "south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#0"}, - "west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#0"}, - "up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#0"}, - "down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#0"} + "north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#texture"}, + "east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#texture"}, + "south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#texture"}, + "west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#texture"} } } ] From 76de8549aaa397cc74e15b303a8951302644e806 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 25 Aug 2021 02:42:23 +0600 Subject: [PATCH 2/2] fixed an error in matter decomposer's model, again. --- .../models/block/matter_decomposer_working.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json index ca4f126fd..4207d56fd 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json @@ -2,7 +2,7 @@ "parent": "block/block", "texture_size": [64, 64], "textures": { - "0": "overdrive_that_matters:block/matter_decomposer", + "texture": "overdrive_that_matters:block/matter_decomposer", "particle": "overdrive_that_matters:block/matter_decomposer" }, "elements": [