Skip to content

Commit

Permalink
✨ more decorative blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@LocusAzzurro
LocusAzzurro committed Jul 19, 2023
1 parent 726a28b commit 0bd1c82
Show file tree
Hide file tree
Showing 22 changed files with 726 additions and 3 deletions.
13 changes: 11 additions & 2 deletions src/generated/resources/.cache/cache
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
43a8097658049963b5a203fe1cd9c346f0176646 assets/ultramarine/blockstates/abacus.json
ee1f1fa11379dc2f8d54020c282dfdfefe2c0880 assets/ultramarine/blockstates/apple_basket.json
565181ba6b7e8c96a6184275d0ae1e8e64be8ccb assets/ultramarine/blockstates/back_cushion.json
76966572063df006270d3fb16a7e5d62da3bf8f9 assets/ultramarine/blockstates/bamboo_mat.json
d314f271f5f2110ab70017ff907125a3886e5bec assets/ultramarine/blockstates/bamboo_mat_slab.json
e9a14c3e9fc7004f3be3875bb29156ef7369d1a1 assets/ultramarine/blockstates/bamboo_mat_stairs.json
Expand Down Expand Up @@ -32,6 +33,7 @@ fe88dba8d0efaf5f07049cf4f33fbdec7e08b3b5 assets/ultramarine/blockstates/carved_r
f3e85a59ce80312d9b84da73c9e30a48e7f5f374 assets/ultramarine/blockstates/carved_red_pillar_base.json
fa8237c3d5738a33c75565dd3fa47cdd5a697934 assets/ultramarine/blockstates/carved_red_pillar_head.json
25dc6f0a6e1178000ed0570b9972d06e593227b7 assets/ultramarine/blockstates/celery_basket.json
bfddaa118567b748dce5849795f6888b28467724 assets/ultramarine/blockstates/chessboard.json
19a02ddda5dc8be9590638a7f87a60bc4d2b38e8 assets/ultramarine/blockstates/chiseled_gilded_dark_oak.json
c85ec2ad408bbc5fd9e1fae67408715d119c5aee assets/ultramarine/blockstates/clay_doll_female.json
3bd1c452b1d845cfb76f30fddef8618c74ba6ed0 assets/ultramarine/blockstates/clay_doll_male.json
Expand Down Expand Up @@ -85,6 +87,7 @@ de2ef08ba562cad26ba62896ad83bbf03c48220b assets/ultramarine/blockstates/magnesit
c14aef2b2cb4f378fd0dc0455233eb5e9b64fffb assets/ultramarine/blockstates/oak_cabinet.json
3ed3674679e1208b2cc02f5cfb754c917fc2d125 assets/ultramarine/blockstates/octagonal_palace_lantern.json
508764f30c82c910ee5e34010d3200db3831b8f1 assets/ultramarine/blockstates/orange_basket.json
38ff2f4b2a0fdbacbff2b9c0ddbf797db306d2e4 assets/ultramarine/blockstates/painting_scroll.json
d24e4229b5164a00b8b240b908902d8a424e7c66 assets/ultramarine/blockstates/pale_yellow_stone.json
654529a74e3a9efb2aac9ad32cf661f4b1b515f6 assets/ultramarine/blockstates/pale_yellow_stone_slab.json
9d318767225e5389b37ead2a302ba6ab28de83ad assets/ultramarine/blockstates/pale_yellow_stone_stairs.json
Expand Down Expand Up @@ -278,6 +281,7 @@ ed0276a0b61b913dcc2045381e882ae92eb8976e assets/ultramarine/models/block/yellow_
05bf40f848181516c97140e8f124c4720b890034 assets/ultramarine/models/block/yellow_roof_tiles_shifted.json
3c5cc7fc6dfe115e9de2e8fa1b42d61ef7285f2e assets/ultramarine/models/item/abacus.json
207516384dccc7165f9a62da579d92c82cc7d4ee assets/ultramarine/models/item/apple_basket.json
86a7ced5431176c275dc3e8bf228f18546e5404a assets/ultramarine/models/item/back_cushion.json
14ca05afad34dfa2a6cc6357b532d18cb3418423 assets/ultramarine/models/item/bamboo_mat.json
04487ff78832e964a7ec353b8644dcc98129480b assets/ultramarine/models/item/bamboo_mat_slab.json
435225e6fea4c6fd2a5d3bdc8726978dc34f0447 assets/ultramarine/models/item/bamboo_mat_stairs.json
Expand Down Expand Up @@ -317,6 +321,7 @@ a05dac8cf6dad155bcc3ebdf2c46fddcdbb6ec34 assets/ultramarine/models/item/carved_r
375b9657455b41c6153296d47917d370cc00cf1d assets/ultramarine/models/item/carved_red_pillar_base.json
cea5a281f3c0f11898508ce1ea5800896299b093 assets/ultramarine/models/item/carved_red_pillar_head.json
6360cba96e25c303db7befcbcd78e5a0674c177f assets/ultramarine/models/item/celery_basket.json
56dea7c2b3d0811895c8632f5150042d85e560d8 assets/ultramarine/models/item/chessboard.json
80acca9983a5839811e7988f8156a09c9c8261ff assets/ultramarine/models/item/chiseled_gilded_dark_oak.json
6064accb2eca82070eca9fdce116779760c3b6b7 assets/ultramarine/models/item/clay_doll_female.json
58ff6807e27bbe473166deb302303384c7a21a2a assets/ultramarine/models/item/clay_doll_male.json
Expand Down Expand Up @@ -385,6 +390,7 @@ c47195d043a1b6da3bfa2158122ea774d9bb818d assets/ultramarine/models/item/mung_bea
e6de6e1851202c9f3b8943518b797a83835e6a73 assets/ultramarine/models/item/oak_cabinet.json
099a0bff1338d6bc10e666a0b7af9cc01451ef1a assets/ultramarine/models/item/octagonal_palace_lantern.json
4904e9c8512e8f5e92f00cf34284e2878a592703 assets/ultramarine/models/item/orange_basket.json
0868701e42df616c21c4d6bfe54f32856a91a324 assets/ultramarine/models/item/painting_scroll.json
42faa2c1d3731cb7017307139ba35ecc38294977 assets/ultramarine/models/item/pale_yellow_stone.json
47275b41fbc1d9d934371b3d1d04d9ae3647e6ec assets/ultramarine/models/item/pale_yellow_stone_slab.json
9146d2080f6bdf637647cde2f6cf16de1d365d73 assets/ultramarine/models/item/pale_yellow_stone_stairs.json
Expand Down Expand Up @@ -452,7 +458,7 @@ e48e56ce7a08d5506893c975360626e425e808ea assets/ultramarine/models/item/yellow_s
67c3f3456e93f5361242cd02c815ee09b5824823 data/minecraft/advancements/recipes/decorations/white_candle.json
645284c5035f3bb0e95477cf7f70b5a9a5d5ac32 data/minecraft/recipes/white_candle.json
bb3cff8ef2b03825fc5bbeffb336436d70edcaa4 data/minecraft/tags/blocks/fences.json
6cad47851e11901ccf8c03e49dbf08db903e3679 data/minecraft/tags/blocks/mineable/axe.json
bd8607dd89ba6a0cf194f4e908eafcf7f82d9ade data/minecraft/tags/blocks/mineable/axe.json
94bdd5daa59fd2b3ea6aef937157931c4d72c277 data/minecraft/tags/blocks/mineable/hoe.json
e7a830893c810e7d8f719e4daa09a3b9da72917c data/minecraft/tags/blocks/mineable/pickaxe.json
17545dd0c9613eb0477c89b2b64307a497bc1d58 data/minecraft/tags/blocks/needs_iron_tool.json
Expand Down Expand Up @@ -575,6 +581,7 @@ fc12f504b94526a0de0f6b0b6b095bcd19bf90dd data/ultramarine/advancements/recipes/u
957ffb22555454c434eed8518ec6f60d1565ade0 data/ultramarine/advancements/recipes/ultramarine.materials/polished_warped_plank.json
6e3e1d7bb97fb7099d7bde94ad6177e02659405e data/ultramarine/advancements/recipes/ultramarine.materials/wooden_frame.json
73911b3e562f3076e2f26b1912c0afb6e088b7a7 data/ultramarine/loot_tables/blocks/abacus.json
953efe57699fa453b60d0e17ea2fbaa6b876170a data/ultramarine/loot_tables/blocks/back_cushion.json
78249f6e38dfa012f50b2103718e6c7d0ffac6ae data/ultramarine/loot_tables/blocks/bamboo_mat.json
1e8cbd84a108a60f6e47ec9142c3b89032f2edbd data/ultramarine/loot_tables/blocks/bamboo_mat_slab.json
fdabf68a2afc6e785fff0cf61b1bb6f37bfe8514 data/ultramarine/loot_tables/blocks/bamboo_mat_stairs.json
Expand Down Expand Up @@ -605,6 +612,7 @@ c1d4f2c15a276843b47f3d860875f16bb638f628 data/ultramarine/loot_tables/blocks/bru
e8dc516932fefa81d10bb2b483984a889b55d6e4 data/ultramarine/loot_tables/blocks/carved_red_pillar.json
4ca12e7cd0edc7abcbbc14b2b69fa8dc6bc1eb34 data/ultramarine/loot_tables/blocks/carved_red_pillar_base.json
35ee86c49c93b1c408668714301eb4b87fb06d59 data/ultramarine/loot_tables/blocks/carved_red_pillar_head.json
a116de3887054bff548feb7f84424784d5709434 data/ultramarine/loot_tables/blocks/chessboard.json
10dacfe2692163001d80d8f4d9b2e8ecaaab3d0f data/ultramarine/loot_tables/blocks/chiseled_gilded_dark_oak.json
2c4756fa053a76611c57ec8a0bbffdce6450b386 data/ultramarine/loot_tables/blocks/clay_doll_female.json
9b8f7d0ab15e290304a3346de61d7217f0bd5f9b data/ultramarine/loot_tables/blocks/clay_doll_male.json
Expand Down Expand Up @@ -654,6 +662,7 @@ bd99fe35771783311c592c453316d7d316fa067c data/ultramarine/loot_tables/blocks/lig
b3545373c621311f298df9dc5490665587467822 data/ultramarine/loot_tables/blocks/memorial_tablet.json
1d8922f4783a9bb430920819ca1616bcdd4d9da3 data/ultramarine/loot_tables/blocks/oak_cabinet.json
9c9ff344910410e41caf3fc931f618c967460904 data/ultramarine/loot_tables/blocks/octagonal_palace_lantern.json
60858d45b02e1be5171ba0a1932e5da5f7c038dc data/ultramarine/loot_tables/blocks/painting_scroll.json
94a96e424ac76db32ac8cc9b583cd1863dc9e9bf data/ultramarine/loot_tables/blocks/pale_yellow_stone.json
69330bb178e5ecd8b526093d5302ad07a8cbe59f data/ultramarine/loot_tables/blocks/pale_yellow_stone_slab.json
45ab62be5eccb32bec09c6f11b6648b6ce91d6b9 data/ultramarine/loot_tables/blocks/pale_yellow_stone_stairs.json
Expand Down Expand Up @@ -811,5 +820,5 @@ daf52f68f622d70c0be6679947fc3eeb177e4753 data/ultramarine/recipes/yellow_roof_ti
9d963c46671a863353a8b469457bc55efd511e7f data/ultramarine/recipes/yellow_roof_tile_stairs.json
fcfeebbc3040cb32e94a29f1a90f1c0e18ab6b64 data/ultramarine/recipes/yellow_roof_tiles.json
0a749c939400810233b1bfc6fba83efc5d4ed0fe data/ultramarine/recipes/yellow_sky_lantern.json
5808cd5fcf47b70496390eecf76e72ebcc8ef86e data/ultramarine/tags/blocks/mineable_with_shears.json
87c90ddea06addb10687f55f87ad475fc9cccabe data/ultramarine/tags/blocks/mineable_with_shears.json
c4efa9827b33be29f6dd9bff76d30e27d195bac6 data/ultramarine/tags/items/polished_planks.json
19 changes: 19 additions & 0 deletions src/generated/resources/assets/ultramarine/blockstates/back_cushion.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"variants": {
"facing=north": {
"model": "ultramarine:block/back_cushion",
"y": 180
},
"facing=south": {
"model": "ultramarine:block/back_cushion"
},
"facing=west": {
"model": "ultramarine:block/back_cushion",
"y": 90
},
"facing=east": {
"model": "ultramarine:block/back_cushion",
"y": 270
}
}
}
126 changes: 126 additions & 0 deletions src/generated/resources/assets/ultramarine/blockstates/chessboard.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
{
"variants": {
"diagonal=false,facing=north,facing_shift=north": {
"model": "ultramarine:block/chessboard",
"y": 180
},
"diagonal=true,facing=north,facing_shift=north": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
},
"diagonal=false,facing=south,facing_shift=north": {
"model": "ultramarine:block/chessboard"
},
"diagonal=true,facing=south,facing_shift=north": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
},
"diagonal=false,facing=west,facing_shift=north": {
"model": "ultramarine:block/chessboard",
"y": 90
},
"diagonal=true,facing=west,facing_shift=north": {
"model": "ultramarine:block/chessboard_diagonal",
"y": 180
},
"diagonal=false,facing=east,facing_shift=north": {
"model": "ultramarine:block/chessboard",
"y": 270
},
"diagonal=true,facing=east,facing_shift=north": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
},
"diagonal=false,facing=north,facing_shift=south": {
"model": "ultramarine:block/chessboard",
"y": 180
},
"diagonal=true,facing=north,facing_shift=south": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
},
"diagonal=false,facing=south,facing_shift=south": {
"model": "ultramarine:block/chessboard"
},
"diagonal=true,facing=south,facing_shift=south": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
},
"diagonal=false,facing=west,facing_shift=south": {
"model": "ultramarine:block/chessboard",
"y": 90
},
"diagonal=true,facing=west,facing_shift=south": {
"model": "ultramarine:block/chessboard_diagonal",
"y": 90
},
"diagonal=false,facing=east,facing_shift=south": {
"model": "ultramarine:block/chessboard",
"y": 270
},
"diagonal=true,facing=east,facing_shift=south": {
"model": "ultramarine:block/chessboard_diagonal"
},
"diagonal=false,facing=north,facing_shift=west": {
"model": "ultramarine:block/chessboard",
"y": 180
},
"diagonal=true,facing=north,facing_shift=west": {
"model": "ultramarine:block/chessboard_diagonal",
"y": 180
},
"diagonal=false,facing=south,facing_shift=west": {
"model": "ultramarine:block/chessboard"
},
"diagonal=true,facing=south,facing_shift=west": {
"model": "ultramarine:block/chessboard_diagonal",
"y": 90
},
"diagonal=false,facing=west,facing_shift=west": {
"model": "ultramarine:block/chessboard",
"y": 90
},
"diagonal=true,facing=west,facing_shift=west": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
},
"diagonal=false,facing=east,facing_shift=west": {
"model": "ultramarine:block/chessboard",
"y": 270
},
"diagonal=true,facing=east,facing_shift=west": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
},
"diagonal=false,facing=north,facing_shift=east": {
"model": "ultramarine:block/chessboard",
"y": 180
},
"diagonal=true,facing=north,facing_shift=east": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
},
"diagonal=false,facing=south,facing_shift=east": {
"model": "ultramarine:block/chessboard"
},
"diagonal=true,facing=south,facing_shift=east": {
"model": "ultramarine:block/chessboard_diagonal"
},
"diagonal=false,facing=west,facing_shift=east": {
"model": "ultramarine:block/chessboard",
"y": 90
},
"diagonal=true,facing=west,facing_shift=east": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
},
"diagonal=false,facing=east,facing_shift=east": {
"model": "ultramarine:block/chessboard",
"y": 270
},
"diagonal=true,facing=east,facing_shift=east": {
"model": "ultramarine:block/chessboard_diagonal",
"y": -90
}
}
}
126 changes: 126 additions & 0 deletions src/generated/resources/assets/ultramarine/blockstates/painting_scroll.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
{
"variants": {
"diagonal=false,facing=north,facing_shift=north": {
"model": "ultramarine:block/painting_scroll",
"y": 180
},
"diagonal=true,facing=north,facing_shift=north": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
},
"diagonal=false,facing=south,facing_shift=north": {
"model": "ultramarine:block/painting_scroll"
},
"diagonal=true,facing=south,facing_shift=north": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
},
"diagonal=false,facing=west,facing_shift=north": {
"model": "ultramarine:block/painting_scroll",
"y": 90
},
"diagonal=true,facing=west,facing_shift=north": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": 180
},
"diagonal=false,facing=east,facing_shift=north": {
"model": "ultramarine:block/painting_scroll",
"y": 270
},
"diagonal=true,facing=east,facing_shift=north": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
},
"diagonal=false,facing=north,facing_shift=south": {
"model": "ultramarine:block/painting_scroll",
"y": 180
},
"diagonal=true,facing=north,facing_shift=south": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
},
"diagonal=false,facing=south,facing_shift=south": {
"model": "ultramarine:block/painting_scroll"
},
"diagonal=true,facing=south,facing_shift=south": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
},
"diagonal=false,facing=west,facing_shift=south": {
"model": "ultramarine:block/painting_scroll",
"y": 90
},
"diagonal=true,facing=west,facing_shift=south": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": 90
},
"diagonal=false,facing=east,facing_shift=south": {
"model": "ultramarine:block/painting_scroll",
"y": 270
},
"diagonal=true,facing=east,facing_shift=south": {
"model": "ultramarine:block/painting_scroll_diagonal"
},
"diagonal=false,facing=north,facing_shift=west": {
"model": "ultramarine:block/painting_scroll",
"y": 180
},
"diagonal=true,facing=north,facing_shift=west": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": 180
},
"diagonal=false,facing=south,facing_shift=west": {
"model": "ultramarine:block/painting_scroll"
},
"diagonal=true,facing=south,facing_shift=west": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": 90
},
"diagonal=false,facing=west,facing_shift=west": {
"model": "ultramarine:block/painting_scroll",
"y": 90
},
"diagonal=true,facing=west,facing_shift=west": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
},
"diagonal=false,facing=east,facing_shift=west": {
"model": "ultramarine:block/painting_scroll",
"y": 270
},
"diagonal=true,facing=east,facing_shift=west": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
},
"diagonal=false,facing=north,facing_shift=east": {
"model": "ultramarine:block/painting_scroll",
"y": 180
},
"diagonal=true,facing=north,facing_shift=east": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
},
"diagonal=false,facing=south,facing_shift=east": {
"model": "ultramarine:block/painting_scroll"
},
"diagonal=true,facing=south,facing_shift=east": {
"model": "ultramarine:block/painting_scroll_diagonal"
},
"diagonal=false,facing=west,facing_shift=east": {
"model": "ultramarine:block/painting_scroll",
"y": 90
},
"diagonal=true,facing=west,facing_shift=east": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
},
"diagonal=false,facing=east,facing_shift=east": {
"model": "ultramarine:block/painting_scroll",
"y": 270
},
"diagonal=true,facing=east,facing_shift=east": {
"model": "ultramarine:block/painting_scroll_diagonal",
"y": -90
}
}
}
3 changes: 3 additions & 0 deletions src/generated/resources/assets/ultramarine/models/item/back_cushion.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ultramarine:block/back_cushion"
}
3 changes: 3 additions & 0 deletions src/generated/resources/assets/ultramarine/models/item/chessboard.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ultramarine:block/chessboard"
}
3 changes: 3 additions & 0 deletions src/generated/resources/assets/ultramarine/models/item/painting_scroll.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "ultramarine:block/painting_scroll"
}
1 change: 1 addition & 0 deletions src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"ultramarine:empty_bamboo_tea_basket",
"ultramarine:ruler",
"ultramarine:bottle_gourd",
"ultramarine:chessboard",
"ultramarine:memorial_tablet",
"ultramarine:fruit_box",
"ultramarine:wooden_crate",
Expand Down
Loading

0 comments on commit 0bd1c82

Please sign in to comment.