diff --git a/assets/minecraft/models/item/arrow.json b/assets/minecraft/models/item/arrow.json index aa21698b1..0a8bdba31 100644 --- a/assets/minecraft/models/item/arrow.json +++ b/assets/minecraft/models/item/arrow.json @@ -275,7 +275,7 @@ {"predicate": {"custom_model_data":272},"model":"ms:clutter/shelf_clutter_misc_2"}, {"predicate": {"custom_model_data":273},"model":"ms:clutter/shelves_clutter_misc_1"}, {"predicate": {"custom_model_data":274},"model":"ms:clutter/shelves_clutter_misc_2"}, -{"predicate": {"custom_model_data":275},"model":"item/empty"}, +{"predicate": {"custom_model_data":275},"model":"ms:clutter/elemental_workshop_machinery_piston_moving"}, {"predicate": {"custom_model_data":276},"model":"item/empty"}, {"predicate": {"custom_model_data":277},"model":"item/empty"}, {"predicate": {"custom_model_data":278},"model":"item/empty"}, diff --git a/assets/minecraft/textures/item/custom/ew_machinery_moving1.png b/assets/minecraft/textures/item/custom/ew_machinery_moving1.png new file mode 100644 index 000000000..0a99e591e Binary files /dev/null and b/assets/minecraft/textures/item/custom/ew_machinery_moving1.png differ diff --git a/assets/minecraft/textures/item/custom/ew_machinery_moving1.png.mcmeta b/assets/minecraft/textures/item/custom/ew_machinery_moving1.png.mcmeta new file mode 100644 index 000000000..78df88c42 --- /dev/null +++ b/assets/minecraft/textures/item/custom/ew_machinery_moving1.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/assets/minecraft/textures/item/custom/ew_machinery_moving2.png b/assets/minecraft/textures/item/custom/ew_machinery_moving2.png new file mode 100644 index 000000000..5217f32ad Binary files /dev/null and b/assets/minecraft/textures/item/custom/ew_machinery_moving2.png differ diff --git a/assets/minecraft/textures/item/custom/ew_machinery_moving2.png.mcmeta b/assets/minecraft/textures/item/custom/ew_machinery_moving2.png.mcmeta new file mode 100644 index 000000000..78df88c42 --- /dev/null +++ b/assets/minecraft/textures/item/custom/ew_machinery_moving2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/assets/minecraft/textures/item/custom/ew_machinery_moving3.png b/assets/minecraft/textures/item/custom/ew_machinery_moving3.png new file mode 100644 index 000000000..d34d27a20 Binary files /dev/null and b/assets/minecraft/textures/item/custom/ew_machinery_moving3.png differ diff --git a/assets/minecraft/textures/item/custom/ew_machinery_moving3.png.mcmeta b/assets/minecraft/textures/item/custom/ew_machinery_moving3.png.mcmeta new file mode 100644 index 000000000..78df88c42 --- /dev/null +++ b/assets/minecraft/textures/item/custom/ew_machinery_moving3.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} \ No newline at end of file diff --git a/assets/ms/models/clutter/elemental_workshop_machinery_piston_moving.json b/assets/ms/models/clutter/elemental_workshop_machinery_piston_moving.json new file mode 100644 index 000000000..93cfc4824 --- /dev/null +++ b/assets/ms/models/clutter/elemental_workshop_machinery_piston_moving.json @@ -0,0 +1,442 @@ +{ + "credit": "Made by Regorty", + "textures": { + "1": "item/custom/ew_machinery_moving1", + "2": "item/custom/ew_machinery_moving2", + "3": "block/exposed_cut_copper", + "4": "item/custom/ew_machinery_moving3", + "particle": "item/custom/ew_machinery_moving1" + }, + "elements": [ + { + "from": [3, 3, 25], + "to": [13, 5, 29.82843], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 4, 23.20711]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "south": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [6, 2.75, 11], + "to": [10, 5.25, 27], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 4, 23.20711]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 4], "texture": "#1"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#1"}, + "down": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [3, -1.38909, 25.18198], + "to": [13, 3.43934, 27.18198], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 4, 23.20711]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "up": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "down": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [3, 1.58579, 26.41421], + "to": [13, 6.41421, 28.41421], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 4, 23.20711]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "up": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "down": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [3, 0.02513, 23.76777], + "to": [13, 2.02513, 28.59619], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 4, 23.20711]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "south": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [3, 8.06066, 9.18198], + "to": [13, 12.88909, 11.18198], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7.5, 7.20711]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "up": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "down": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [3, 5.08579, 10.41421], + "to": [13, 9.91421, 12.41421], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 7.5, 7.20711]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "up": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "down": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [3, 9.47487, 7.76777], + "to": [13, 11.47487, 12.59619], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 7.5, 7.20711]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "south": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [6, 6.25, -5], + "to": [10, 8.75, 11], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 7.5, 7.20711]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "up": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "down": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [3, 6.5, 9], + "to": [13, 8.5, 13.82843], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 7.5, 7.20711]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "east": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "south": {"uv": [0, 0, 4, 3.5], "texture": "#1"}, + "west": {"uv": [0, 0, 4, 3.5], "texture": "#1"} + } + }, + { + "from": [3, 4.5, 19], + "to": [13, 6.5, 23.82843], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 5.5, 17.20711]}, + "faces": { + "north": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "south": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [6, 4.25, 5], + "to": [10, 6.75, 21], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 5.5, 17.20711]}, + "faces": { + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "up": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "down": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [3, 0.11091, 19.18198], + "to": [13, 4.93934, 21.18198], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 5.5, 17.20711]}, + "faces": { + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "up": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "down": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [3, 3.08579, 20.41421], + "to": [13, 7.91421, 22.41421], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 5.5, 17.20711]}, + "faces": { + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "up": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "down": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [3, 1.52513, 17.76777], + "to": [13, 3.52513, 22.59619], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 5.5, 17.20711]}, + "faces": { + "north": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "south": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [3, 12.81066, 6.43198], + "to": [13, 17.63909, 8.43198], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 12.25, 4.45711]}, + "faces": { + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "up": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "down": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [3, 9.83579, 7.66421], + "to": [13, 14.66421, 9.66421], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12.25, 4.45711]}, + "faces": { + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "up": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "down": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [3, 14.22487, 5.01777], + "to": [13, 16.22487, 9.84619], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 12.25, 4.45711]}, + "faces": { + "north": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "south": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [6, 11, -7.75], + "to": [10, 13.5, 8.25], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12.25, 4.45711]}, + "faces": { + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "up": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "down": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [3, 11.25, 6.25], + "to": [13, 13.25, 11.07843], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12.25, 4.45711]}, + "faces": { + "north": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "east": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "south": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"}, + "west": {"uv": [0, 0, 4.25, 3.75], "texture": "#2"} + } + }, + { + "from": [3, -0.12132, 5.95711], + "to": [13, 4.70711, 7.95711], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 6.5, 6.95711]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "up": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "down": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [6, 2.70711, 5.70711], + "to": [10, 18.70711, 8.20711], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 6.5, 6.95711]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "south": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [3, 1.11091, 8.93198], + "to": [13, 5.93934, 10.93198], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 6.5, 6.95711]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "up": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "down": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [3, 1.29289, 4.54289], + "to": [13, 3.29289, 9.37132], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 6.5, 6.95711]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "south": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [3, 2.52513, 7.51777], + "to": [13, 4.52513, 12.34619], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 6.5, 6.95711]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "south": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [3, 16.06066, 1.93198], + "to": [13, 20.88909, 3.93198], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15.5, -0.04289]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "up": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "down": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [3, 18.70711, -2.45711], + "to": [13, 20.70711, 2.37132], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 15.5, -0.04289]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "south": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [3, 17.47487, 0.51777], + "to": [13, 19.47487, 5.34619], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 15.5, -0.04289]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "south": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [6, 3.29289, -1.29289], + "to": [10, 19.29289, 1.20711], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 15.5, -0.04289]}, + "faces": { + "north": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "south": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [3, 17.29289, -1.04289], + "to": [13, 22.12132, 0.95711], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 15.5, -0.04289]}, + "faces": { + "east": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "west": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "up": {"uv": [0, 0, 4, 3.82843], "texture": "#4"}, + "down": {"uv": [0, 0, 4, 3.82843], "texture": "#4"} + } + }, + { + "from": [3, 1.39917, -7.93976], + "to": [13, 3.39917, -3.11133], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.07, -7.32802]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"} + } + }, + { + "from": [3, 1.45598, -6.57913], + "to": [13, 6.28441, -4.57913], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 3.07, -7.32802]}, + "faces": { + "east": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, + { + "from": [3, -0.01504, -6.52555], + "to": [13, 4.81338, -4.52555], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 3.07, -7.32802]}, + "faces": { + "east": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, + { + "from": [3, 2.87019, -7.99334], + "to": [13, 4.87019, -3.16491], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 3.07, -7.32802]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + }, + { + "from": [6, 1.5, -15.25], + "to": [10, 4, -6.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 2.82, -7.32802]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#3"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#3"} + } + } + ], + "display": { + "thirdperson_righthand": { + "scale": [0.25, 0.25, 0.25] + }, + "firstperson_righthand": { + "rotation": [0, 50, 0], + "scale": [0.15, 0.15, 0.15] + }, + "gui": { + "rotation": [12, 40, 0], + "translation": [-0.25, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [-16, -2, 18], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "stage 1", + "origin": [0, 0, 6], + "color": 3, + "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + }, + { + "name": "stage 2", + "origin": [0, 0, 6], + "color": 2, + "children": [10, 11, 12, 13, 14, 15, 16, 17, 18, 19] + }, + { + "name": "stage 3", + "origin": [0, 0, 6], + "color": 1, + "children": [20, 21, 22, 23, 24, 25, 26, 27, 28, 29] + }, + 30, + 31, + 32, + 33, + 34 + ] +} \ No newline at end of file