From 5d24f2cf67ea9ca48e8b8ee3fd65a4cdb73be5d2 Mon Sep 17 00:00:00 2001 From: bill96012 Date: Mon, 27 May 2019 19:41:24 +0800 Subject: [PATCH] update lobby decorations --- .../minecraft/blockstates/brick_stairs.json | 40 +-- .../blockstates/stone_brick_stairs.json | 24 +- .../minecraft/blockstates/stone_stairs.json | 44 +++ .../blockstates/unpowered_comparator.json | 20 ++ assets/minecraft/models/block/blank.json | 21 ++ .../models/block/comparator_unlit.json | 55 ---- .../{kitchen_counter.json => counter.json} | 0 ...et_left.json => counter_cabinet_left.json} | 0 ..._right.json => counter_cabinet_right.json} | 0 ...ner_left.json => counter_corner_left.json} | 3 +- ...r_right.json => counter_corner_right.json} | 3 +- ...ounter_drawer.json => counter_drawer.json} | 0 .../kitchen/{kitchen_sink.json => sink.json} | 0 .../starmap/starmap.json} | 285 ++++++++++-------- .../block/galaxy_lobby/starmap/table_box.json | 198 ++++++++++++ .../galaxy_lobby/starmap/table_corner.json | 280 +++++++++++++++++ .../galaxy_lobby/starmap/table_vents.json | 168 +++++++++++ .../models/galaxy_lobby/micorwave.json | 57 +++- .../starmap_projection_planet_1.json | 2 +- .../starmap_projection_planet_2.json | 2 +- .../galaxy_lobby/starmap_projection_sun.json | 2 +- .../textures/galaxy/hardened_clay_corner.png | Bin 0 -> 560 bytes .../textures/galaxy/starmap_screen.png | Bin 0 -> 472 bytes 23 files changed, 974 insertions(+), 230 deletions(-) create mode 100644 assets/minecraft/blockstates/stone_stairs.json create mode 100644 assets/minecraft/blockstates/unpowered_comparator.json create mode 100644 assets/minecraft/models/block/blank.json delete mode 100644 assets/minecraft/models/block/comparator_unlit.json rename assets/minecraft/models/block/galaxy_lobby/kitchen/{kitchen_counter.json => counter.json} (100%) rename assets/minecraft/models/block/galaxy_lobby/kitchen/{kitchen_counter_cabinet_left.json => counter_cabinet_left.json} (100%) rename assets/minecraft/models/block/galaxy_lobby/kitchen/{kitchen_counter_cabinet_right.json => counter_cabinet_right.json} (100%) rename assets/minecraft/models/block/galaxy_lobby/kitchen/{kitchen_counter_corner_left.json => counter_corner_left.json} (95%) rename assets/minecraft/models/block/galaxy_lobby/kitchen/{kitchen_counter_corner_right.json => counter_corner_right.json} (95%) rename assets/minecraft/models/block/galaxy_lobby/kitchen/{kitchen_counter_drawer.json => counter_drawer.json} (100%) rename assets/minecraft/models/block/galaxy_lobby/kitchen/{kitchen_sink.json => sink.json} (100%) rename assets/minecraft/models/block/{comparator_unlit_subtract.json => galaxy_lobby/starmap/starmap.json} (81%) create mode 100644 assets/minecraft/models/block/galaxy_lobby/starmap/table_box.json create mode 100644 assets/minecraft/models/block/galaxy_lobby/starmap/table_corner.json create mode 100644 assets/minecraft/models/block/galaxy_lobby/starmap/table_vents.json create mode 100644 assets/minecraft/textures/galaxy/hardened_clay_corner.png create mode 100644 assets/minecraft/textures/galaxy/starmap_screen.png diff --git a/assets/minecraft/blockstates/brick_stairs.json b/assets/minecraft/blockstates/brick_stairs.json index f7091ee..3d62386 100644 --- a/assets/minecraft/blockstates/brick_stairs.json +++ b/assets/minecraft/blockstates/brick_stairs.json @@ -20,25 +20,25 @@ "facing=west,half=bottom,shape=inner_left": { "model": "brick_inner_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { "model": "brick_inner_stairs" }, "facing=north,half=bottom,shape=inner_left": { "model": "brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/kitchen_counter_drawer", "y": 270 }, - "facing=west,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/kitchen_counter_drawer", "y": 90 }, - "facing=south,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/kitchen_counter_drawer" }, - "facing=north,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/kitchen_counter_drawer", "y": 180 }, - "facing=east,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/kitchen_counter_cabinet_left" }, - "facing=west,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/kitchen_counter_cabinet_left", "y": 180 }, - "facing=south,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/kitchen_counter_cabinet_left", "y": 90 }, - "facing=north,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/kitchen_counter_cabinet_left", "y": 270 }, - "facing=east,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/kitchen_counter_cabinet_right", "y": 180 }, - "facing=west,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/kitchen_counter_cabinet_right" }, - "facing=south,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/kitchen_counter_cabinet_right", "y": 270 }, - "facing=north,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/kitchen_counter_cabinet_right", "y": 90 }, - "facing=east,half=top,shape=inner_right": { "model": "galaxy_lobby/kitchen/kitchen_counter_corner_right" }, - "facing=west,half=top,shape=inner_right": { "model": "galaxy_lobby/kitchen/kitchen_counter_corner_right", "y": 180 }, - "facing=south,half=top,shape=inner_right": { "model": "galaxy_lobby/kitchen/kitchen_counter_corner_right", "y": 90 }, - "facing=north,half=top,shape=inner_right": { "model": "galaxy_lobby/kitchen/kitchen_counter_corner_right", "y": 270 }, - "facing=east,half=top,shape=inner_left": { "model": "galaxy_lobby/kitchen/kitchen_counter_corner_left", "y": 180 }, - "facing=west,half=top,shape=inner_left": { "model": "galaxy_lobby/kitchen/kitchen_counter_corner_left" }, - "facing=south,half=top,shape=inner_left": { "model": "galaxy_lobby/kitchen/kitchen_counter_corner_left", "y": 270 }, - "facing=north,half=top,shape=inner_left": { "model": "galaxy_lobby/kitchen/kitchen_counter_corner_left", "y": 90 } + "facing=east,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/counter_drawer", "y": 270 }, + "facing=west,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/counter_drawer", "y": 90 }, + "facing=south,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/counter_drawer" }, + "facing=north,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/counter_drawer", "y": 180 }, + "facing=east,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/counter_cabinet_left" }, + "facing=west,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/counter_cabinet_left", "y": 180 }, + "facing=south,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/counter_cabinet_left", "y": 90 }, + "facing=north,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/counter_cabinet_left", "y": 270 }, + "facing=east,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/counter_cabinet_right", "y": 180 }, + "facing=west,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/counter_cabinet_right" }, + "facing=south,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/counter_cabinet_right", "y": 270 }, + "facing=north,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/counter_cabinet_right", "y": 90 }, + "facing=east,half=top,shape=inner_right": { "model": "galaxy_lobby/kitchen/counter_corner_right" }, + "facing=west,half=top,shape=inner_right": { "model": "galaxy_lobby/kitchen/counter_corner_right", "y": 180 }, + "facing=south,half=top,shape=inner_right": { "model": "galaxy_lobby/kitchen/counter_corner_right", "y": 90 }, + "facing=north,half=top,shape=inner_right": { "model": "galaxy_lobby/kitchen/counter_corner_right", "y": 270 }, + "facing=east,half=top,shape=inner_left": { "model": "galaxy_lobby/kitchen/counter_corner_left", "y": 180 }, + "facing=west,half=top,shape=inner_left": { "model": "galaxy_lobby/kitchen/counter_corner_left" }, + "facing=south,half=top,shape=inner_left": { "model": "galaxy_lobby/kitchen/counter_corner_left", "y": 270 }, + "facing=north,half=top,shape=inner_left": { "model": "galaxy_lobby/kitchen/counter_corner_left", "y": 90 } } } diff --git a/assets/minecraft/blockstates/stone_brick_stairs.json b/assets/minecraft/blockstates/stone_brick_stairs.json index a2d0336..3ca7c86 100644 --- a/assets/minecraft/blockstates/stone_brick_stairs.json +++ b/assets/minecraft/blockstates/stone_brick_stairs.json @@ -20,18 +20,18 @@ "facing=west,half=bottom,shape=inner_left": { "model": "stone_brick_inner_stairs", "y": 90, "uvlock": true }, "facing=south,half=bottom,shape=inner_left": { "model": "stone_brick_inner_stairs" }, "facing=north,half=bottom,shape=inner_left": { "model": "stone_brick_inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/kitchen_counter", "y": 270 }, - "facing=west,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/kitchen_counter", "y": 90 }, - "facing=south,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/kitchen_counter" }, - "facing=north,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/kitchen_counter", "y": 180 }, - "facing=east,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/kitchen_sink" }, - "facing=west,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/kitchen_sink", "y": 180 }, - "facing=south,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/kitchen_sink", "y": 90 }, - "facing=north,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/kitchen_sink", "y": 270 }, - "facing=east,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/kitchen_sink", "y": 180 }, - "facing=west,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/kitchen_sink" }, - "facing=south,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/kitchen_sink", "y": 270 }, - "facing=north,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/kitchen_sink", "y": 90 }, + "facing=east,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/counter", "y": 270 }, + "facing=west,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/counter", "y": 90 }, + "facing=south,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/counter" }, + "facing=north,half=top,shape=straight": { "model": "galaxy_lobby/kitchen/counter", "y": 180 }, + "facing=east,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/sink" }, + "facing=west,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/sink", "y": 180 }, + "facing=south,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/sink", "y": 90 }, + "facing=north,half=top,shape=outer_right": { "model": "galaxy_lobby/kitchen/sink", "y": 270 }, + "facing=east,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/sink", "y": 180 }, + "facing=west,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/sink" }, + "facing=south,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/sink", "y": 270 }, + "facing=north,half=top,shape=outer_left": { "model": "galaxy_lobby/kitchen/sink", "y": 90 }, "facing=east,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true }, "facing=west,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }, "facing=south,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true }, diff --git a/assets/minecraft/blockstates/stone_stairs.json b/assets/minecraft/blockstates/stone_stairs.json new file mode 100644 index 0000000..530d904 --- /dev/null +++ b/assets/minecraft/blockstates/stone_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "stone_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "stone_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "stone_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "stone_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "stone_outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "stone_outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "stone_outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "stone_outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "stone_outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "stone_outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "stone_outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "stone_outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "stone_inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "stone_inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "stone_inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "stone_inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "stone_inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "stone_inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "stone_inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "stone_inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "galaxy_lobby/starmap/table_vents", "y": 270 }, + "facing=west,half=top,shape=straight": { "model": "galaxy_lobby/starmap/table_vents", "y": 90 }, + "facing=south,half=top,shape=straight": { "model": "galaxy_lobby/starmap/table_box" }, + "facing=north,half=top,shape=straight": { "model": "galaxy_lobby/starmap/table_vents", "y": 180 }, + "facing=east,half=top,shape=outer_right": { "model": "galaxy_lobby/starmap/table_corner", "y": 270 }, + "facing=west,half=top,shape=outer_right": { "model": "galaxy_lobby/starmap/table_corner", "y": 90 }, + "facing=south,half=top,shape=outer_right": { "model": "galaxy_lobby/starmap/table_corner" }, + "facing=north,half=top,shape=outer_right": { "model": "galaxy_lobby/starmap/table_corner", "y": 180 }, + "facing=east,half=top,shape=outer_left": { "model": "galaxy_lobby/starmap/table_corner", "y": 180 }, + "facing=west,half=top,shape=outer_left": { "model": "galaxy_lobby/starmap/table_corner" }, + "facing=south,half=top,shape=outer_left": { "model": "galaxy_lobby/starmap/table_corner", "y": 270 }, + "facing=north,half=top,shape=outer_left": { "model": "galaxy_lobby/starmap/table_corner", "y": 90 }, + "facing=east,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} diff --git a/assets/minecraft/blockstates/unpowered_comparator.json b/assets/minecraft/blockstates/unpowered_comparator.json new file mode 100644 index 0000000..98cc188 --- /dev/null +++ b/assets/minecraft/blockstates/unpowered_comparator.json @@ -0,0 +1,20 @@ +{ + "variants": { + "facing=south,mode=compare,powered=false": { "model": "blank" }, + "facing=west,mode=compare,powered=false": { "model": "blank", "y": 90 }, + "facing=north,mode=compare,powered=false": { "model": "blank", "y": 180 }, + "facing=east,mode=compare,powered=false": { "model": "blank", "y": 270 }, + "facing=south,mode=subtract,powered=false": { "model": "galaxy_lobby/starmap/starmap" }, + "facing=west,mode=subtract,powered=false": { "model": "galaxy_lobby/starmap/starmap", "y": 90 }, + "facing=north,mode=subtract,powered=false": { "model": "galaxy_lobby/starmap/starmap", "y": 180 }, + "facing=east,mode=subtract,powered=false": { "model": "galaxy_lobby/starmap/starmap", "y": 270 }, + "facing=south,mode=compare,powered=true": { "model": "comparator_lit" }, + "facing=west,mode=compare,powered=true": { "model": "comparator_lit", "y": 90 }, + "facing=north,mode=compare,powered=true": { "model": "comparator_lit", "y": 180 }, + "facing=east,mode=compare,powered=true": { "model": "comparator_lit", "y": 270 }, + "facing=south,mode=subtract,powered=true": { "model": "comparator_lit_subtract" }, + "facing=west,mode=subtract,powered=true": { "model": "comparator_lit_subtract", "y": 90 }, + "facing=north,mode=subtract,powered=true": { "model": "comparator_lit_subtract", "y": 180 }, + "facing=east,mode=subtract,powered=true": { "model": "comparator_lit_subtract", "y": 270 } + } +} diff --git a/assets/minecraft/models/block/blank.json b/assets/minecraft/models/block/blank.json new file mode 100644 index 0000000..e88b214 --- /dev/null +++ b/assets/minecraft/models/block/blank.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench, model design by OKTW team", + "textures": { + "0": "galaxy/blank", + "particle": "galaxy/blank" + }, + "elements": [ + { + "from": [7.75, 7.75, 7.75], + "to": [8.25, 8.25, 8.25], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/assets/minecraft/models/block/comparator_unlit.json b/assets/minecraft/models/block/comparator_unlit.json deleted file mode 100644 index d3e8b9c..0000000 --- a/assets/minecraft/models/block/comparator_unlit.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "credit": "Made with Blockbench, model design by OKTW team", - "textures": { - "0": "galaxy/colors", - "particle": "galaxy/colors" - }, - "elements": [ - { - "from": [8, 0.125, 8], - "to": [8.1, 0.225, 8.1], - "faces": { - "north": {"uv": [0.5, 14.5, 1.5, 15.5], "texture": "#0"}, - "east": {"uv": [0.5, 14.5, 1.5, 15.5], "texture": "#0"}, - "south": {"uv": [0.5, 14.5, 1.5, 15.5], "texture": "#0"}, - "west": {"uv": [0.5, 14.5, 1.5, 15.5], "texture": "#0"}, - "up": {"uv": [0.5, 14.5, 1.5, 15.5], "texture": "#0"}, - "down": {"uv": [0.5, 14.5, 1.5, 15.5], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [90, 0, 0], - "translation": [0, 4, 3], - "scale": [0.25, 0.25, 0.25] - }, - "thirdperson_lefthand": { - "rotation": [90, 0, 0], - "translation": [0, 4, 3], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_righthand": { - "rotation": [90, 0, 0], - "translation": [3.5, 4, 0], - "scale": [0.25, 0.25, 0.25] - }, - "firstperson_lefthand": { - "rotation": [90, 0, 0], - "translation": [3.5, 4, 0], - "scale": [0.25, 0.25, 0.25] - }, - "ground": { - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [90, 0, 0], - "scale": [0.39, 0.39, 0.39] - }, - "fixed": { - "rotation": [-90, 0, 0], - "translation": [0, 0, -14], - "scale": [2, 2, 2] - } - } -} \ No newline at end of file diff --git a/assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter.json b/assets/minecraft/models/block/galaxy_lobby/kitchen/counter.json similarity index 100% rename from assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter.json rename to assets/minecraft/models/block/galaxy_lobby/kitchen/counter.json diff --git a/assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_cabinet_left.json b/assets/minecraft/models/block/galaxy_lobby/kitchen/counter_cabinet_left.json similarity index 100% rename from assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_cabinet_left.json rename to assets/minecraft/models/block/galaxy_lobby/kitchen/counter_cabinet_left.json diff --git a/assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_cabinet_right.json b/assets/minecraft/models/block/galaxy_lobby/kitchen/counter_cabinet_right.json similarity index 100% rename from assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_cabinet_right.json rename to assets/minecraft/models/block/galaxy_lobby/kitchen/counter_cabinet_right.json diff --git a/assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_corner_left.json b/assets/minecraft/models/block/galaxy_lobby/kitchen/counter_corner_left.json similarity index 95% rename from assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_corner_left.json rename to assets/minecraft/models/block/galaxy_lobby/kitchen/counter_corner_left.json index 5c0c6f8..88b50c6 100644 --- a/assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_corner_left.json +++ b/assets/minecraft/models/block/galaxy_lobby/kitchen/counter_corner_left.json @@ -3,6 +3,7 @@ "textures": { "0": "galaxy/colors", "1": "blocks/hardened_clay", + "2": "galaxy/hardened_clay_corner", "particle": "galaxy/colors" }, "elements": [ @@ -26,7 +27,7 @@ "east": {"uv": [0.5, 0, 16, 1], "texture": "#1"}, "south": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#1"}, "west": {"uv": [0, 10, 15.5, 11], "texture": "#1"}, - "up": {"uv": [0.5, 0, 16, 15.5], "texture": "#1"}, + "up": {"uv": [0.5, 0.5, 16, 16], "rotation": 270, "texture": "#2"}, "down": {"uv": [0, 0.5, 15.5, 16], "texture": "#1"} } }, diff --git a/assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_corner_right.json b/assets/minecraft/models/block/galaxy_lobby/kitchen/counter_corner_right.json similarity index 95% rename from assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_corner_right.json rename to assets/minecraft/models/block/galaxy_lobby/kitchen/counter_corner_right.json index 3f950e3..73701bf 100644 --- a/assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_corner_right.json +++ b/assets/minecraft/models/block/galaxy_lobby/kitchen/counter_corner_right.json @@ -3,6 +3,7 @@ "textures": { "0": "galaxy/colors", "1": "blocks/hardened_clay", + "2": "galaxy/hardened_clay_corner", "particle": "galaxy/colors" }, "elements": [ @@ -26,7 +27,7 @@ "east": {"uv": [0.5, 0, 16, 1], "texture": "#1"}, "south": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#1"}, "west": {"uv": [0, 10, 15.5, 11], "texture": "#1"}, - "up": {"uv": [0, 0, 15.5, 15.5], "texture": "#1"}, + "up": {"uv": [0.5, 0.5, 16, 16], "rotation": 180, "texture": "#2"}, "down": {"uv": [0, 0.5, 15.5, 16], "texture": "#1"} } }, diff --git a/assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_drawer.json b/assets/minecraft/models/block/galaxy_lobby/kitchen/counter_drawer.json similarity index 100% rename from assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_counter_drawer.json rename to assets/minecraft/models/block/galaxy_lobby/kitchen/counter_drawer.json diff --git a/assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_sink.json b/assets/minecraft/models/block/galaxy_lobby/kitchen/sink.json similarity index 100% rename from assets/minecraft/models/block/galaxy_lobby/kitchen/kitchen_sink.json rename to assets/minecraft/models/block/galaxy_lobby/kitchen/sink.json diff --git a/assets/minecraft/models/block/comparator_unlit_subtract.json b/assets/minecraft/models/block/galaxy_lobby/starmap/starmap.json similarity index 81% rename from assets/minecraft/models/block/comparator_unlit_subtract.json rename to assets/minecraft/models/block/galaxy_lobby/starmap/starmap.json index 559e31f..e911f79 100644 --- a/assets/minecraft/models/block/comparator_unlit_subtract.json +++ b/assets/minecraft/models/block/galaxy_lobby/starmap/starmap.json @@ -1,25 +1,27 @@ { "credit": "Made with Blockbench, model design by OKTW team", "textures": { - "0": "galaxy/colors" + "0": "galaxy/colors", + "1": "galaxy/starmap_screen", + "particle": "galaxy/starmap_screen" }, "elements": [ { "name": "base", "from": [-11, 0, -11], - "to": [27, 1, 27], + "to": [27, 0.25, 27], "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "south": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "west": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, - "up": {"uv": [12.5, 6.5, 13.5, 7.5], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, "down": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"} } }, { "from": [-10.5, 0, 27], - "to": [26.5, 1.25, 28], + "to": [26.5, 0.45, 28], "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -31,7 +33,7 @@ }, { "from": [-12, 0, -10.5], - "to": [-11, 1.25, 26.5], + "to": [-11, 0.45, 26.5], "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -43,8 +45,8 @@ }, { "from": [-11.97487, 0, 26.43934], - "to": [-9.85355, 1.25, 27.43934], - "rotation": {"angle": -45, "axis": "y", "origin": [-10.85355, 0.5, 26.93934]}, + "to": [-9.85355, 0.45, 27.43934], + "rotation": {"angle": -45, "axis": "y", "origin": [-10.85355, -0.25, 26.93934]}, "faces": { "north": {"uv": [5.5, 2.5, 4.5, 3.5], "texture": "#0"}, "east": {"uv": [5.5, 2.5, 4.5, 3.5], "texture": "#0"}, @@ -56,8 +58,8 @@ }, { "from": [25.85355, 0, 26.43934], - "to": [27.97487, 1.25, 27.43934], - "rotation": {"angle": 45, "axis": "y", "origin": [26.85355, 0.5, 26.93934]}, + "to": [27.97487, 0.45, 27.43934], + "rotation": {"angle": 45, "axis": "y", "origin": [26.85355, -0.25, 26.93934]}, "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -69,7 +71,7 @@ }, { "from": [27, 0, -10.5], - "to": [28, 1.25, 26.5], + "to": [28, 0.45, 26.5], "faces": { "north": {"uv": [5.5, 2.5, 4.5, 3.5], "texture": "#0"}, "east": {"uv": [5.5, 2.5, 4.5, 3.5], "texture": "#0"}, @@ -81,8 +83,8 @@ }, { "from": [-11.97487, 0, -11.43934], - "to": [-9.85355, 1.25, -10.43934], - "rotation": {"angle": 45, "axis": "y", "origin": [-10.85355, 0.5, -10.93934]}, + "to": [-9.85355, 0.45, -10.43934], + "rotation": {"angle": 45, "axis": "y", "origin": [-10.85355, -0.25, -10.93934]}, "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -94,7 +96,7 @@ }, { "from": [-10.5, 0, -12], - "to": [26.5, 1.25, -11], + "to": [26.5, 0.45, -11], "faces": { "north": {"uv": [5.5, 2.5, 4.5, 3.5], "texture": "#0"}, "east": {"uv": [5.5, 2.5, 4.5, 3.5], "texture": "#0"}, @@ -106,8 +108,8 @@ }, { "from": [25.85355, 0, -11.43934], - "to": [27.97487, 1.25, -10.43934], - "rotation": {"angle": -45, "axis": "y", "origin": [26.85355, 0.5, -10.93934]}, + "to": [27.97487, 0.45, -10.43934], + "rotation": {"angle": -45, "axis": "y", "origin": [26.85355, -0.25, -10.93934]}, "faces": { "north": {"uv": [5.5, 2.5, 4.5, 3.5], "texture": "#0"}, "east": {"uv": [5.5, 2.5, 4.5, 3.5], "texture": "#0"}, @@ -118,8 +120,8 @@ } }, { - "from": [3, 0, 28], - "to": [13, 1.25, 28.5], + "from": [3, 0, 27.75], + "to": [13, 1.25, 28.25], "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -130,9 +132,9 @@ } }, { - "from": [3.25, -0.06444, 28.07919], - "to": [12.75, 2.93556, 28.72919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [3.25, -0.06444, 27.82919], + "to": [12.75, 2.93556, 28.47919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -143,9 +145,9 @@ } }, { - "from": [3, -0.31444, 28.07919], - "to": [3.25, 3.18556, 28.75419], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [3, -0.31444, 27.82919], + "to": [3.25, 3.18556, 28.50419], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -156,9 +158,9 @@ } }, { - "from": [12.75, -0.31444, 28.07919], - "to": [13, 3.18556, 28.75419], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [12.75, -0.31444, 27.82919], + "to": [13, 3.18556, 28.50419], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -169,9 +171,9 @@ } }, { - "from": [3.25, 2.93556, 28.07919], - "to": [12.75, 3.18556, 28.75419], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [3.25, 2.93556, 27.82919], + "to": [12.75, 3.18556, 28.50419], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -182,9 +184,9 @@ } }, { - "from": [3, -0.31444, 28.07919], - "to": [13, -0.06444, 28.75419], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [3, -0.31444, 27.82919], + "to": [13, -0.06444, 28.50419], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, @@ -195,9 +197,9 @@ } }, { - "from": [3.5, 0.18556, 28.72919], - "to": [12.5, 2.68556, 28.75419], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [3.5, 0.18556, 28.47919], + "to": [12.5, 2.68556, 28.50419], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"}, "east": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"}, @@ -208,9 +210,34 @@ } }, { - "from": [11.25, 1.68556, 28.72919], - "to": [12, 2.43556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [3, 0, 27.25], + "to": [13, 0.45, 27.75], + "faces": { + "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "south": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "west": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "up": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "down": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"} + } + }, + { + "from": [3, 13.85, 21.4], + "to": [13, 14.35, 21.65], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8], "rescale": true}, + "faces": { + "north": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "east": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "south": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "west": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "up": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"}, + "down": {"uv": [4.5, 2.5, 5.5, 3.5], "texture": "#0"} + } + }, + { + "from": [11.25, 1.68556, 28.47919], + "to": [12, 2.43556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -221,9 +248,9 @@ } }, { - "from": [11.35, 1.78556, 28.72919], - "to": [11.9, 2.33556, 28.82919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [11.35, 1.78556, 28.47919], + "to": [11.9, 2.33556, 28.57919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -234,9 +261,9 @@ } }, { - "from": [9, 1.93556, 28.72919], - "to": [10.75, 2.18556, 28.76919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [9, 1.93556, 28.47919], + "to": [10.75, 2.18556, 28.51919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -247,9 +274,9 @@ } }, { - "from": [8.75, 1.68556, 28.72919], - "to": [11, 2.03556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [8.75, 1.68556, 28.47919], + "to": [11, 2.03556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -260,9 +287,9 @@ } }, { - "from": [8.75, 2.08556, 28.72919], - "to": [11, 2.43556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [8.75, 2.08556, 28.47919], + "to": [11, 2.43556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -273,9 +300,9 @@ } }, { - "from": [8.75, 2.03556, 28.72919], - "to": [9.075, 2.08556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [8.75, 2.03556, 28.47919], + "to": [9.075, 2.08556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -286,9 +313,9 @@ } }, { - "from": [10.675, 2.03556, 28.72919], - "to": [11, 2.08556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [10.675, 2.03556, 28.47919], + "to": [11, 2.08556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -299,9 +326,9 @@ } }, { - "from": [10.425, 2.21056, 28.7842], - "to": [10.525, 2.33556, 28.8292], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [10.425, 2.21056, 28.5342], + "to": [10.525, 2.33556, 28.5792], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -312,9 +339,9 @@ } }, { - "from": [10.325, 2.03556, 28.75419], - "to": [10.425, 2.08556, 28.78419], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [10.325, 2.03556, 28.50419], + "to": [10.425, 2.08556, 28.53419], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -325,9 +352,9 @@ } }, { - "from": [10.225, 1.78556, 28.7842], - "to": [10.525, 2.21056, 28.8292], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [10.225, 1.78556, 28.5342], + "to": [10.525, 2.21056, 28.5792], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -338,9 +365,9 @@ } }, { - "from": [10.225, 2.21056, 28.7842], - "to": [10.325, 2.33556, 28.8292], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [10.225, 2.21056, 28.5342], + "to": [10.325, 2.33556, 28.5792], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -351,9 +378,9 @@ } }, { - "from": [10.325, 2.21056, 28.7842], - "to": [10.425, 2.23556, 28.8292], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [10.325, 2.21056, 28.5342], + "to": [10.425, 2.23556, 28.5792], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -364,9 +391,9 @@ } }, { - "from": [10.37, 2.23556, 28.79], - "to": [10.38, 2.31056, 28.795], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [10.37, 2.23556, 28.54], + "to": [10.38, 2.31056, 28.545], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [0.5, 0.5, 1.5, 1.5], "texture": "#0"}, "east": {"uv": [0.5, 0.5, 1.5, 1.5], "texture": "#0"}, @@ -377,9 +404,9 @@ } }, { - "from": [11.25, 0.43556, 28.72919], - "to": [12, 1.43556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [11.25, 0.43556, 28.47919], + "to": [12, 1.43556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -390,9 +417,9 @@ } }, { - "from": [8.9, 1.28556, 28.72919], - "to": [11.25, 1.43556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [8.9, 1.28556, 28.47919], + "to": [11.25, 1.43556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -403,9 +430,9 @@ } }, { - "from": [8.9, 0.58556, 28.72919], - "to": [11.25, 1.28556, 28.76919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [8.9, 0.58556, 28.47919], + "to": [11.25, 1.28556, 28.51919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -416,9 +443,9 @@ } }, { - "from": [8.9, 0.43556, 28.72919], - "to": [11.25, 0.58556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [8.9, 0.43556, 28.47919], + "to": [11.25, 0.58556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -429,9 +456,9 @@ } }, { - "from": [8.75, 0.43556, 28.72919], - "to": [8.9, 1.43556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [8.75, 0.43556, 28.47919], + "to": [8.9, 1.43556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -442,9 +469,9 @@ } }, { - "from": [11.65, 1.08556, 28.77919], - "to": [11.9, 1.28556, 28.78919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [11.65, 1.08556, 28.52919], + "to": [11.9, 1.28556, 28.53919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -455,9 +482,9 @@ } }, { - "from": [11.35, 1.08556, 28.77919], - "to": [11.6, 1.28556, 28.78919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [11.35, 1.08556, 28.52919], + "to": [11.6, 1.28556, 28.53919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -468,9 +495,9 @@ } }, { - "from": [11.65, 0.83556, 28.77919], - "to": [11.9, 1.03556, 28.78919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [11.65, 0.83556, 28.52919], + "to": [11.9, 1.03556, 28.53919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -481,9 +508,9 @@ } }, { - "from": [11.35, 0.83556, 28.77919], - "to": [11.6, 1.03556, 28.78919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [11.35, 0.83556, 28.52919], + "to": [11.6, 1.03556, 28.53919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -494,9 +521,9 @@ } }, { - "from": [11.65, 0.58556, 28.77919], - "to": [11.9, 0.78556, 28.78919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [11.65, 0.58556, 28.52919], + "to": [11.9, 0.78556, 28.53919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -507,9 +534,9 @@ } }, { - "from": [11.35, 0.58556, 28.77919], - "to": [11.6, 0.78556, 28.78919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [11.35, 0.58556, 28.52919], + "to": [11.6, 0.78556, 28.53919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, "east": {"uv": [14.5, 4.5, 15.5, 5.5], "texture": "#0"}, @@ -520,9 +547,9 @@ } }, { - "from": [8.1, 0.43556, 28.72919], - "to": [8.25, 2.43556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [8.1, 0.43556, 28.47919], + "to": [8.25, 2.43556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -533,9 +560,9 @@ } }, { - "from": [4, 0.43556, 28.72919], - "to": [4.15, 2.43556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [4, 0.43556, 28.47919], + "to": [4.15, 2.43556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -546,9 +573,9 @@ } }, { - "from": [4.15, 2.28556, 28.72919], - "to": [8.1, 2.43556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [4.15, 2.28556, 28.47919], + "to": [8.1, 2.43556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -559,9 +586,9 @@ } }, { - "from": [4.15, 0.43556, 28.72919], - "to": [8.1, 0.58556, 28.77919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [4.15, 0.43556, 28.47919], + "to": [8.1, 0.58556, 28.52919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -572,9 +599,9 @@ } }, { - "from": [4.15, 0.58556, 28.72919], - "to": [8.1, 2.28556, 28.76919], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.49919]}, + "from": [4.15, 0.58556, 28.47919], + "to": [8.1, 2.28556, 28.51919], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 0.90056, 27.24919]}, "faces": { "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, @@ -633,33 +660,33 @@ "children": [ { "name": "base", - "children": [9, 10, 11, 12, 13, 14, 15] + "children": [9, 10, 11, 12, 13, 14, 15, 16, 17] }, { "name": "buttons", - "children": [16, 17] + "children": [18, 19] }, { "name": "slider", - "children": [18, 19, 20, 21, 22, + "children": [20, 21, 22, 23, 24, { "name": "button", - "children": [23, 24, 25, 26, 27, 28] + "children": [25, 26, 27, 28, 29, 30] } ] }, { "name": "screen1", - "children": [29, 30, 31, 32, 33, + "children": [31, 32, 33, 34, 35, { "name": "buttons", - "children": [34, 35, 36, 37, 38, 39] + "children": [36, 37, 38, 39, 40, 41] } ] }, { "name": "screen2", - "children": [40, 41, 42, 43, 44] + "children": [42, 43, 44, 45, 46] } ] } diff --git a/assets/minecraft/models/block/galaxy_lobby/starmap/table_box.json b/assets/minecraft/models/block/galaxy_lobby/starmap/table_box.json new file mode 100644 index 0000000..252e6de --- /dev/null +++ b/assets/minecraft/models/block/galaxy_lobby/starmap/table_box.json @@ -0,0 +1,198 @@ +{ + "credit": "Made with Blockbench, model design by OKTW team", + "textures": { + "0": "galaxy/colors", + "particle": "galaxy/colors" + }, + "elements": [ + { + "from": [0, 0, 8.5], + "to": [16, 8, 16], + "faces": { + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.5, 2.5], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "south": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [4, 0, 8], + "to": [12, 1.5, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [4, 6.5, 8], + "to": [12, 8, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [4.05, 1.55, 8], + "to": [11.95, 6.45, 8.5], + "faces": { + "north": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"}, + "east": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"}, + "west": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"}, + "up": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"}, + "down": {"uv": [4.5, 6.5, 5.5, 7.5], "texture": "#0"} + } + }, + { + "from": [12, 0, 8], + "to": [16, 8, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 0, 8], + "to": [4, 8, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [4, 1.5, 8.25], + "to": [12, 6.5, 8.5], + "faces": { + "north": {"uv": [10.5, 6.5, 11.5, 7.5], "texture": "#0"} + } + }, + { + "from": [10.85, 2.95, 7.95], + "to": [11.45, 5.2, 8], + "faces": { + "north": {"uv": [2.5, 6.5, 3.5, 7.5], "texture": "#0"}, + "east": {"uv": [2.5, 6.5, 3.5, 7.5], "texture": "#0"}, + "south": {"uv": [2.5, 6.5, 3.5, 7.5], "texture": "#0"}, + "west": {"uv": [2.5, 6.5, 3.5, 7.5], "texture": "#0"}, + "up": {"uv": [2.5, 6.5, 3.5, 7.5], "texture": "#0"}, + "down": {"uv": [2.5, 6.5, 3.5, 7.5], "texture": "#0"} + } + }, + { + "from": [10.95, 3.7, 7.9], + "to": [11.35, 4.95, 7.95], + "faces": { + "north": {"uv": [0.5, 6.5, 1.5, 7.5], "texture": "#0"}, + "east": {"uv": [0.5, 6.5, 1.5, 7.5], "texture": "#0"}, + "south": {"uv": [0.5, 6.5, 1.5, 7.5], "texture": "#0"}, + "west": {"uv": [0.5, 6.5, 1.5, 7.5], "texture": "#0"}, + "up": {"uv": [0.5, 6.5, 1.5, 7.5], "texture": "#0"}, + "down": {"uv": [0.5, 6.5, 1.5, 7.5], "texture": "#0"} + } + }, + { + "from": [10.95, 3.2, 7.9], + "to": [11.35, 3.6, 7.95], + "faces": { + "north": {"uv": [0.5, 0.5, 1.5, 1.5], "texture": "#0"}, + "east": {"uv": [0.5, 0.5, 1.5, 1.5], "texture": "#0"}, + "south": {"uv": [0.5, 0.5, 1.5, 1.5], "texture": "#0"}, + "west": {"uv": [0.5, 0.5, 1.5, 1.5], "texture": "#0"}, + "up": {"uv": [0.5, 0.5, 1.5, 1.5], "texture": "#0"}, + "down": {"uv": [0.5, 0.5, 1.5, 1.5], "texture": "#0"} + } + }, + { + "from": [0, 8, 0], + "to": [16, 15.75, 2.25], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 8, 2.5], + "to": [16, 15.5, 16], + "faces": { + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.75, 2.5], + "to": [16, 16, 2.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 16, 2.5], "rescale": true}, + "faces": { + "north": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "south": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 8, 2.25], + "to": [16, 15.5, 2.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.375, 2.25], + "to": [16, 15.5, 2.5], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 15.5, 2.5], "rescale": true}, + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + } + ], + "groups": [0, 1, + { + "name": "group", + "children": [2, 3, 4, 5, 6, 7, + { + "name": "group", + "children": [8, 9, 10] + } + ] + }, 11, 12, 13, 14, 15] +} \ No newline at end of file diff --git a/assets/minecraft/models/block/galaxy_lobby/starmap/table_corner.json b/assets/minecraft/models/block/galaxy_lobby/starmap/table_corner.json new file mode 100644 index 0000000..d177627 --- /dev/null +++ b/assets/minecraft/models/block/galaxy_lobby/starmap/table_corner.json @@ -0,0 +1,280 @@ +{ + "credit": "Made with Blockbench, model design by OKTW team", + "textures": { + "0": "galaxy/colors", + "particle": "galaxy/colors" + }, + "elements": [ + { + "from": [0, 0, 8], + "to": [7, 8, 9], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 0, 9], + "to": [8, 8, 16], + "faces": { + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [6.5, 0, 8], + "to": [7.5, 8, 9], + "rotation": {"angle": 45, "axis": "y", "origin": [7.5, 4, 8.5], "rescale": true}, + "faces": { + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.5, 3], + "to": [13, 16, 16], + "faces": { + "south": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [6, 15.5, 2], + "to": [13, 16, 3], + "faces": { + "north": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13, 15.5, 2.5], + "to": [13.5, 16, 3.5], + "rotation": {"angle": 45, "axis": "y", "origin": [13, 12, 3], "rescale": true}, + "faces": { + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13, 15.5, 3], + "to": [14, 16, 10], + "faces": { + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13, 15.5, 10], + "to": [13.5, 16, 16], + "faces": { + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "south": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [6, 15.5, 10.25], + "to": [6.5, 16, 10.5], + "rotation": {"angle": 45, "axis": "y", "origin": [6, 12, 3], "rescale": true}, + "faces": { + "south": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.5, 2.5], + "to": [6, 16, 3], + "faces": { + "north": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [6, 15.5, 2.5], + "to": [6.5, 16, 2.75], + "rotation": {"angle": 45, "axis": "y", "origin": [6, 12, 3], "rescale": true}, + "faces": { + "north": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.75, 2.5], + "to": [6, 16, 2.75], + "rotation": {"angle": 45, "axis": "x", "origin": [3, 16, 2.5], "rescale": true}, + "faces": { + "north": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13.25, 15.75, 10], + "to": [13.5, 16, 16], + "rotation": {"angle": 45, "axis": "z", "origin": [13.5, 16, 13], "rescale": true}, + "faces": { + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "south": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 12, 0], + "to": [14, 15.75, 2], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 12, 2], + "to": [5.5, 15.75, 2.25], + "faces": { + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [5, 12, 2.75], + "to": [5.5, 15.75, 3], + "rotation": {"angle": 45, "axis": "y", "origin": [4.5, 12, 2.5], "rescale": true}, + "faces": { + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13.5, 12, 0], + "to": [15, 15.75, 2], + "rotation": {"angle": 45, "axis": "y", "origin": [15, 12, 1], "rescale": true}, + "faces": { + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [14, 12, 2], + "to": [16, 15.75, 16], + "faces": { + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13.5, 12, 10.5], + "to": [14, 15.75, 10.75], + "rotation": {"angle": 45, "axis": "y", "origin": [13.5, 12, 10.5], "rescale": true}, + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13.75, 12, 10.5], + "to": [14, 15.75, 16], + "faces": { + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 12, 2.25], + "to": [5.5, 15.5, 2.5], + "faces": { + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.375, 2.25], + "to": [5.5, 15.5, 2.5], + "rotation": {"angle": 45, "axis": "x", "origin": [3, 15.5, 2.5], "rescale": true}, + "faces": { + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13.5, 12, 10.5], + "to": [13.75, 15.5, 16], + "faces": { + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13.5, 15.375, 10.5], + "to": [13.75, 15.5, 16], + "rotation": {"angle": 45, "axis": "z", "origin": [13.5, 15.5, 13.5], "rescale": true}, + "faces": { + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 8, 2], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 8, 0], + "to": [14, 12, 2], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [13, 8, 0], + "to": [15, 12, 2], + "rotation": {"angle": 45, "axis": "y", "origin": [15, 10, 1], "rescale": true}, + "faces": { + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 12, 2.5], + "to": [13.5, 15.5, 16], + "faces": { + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + } + ], + "groups": [0, 1, 2, + { + "name": "group", + "children": [3, 4, 5, 6, 7, 8, 9, 10, 11, 12] + }, + { + "name": "group", + "children": [13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23] + }, + { + "name": "group", + "children": [24, 25, 26, 27] + } + ] +} \ No newline at end of file diff --git a/assets/minecraft/models/block/galaxy_lobby/starmap/table_vents.json b/assets/minecraft/models/block/galaxy_lobby/starmap/table_vents.json new file mode 100644 index 0000000..55b242b --- /dev/null +++ b/assets/minecraft/models/block/galaxy_lobby/starmap/table_vents.json @@ -0,0 +1,168 @@ +{ + "credit": "Made with Blockbench, model design by OKTW team", + "textures": { + "0": "galaxy/colors", + "particle": "galaxy/colors" + }, + "elements": [ + { + "from": [0, 0, 8.5], + "to": [16, 8, 16], + "faces": { + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.5, 2.5], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "south": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [4, 0, 8], + "to": [12, 2, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [4, 6.25, 8], + "to": [12, 8, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [4, 4.5, 8], + "to": [12, 5.5, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [12, 0, 8], + "to": [16, 8, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 0, 8], + "to": [4, 8, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [4, 2.75, 8], + "to": [12, 3.75, 8.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [4, 2, 8.25], + "to": [12, 6.25, 8.5], + "faces": { + "north": {"uv": [2.5, 6.5, 3.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 8, 0], + "to": [16, 15.75, 2.25], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 8, 2.5], + "to": [16, 15.5, 16], + "faces": { + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.75, 2.5], + "to": [16, 16, 2.75], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 16, 2.5], "rescale": true}, + "faces": { + "north": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "east": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "south": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"}, + "up": {"uv": [6.5, 6.5, 7.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 8, 2.25], + "to": [16, 15.5, 2.5], + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + }, + { + "from": [0, 15.375, 2.25], + "to": [16, 15.5, 2.5], + "rotation": {"angle": 45, "axis": "x", "origin": [8, 15.5, 2.5], "rescale": true}, + "faces": { + "north": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "east": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "south": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "west": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"}, + "down": {"uv": [8.5, 6.5, 9.5, 7.5], "texture": "#0"} + } + } + ], + "groups": [0, 1, + { + "name": "group", + "children": [2, 3, 4, 5, 6, 7, 8] + }, 9, 10, 11, 12, 13] +} \ No newline at end of file diff --git a/assets/minecraft/models/galaxy_lobby/micorwave.json b/assets/minecraft/models/galaxy_lobby/micorwave.json index 8b817c5..1d30cdd 100644 --- a/assets/minecraft/models/galaxy_lobby/micorwave.json +++ b/assets/minecraft/models/galaxy_lobby/micorwave.json @@ -349,7 +349,7 @@ "east": {"uv": [8.5, 4.5, 9.5, 5.5], "texture": "#1"}, "south": {"uv": [8.5, 4.5, 9.5, 5.5], "texture": "#1"}, "west": {"uv": [8.5, 4.5, 9.5, 5.5], "texture": "#1"}, - "up": {"uv": [8.5, 4.5, 9.5, 5.5], "texture": "#1"}, + "up": {"uv": [10.5, 4.5, 11.5, 5.5], "texture": "#1"}, "down": {"uv": [8.5, 4.5, 9.5, 5.5], "texture": "#1"} } }, @@ -1065,14 +1065,6 @@ "down": {"uv": [8.5, 4.5, 9.5, 5.5], "texture": "#1"} } }, - { - "from": [6.25, 2, 3.1], - "to": [12.25, 7, 3.675], - "faces": { - "north": {"uv": [1, 1, 15, 14], "texture": "#0"}, - "south": {"uv": [1, 2, 15, 15], "texture": "#0"} - } - }, { "from": [4.55, 7.8, 3.725], "to": [13.95, 8.45, 3.75], @@ -1120,8 +1112,55 @@ "up": {"uv": [6.5, 2.5, 7.5, 3.5], "texture": "#1"}, "down": {"uv": [6.5, 2.5, 7.5, 3.5], "texture": "#1"} } + }, + { + "from": [6.25, 2, 3.1], + "to": [12.25, 7, 3.675], + "faces": { + "north": {"uv": [1, 1, 15, 14], "texture": "#0"}, + "south": {"uv": [1, 2, 15, 15], "texture": "#0"} + } } ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2, 1.75], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2, 1.75], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 120, 0], + "translation": [0.75, 2.75, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 120, 0], + "translation": [0.75, 2.75, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.35, 0.35, 0.35] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, 2.25, 0], + "scale": [0.75, 0.75, 0.75] + }, + "head": { + "translation": [0, -14.665, 0], + "scale": [2.2855, 2.2855, 2.2855] + }, + "fixed": { + "translation": [0, 2.5, 0], + "scale": [0.65, 0.65, 0.65] + } + }, "groups": [ { "name": "group", diff --git a/assets/minecraft/models/galaxy_lobby/starmap_projection_planet_1.json b/assets/minecraft/models/galaxy_lobby/starmap_projection_planet_1.json index 0325c98..c9393b9 100644 --- a/assets/minecraft/models/galaxy_lobby/starmap_projection_planet_1.json +++ b/assets/minecraft/models/galaxy_lobby/starmap_projection_planet_1.json @@ -47,7 +47,7 @@ "scale": [4, 4, 4] }, "head": { - "translation": [0, -14.665, 18.5], + "translation": [0, -15.665, 18.5], "scale": [2.2855, 2.2855, 2.2855] }, "fixed": { diff --git a/assets/minecraft/models/galaxy_lobby/starmap_projection_planet_2.json b/assets/minecraft/models/galaxy_lobby/starmap_projection_planet_2.json index a7b1869..c5b81c1 100644 --- a/assets/minecraft/models/galaxy_lobby/starmap_projection_planet_2.json +++ b/assets/minecraft/models/galaxy_lobby/starmap_projection_planet_2.json @@ -47,7 +47,7 @@ "scale": [4, 4, 4] }, "head": { - "translation": [0, -14.665, 33], + "translation": [0, -15.665, 33], "scale": [2.2855, 2.2855, 2.2855] }, "fixed": { diff --git a/assets/minecraft/models/galaxy_lobby/starmap_projection_sun.json b/assets/minecraft/models/galaxy_lobby/starmap_projection_sun.json index cc4db4c..f42b4df 100644 --- a/assets/minecraft/models/galaxy_lobby/starmap_projection_sun.json +++ b/assets/minecraft/models/galaxy_lobby/starmap_projection_sun.json @@ -50,7 +50,7 @@ "scale": [2, 2, 2] }, "head": { - "translation": [0, -14.665, 0], + "translation": [0, -15.665, 0], "scale": [2.2855, 2.2855, 2.2855] }, "fixed": { diff --git a/assets/minecraft/textures/galaxy/hardened_clay_corner.png b/assets/minecraft/textures/galaxy/hardened_clay_corner.png new file mode 100644 index 0000000000000000000000000000000000000000..29e8ac24997b43353f48f002a033374b2adc2d41 GIT binary patch literal 560 zcmV-00?+-4P)-s@g`at2gR%?EFX&J;>K)#(+-*7yI|`A5|6qhvRr}^byo5uKQx& z2PK%t#aashGb18sxhAbOw$}?Yg9*2s^Z3R}xWk;2);HQ~BY#8-2Ovu{NdTPJiIu1- zO5g_OPH&x6FjqoBw2tov*TSM`04s}V9n+))lE8!E!M*Cq69_PjIs_^t@YWjRV_JOH#9Z?g#DU(-4ipzB5;Yy;;66|8g6M%8R23fYkHc_xoCj%1(46^oJyP8r yVGMuX_nwQbH>^bTfn-Drq$HQ1KxGh(Rq!8T{y?ckDsQv^0000XdtN+F|J>x67@P!gC(}y6JV{Z2@10 zl|nO%ZrFC$f2`Z*ez-VSFwCRvk?Xq1^sPH5CwwU{I~3coZr63z`7c!FweTG6{vj)n z%0HiJbNvSG#qqUrvFvB&v001jZ<=Snhc!+8{>-U!yqWHCur6R;u#lmI!9=8iuc3|U z0^@}M1}g?BE(dl8XT}!{85#_-47?;N+EDc2m3N0mSWy|%n}oaH_T8R(^-q7?)Vr~V zxE|_WxTU>xiRPWOue%Nuy==I+`sw1S;k$)AUx@kibX9q?yBseqKJa3dJ9mHClCzSW zmTwprv%1}Tz~kcI@N(167yHhCIJKvI;WV{_WfQ)~ilrIdv2;)=zbLr<8sB#I^o*a9 g{bBw0CI7JP`@Q$eKiLz8pm<~OboFyt=akR{0Od-{X#fBK literal 0 HcmV?d00001