Skip to content

Commit

Permalink
update lobby decorations
Browse files Browse the repository at this point in the history
  • Loading branch information
bill96012 committed May 27, 2019
1 parent 1f2c0ac commit 5d24f2c
Show file tree
Hide file tree
Showing 23 changed files with 974 additions and 230 deletions.
40 changes: 20 additions & 20 deletions assets/minecraft/blockstates/brick_stairs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
}
24 changes: 12 additions & 12 deletions assets/minecraft/blockstates/stone_brick_stairs.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
44 changes: 44 additions & 0 deletions assets/minecraft/blockstates/stone_stairs.json
Original file line number Diff line number Diff line change
@@ -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 }
}
}
20 changes: 20 additions & 0 deletions assets/minecraft/blockstates/unpowered_comparator.json
Original file line number Diff line number Diff line change
@@ -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 }
}
}
21 changes: 21 additions & 0 deletions assets/minecraft/models/block/blank.json
Original file line number Diff line number Diff line change
@@ -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"}
}
}
]
}
55 changes: 0 additions & 55 deletions assets/minecraft/models/block/comparator_unlit.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"textures": {
"0": "galaxy/colors",
"1": "blocks/hardened_clay",
"2": "galaxy/hardened_clay_corner",
"particle": "galaxy/colors"
},
"elements": [
Expand All @@ -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"}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"textures": {
"0": "galaxy/colors",
"1": "blocks/hardened_clay",
"2": "galaxy/hardened_clay_corner",
"particle": "galaxy/colors"
},
"elements": [
Expand All @@ -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"}
}
},
Expand Down
Loading

0 comments on commit 5d24f2c

Please sign in to comment.