From 70106a0dcf94353fe8fb5edf83694f2bd9c8be00 Mon Sep 17 00:00:00 2001 From: Alexander Minges Date: Fri, 15 May 2020 16:20:03 +0200 Subject: [PATCH] Fix missing/wrong paths in models Some models were either pointing to missing or non-existant base models and/or textures. --- assets/minecraft/blockstates/acacia_log.json | 6 +++--- assets/minecraft/blockstates/birch_log.json | 6 +++--- assets/minecraft/blockstates/dark_oak_log.json | 6 +++--- assets/minecraft/blockstates/jungle_log.json | 6 +++--- assets/minecraft/blockstates/lit_redstone_ore.json | 2 +- assets/minecraft/blockstates/oak_log.json | 4 ++-- assets/minecraft/blockstates/spruce_log.json | 6 +++--- assets/minecraft/models/block/item_frame_map.json | 6 +++--- assets/minecraft/models/block/ore/redstone/0.json | 6 ++++++ 9 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 assets/minecraft/models/block/ore/redstone/0.json diff --git a/assets/minecraft/blockstates/acacia_log.json b/assets/minecraft/blockstates/acacia_log.json index 57a91c6..245a9f6 100644 --- a/assets/minecraft/blockstates/acacia_log.json +++ b/assets/minecraft/blockstates/acacia_log.json @@ -7,11 +7,11 @@ "axis=z": [ { "model": "block/acacia_log", "x": 90 }, { "model": "block/logs/acacia/1", "x": 90 } - ], + ], "axis=x": [ { "model": "block/acacia_log", "x": 90, "y": 90 }, { "model": "block/logs/acacia/1", "x": 90, "y": 90 } ], - "axis=none": { "model": "block/acacia_bark" } + "axis=none": { "model": "block/acacia_log" } } -} \ No newline at end of file +} diff --git a/assets/minecraft/blockstates/birch_log.json b/assets/minecraft/blockstates/birch_log.json index c0034f8..8e771c4 100644 --- a/assets/minecraft/blockstates/birch_log.json +++ b/assets/minecraft/blockstates/birch_log.json @@ -7,11 +7,11 @@ "axis=z": [ { "model": "block/birch_log", "x": 90 }, { "model": "block/logs/birch/1", "x": 90 } - ], + ], "axis=x": [ { "model": "block/birch_log", "x": 90, "y": 90 }, { "model": "block/logs/birch/1", "x": 90, "y": 90 } ], - "axis=none": { "model": "block/birch_bark" } + "axis=none": { "model": "block/birch_log" } } -} \ No newline at end of file +} diff --git a/assets/minecraft/blockstates/dark_oak_log.json b/assets/minecraft/blockstates/dark_oak_log.json index a0aa921..3f2fd53 100644 --- a/assets/minecraft/blockstates/dark_oak_log.json +++ b/assets/minecraft/blockstates/dark_oak_log.json @@ -7,11 +7,11 @@ "axis=z": [ { "model": "block/dark_oak_log", "x": 90 }, { "model": "block/logs/dark_oak/1", "x": 90 } - ], + ], "axis=x": [ { "model": "block/dark_oak_log", "x": 90, "y": 90 }, { "model": "block/logs/dark_oak/1", "x": 90, "y": 90 } ], - "axis=none": { "model": "block/dark_oak_bark" } + "axis=none": { "model": "block/dark_oak_log" } } -} \ No newline at end of file +} diff --git a/assets/minecraft/blockstates/jungle_log.json b/assets/minecraft/blockstates/jungle_log.json index b48f5d9..9ddcf01 100644 --- a/assets/minecraft/blockstates/jungle_log.json +++ b/assets/minecraft/blockstates/jungle_log.json @@ -7,11 +7,11 @@ "axis=z": [ { "model": "block/jungle_log", "x": 90 }, { "model": "block/logs/jungle/1", "x": 90 } - ], + ], "axis=x": [ { "model": "block/jungle_log", "x": 90, "y": 90 }, { "model": "block/logs/jungle/1", "x": 90, "y": 90 } ], - "axis=none": { "model": "block/jungle_bark" } + "axis=none": { "model": "block/jungle_log" } } -} \ No newline at end of file +} diff --git a/assets/minecraft/blockstates/lit_redstone_ore.json b/assets/minecraft/blockstates/lit_redstone_ore.json index fca3ebf..fff3d33 100644 --- a/assets/minecraft/blockstates/lit_redstone_ore.json +++ b/assets/minecraft/blockstates/lit_redstone_ore.json @@ -1,7 +1,7 @@ { "variants": { "": [ - { "model": "block/lit_redstone_ore" }, + { "model": "block/ore/redstone/0" }, { "model": "block/ore/redstone/1"} ] } diff --git a/assets/minecraft/blockstates/oak_log.json b/assets/minecraft/blockstates/oak_log.json index f62a2ca..bd0419a 100644 --- a/assets/minecraft/blockstates/oak_log.json +++ b/assets/minecraft/blockstates/oak_log.json @@ -7,11 +7,11 @@ "axis=z": [ { "model": "block/oak_log", "x": 90 }, { "model": "block/logs/oak/1", "x": 90 } - ], + ], "axis=x": [ { "model": "block/oak_log", "x": 90, "y": 90 }, { "model": "block/logs/oak/1", "x": 90, "y": 90 } ], - "axis=none": { "model": "block/oak_bark" } + "axis=none": { "model": "block/oak_log" } } } diff --git a/assets/minecraft/blockstates/spruce_log.json b/assets/minecraft/blockstates/spruce_log.json index fd7e2ee..beeae6f 100644 --- a/assets/minecraft/blockstates/spruce_log.json +++ b/assets/minecraft/blockstates/spruce_log.json @@ -7,11 +7,11 @@ "axis=z": [ { "model": "block/spruce_log", "x": 90 }, { "model": "block/logs/spruce/1", "x": 90 } - ], + ], "axis=x": [ { "model": "block/spruce_log", "x": 90, "y": 90 }, { "model": "block/logs/spruce/1", "x": 90, "y": 90 } ], - "axis=none": { "model": "block/spruce_bark" } + "axis=none": { "model": "block/spruce_log" } } -} \ No newline at end of file +} diff --git a/assets/minecraft/models/block/item_frame_map.json b/assets/minecraft/models/block/item_frame_map.json index 77a1f5b..cfc3b1b 100644 --- a/assets/minecraft/models/block/item_frame_map.json +++ b/assets/minecraft/models/block/item_frame_map.json @@ -1,9 +1,9 @@ { "__comment": "Fair warning, this format is highly likely to change even more in the future!", "textures": { - "particle": "block/planks_oak", - "wood": "block/planks_oak", - "back": "block/itemframe_background" + "particle": "block/planks_birch", + "wood": "block/item_frame_border", + "back": "block/item_frame" }, "elements": [ { "from": [ 1, 1, 15.001 ], diff --git a/assets/minecraft/models/block/ore/redstone/0.json b/assets/minecraft/models/block/ore/redstone/0.json new file mode 100644 index 0000000..72056a1 --- /dev/null +++ b/assets/minecraft/models/block/ore/redstone/0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "block/redstone_ore" + } +}