diff --git a/src/main/resources/assets/sfcraft/models/item/lunch_box.json b/src/main/resources/assets/sfcraft/models/item/lunch_box.json index 95b4da6..742ea6a 100644 --- a/src/main/resources/assets/sfcraft/models/item/lunch_box.json +++ b/src/main/resources/assets/sfcraft/models/item/lunch_box.json @@ -1,239 +1,6 @@ { - "format_version": "1.21.11", - "credit": "Made with Blockbench", - "texture_size": [32, 32], + "parent": "minecraft:item/generated", "textures": { - "0": "sfcraft:item/lunch_box", - "particle": "sfcraft:item/lunch_box" - }, - "elements": [ - { - "from": [2, 0, 9], - "to": [3, 1, 13], - "faces": { - "north": {"uv": [14.5, 0, 15, 0.5], "texture": "#0"}, - "east": {"uv": [9.5, 0.5, 11.5, 1], "texture": "#0"}, - "south": {"uv": [9, 1, 9.5, 1.5], "texture": "#0"}, - "west": {"uv": [12.5, 1.5, 14.5, 2], "texture": "#0"}, - "up": {"uv": [7, 3.5, 6.5, 1.5], "texture": "#0"}, - "down": {"uv": [7, 9.5, 6.5, 11.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 3], - "to": [5, 1, 6], - "faces": { - "north": {"uv": [13.5, 0, 14, 0.5], "texture": "#0"}, - "east": {"uv": [13, 0.5, 14.5, 1], "texture": "#0"}, - "south": {"uv": [10, 1, 10.5, 1.5], "texture": "#0"}, - "west": {"uv": [9.5, 1.5, 11, 2], "texture": "#0"}, - "up": {"uv": [6, 6.5, 5.5, 5], "texture": "#0"}, - "down": {"uv": [6, 13, 5.5, 14.5], "texture": "#0"} - } - }, - { - "from": [5, 0, 2], - "to": [6, 1, 6], - "faces": { - "north": {"uv": [13, 0, 13.5, 0.5], "texture": "#0"}, - "east": {"uv": [13, 0.5, 15, 1], "texture": "#0"}, - "south": {"uv": [10.5, 1, 11, 1.5], "texture": "#0"}, - "west": {"uv": [9, 1.5, 11, 2], "texture": "#0"}, - "up": {"uv": [5.5, 7, 5, 5], "texture": "#0"}, - "down": {"uv": [5.5, 13, 5, 15], "texture": "#0"} - } - }, - { - "from": [6, 0, 1], - "to": [8, 1, 6], - "faces": { - "north": {"uv": [12, 0, 13, 0.5], "texture": "#0"}, - "east": {"uv": [13, 0.5, 15.5, 1], "texture": "#0"}, - "south": {"uv": [11, 1, 12, 1.5], "texture": "#0"}, - "west": {"uv": [8.5, 1.5, 11, 2], "texture": "#0"}, - "up": {"uv": [5, 7.5, 4, 5], "texture": "#0"}, - "down": {"uv": [5, 13, 4, 15.5], "texture": "#0"} - } - }, - { - "from": [4, 0, 13], - "to": [8, 1, 14], - "faces": { - "north": {"uv": [12, 0, 14, 0.5], "texture": "#0"}, - "east": {"uv": [9, 0.5, 9.5, 1], "texture": "#0"}, - "south": {"uv": [10, 1, 12, 1.5], "texture": "#0"}, - "west": {"uv": [14.5, 1.5, 15, 2], "texture": "#0"}, - "up": {"uv": [6, 1.5, 4, 1], "texture": "#0"}, - "down": {"uv": [6, 9, 4, 9.5], "texture": "#0"} - } - }, - { - "from": [5, 0, 14], - "to": [8, 1, 15], - "faces": { - "north": {"uv": [12, 0, 13.5, 0.5], "texture": "#0"}, - "east": {"uv": [8.5, 0.5, 9, 1], "texture": "#0"}, - "south": {"uv": [10.5, 1, 12, 1.5], "texture": "#0"}, - "west": {"uv": [15, 1.5, 15.5, 2], "texture": "#0"}, - "up": {"uv": [5.5, 1, 4, 0.5], "texture": "#0"}, - "down": {"uv": [5.5, 8.5, 4, 9], "texture": "#0"} - } - }, - { - "from": [6, 0, 15], - "to": [8, 1, 16], - "faces": { - "north": {"uv": [12, 0, 13, 0.5], "texture": "#0"}, - "east": {"uv": [8, 0.5, 8.5, 1], "texture": "#0"}, - "south": {"uv": [11, 1, 12, 1.5], "texture": "#0"}, - "west": {"uv": [15.5, 1.5, 16, 2], "texture": "#0"}, - "up": {"uv": [5, 0.5, 4, 0], "texture": "#0"}, - "down": {"uv": [5, 8, 4, 8.5], "texture": "#0"} - } - }, - { - "from": [8, 0, 1], - "to": [9, 1, 15], - "faces": { - "north": {"uv": [11.5, 0, 12, 0.5], "texture": "#0"}, - "east": {"uv": [8.5, 0.5, 15.5, 1], "texture": "#0"}, - "south": {"uv": [12, 1, 12.5, 1.5], "texture": "#0"}, - "west": {"uv": [8.5, 1.5, 15.5, 2], "texture": "#0"}, - "up": {"uv": [4, 7.5, 3.5, 0.5], "texture": "#0"}, - "down": {"uv": [4, 8.5, 3.5, 15.5], "texture": "#0"} - } - }, - { - "from": [9, 0, 0], - "to": [10, 1, 14], - "faces": { - "north": {"uv": [11, 0, 11.5, 0.5], "texture": "#0"}, - "east": {"uv": [9, 0.5, 16, 1], "texture": "#0"}, - "south": {"uv": [12.5, 1, 13, 1.5], "texture": "#0"}, - "west": {"uv": [8, 1.5, 15, 2], "texture": "#0"}, - "up": {"uv": [3.5, 8, 3, 1], "texture": "#0"}, - "down": {"uv": [3.5, 9, 3, 16], "texture": "#0"} - } - }, - { - "from": [10, 0, 0], - "to": [11, 1, 14], - "faces": { - "north": {"uv": [10.5, 0, 11, 0.5], "texture": "#0"}, - "east": {"uv": [9, 0.5, 16, 1], "texture": "#0"}, - "south": {"uv": [13, 1, 13.5, 1.5], "texture": "#0"}, - "west": {"uv": [8, 1.5, 15, 2], "texture": "#0"}, - "up": {"uv": [3, 8, 2.5, 1], "texture": "#0"}, - "down": {"uv": [3, 9, 2.5, 16], "texture": "#0"} - } - }, - { - "from": [11, 0, 0], - "to": [12, 1, 13], - "faces": { - "north": {"uv": [10, 0, 10.5, 0.5], "texture": "#0"}, - "east": {"uv": [9.5, 0.5, 16, 1], "texture": "#0"}, - "south": {"uv": [13.5, 1, 14, 1.5], "texture": "#0"}, - "west": {"uv": [8, 1.5, 14.5, 2], "texture": "#0"}, - "up": {"uv": [2.5, 8, 2, 1.5], "texture": "#0"}, - "down": {"uv": [2.5, 9.5, 2, 16], "texture": "#0"} - } - }, - { - "from": [12, 0, 1], - "to": [13, 1, 12], - "faces": { - "north": {"uv": [9.5, 0, 10, 0.5], "texture": "#0"}, - "east": {"uv": [10, 0.5, 15.5, 1], "texture": "#0"}, - "south": {"uv": [14, 1, 14.5, 1.5], "texture": "#0"}, - "west": {"uv": [8.5, 1.5, 14, 2], "texture": "#0"}, - "up": {"uv": [2, 7.5, 1.5, 2], "texture": "#0"}, - "down": {"uv": [2, 10, 1.5, 15.5], "texture": "#0"} - } - }, - { - "from": [13, 0, 2], - "to": [14, 1, 9], - "faces": { - "north": {"uv": [9, 0, 9.5, 0.5], "texture": "#0"}, - "east": {"uv": [11.5, 0.5, 15, 1], "texture": "#0"}, - "south": {"uv": [14.5, 1, 15, 1.5], "texture": "#0"}, - "west": {"uv": [9, 1.5, 12.5, 2], "texture": "#0"}, - "up": {"uv": [1.5, 7, 1, 3.5], "texture": "#0"}, - "down": {"uv": [1.5, 11.5, 1, 15], "texture": "#0"} - } - }, - { - "from": [14, 0, 3], - "to": [15, 1, 6], - "faces": { - "north": {"uv": [8.5, 0, 9, 0.5], "texture": "#0"}, - "east": {"uv": [13, 0.5, 14.5, 1], "texture": "#0"}, - "south": {"uv": [15, 1, 15.5, 1.5], "texture": "#0"}, - "west": {"uv": [9.5, 1.5, 11, 2], "texture": "#0"}, - "up": {"uv": [1, 6.5, 0.5, 5], "texture": "#0"}, - "down": {"uv": [1, 13, 0.5, 14.5], "texture": "#0"} - } - }, - { - "from": [3, 0, 6], - "to": [8, 1, 13], - "faces": { - "north": {"uv": [12, 0, 14.5, 0.5], "texture": "#0"}, - "east": {"uv": [9.5, 0.5, 13, 1], "texture": "#0"}, - "south": {"uv": [9.5, 1, 12, 1.5], "texture": "#0"}, - "west": {"uv": [11, 1.5, 14.5, 2], "texture": "#0"}, - "up": {"uv": [6.5, 5, 4, 1.5], "texture": "#0"}, - "down": {"uv": [6.5, 9.5, 4, 13], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [59.26, -12.02, 115.05], - "translation": [-3, 0, -1.25], - "scale": [0.35547, 0.35547, 0.35547] - }, - "thirdperson_lefthand": { - "rotation": [-83.24, -12.02, 115.05], - "translation": [-3, 0.25, 1.5], - "scale": [0.35547, 0.35547, 0.35547] - }, - "firstperson_righthand": { - "rotation": [21.59, 29.56, 67.84], - "translation": [2.25, 1.75, -1.25] - }, - "firstperson_lefthand": { - "rotation": [-10.25, 47.06, -105.98], - "translation": [4.75, 1.25, -1.25], - "scale": [0.62695, 0.62695, 0.62695] - }, - "ground": { - "translation": [0, 8.75, 0] - }, - "gui": { - "rotation": [-84.93, 79.56, 178.36], - "translation": [0.5, 0, 0] - }, - "head": { - "translation": [0, 15.75, 0] - }, - "fixed": { - "rotation": [-70.17, -81.22, 11.15], - "translation": [0, 0, -8] - }, - "on_shelf": { - "rotation": [-104.18, 70.19, -166.68], - "translation": [1.25, 0, 4.25] - } - }, - "groups": [ - { - "name": "group", - "origin": [8, 8, 8], - "scope": 0, - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] - } - ] + "layer0": "sfcraft:item/lunch_box" + } } \ No newline at end of file diff --git a/src/main/resources/assets/sfcraft/textures/item/lunch_box.png b/src/main/resources/assets/sfcraft/textures/item/lunch_box.png index f024748..db0dfe9 100644 Binary files a/src/main/resources/assets/sfcraft/textures/item/lunch_box.png and b/src/main/resources/assets/sfcraft/textures/item/lunch_box.png differ diff --git a/src/main/resources/data/minecraft/tags/villager_trade/weaponsmith/level_2.json b/src/main/resources/data/minecraft/tags/villager_trade/weaponsmith/level_2.json new file mode 100644 index 0000000..966a879 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/villager_trade/weaponsmith/level_2.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "sfcraft:weaponsmith/2/fire_charge_emerald_bomb" + ] +} diff --git a/src/main/resources/data/minecraft/tags/villager_trade/weaponsmith/level_4.json b/src/main/resources/data/minecraft/tags/villager_trade/weaponsmith/level_4.json deleted file mode 100644 index 530a4a9..0000000 --- a/src/main/resources/data/minecraft/tags/villager_trade/weaponsmith/level_4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "sfcraft:weaponsmith/4/fire_charge_emerald_bomb" - ] -} diff --git a/src/main/resources/data/sfcraft/villager_trade/weaponsmith/4/fire_charge_emerald_bomb.json b/src/main/resources/data/sfcraft/villager_trade/weaponsmith/2/fire_charge_emerald_bomb.json similarity index 100% rename from src/main/resources/data/sfcraft/villager_trade/weaponsmith/4/fire_charge_emerald_bomb.json rename to src/main/resources/data/sfcraft/villager_trade/weaponsmith/2/fire_charge_emerald_bomb.json