diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/computer_terminal.json b/src/main/resources/assets/overdrive_that_matters/models/block/computer_terminal.json index b0330d376..489cfffdb 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/computer_terminal.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/computer_terminal.json @@ -53,5 +53,36 @@ "down": {"uv": [6, 12.5, 11, 13], "texture": "#1"} } } - ] + ], + "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, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 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/overdrive_that_matters/models/block/star_chair.json b/src/main/resources/assets/overdrive_that_matters/models/block/star_chair.json new file mode 100644 index 000000000..c8a636a24 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/star_chair.json @@ -0,0 +1,172 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "overdrive_that_matters:block/decorative/carbon_fibre_borderless", + "1": "overdrive_that_matters:block/decorative/star_chair", + "2": "overdrive_that_matters:block/powered_smoker_base", + "particle": "overdrive_that_matters:block/decorative/carbon_fibre_borderless" + }, + "elements": [ + { + "name": "base", + "from": [2, 0, 2], + "to": [14, 2, 14], + "faces": { + "north": {"uv": [7, 7.5, 13, 8.5], "texture": "#1"}, + "east": {"uv": [7, 7.5, 13, 8.5], "texture": "#1"}, + "south": {"uv": [7, 7.5, 13, 8.5], "texture": "#1"}, + "west": {"uv": [7, 7.5, 13, 8.5], "texture": "#1"}, + "up": {"uv": [7, 0, 13, 6], "texture": "#1"}, + "down": {"uv": [1, 1, 7, 7], "texture": "#2"} + } + }, + { + "name": "base", + "from": [4, 0.1, 13], + "to": [12, 5.1, 15], + "faces": { + "east": {"uv": [4, 13.5, 5, 16], "texture": "#1"}, + "south": {"uv": [0, 13.5, 4, 16], "texture": "#1"}, + "west": {"uv": [5, 13.5, 4, 16], "texture": "#1"}, + "up": {"uv": [11, 14, 15, 15], "rotation": 180, "texture": "#1"}, + "down": {"uv": [11, 15, 15, 16], "texture": "#1"} + } + }, + { + "name": "base", + "from": [4, 0.1, 1], + "to": [12, 5.1, 3], + "faces": { + "north": {"uv": [0, 13.5, 4, 16], "texture": "#1"}, + "east": {"uv": [5, 13.5, 4, 16], "texture": "#1"}, + "west": {"uv": [4, 13.5, 5, 16], "texture": "#1"}, + "up": {"uv": [11, 14, 15, 15], "texture": "#1"}, + "down": {"uv": [11, 15, 15, 16], "texture": "#1"} + } + }, + { + "name": "base", + "from": [2, 4, 2], + "to": [14, 7, 14], + "faces": { + "north": {"uv": [7, 6, 13, 7.5], "texture": "#1"}, + "east": {"uv": [7, 6, 13, 7.5], "texture": "#1"}, + "south": {"uv": [7, 6, 13, 7.5], "texture": "#1"}, + "west": {"uv": [7, 6, 13, 7.5], "texture": "#1"}, + "up": {"uv": [7, 0, 13, 6], "texture": "#1"}, + "down": {"uv": [7, 0, 13, 6], "texture": "#1"} + } + }, + { + "name": "base", + "from": [3, 6, 11], + "to": [13, 23, 15], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 7, 13]}, + "faces": { + "north": {"uv": [5, 0, 0, 8.5], "texture": "#1"}, + "east": {"uv": [7, 0, 5, 8.5], "texture": "#1"}, + "south": {"uv": [0, 0, 5, 8.5], "texture": "#1"}, + "west": {"uv": [5, 0, 7, 8.5], "texture": "#1"}, + "up": {"uv": [0, 8.5, 5, 10.5], "texture": "#1"}, + "down": {"uv": [0, 10.5, 5, 12.5], "texture": "#1"} + } + }, + { + "name": "base", + "from": [3, 2, 3], + "to": [13, 4, 13], + "faces": { + "north": {"uv": [0, 12.5, 5, 13.5], "texture": "#1"}, + "east": {"uv": [0, 12.5, 5, 13.5], "texture": "#1"}, + "south": {"uv": [0, 12.5, 5, 13.5], "texture": "#1"}, + "west": {"uv": [0, 12.5, 5, 13.5], "texture": "#1"} + } + }, + { + "name": "fabric", + "from": [3, 6, 1], + "to": [13, 9, 11], + "faces": { + "north": {"uv": [0, 0, 3, 10], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 10, 3], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 0, 10, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 10, 10], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 10, 10], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "fabric", + "from": [4, 8, 10], + "to": [12, 22, 12], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 13]}, + "faces": { + "north": {"uv": [0, 0, 14, 8], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 0, 14, 2], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 0, 14, 2], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 2, 8], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "arm", + "from": [1, 6, 0], + "to": [3, 12, 12], + "faces": { + "north": {"uv": [9, 13, 10, 16], "texture": "#1"}, + "east": {"uv": [6, 16, 9, 10], "rotation": 90, "texture": "#1"}, + "south": {"uv": [9, 10, 10, 13], "texture": "#1"}, + "west": {"uv": [6, 10, 9, 16], "rotation": 90, "texture": "#1"}, + "up": {"uv": [5, 10, 6, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [10, 10, 11, 16], "texture": "#1"} + } + }, + { + "name": "arm", + "from": [13, 6, 0], + "to": [15, 12, 12], + "faces": { + "north": {"uv": [9, 13, 10, 16], "texture": "#1"}, + "east": {"uv": [6, 16, 9, 10], "rotation": 90, "texture": "#1"}, + "south": {"uv": [9, 10, 10, 13], "texture": "#1"}, + "west": {"uv": [6, 10, 9, 16], "rotation": 90, "texture": "#1"}, + "up": {"uv": [5, 10, 6, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [10, 10, 11, 16], "texture": "#1"} + } + } + ], + "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, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 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] + }, + "head": { + "translation": [0, 8.5, 1] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair.png new file mode 100644 index 000000000..3d2e0459d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/star_chair.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png index bf0d32920..093e2bc63 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_flowing.png b/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_flowing.png index d36635b4d..63b6586ce 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_flowing.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_flowing.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_flowing.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_flowing.png.mcmeta new file mode 100644 index 000000000..8e55e43ba --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_still.png b/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_still.png index d36635b4d..6644d159f 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_still.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_still.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_still.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_still.png.mcmeta new file mode 100644 index 000000000..7ceb36394 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/liquid_xp_still.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file