diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..61eea51 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +assets/.DS_Store +.DS_Store +assets/minecraft/.DS_Store +assets/minecraft/.DS_Store diff --git a/assets/minecraft/.DS_Store b/assets/minecraft/.DS_Store deleted file mode 100644 index e9d8e21..0000000 Binary files a/assets/minecraft/.DS_Store and /dev/null differ diff --git a/assets/minecraft/items/mace.json b/assets/minecraft/items/mace.json index 8ceeb32..09a9864 100644 --- a/assets/minecraft/items/mace.json +++ b/assets/minecraft/items/mace.json @@ -1,27 +1,37 @@ { - "model": { - "type": "minecraft:select", - "property": "minecraft:component", - "component": "minecraft:custom_name", - "cases": [ - { - "when": [ - "sahur", - "Sahur", - "bat", - "Bat", - "бита", - "Бита" - ], - "model": { - "type": "minecraft:model", - "model": "minecraft:item/bat/bat" + "model": { + "type": "minecraft:select", + "property": "minecraft:component", + "component": "minecraft:custom_name", + "cases": [ + { + "when": [ + "sahur", + "Sahur", + "bat", + "Bat", + "бита", + "Бита" + ], + "model": { + "type": "minecraft:model", + "model": "minecraft:item/bat/bat" + } + }, + { + "when": [ + "puffermace", + "булафуга" + ], + "model": { + "type": "minecraft:model", + "model": "minecraft:item/puffermace/puffer" + } } + ], + "fallback": { + "type": "minecraft:model", + "model": "minecraft:item/mace" } - ], - "fallback": { - "type": "minecraft:model", - "model": "minecraft:item/mace" } - } } diff --git a/assets/minecraft/models/.DS_Store b/assets/minecraft/models/.DS_Store deleted file mode 100644 index dfa7160..0000000 Binary files a/assets/minecraft/models/.DS_Store and /dev/null differ diff --git a/assets/minecraft/models/item/puffermace/puffer.json b/assets/minecraft/models/item/puffermace/puffer.json new file mode 100644 index 0000000..e93800d --- /dev/null +++ b/assets/minecraft/models/item/puffermace/puffer.json @@ -0,0 +1,398 @@ +{ + "credit": "Made with Sharp1x", + "texture_size": [32, 32], + "textures": { + "2": "item/puffermace/puffer", + "particle": "item/puffermace/puffer" + }, + "elements": [ + { + "name": "mace_rod_1", + "from": [7.5, 21.80761, 17.12132], + "to": [8.5, 23.80761, 19.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [8, 13, 9, 13.5], "rotation": 270, "texture": "#2"}, + "east": {"uv": [8, 12.5, 9, 13.5], "rotation": 270, "texture": "#2"}, + "south": {"uv": [8, 12.5, 9, 13], "rotation": 270, "texture": "#2"}, + "west": {"uv": [9, 12.5, 8, 13.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [8.5, 12.5, 9, 13.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [8, 12.5, 8.5, 13.5], "texture": "#2"} + } + }, + { + "name": "mace_rod_2", + "from": [7.5, 14.80761, 10.12132], + "to": [8.5, 16.80761, 12.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [14.5, 12, 15.5, 12.5], "rotation": 270, "texture": "#2"}, + "east": {"uv": [14.5, 11.5, 15.5, 12.5], "rotation": 270, "texture": "#2"}, + "south": {"uv": [14.5, 11.5, 15.5, 12], "rotation": 270, "texture": "#2"}, + "west": {"uv": [15.5, 11.5, 14.5, 12.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [15, 11.5, 15.5, 12.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [14.5, 11.5, 15, 12.5], "texture": "#2"} + } + }, + { + "name": "mace_rod_3", + "from": [7.5, 13.80761, 8.12132], + "to": [8.5, 14.80761, 11.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [14, 13, 14.5, 13.5], "rotation": 270, "texture": "#2"}, + "east": {"uv": [14, 12, 14.5, 13.5], "rotation": 270, "texture": "#2"}, + "south": {"uv": [14, 12, 14.5, 12.5], "rotation": 270, "texture": "#2"}, + "west": {"uv": [14.5, 12, 14, 13.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [14, 12, 14.5, 13.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [14, 12, 14.5, 13.5], "texture": "#2"} + } + }, + { + "name": "mace_rod_4", + "from": [7.5, 12.80761, 7.12132], + "to": [8.5, 13.80761, 10.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [13.5, 13.5, 14, 14], "rotation": 270, "texture": "#2"}, + "east": {"uv": [13.5, 12.5, 14, 14], "rotation": 270, "texture": "#2"}, + "south": {"uv": [13.5, 12.5, 14, 13], "rotation": 270, "texture": "#2"}, + "west": {"uv": [14, 12.5, 13.5, 14], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13.5, 12.5, 14, 14], "rotation": 180, "texture": "#2"}, + "down": {"uv": [13.5, 12.5, 14, 14], "texture": "#2"} + } + }, + { + "name": "mace_rod_5", + "from": [7.5, 14.80761, 9.12132], + "to": [8.5, 15.80761, 10.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [14.5, 12.5, 15, 13], "rotation": 270, "texture": "#2"}, + "east": {"uv": [14.5, 12.5, 15, 13], "rotation": 270, "texture": "#2"}, + "south": {"uv": [14.5, 12.5, 15, 13], "rotation": 270, "texture": "#2"}, + "west": {"uv": [15, 12.5, 14.5, 13], "rotation": 90, "texture": "#2"}, + "up": {"uv": [14.5, 12.5, 15, 13], "rotation": 180, "texture": "#2"}, + "down": {"uv": [14.5, 12.5, 15, 13], "texture": "#2"} + } + }, + { + "name": "mace_rod_6", + "from": [7.5, 11.80761, 6.12132], + "to": [8.5, 12.80761, 9.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [13, 14, 13.5, 14.5], "rotation": 270, "texture": "#2"}, + "east": {"uv": [13, 13, 13.5, 14.5], "rotation": 270, "texture": "#2"}, + "south": {"uv": [13, 13, 13.5, 13.5], "rotation": 270, "texture": "#2"}, + "west": {"uv": [13.5, 13, 13, 14.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 13, 13.5, 14.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [13, 13, 13.5, 14.5], "texture": "#2"} + } + }, + { + "name": "mace_rod_7", + "from": [7.5, 10.80761, 4.12132], + "to": [8.5, 11.80761, 8.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [12.5, 15, 13, 15.5], "rotation": 270, "texture": "#2"}, + "east": {"uv": [12.5, 13.5, 13, 15.5], "rotation": 270, "texture": "#2"}, + "south": {"uv": [12.5, 13.5, 13, 14], "rotation": 270, "texture": "#2"}, + "west": {"uv": [13, 13.5, 12.5, 15.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [12.5, 13.5, 13, 15.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [12.5, 13.5, 13, 15.5], "texture": "#2"} + } + }, + { + "name": "mace_rod_8", + "from": [7.5, 8.80761, 4.12132], + "to": [8.5, 10.80761, 7.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [11.5, 15, 12.5, 15.5], "rotation": 270, "texture": "#2"}, + "east": {"uv": [11.5, 14, 12.5, 15.5], "rotation": 270, "texture": "#2"}, + "south": {"uv": [11.5, 14, 12.5, 14.5], "rotation": 270, "texture": "#2"}, + "west": {"uv": [12.5, 14, 12, 15.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [12, 14, 12.5, 15.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [11.5, 14, 12, 15.5], "texture": "#2"} + } + }, + { + "name": "mace_rod_9", + "from": [7.5, 15.80761, 12.12132], + "to": [8.5, 16.80761, 13.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [15, 11, 15.5, 11.5], "rotation": 270, "texture": "#2"}, + "east": {"uv": [15, 11, 15.5, 11.5], "rotation": 270, "texture": "#2"}, + "south": {"uv": [15, 11, 15.5, 11.5], "rotation": 270, "texture": "#2"}, + "west": {"uv": [15, 11, 15.5, 11.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [15, 11, 15.5, 11.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [15, 11, 15.5, 11.5], "texture": "#2"} + } + }, + { + "name": "mace_rod_10", + "from": [7.5, 16.80761, 11.12132], + "to": [8.5, 17.80761, 12.12132], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 7]}, + "faces": { + "north": {"uv": [15.5, 11.5, 16, 12], "rotation": 270, "texture": "#2"}, + "east": {"uv": [15.5, 11.5, 16, 12], "rotation": 270, "texture": "#2"}, + "south": {"uv": [15.5, 11.5, 16, 12], "rotation": 270, "texture": "#2"}, + "west": {"uv": [15.5, 12, 16, 11.5], "rotation": 90, "texture": "#2"}, + "up": {"uv": [15.5, 11.5, 16, 12], "rotation": 180, "texture": "#2"}, + "down": {"uv": [15.5, 11.5, 16, 12], "texture": "#2"} + } + }, + { + "from": [4, 19, 3], + "to": [12, 27, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 19, -1]}, + "faces": { + "north": {"uv": [4, 4, 8, 8], "texture": "#2"}, + "east": {"uv": [0, 4, 4, 8], "texture": "#2"}, + "south": {"uv": [12, 4, 16, 8], "texture": "#2"}, + "west": {"uv": [8, 4, 12, 8], "texture": "#2"}, + "up": {"uv": [4, 0, 8, 4], "texture": "#2"}, + "down": {"uv": [8, 0, 12, 4], "texture": "#2"} + } + }, + { + "from": [3, 19, 7], + "to": [4, 27, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 19, -1]}, + "faces": { + "north": {"uv": [2.5, 8, 3, 12], "texture": "#2"}, + "east": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "south": {"uv": [2.5, 8, 3, 12], "texture": "#2"}, + "west": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "up": {"uv": [2.5, 8, 3, 8], "texture": "#2"}, + "down": {"uv": [2.5, 8, 3, 8], "texture": "#2"} + } + }, + { + "from": [2, 26, 4], + "to": [4, 26, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 19, -1]}, + "faces": { + "north": {"uv": [2.5, 8, 3, 12], "texture": "#2"}, + "east": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "south": {"uv": [13, 0, 14, 1], "texture": "#2"}, + "west": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "up": {"uv": [13, 1, 14, 0], "texture": "#2"}, + "down": {"uv": [13, 2.5, 14, 1.5], "texture": "#2"} + } + }, + { + "from": [12, 26, 4], + "to": [14, 26, 6], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 19, -1]}, + "faces": { + "north": {"uv": [3, 8, 2.5, 12], "texture": "#2"}, + "east": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "south": {"uv": [14, 0, 13, 1], "texture": "#2"}, + "west": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "up": {"uv": [14, 1, 13, 0], "texture": "#2"}, + "down": {"uv": [14, 2.5, 13, 1.5], "texture": "#2"} + } + }, + { + "from": [4, 27, 7], + "to": [12, 28, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 19, -1]}, + "faces": { + "north": {"uv": [8, 8.5, 11.5, 9], "texture": "#2"}, + "east": {"uv": [8, 8.5, 10.5, 9], "texture": "#2"}, + "south": {"uv": [8, 8.5, 11.5, 9], "texture": "#2"}, + "west": {"uv": [8, 8.5, 10.5, 9], "texture": "#2"}, + "up": {"uv": [8, 8.5, 11.5, 8], "texture": "#2"}, + "down": {"uv": [8, 8.5, 11.5, 8], "texture": "#2"} + } + }, + { + "from": [4, 18, 7], + "to": [12, 19, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 19, -1]}, + "faces": { + "north": {"uv": [8, 10, 11.5, 10.5], "texture": "#2"}, + "east": {"uv": [8, 8.5, 11, 9], "texture": "#2"}, + "south": {"uv": [8, 10, 11.5, 10.5], "texture": "#2"}, + "west": {"uv": [8, 10, 11.5, 10.5], "texture": "#2"}, + "up": {"uv": [8, 8.5, 11, 5], "texture": "#2"}, + "down": {"uv": [8, 8.5, 11, 5], "texture": "#2"} + } + }, + { + "from": [4, 27, 3], + "to": [12, 28, 3], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 27, 3]}, + "faces": { + "north": {"uv": [8, 8.5, 11.5, 9], "texture": "#2"}, + "east": {"uv": [8, 8.5, 10.5, 9], "texture": "#2"}, + "south": {"uv": [8, 8.5, 11, 9], "texture": "#2"}, + "west": {"uv": [8, 8.5, 10.5, 9], "texture": "#2"}, + "up": {"uv": [8, 8.5, 11.5, 8], "texture": "#2"}, + "down": {"uv": [8, 8.5, 11.5, 8], "texture": "#2"} + } + }, + { + "from": [4, 27, 11], + "to": [12, 28, 11], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 27, 11]}, + "faces": { + "north": {"uv": [12, 9, 15.5, 9.5], "texture": "#2"}, + "east": {"uv": [10.5, 8.5, 8, 9], "texture": "#2"}, + "south": {"uv": [15.5, 9, 12, 9.5], "texture": "#2"}, + "west": {"uv": [15.5, 9, 12, 9.5], "texture": "#2"}, + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#2"}, + "down": {"uv": [8, 8.5, 11.5, 8], "texture": "#2"} + } + }, + { + "from": [4, 18, 11], + "to": [12, 19, 11], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 19, 11]}, + "faces": { + "north": {"uv": [11.5, 10.5, 8, 10], "texture": "#2"}, + "east": {"uv": [11.5, 10.5, 8, 10], "texture": "#2"}, + "south": {"uv": [11.5, 10.5, 8, 10], "rotation": 180, "texture": "#2"}, + "west": {"uv": [11.5, 10.5, 8, 10], "texture": "#2"}, + "up": {"uv": [8, 8.5, 11.5, 8], "texture": "#2"}, + "down": {"uv": [8, 8.5, 11.5, 8], "texture": "#2"} + } + }, + { + "from": [4, 18, 3], + "to": [12, 19, 3], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 19, 3]}, + "faces": { + "north": {"uv": [8, 10.5, 11.5, 10], "texture": "#2"}, + "east": {"uv": [8, 10.5, 11.5, 10], "texture": "#2"}, + "south": {"uv": [8, 10.5, 11.5, 10], "texture": "#2"}, + "west": {"uv": [8, 10.5, 11.5, 10], "texture": "#2"}, + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#2"}, + "down": {"uv": [8, 8.5, 11.5, 8], "texture": "#2"} + } + }, + { + "from": [12, 19, 7], + "to": [13, 27, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 19, -1]}, + "faces": { + "north": {"uv": [3, 8, 2.5, 12], "texture": "#2"}, + "east": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "south": {"uv": [3, 8, 2.5, 12], "texture": "#2"}, + "west": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "up": {"uv": [3, 8, 2.5, 8], "texture": "#2"}, + "down": {"uv": [3, 8, 2.5, 8], "texture": "#2"} + } + }, + { + "from": [12, 19, 3], + "to": [13, 27, 3], + "rotation": {"angle": 45, "axis": "y", "origin": [12, 23, 3]}, + "faces": { + "north": {"uv": [3, 8, 2.5, 12], "texture": "#2"}, + "east": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "south": {"uv": [3, 8, 2.5, 12], "texture": "#2"}, + "west": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "up": {"uv": [3, 8, 2.5, 8], "texture": "#2"}, + "down": {"uv": [3, 8, 2.5, 8], "texture": "#2"} + } + }, + { + "from": [12, 19, 11], + "to": [13, 27, 11], + "rotation": {"angle": -45, "axis": "y", "origin": [12, 23, 11]}, + "faces": { + "north": {"uv": [4.5, 8, 5, 12], "texture": "#2"}, + "east": {"uv": [4.5, 8, 4.5, 12], "texture": "#2"}, + "south": {"uv": [4.5, 8, 5, 12], "texture": "#2"}, + "west": {"uv": [4.5, 8, 4.5, 12], "texture": "#2"}, + "up": {"uv": [5, 8, 4.5, 8], "texture": "#2"}, + "down": {"uv": [5, 8, 4.5, 8], "texture": "#2"} + } + }, + { + "from": [3, 19, 11], + "to": [4, 27, 11], + "rotation": {"angle": 45, "axis": "y", "origin": [4, 23, 11]}, + "faces": { + "north": {"uv": [5, 8, 4.5, 12], "texture": "#2"}, + "east": {"uv": [4.5, 8, 4.5, 12], "texture": "#2"}, + "south": {"uv": [5, 8, 4.5, 12], "texture": "#2"}, + "west": {"uv": [4.5, 8, 4.5, 12], "texture": "#2"}, + "up": {"uv": [4.5, 8, 5, 8], "texture": "#2"}, + "down": {"uv": [4.5, 8, 5, 8], "texture": "#2"} + } + }, + { + "from": [3, 19, 3], + "to": [4, 27, 3], + "rotation": {"angle": -45, "axis": "y", "origin": [4, 23, 3]}, + "faces": { + "north": {"uv": [2.5, 8, 3, 12], "texture": "#2"}, + "east": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "south": {"uv": [2.5, 8, 3, 12], "texture": "#2"}, + "west": {"uv": [2.5, 8, 2.5, 12], "texture": "#2"}, + "up": {"uv": [2.5, 8, 3, 8], "texture": "#2"}, + "down": {"uv": [2.5, 8, 3, 8], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-3.86, -180, 0.85], + "translation": [0, -5, 2], + "scale": [0.7, 0.7, 0.7] + }, + "thirdperson_lefthand": { + "rotation": [-3.86, -180, 0.85], + "translation": [0, -5, 2], + "scale": [0.7, 0.7, 0.7] + }, + "firstperson_righthand": { + "rotation": [171.24, 18.07, -169.71], + "translation": [3.75, -6.5, -3.25], + "scale": [0.8, 0.8, 0.8] + }, + "firstperson_lefthand": { + "rotation": [171.24, 18.07, -169.71], + "translation": [3.75, -6.5, -3.25], + "scale": [0.8, 0.8, 0.8] + }, + "ground": { + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [153.25, 42.5, -145], + "translation": [-2.75, -5.75, -5], + "scale": [0.6, 0.6, 0.6] + }, + "head": { + "translation": [0, -27, 0.75], + "scale": [1.85, 1.85, 1.85] + }, + "fixed": { + "rotation": [23.91, -37.91, 32.76], + "translation": [4.75, -9, 0], + "scale": [0.92, 0.92, 0.92] + } + }, + "groups": [ + { + "name": "mace_rod", + "origin": [8, 8, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + }, + { + "name": "big", + "origin": [4, 4, 4], + "color": 0, + "children": [10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24] + } + ] +} diff --git a/assets/minecraft/textures/item/puffermace/puffer.png b/assets/minecraft/textures/item/puffermace/puffer.png new file mode 100644 index 0000000..1f461d3 Binary files /dev/null and b/assets/minecraft/textures/item/puffermace/puffer.png differ