diff --git a/packs/0-lzcustom/assets/lz/models/festive/christmas_tree.json b/packs/0-lzcustom/assets/lz/models/festive/christmas_tree.json index 9472eeb..783602e 100644 --- a/packs/0-lzcustom/assets/lz/models/festive/christmas_tree.json +++ b/packs/0-lzcustom/assets/lz/models/festive/christmas_tree.json @@ -2,7 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [128, 128], "textures": { - "6": "lz:block/festive/christmas_tree" + "6": "lz:block/festive/christmas_tree", + "particle": "block/oak_leaves" }, "elements": [ { diff --git a/packs/0-lzcustom/assets/lz/models/food/soup_beetroot.json b/packs/0-lzcustom/assets/lz/models/food/soup_beetroot.json index 0b603dd..87cc3df 100644 --- a/packs/0-lzcustom/assets/lz/models/food/soup_beetroot.json +++ b/packs/0-lzcustom/assets/lz/models/food/soup_beetroot.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "parent": "displaydelight:block/bowl", "textures": { "2": "lz:block/food/beetroot_soup", "4": "lz:block/food/bowl", diff --git a/packs/0-lzcustom/assets/lz/models/food/soup_pumpkin.json b/packs/0-lzcustom/assets/lz/models/food/soup_pumpkin.json index 3cea676..3da4f9a 100644 --- a/packs/0-lzcustom/assets/lz/models/food/soup_pumpkin.json +++ b/packs/0-lzcustom/assets/lz/models/food/soup_pumpkin.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "parent": "displaydelight:block/parent_bowl", "render_type": "cutout", "textures": { "2": "lz:block/food/stuffed_pumpkin_details", @@ -111,10 +110,10 @@ "to": [11, 3.5, 11], "rotation": {"angle": 0, "axis": "y", "origin": [-3, 0, 3]}, "faces": { - "north": {"uv": [0, 6, 6, 8], "texture": "#missing"}, - "east": {"uv": [0, 6, 6, 8], "texture": "#missing"}, - "south": {"uv": [6, 0, 12, 2], "texture": "#missing"}, - "west": {"uv": [6, 0, 12, 2], "texture": "#missing"}, + "north": {"uv": [0, 6, 6, 8], "texture": "#6"}, + "east": {"uv": [0, 6, 6, 8], "texture": "#6"}, + "south": {"uv": [6, 0, 12, 2], "texture": "#6"}, + "west": {"uv": [6, 0, 12, 2], "texture": "#6"}, "up": {"uv": [6, 6, 0, 0], "texture": "#6"} } }, diff --git a/packs/0-lzcustom/assets/lz/textures/block/food/cod_roll.png b/packs/0-lzcustom/assets/lz/textures/block/food/cod_roll.png index 1ab02f6..27541f9 100644 Binary files a/packs/0-lzcustom/assets/lz/textures/block/food/cod_roll.png and b/packs/0-lzcustom/assets/lz/textures/block/food/cod_roll.png differ diff --git a/packs/0-lzcustom/assets/lz/textures/block/food/kelp_roll.png b/packs/0-lzcustom/assets/lz/textures/block/food/kelp_roll.png index 41129f3..5aead6e 100644 Binary files a/packs/0-lzcustom/assets/lz/textures/block/food/kelp_roll.png and b/packs/0-lzcustom/assets/lz/textures/block/food/kelp_roll.png differ diff --git a/packs/0-lzcustom/assets/lz/textures/block/food/salmon_roll.png b/packs/0-lzcustom/assets/lz/textures/block/food/salmon_roll.png index b09f5b3..735d391 100644 Binary files a/packs/0-lzcustom/assets/lz/textures/block/food/salmon_roll.png and b/packs/0-lzcustom/assets/lz/textures/block/food/salmon_roll.png differ diff --git a/packs/0-lzcustom/assets/minecraft/items/carrot_on_a_stick.json b/packs/0-lzcustom/assets/minecraft/items/carrot_on_a_stick.json new file mode 100644 index 0000000..ebdd84e --- /dev/null +++ b/packs/0-lzcustom/assets/minecraft/items/carrot_on_a_stick.json @@ -0,0 +1,18 @@ +{ + "model": { + "type": "select", + "property": "custom_model_data", + "index": 1, + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/carrot_on_a_stick" + }, + "cases": [ + { "when": "lzstealth:wrench_default", "model": { "type": "model", "model": "rotator_wrench:items/rotator_wrench" } }, + { "when": "lzstealth:wrench_flip", "model": { "type": "model", "model": "rotator_wrench:items/rotator_wrench_flip" } }, + { "when": "lzstealth:wrench_face_player", "model": { "type": "model", "model": "rotator_wrench:items/rotator_wrench_face_player" } }, + { "when": "lzstealth:wrench_face_click", "model": { "type": "model", "model": "rotator_wrench:items/rotator_wrench_face_click" } }, + { "when": "lzstealth:wrench_terracotta", "model": { "type": "model", "model": "rotator_wrench:items/rotator_wrench_terracotta" } } + ] + } +} \ No newline at end of file diff --git a/packs/0-lzcustom/assets/minecraft/items/sweet_berries.json b/packs/0-lzcustom/assets/minecraft/items/sweet_berries.json index bac0c8e..a048f95 100644 --- a/packs/0-lzcustom/assets/minecraft/items/sweet_berries.json +++ b/packs/0-lzcustom/assets/minecraft/items/sweet_berries.json @@ -12,7 +12,7 @@ { "when": "pie2", "model": { "type": "model", "model": "lz:food/pie_sweet_berry2" } }, { "when": "pie3", "model": { "type": "model", "model": "lz:food/pie_sweet_berry3" } }, { "when": "pie4", "model": { "type": "model", "model": "lz:food/pie_sweet_berry4" } }, - { "when": "drink", "model": { "type": "model", "model": "lz:foodfood/drink_sweet_berry" } } + { "when": "drink", "model": { "type": "model", "model": "lz:food/drink_sweet_berry" } } ] } } \ No newline at end of file diff --git a/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench.json b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench.json new file mode 100644 index 0000000..d123961 --- /dev/null +++ b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench.json @@ -0,0 +1,92 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [8, 8], + "textures": { + "0": "rotator_wrench:block/rotator_wrench/stick", + "1": "block/oak_log_top", + "2": "block/oak_log", + "3": "block/oak_log_top", + "4": "block/oak_log", + "5": "block/oak_log", + "6": "block/oak_log", + "overlay": "rotator_wrench:block/rotator_wrench/rotate", + "particle": "block/oak_log" + }, + "elements": [ + { + "from": [7.5, 0, 7.5], + "to": [8.5, 7, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, + "faces": { + "north": {"uv": [0, 0, 3, 16], "texture": "#0"}, + "east": {"uv": [3, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 16], "texture": "#0"}, + "west": {"uv": [3, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [3, 3, 6, 0], "texture": "#0"}, + "down": {"uv": [3, 3, 6, 0], "texture": "#0"} + } + }, + { + "name": "block", + "from": [6.5, 7, 6.5], + "to": [9.5, 10, 9.5], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#2"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#6"} + } + }, + { + "name": "overlay", + "from": [6.45, 6.95, 6.45], + "to": [9.55, 10.05, 9.55], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#overlay"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#overlay"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 4.5, 1] + }, + "thirdperson_lefthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 4.5, 1] + }, + "firstperson_righthand": { + "rotation": [0, 85, -20], + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -85, 20], + "translation": [0, 3, 0] + }, + "ground": { + "rotation": [45, 0, 72.5], + "translation": [0, -1, 0], + "scale": [1.2, 1.2, 1.2] + }, + "gui": { + "rotation": [-25, 10, 45], + "translation": [-3.25, 3, 0], + "scale": [1.725, 1.725, 1.725] + }, + "head": { + "rotation": [0, 0, 28.5], + "translation": [-7, 10.5, 0], + "scale": [2.5, 2.5, 2.5] + }, + "fixed": { + "rotation": [-5, 0, -45], + "translation": [5, 5, -1.5], + "scale": [2.5, 2.5, 2.5] + } + } +} \ No newline at end of file diff --git a/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_2.json b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_2.json new file mode 100644 index 0000000..133a2db --- /dev/null +++ b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_2.json @@ -0,0 +1,89 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [8, 8], + "textures": { + "0": "rotator_wrench:block/rotator_wrench/stick", + "4": "rotator_wrench:block/rotator_wrench/rotate", + "6": "1.21.4:block/observer_back", + "7": "1.21.4:block/observer_front", + "8": "1.21.4:block/observer_side", + "9": "1.21.4:block/observer_top", + "particle": "block/oak_log" + }, + "elements": [ + { + "from": [7.5, 0, 7.5], + "to": [8.5, 7, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, + "faces": { + "north": {"uv": [0, 0, 3, 16], "texture": "#0"}, + "east": {"uv": [3, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 16], "texture": "#0"}, + "west": {"uv": [3, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [3, 3, 6, 0], "texture": "#0"}, + "down": {"uv": [3, 3, 6, 0], "texture": "#0"} + } + }, + { + "from": [6.5, 7, 6.5], + "to": [9.5, 10, 9.5], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#9"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#8"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#9"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#8"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#7"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#6"} + } + }, + { + "name": "overlay", + "from": [6.45, 6.95, 6.45], + "to": [9.55, 10.05, 9.55], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#4"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#4"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 4.5, 1] + }, + "thirdperson_lefthand": { + "rotation": [0, -45, 0], + "translation": [0.5, 4.5, 1] + }, + "firstperson_righthand": { + "rotation": [0, -85, 20], + "translation": [0, 3, 0] + }, + "firstperson_lefthand": { + "rotation": [0, -85, 20], + "translation": [0, 3, 0] + }, + "ground": { + "rotation": [45, 0, 72.5], + "translation": [0, -1, 0], + "scale": [1.2, 1.2, 1.2] + }, + "gui": { + "rotation": [-25, 10, 45], + "translation": [-3.25, 3, 0], + "scale": [1.725, 1.725, 1.725] + }, + "head": { + "rotation": [0, 0, 28.5], + "translation": [-7, 10.5, 0], + "scale": [2.5, 2.5, 2.5] + }, + "fixed": { + "rotation": [-5, 0, -45], + "translation": [5, 5, -1.5], + "scale": [2.5, 2.5, 2.5] + } + } +} \ No newline at end of file diff --git a/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_face_click.json b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_face_click.json new file mode 100644 index 0000000..6bc05ce --- /dev/null +++ b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_face_click.json @@ -0,0 +1,50 @@ +{ + "parent": "rotator_wrench:items/rotator_wrench", + "textures": { + "1": "block/observer_top", + "2": "block/observer_side", + "3": "block/observer_top", + "4": "block/observer_side", + "5": "block/observer_front", + "6": "block/observer_back" + }, + "elements": [ + { + "from": [7.5, 0, 7.5], + "to": [8.5, 7, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, + "faces": { + "north": {"uv": [0, 0, 3, 16], "texture": "#0"}, + "east": {"uv": [3, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 16], "texture": "#0"}, + "west": {"uv": [3, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [3, 3, 6, 0], "texture": "#0"}, + "down": {"uv": [3, 3, 6, 0], "texture": "#0"} + } + }, + { + "name": "block", + "from": [6.5, 7, 6.5], + "to": [9.5, 10, 9.5], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#2"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#5"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#6"} + } + }, + { + "name": "overlay", + "from": [6.45, 6.95, 6.45], + "to": [9.55, 10.05, 9.55], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#overlay"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#overlay"} + } + } + ] + } \ No newline at end of file diff --git a/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_face_player.json b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_face_player.json new file mode 100644 index 0000000..475eaa2 --- /dev/null +++ b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_face_player.json @@ -0,0 +1,11 @@ +{ + "parent": "rotator_wrench:items/rotator_wrench", + "textures": { + "1": "block/chiseled_polished_blackstone", + "2": "block/chiseled_polished_blackstone", + "3": "block/chiseled_polished_blackstone", + "4": "block/chiseled_polished_blackstone", + "5": "block/chiseled_polished_blackstone", + "6": "block/chiseled_polished_blackstone" + } + } \ No newline at end of file diff --git a/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_flip.json b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_flip.json new file mode 100644 index 0000000..40dd99c --- /dev/null +++ b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_flip.json @@ -0,0 +1,11 @@ +{ + "parent": "rotator_wrench:items/rotator_wrench", + "textures": { + "1": "block/gold_block", + "2": "block/gold_block", + "3": "block/gold_block", + "4": "block/gold_block", + "5": "block/gold_block", + "6": "block/gold_block" + } + } \ No newline at end of file diff --git a/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_terracotta.json b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_terracotta.json new file mode 100644 index 0000000..4c36031 --- /dev/null +++ b/packs/0-lzcustom/assets/rotator_wrench/models/items/rotator_wrench_terracotta.json @@ -0,0 +1,50 @@ +{ + "parent": "rotator_wrench:items/rotator_wrench", + "textures": { + "1": "block/pink_glazed_terracotta", + "2": "block/pink_glazed_terracotta", + "3": "block/pink_glazed_terracotta", + "4": "block/pink_glazed_terracotta", + "5": "block/pink_glazed_terracotta", + "6": "block/pink_glazed_terracotta" + }, + "elements": [ + { + "name": "block", + "from": [6.5, 7, 6.5], + "to": [9.5, 10, 9.5], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#4"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#5"}, + "down": {"uv": [0, 16, 16, 0], "rotation": 90, "texture": "#6"} + } + }, + { + "from": [7.5, 0, 7.5], + "to": [8.5, 7, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, + "faces": { + "north": {"uv": [0, 0, 3, 16], "texture": "#0"}, + "east": {"uv": [3, 0, 0, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 16], "texture": "#0"}, + "west": {"uv": [3, 0, 0, 16], "texture": "#0"}, + "up": {"uv": [3, 3, 6, 0], "texture": "#0"}, + "down": {"uv": [3, 3, 6, 0], "texture": "#0"} + } + }, + { + "name": "overlay", + "from": [6.45, 6.95, 6.45], + "to": [9.55, 10.05, 9.55], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 8.5, 8]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#overlay"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#overlay"} + } + } + ] +} \ No newline at end of file diff --git a/packs/0-lzcustom/assets/rotator_wrench/textures/block/rotator_wrench/rotate.png b/packs/0-lzcustom/assets/rotator_wrench/textures/block/rotator_wrench/rotate.png new file mode 100644 index 0000000..61cdb8a Binary files /dev/null and b/packs/0-lzcustom/assets/rotator_wrench/textures/block/rotator_wrench/rotate.png differ diff --git a/packs/0-lzcustom/assets/rotator_wrench/textures/block/rotator_wrench/stick.png b/packs/0-lzcustom/assets/rotator_wrench/textures/block/rotator_wrench/stick.png new file mode 100644 index 0000000..11982b0 Binary files /dev/null and b/packs/0-lzcustom/assets/rotator_wrench/textures/block/rotator_wrench/stick.png differ