diff --git a/src/main/resources/assets/functionalstorage/models/block/compacting_drawer.json b/src/main/resources/assets/functionalstorage/models/block/compacting_drawer.json index cec800e..dc1db11 100644 --- a/src/main/resources/assets/functionalstorage/models/block/compacting_drawer.json +++ b/src/main/resources/assets/functionalstorage/models/block/compacting_drawer.json @@ -125,11 +125,11 @@ "scale": [0.375, 0.375, 0.375] }, "firstperson_righthand": { - "rotation": [0, 45, 0], + "rotation": [0, 135, 0], "scale": [0.4, 0.4, 0.4] }, "firstperson_lefthand": { - "rotation": [0, 225, 0], + "rotation": [0, 135, 0], "scale": [0.4, 0.4, 0.4] }, "ground": { diff --git a/src/main/resources/assets/functionalstorage/models/block/storage_controller.json b/src/main/resources/assets/functionalstorage/models/block/storage_controller.json new file mode 100644 index 0000000..e533887 --- /dev/null +++ b/src/main/resources/assets/functionalstorage/models/block/storage_controller.json @@ -0,0 +1,108 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "bottom": "functionalstorage:blocks/compacting_drawer_bottom", + "front": "functionalstorage:blocks/controller_front", + "particle": "functionalstorage:blocks/compacting_drawer_side", + "side": "functionalstorage:blocks/compacting_drawer_side", + "top": "functionalstorage:blocks/compacting_drawer_top" + }, + "elements": [ + { + "from": [1, 1, 0.5], + "to": [15, 15, 2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [1, 1, 15, 15], "texture": "#front"}, + "down": {"uv": [0, 0, 14, 2], "texture": "#front"} + } + }, + { + "from": [15, 1, 0], + "to": [16, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [0, 1, 1, 15], "texture": "#side", "cullface": "north"}, + "east": {"uv": [1, 1, 16, 15], "texture": "#side", "cullface": "east"}, + "west": {"uv": [0, 1, 15, 15], "texture": "#side"} + } + }, + { + "from": [0, 15, 0], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [0, 0, 16, 1], "texture": "#top", "cullface": "north"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#top", "cullface": "east"}, + "south": {"uv": [0, 0, 16, 1], "texture": "#top", "cullface": "south"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#top", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#top"} + } + }, + { + "from": [0, 1, 0], + "to": [1, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [15, 1, 16, 15], "texture": "#side", "cullface": "north"}, + "east": {"uv": [1, 1, 16, 15], "texture": "#side"}, + "west": {"uv": [0, 1, 15, 15], "texture": "#side", "cullface": "west"} + } + }, + { + "from": [0, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "north": {"uv": [0, 15, 16, 16], "texture": "#side", "cullface": "north"}, + "east": {"uv": [0, 15, 16, 16], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 15, 16, 16], "texture": "#side", "cullface": "south"}, + "west": {"uv": [0, 15, 16, 16], "texture": "#side", "cullface": "west"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "down"} + } + }, + { + "from": [0, 1, 15], + "to": [16, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-8, 0, -8]}, + "faces": { + "east": {"uv": [0, 1, 1, 15], "texture": "#side", "cullface": "east"}, + "south": {"uv": [0, 1, 16, 15], "texture": "#side", "cullface": "south"}, + "west": {"uv": [15, 1, 16, 15], "texture": "#side", "cullface": "west"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 135, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/functionalstorage/textures/blocks/controller_front.png b/src/main/resources/assets/functionalstorage/textures/blocks/controller_front.png new file mode 100644 index 0000000..985ed99 Binary files /dev/null and b/src/main/resources/assets/functionalstorage/textures/blocks/controller_front.png differ diff --git a/src/main/resources/assets/functionalstorage/textures/blocks/controller_front.png.mcmeta b/src/main/resources/assets/functionalstorage/textures/blocks/controller_front.png.mcmeta new file mode 100644 index 0000000..0cdd6dc --- /dev/null +++ b/src/main/resources/assets/functionalstorage/textures/blocks/controller_front.png.mcmeta @@ -0,0 +1,23 @@ +{ + "animation": { + "interpolate": false, + "frames": [ + { + "index": 0, + "time": 25 + }, + { + "index": 1, + "time": 2 + }, + { + "index": 2, + "time": 25 + }, + { + "index": 3, + "time": 2 + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/functionalstorage/textures/items/linking_tool_base.png b/src/main/resources/assets/functionalstorage/textures/items/linking_tool_base.png index f5b0a86..7367c14 100644 Binary files a/src/main/resources/assets/functionalstorage/textures/items/linking_tool_base.png and b/src/main/resources/assets/functionalstorage/textures/items/linking_tool_base.png differ