diff --git a/packs/0-lzcustom/assets/minecraft/items/apple.json b/packs/0-lzcustom/assets/minecraft/items/apple.json new file mode 100644 index 0000000..9f4d3a8 --- /dev/null +++ b/packs/0-lzcustom/assets/minecraft/items/apple.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "select", + "property": "custom_model_data", + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/apple" + }, + "cases": [ + { "when": "pie_apple", "model": { "type": "model", "model": "lz:food/pie_apple" } }, + { "when": "pie_apple1", "model": { "type": "model", "model": "lz:food/pie_apple1" } }, + { "when": "pie_apple2", "model": { "type": "model", "model": "lz:food/pie_apple2" } }, + { "when": "pie_apple3", "model": { "type": "model", "model": "lz:food/pie_apple3" } }, + { "when": "pie_apple4", "model": { "type": "model", "model": "lz:food/pie_apple4" } }, + { "when": "apple_cider", "model": { "type": "model", "model": "lz:food/drink_apple_cider" } } + ] + } +} \ No newline at end of file diff --git a/packs/0-lzcustom/assets/minecraft/models/item/baked_potato.json b/packs/0-lzcustom/assets/minecraft/items/baked_potato.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/baked_potato.json rename to packs/0-lzcustom/assets/minecraft/items/baked_potato.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/beetroot_soup.json b/packs/0-lzcustom/assets/minecraft/items/beetroot_soup.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/beetroot_soup.json rename to packs/0-lzcustom/assets/minecraft/items/beetroot_soup.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/bone.json b/packs/0-lzcustom/assets/minecraft/items/bone.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/bone.json rename to packs/0-lzcustom/assets/minecraft/items/bone.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/bread.json b/packs/0-lzcustom/assets/minecraft/items/bread.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/bread.json rename to packs/0-lzcustom/assets/minecraft/items/bread.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/cake.json b/packs/0-lzcustom/assets/minecraft/items/cake.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/cake.json rename to packs/0-lzcustom/assets/minecraft/items/cake.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/candle.json b/packs/0-lzcustom/assets/minecraft/items/candle.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/candle.json rename to packs/0-lzcustom/assets/minecraft/items/candle.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/carrot.json b/packs/0-lzcustom/assets/minecraft/items/carrot.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/carrot.json rename to packs/0-lzcustom/assets/minecraft/items/carrot.json diff --git a/packs/0-lzcustom/assets/minecraft/items/carved_pumpkin.json b/packs/0-lzcustom/assets/minecraft/items/carved_pumpkin.json new file mode 100644 index 0000000..74dd503 --- /dev/null +++ b/packs/0-lzcustom/assets/minecraft/items/carved_pumpkin.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "select", + "property": "custom_model_data", + "fallback": { + "type": "minecraft:model", + "model": "minecraft:block/carved_pumpkin" + }, + "cases": [ + { "when": "witch_hat", "model": { "type": "model", "model": "lz:hats/witch" } }, + { "when": "floral_crown", "model": { "type": "model", "model": "lz:hats/floral_crown" } } + ] + } +} \ No newline at end of file diff --git a/packs/0-lzcustom/assets/minecraft/models/item/cocoa_beans.json b/packs/0-lzcustom/assets/minecraft/items/cocoa_beans.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/cocoa_beans.json rename to packs/0-lzcustom/assets/minecraft/items/cocoa_beans.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/cod.json b/packs/0-lzcustom/assets/minecraft/items/cod.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/cod.json rename to packs/0-lzcustom/assets/minecraft/items/cod.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/cooked_beef.json b/packs/0-lzcustom/assets/minecraft/items/cooked_beef.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/cooked_beef.json rename to packs/0-lzcustom/assets/minecraft/items/cooked_beef.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/cooked_chicken.json b/packs/0-lzcustom/assets/minecraft/items/cooked_chicken.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/cooked_chicken.json rename to packs/0-lzcustom/assets/minecraft/items/cooked_chicken.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/cooked_cod.json b/packs/0-lzcustom/assets/minecraft/items/cooked_cod.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/cooked_cod.json rename to packs/0-lzcustom/assets/minecraft/items/cooked_cod.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/cooked_porkchop.json b/packs/0-lzcustom/assets/minecraft/items/cooked_porkchop.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/cooked_porkchop.json rename to packs/0-lzcustom/assets/minecraft/items/cooked_porkchop.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/cooked_rabbit.json b/packs/0-lzcustom/assets/minecraft/items/cooked_rabbit.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/cooked_rabbit.json rename to packs/0-lzcustom/assets/minecraft/items/cooked_rabbit.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/cookie.json b/packs/0-lzcustom/assets/minecraft/items/cookie.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/cookie.json rename to packs/0-lzcustom/assets/minecraft/items/cookie.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/dried_kelp.json b/packs/0-lzcustom/assets/minecraft/items/dried_kelp.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/dried_kelp.json rename to packs/0-lzcustom/assets/minecraft/items/dried_kelp.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/glass_bottle.json b/packs/0-lzcustom/assets/minecraft/items/glass_bottle.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/glass_bottle.json rename to packs/0-lzcustom/assets/minecraft/items/glass_bottle.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/glow_berries.json b/packs/0-lzcustom/assets/minecraft/items/glow_berries.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/glow_berries.json rename to packs/0-lzcustom/assets/minecraft/items/glow_berries.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/melon_slice.json b/packs/0-lzcustom/assets/minecraft/items/melon_slice.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/melon_slice.json rename to packs/0-lzcustom/assets/minecraft/items/melon_slice.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/mushroom_stew.json b/packs/0-lzcustom/assets/minecraft/items/mushroom_stew.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/mushroom_stew.json rename to packs/0-lzcustom/assets/minecraft/items/mushroom_stew.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/oak_sapling.json b/packs/0-lzcustom/assets/minecraft/items/oak_sapling.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/oak_sapling.json rename to packs/0-lzcustom/assets/minecraft/items/oak_sapling.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/paper.json b/packs/0-lzcustom/assets/minecraft/items/paper.json similarity index 99% rename from packs/0-lzcustom/assets/minecraft/models/item/paper.json rename to packs/0-lzcustom/assets/minecraft/items/paper.json index 23df136..e41573e 100644 --- a/packs/0-lzcustom/assets/minecraft/models/item/paper.json +++ b/packs/0-lzcustom/assets/minecraft/items/paper.json @@ -130,7 +130,7 @@ { "predicate": {"custom_model_data": 52154}, "model": "cards:item/custom/joker_black"}, { "predicate": {"custom_model_data": 52155}, "model": "cards:item/custom/back"}, - { "predicate": {"custom_model_data": 59701}, "model": "lz:festive/presents"} + { "predicate": {"custom_model_data": "lz:presents"}, "model": "lz:festive/presents"} ] } \ No newline at end of file diff --git a/packs/0-lzcustom/assets/minecraft/models/item/pumpkin.json b/packs/0-lzcustom/assets/minecraft/items/pumpkin.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/pumpkin.json rename to packs/0-lzcustom/assets/minecraft/items/pumpkin.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/pumpkin_pie.json b/packs/0-lzcustom/assets/minecraft/items/pumpkin_pie.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/pumpkin_pie.json rename to packs/0-lzcustom/assets/minecraft/items/pumpkin_pie.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/salmon.json b/packs/0-lzcustom/assets/minecraft/items/salmon.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/salmon.json rename to packs/0-lzcustom/assets/minecraft/items/salmon.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/snow_block.json b/packs/0-lzcustom/assets/minecraft/items/snow_block.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/snow_block.json rename to packs/0-lzcustom/assets/minecraft/items/snow_block.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/sweet_berries.json b/packs/0-lzcustom/assets/minecraft/items/sweet_berries.json similarity index 100% rename from packs/0-lzcustom/assets/minecraft/models/item/sweet_berries.json rename to packs/0-lzcustom/assets/minecraft/items/sweet_berries.json diff --git a/packs/0-lzcustom/assets/minecraft/models/item/apple.json b/packs/0-lzcustom/assets/minecraft/models/item/apple.json deleted file mode 100644 index 0a8116b..0000000 --- a/packs/0-lzcustom/assets/minecraft/models/item/apple.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/apple" - }, - "overrides": [ - {"predicate": {"custom_model_data":59700}, "model": "lz:food/pie_apple"}, - {"predicate": {"custom_model_data":59701}, "model": "lz:food/pie_apple1"}, - {"predicate": {"custom_model_data":59702}, "model": "lz:food/pie_apple2"}, - {"predicate": {"custom_model_data":59703}, "model": "lz:food/pie_apple3"}, - {"predicate": {"custom_model_data":59704}, "model": "lz:food/pie_apple4"}, - {"predicate": {"custom_model_data":59710}, "model": "lz:food/drink_apple_cider"} - ] -} \ No newline at end of file diff --git a/packs/0-lzcustom/assets/minecraft/models/item/carved_pumpkin.json b/packs/0-lzcustom/assets/minecraft/models/item/carved_pumpkin.json deleted file mode 100644 index 309e2e5..0000000 --- a/packs/0-lzcustom/assets/minecraft/models/item/carved_pumpkin.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/carved_pumpkin", - "overrides": [ - {"predicate": {"custom_model_data":5971}, "model": "lz:hats/witch"}, - {"predicate": {"custom_model_data":5972}, "model": "lz:hats/floral_crown"} - ] -} \ No newline at end of file