diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 54b24eb3..bfd14ad0 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -3,6 +3,7 @@ ee1f1fa11379dc2f8d54020c282dfdfefe2c0880 assets/ultramarine/blockstates/apple_ba 76966572063df006270d3fb16a7e5d62da3bf8f9 assets/ultramarine/blockstates/bamboo_mat.json d314f271f5f2110ab70017ff907125a3886e5bec assets/ultramarine/blockstates/bamboo_mat_slab.json e9a14c3e9fc7004f3be3875bb29156ef7369d1a1 assets/ultramarine/blockstates/bamboo_mat_stairs.json +61d2e95ea64df15b95ef09dc5433a314c7c328d9 assets/ultramarine/blockstates/bamboo_tea_basket.json 65bf658e550e9fbd47f903a2946dd842d33b56ee assets/ultramarine/blockstates/big_blue_and_white_porcelain_vase.json 682bccacfb4ebb184a930c9ef191c399fbb8321d assets/ultramarine/blockstates/black_brick_slab.json fe33690b9997868a86b85f8422c702ad031ae3af assets/ultramarine/blockstates/black_brick_stairs.json @@ -46,6 +47,7 @@ ca80c6e07acba8923ab48bce8b634067d806aeeb assets/ultramarine/blockstates/cyan_roo 53b6ed077c45e880fd2e26ee29cdc6ec2cbc8550 assets/ultramarine/blockstates/ebony_cabinet.json 446abeb17f69aeb914a524e5626acaf030f65ff1 assets/ultramarine/blockstates/ebony_chair.json 39fd8966b8324a5063af0d5134a8bd0b088aecb7 assets/ultramarine/blockstates/eggplant_basket.json +cbec3e06118ae5f3abad51b1eaf1735b509862f2 assets/ultramarine/blockstates/empty_bamboo_tea_basket.json e4c15295e1aa8bd4ae9f9a9c978ac9e4722b4b0c assets/ultramarine/blockstates/engraved_dark_oak_beam.json 3af8edcc0acf205faa1873b52f1ddab3702d1932 assets/ultramarine/blockstates/engraved_dark_oak_beam_edge.json ce7cb9a741909d750564eed0cd43e154750d1747 assets/ultramarine/blockstates/food_hamper.json @@ -101,6 +103,7 @@ f25e03394bf19d36a64e523fa3c8a7061f405a04 assets/ultramarine/blockstates/red_sky_ c79d9f47c6bbc5068f415f6bfe674d72ef84c792 assets/ultramarine/blockstates/rosewood_slab.json 8a715529ba038397dbce22e3865bc526bf7e40a5 assets/ultramarine/blockstates/rosewood_stairs.json 2babac2cc9c56fd31d53eabf2e99e2c4675d6eb2 assets/ultramarine/blockstates/royal_censer.json +ff06b3e67062912aed06e892e0661617606f6355 assets/ultramarine/blockstates/sack.json 0e56c1d12e62b9c57338073c7e9f0c0e4357823d assets/ultramarine/blockstates/small_red_lantern.json bbb634ead8373625affefa96de93fe10d94ab3d8 assets/ultramarine/blockstates/small_standing_lamp.json 815a8d07be6257a92af7446cc221bd02e5bde357 assets/ultramarine/blockstates/square_palace_lantern.json @@ -273,6 +276,7 @@ ed0276a0b61b913dcc2045381e882ae92eb8976e assets/ultramarine/models/block/yellow_ 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 +ff5ecb4efc3b630fb89a8d5c6e22552792daf972 assets/ultramarine/models/item/bamboo_tea_basket.json 1766a0228391d7d219aacdd8def2d10a919b1bf5 assets/ultramarine/models/item/baozi.json f1e52b2b2c293fca60b91ff1ee3fc3008f7bfe0d assets/ultramarine/models/item/big_blue_and_white_porcelain_vase.json 99ebf4f8978914eba256a4bebc72eed51f04cc73 assets/ultramarine/models/item/black_brick.json @@ -327,6 +331,7 @@ ee182a881043c545058e2efd042f3afc6c18615a assets/ultramarine/models/item/cyan_roo 99f1fb7a9ad6867238abcc08abcc89729d90148c assets/ultramarine/models/item/ebony_cabinet.json 7e548eddf4ed8b95f70375ffb8a0d3ae80bf9715 assets/ultramarine/models/item/ebony_chair.json b7caf86408bad0448c1fe860cc51530b4176f26a assets/ultramarine/models/item/eggplant_basket.json +3fcf1354ca54d10519e3c7d0d335d352c2e3f7fa assets/ultramarine/models/item/empty_bamboo_tea_basket.json 5f7a78cac95bca16a5d991d7b7530813a31e8cc8 assets/ultramarine/models/item/engraved_dark_oak_beam.json f6cdcc92d69719b02e745c8bac6ab46ab618e98b assets/ultramarine/models/item/engraved_dark_oak_beam_edge.json 3c4fc9ad38273e2b781eb092bc95c80bf25893e1 assets/ultramarine/models/item/food_hamper.json @@ -406,6 +411,7 @@ c323cd54911101dd83e1fb6bf73448363f6adb9b assets/ultramarine/models/item/rosewood 735c5becae8922d2b7546097630f075b2e17586f assets/ultramarine/models/item/rosewood_slab.json 3d739b54dc148752eea76c738cd5474416f5098e assets/ultramarine/models/item/rosewood_stairs.json b40304a1367371fb496994dfe4500526ba0242ba assets/ultramarine/models/item/royal_censer.json +e944cf226f9ee3e6bbfebd19394cf7caa4cb4bb1 assets/ultramarine/models/item/sack.json 87a6f7822c60de40c97bb8781b6e5e35c4f9cd07 assets/ultramarine/models/item/silk.json 913ab5176acae2a8610f45e0006e55e2f2a758e3 assets/ultramarine/models/item/small_red_lantern.json 3be3b3d1953ed40db057816485e1d58cde6e50b7 assets/ultramarine/models/item/small_standing_lamp.json @@ -436,7 +442,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 -157fbc00a9b2e23dac376711cc343463b933677c data/minecraft/tags/blocks/mineable/axe.json +2e48434ac37f874ffc63d5129caa2b01888e986f data/minecraft/tags/blocks/mineable/axe.json b7a988c65ec5c840c5d6608ce6d6cd14ab9511bc data/minecraft/tags/blocks/mineable/hoe.json c9ebed78fbc736c548a6077ca57dc15053c7de80 data/minecraft/tags/blocks/mineable/pickaxe.json 17545dd0c9613eb0477c89b2b64307a497bc1d58 data/minecraft/tags/blocks/needs_iron_tool.json @@ -562,6 +568,7 @@ fc12f504b94526a0de0f6b0b6b095bcd19bf90dd data/ultramarine/advancements/recipes/u 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 +fdfa24822d81afe0684623c4c00301b5d2a4d152 data/ultramarine/loot_tables/blocks/bamboo_tea_basket.json 9d37a48363178d63665d7e68be2ada58b3036afd data/ultramarine/loot_tables/blocks/big_blue_and_white_porcelain_vase.json 976457aebc049dd09357698fe946a130392f485e data/ultramarine/loot_tables/blocks/black_brick_slab.json 386948fdd00c9298200353c41071de734c969809 data/ultramarine/loot_tables/blocks/black_brick_stairs.json @@ -603,6 +610,7 @@ de2d955bae7c9882a4ebd65665eb1600a056687b data/ultramarine/loot_tables/blocks/cya 26c863578e35fa270c43d77555f4e3a42883141f data/ultramarine/loot_tables/blocks/cyan_roof_tiles.json e2980652415455eef226ad55170a8ef36eb72cfd data/ultramarine/loot_tables/blocks/ebony_cabinet.json b1fa358ea8eec607e79fa8756cbf382cae6158ad data/ultramarine/loot_tables/blocks/ebony_chair.json +412a6af87489452615506e51620c8abfbf2ec07d data/ultramarine/loot_tables/blocks/empty_bamboo_tea_basket.json 01892f379426a0bfcefdeee8f85ab8f8a8980a20 data/ultramarine/loot_tables/blocks/engraved_dark_oak_beam.json 1244d323335351791562b05e6fbedf0de0bf2ff0 data/ultramarine/loot_tables/blocks/engraved_dark_oak_beam_edge.json dcf20a7d6a956690c7e97d7a66a704cff735c97b data/ultramarine/loot_tables/blocks/food_hamper.json @@ -653,6 +661,7 @@ b38d893495a0b17d61170177d0c64dcfd2627047 data/ultramarine/loot_tables/blocks/ros 61a015040b8475bb100a60e62e158c45e6f6dc21 data/ultramarine/loot_tables/blocks/rosewood_planks.json c7b69a69b96940e95d447beb2298de2722c5d6ef data/ultramarine/loot_tables/blocks/rosewood_stairs.json 0304991a787650b043ccae78f03b81e2b376959c data/ultramarine/loot_tables/blocks/royal_censer.json +67b112b51bd13ecab145aecb94cf40b038d256d7 data/ultramarine/loot_tables/blocks/sack.json cddca3c4daa4c2e499fc2d72f58da889dff84551 data/ultramarine/loot_tables/blocks/small_red_lantern.json 28968078def62b7cd8a81892f98221900bb29753 data/ultramarine/loot_tables/blocks/small_standing_lamp.json c9d09dc40d4c1388b594d26dc0c25f895828c265 data/ultramarine/loot_tables/blocks/square_palace_lantern.json @@ -788,5 +797,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 -32b11f1ef4cf7943218255687a6e836bc31b6a07 data/ultramarine/tags/blocks/mineable_with_shears.json +5808cd5fcf47b70496390eecf76e72ebcc8ef86e data/ultramarine/tags/blocks/mineable_with_shears.json c4efa9827b33be29f6dd9bff76d30e27d195bac6 data/ultramarine/tags/items/polished_planks.json diff --git a/src/generated/resources/assets/ultramarine/blockstates/bamboo_tea_basket.json b/src/generated/resources/assets/ultramarine/blockstates/bamboo_tea_basket.json new file mode 100644 index 00000000..ee435524 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/bamboo_tea_basket.json @@ -0,0 +1,126 @@ +{ + "variants": { + "diagonal=false,facing=north,facing_shift=north": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=north": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=south,facing_shift=north": { + "model": "ultramarine:block/bamboo_tea_basket" + }, + "diagonal=true,facing=south,facing_shift=north": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=west,facing_shift=north": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=north": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": 180 + }, + "diagonal=false,facing=east,facing_shift=north": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=north": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=north,facing_shift=south": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=south": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=south,facing_shift=south": { + "model": "ultramarine:block/bamboo_tea_basket" + }, + "diagonal=true,facing=south,facing_shift=south": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=west,facing_shift=south": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=south": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": 90 + }, + "diagonal=false,facing=east,facing_shift=south": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=south": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal" + }, + "diagonal=false,facing=north,facing_shift=west": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=west": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": 180 + }, + "diagonal=false,facing=south,facing_shift=west": { + "model": "ultramarine:block/bamboo_tea_basket" + }, + "diagonal=true,facing=south,facing_shift=west": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": 90 + }, + "diagonal=false,facing=west,facing_shift=west": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=west": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=east,facing_shift=west": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=west": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=north,facing_shift=east": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=east": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=south,facing_shift=east": { + "model": "ultramarine:block/bamboo_tea_basket" + }, + "diagonal=true,facing=south,facing_shift=east": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal" + }, + "diagonal=false,facing=west,facing_shift=east": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=east": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=east,facing_shift=east": { + "model": "ultramarine:block/bamboo_tea_basket", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=east": { + "model": "ultramarine:block/bamboo_tea_basket_diagonal", + "y": -90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/empty_bamboo_tea_basket.json b/src/generated/resources/assets/ultramarine/blockstates/empty_bamboo_tea_basket.json new file mode 100644 index 00000000..71b572d5 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/empty_bamboo_tea_basket.json @@ -0,0 +1,126 @@ +{ + "variants": { + "diagonal=false,facing=north,facing_shift=north": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=north": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=south,facing_shift=north": { + "model": "ultramarine:block/empty_bamboo_tea_basket" + }, + "diagonal=true,facing=south,facing_shift=north": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=west,facing_shift=north": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=north": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": 180 + }, + "diagonal=false,facing=east,facing_shift=north": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=north": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=north,facing_shift=south": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=south": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=south,facing_shift=south": { + "model": "ultramarine:block/empty_bamboo_tea_basket" + }, + "diagonal=true,facing=south,facing_shift=south": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=west,facing_shift=south": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=south": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": 90 + }, + "diagonal=false,facing=east,facing_shift=south": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=south": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal" + }, + "diagonal=false,facing=north,facing_shift=west": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=west": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": 180 + }, + "diagonal=false,facing=south,facing_shift=west": { + "model": "ultramarine:block/empty_bamboo_tea_basket" + }, + "diagonal=true,facing=south,facing_shift=west": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": 90 + }, + "diagonal=false,facing=west,facing_shift=west": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=west": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=east,facing_shift=west": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=west": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=north,facing_shift=east": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 180 + }, + "diagonal=true,facing=north,facing_shift=east": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=south,facing_shift=east": { + "model": "ultramarine:block/empty_bamboo_tea_basket" + }, + "diagonal=true,facing=south,facing_shift=east": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal" + }, + "diagonal=false,facing=west,facing_shift=east": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 90 + }, + "diagonal=true,facing=west,facing_shift=east": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + }, + "diagonal=false,facing=east,facing_shift=east": { + "model": "ultramarine:block/empty_bamboo_tea_basket", + "y": 270 + }, + "diagonal=true,facing=east,facing_shift=east": { + "model": "ultramarine:block/empty_bamboo_tea_basket_diagonal", + "y": -90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/sack.json b/src/generated/resources/assets/ultramarine/blockstates/sack.json new file mode 100644 index 00000000..9d2d97ee --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/sack.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "ultramarine:block/sack", + "y": 180 + }, + "facing=south": { + "model": "ultramarine:block/sack" + }, + "facing=west": { + "model": "ultramarine:block/sack", + "y": 90 + }, + "facing=east": { + "model": "ultramarine:block/sack", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/bamboo_tea_basket.json b/src/generated/resources/assets/ultramarine/models/item/bamboo_tea_basket.json new file mode 100644 index 00000000..312ba9c9 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/bamboo_tea_basket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/bamboo_tea_basket" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/empty_bamboo_tea_basket.json b/src/generated/resources/assets/ultramarine/models/item/empty_bamboo_tea_basket.json new file mode 100644 index 00000000..babeb09e --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/empty_bamboo_tea_basket.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/empty_bamboo_tea_basket" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/sack.json b/src/generated/resources/assets/ultramarine/models/item/sack.json new file mode 100644 index 00000000..9831e03f --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/sack.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/sack" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index 3a656d14..cb1d7ab3 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -18,6 +18,8 @@ "ultramarine:gilded_dark_oak_bracket", "ultramarine:abacus", "ultramarine:brush_tools", + "ultramarine:bamboo_tea_basket", + "ultramarine:empty_bamboo_tea_basket", "ultramarine:bottle_gourd", "ultramarine:memorial_tablet", "ultramarine:fruit_box", diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/bamboo_tea_basket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/bamboo_tea_basket.json new file mode 100644 index 00000000..4b38f399 --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/bamboo_tea_basket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "bamboo_tea_basket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:bamboo_tea_basket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/empty_bamboo_tea_basket.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/empty_bamboo_tea_basket.json new file mode 100644 index 00000000..1e8c50da --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/empty_bamboo_tea_basket.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "empty_bamboo_tea_basket", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:empty_bamboo_tea_basket" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/sack.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/sack.json new file mode 100644 index 00000000..8c090caa --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/sack.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "sack", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "ultramarine:sack" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/tags/blocks/mineable_with_shears.json b/src/generated/resources/data/ultramarine/tags/blocks/mineable_with_shears.json index a4d8d920..fb0f7027 100644 --- a/src/generated/resources/data/ultramarine/tags/blocks/mineable_with_shears.json +++ b/src/generated/resources/data/ultramarine/tags/blocks/mineable_with_shears.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "ultramarine:brush_and_inkstone", + "ultramarine:sack", "ultramarine:red_silk_fabric_roll", "ultramarine:green_silk_fabric_roll", "ultramarine:purple_silk_fabric_roll" diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java index bf04aed5..910b7240 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java @@ -101,11 +101,17 @@ public class BlockRegistry { public static final RegistryObject BLACK_ROOF_TILE_EDGE = BLOCKS.register("black_roof_tile_edge", RoofTiles::new); public static final RegistryObject ABACUS = BLOCKS.register("abacus", - () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.FLAT_MEDIUM).directional().diagonallyPlaceable().noCollision().build()); + () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.DOUBLE_FLAT_14).directional().diagonallyPlaceable().noCollision().build()); public static final RegistryObject BRUSH_TOOLS = BLOCKS.register("brush_tools", () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().noCollision().build()); public static final RegistryObject BRUSH_AND_INKSTONE = BLOCKS.register("brush_and_inkstone", () -> DecorativeBlock.with(BaseBlockProperty.PAPER).shaped(DecorativeBlock.QUARTER_16).directional().noCollision().noOcclusion().build()); + public static final RegistryObject SACK = BLOCKS.register("sack", + () -> ContainerDecorativeBlock.with(BaseBlockProperty.SILK).content(ContainerType.COMMON_SMALL).shaped(DecorativeBlock.HALF_6).directional().noCollision().build()); + public static final RegistryObject BAMBOO_TEA_BASKET = BLOCKS.register("bamboo_tea_basket", + () -> ContainerDecorativeBlock.with(BaseBlockProperty.BAMBOO_WOOD).content(ContainerType.FOOD_REGULAR).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().build()); + public static final RegistryObject EMPTY_BAMBOO_TEA_BASKET = BLOCKS.register("empty_bamboo_tea_basket", + () -> ContainerDecorativeBlock.with(BaseBlockProperty.BAMBOO_WOOD).content(ContainerType.FOOD_REGULAR).shaped(DecorativeBlock.FULL_14).directional().diagonallyPlaceable().build()); public static final RegistryObject RED_SILK_FABRIC_ROLL = BLOCKS.register("red_silk_fabric_roll", () -> DecorativeBlock.with(BaseBlockProperty.SILK).shaped(DecorativeBlock.QUARTER_12).directional().diagonallyPlaceable().build()); public static final RegistryObject GREEN_SILK_FABRIC_ROLL = BLOCKS.register("green_silk_fabric_roll", @@ -139,7 +145,7 @@ public class BlockRegistry { public static final RegistryObject GUNNY_SACK = BLOCKS.register("gunny_sack", () -> ContainerDecorativeBlock.with(BaseBlockProperty.FLAX).content(ContainerType.COMMON_REGULAR).shaped(DecorativeBlock.FULL_14).directional().build()); public static final RegistryObject FOOD_HAMPER = BLOCKS.register("food_hamper", - () -> ContainerDecorativeBlock.with(BaseBlockProperty.WOOD).content(ContainerType.FOOD_LARGE).shaped(DecorativeBlock.POLE_8).directional().diagonallyPlaceable().build()); + () -> ContainerDecorativeBlock.with(BaseBlockProperty.WOOD).content(ContainerType.FOOD_LARGE).shaped(DecorativeBlock.FULL_8).directional().diagonallyPlaceable().build()); public static final RegistryObject PLATED_MOONCAKES = BLOCKS.register("plated_mooncakes", //todo change stone slab plate to actual block () -> ConsumableDecorativeBlock.with(BaseBlockProperty.PORCELAIN).bites(4).platedWith(Blocks.STONE_SLAB).food(ModFoods.MOONCAKE).shaped(DecorativeBlock.FLAT_16).directional().build()); public static final RegistryObject PLATED_MUNG_BEAN_CAKES = BLOCKS.register("plated_mung_bean_cakes", @@ -165,9 +171,9 @@ public class BlockRegistry { public static final RegistryObject SMALL_RED_LANTERN = BLOCKS.register("small_red_lantern", () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.FULL_BLOCK).diagonallyPlaceable().luminous().build()); public static final RegistryObject STANDING_LAMP = BLOCKS.register("standing_lamp", - () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.POLE_8).diagonallyPlaceable().luminous().noOcclusion().build()); + () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.FULL_8).diagonallyPlaceable().luminous().noOcclusion().build()); public static final RegistryObject SMALL_STANDING_LAMP = BLOCKS.register("small_standing_lamp", - () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.POLE_8).diagonallyPlaceable().luminous().build()); + () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.FULL_8).diagonallyPlaceable().luminous().build()); public static final RegistryObject WHITE_SKY_LANTERN = BLOCKS.register("white_sky_lantern", () -> DecorativeBlock.with(BaseBlockProperty.BAMBOO).luminous().build()); public static final RegistryObject RED_SKY_LANTERN = BLOCKS.register("red_sky_lantern", @@ -177,11 +183,11 @@ public class BlockRegistry { public static final RegistryObject STONE_LAMP = BLOCKS.register("stone_lamp", () -> DecorativeBlock.with(BaseBlockProperty.STONE).luminous().build()); public static final RegistryObject RED_CANDLE = BLOCKS.register("red_candle", - () -> new CandleStick(DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.POLE_4).directional().diagonallyPlaceable().luminous(), new Vec3(0.5,1.1,0.5))); + () -> new CandleStick(DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.FULL_4).directional().diagonallyPlaceable().luminous(), new Vec3(0.5,1.1,0.5))); public static final RegistryObject TRICOLOR_CANDLESTICK = BLOCKS.register("tricolor_candlestick", () -> new CandleStick(DecorativeBlock.with(BaseBlockProperty.IRON).shaped(DecorativeBlock.FULL_12).directional().diagonallyPlaceable().luminous(), new Vec3(0.5,1.25,0.5))); public static final RegistryObject JADE_CANDLESTICK = BLOCKS.register("jade_candlestick", - () -> new CandleStick(DecorativeBlock.with(BaseBlockProperty.JADE).shaped(DecorativeBlock.POLE_8).directional().diagonallyPlaceable().luminous(), new Vec3(0.5,1.3,0.5))); + () -> new CandleStick(DecorativeBlock.with(BaseBlockProperty.JADE).shaped(DecorativeBlock.FULL_8).directional().diagonallyPlaceable().luminous(), new Vec3(0.5,1.3,0.5))); public static final RegistryObject JADE_ORE = BLOCKS.register("jade_ore", () -> new BaseOreBlock(2, 5)); public static final RegistryObject MAGNESITE_ORE = BLOCKS.register("magnesite_ore", () -> new BaseOreBlock(2, 5)); diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java index ca8d2013..d98db40f 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java @@ -104,6 +104,9 @@ public class ItemRegistry { public static final RegistryObject ABACUS = fromBlock(BlockRegistry.ABACUS, CreativeTabs.DECORATIONS); public static final RegistryObject BRUSH_TOOLS = fromBlock(BlockRegistry.BRUSH_TOOLS, CreativeTabs.DECORATIONS); public static final RegistryObject BRUSH_AND_INKSTONE = fromBlock(BlockRegistry.BRUSH_AND_INKSTONE, CreativeTabs.DECORATIONS); + public static final RegistryObject BAMBOO_TEA_BASKET = fromBlock(BlockRegistry.BAMBOO_TEA_BASKET, CreativeTabs.DECORATIONS); + public static final RegistryObject EMPTY_BAMBOO_TEA_BASKET = fromBlock(BlockRegistry.EMPTY_BAMBOO_TEA_BASKET, CreativeTabs.DECORATIONS); + public static final RegistryObject SACK = fromBlock(BlockRegistry.SACK, CreativeTabs.DECORATIONS); public static final RegistryObject RED_SILK_FABRIC_ROLL = fromBlock(BlockRegistry.RED_SILK_FABRIC_ROLL, CreativeTabs.DECORATIONS); public static final RegistryObject GREEN_SILK_FABRIC_ROLL = fromBlock(BlockRegistry.GREEN_SILK_FABRIC_ROLL, CreativeTabs.DECORATIONS); public static final RegistryObject PURPLE_SILK_FABRIC_ROLL = fromBlock(BlockRegistry.PURPLE_SILK_FABRIC_ROLL, CreativeTabs.DECORATIONS); diff --git a/src/main/java/com/voxelutopia/ultramarine/world/block/DecorativeBlock.java b/src/main/java/com/voxelutopia/ultramarine/world/block/DecorativeBlock.java index 7489945b..30d0fbb1 100644 --- a/src/main/java/com/voxelutopia/ultramarine/world/block/DecorativeBlock.java +++ b/src/main/java/com/voxelutopia/ultramarine/world/block/DecorativeBlock.java @@ -31,12 +31,13 @@ public class DecorativeBlock extends HorizontalDirectionalBlock implements BaseB public static final VoxelShape FULL_12 = Block.box(3.0D, 0.0D, 3.0D, 13.0D, 16.0D, 13.0D); public static final VoxelShape HALF_12 = Block.box(3.0D, 0.0D, 3.0D, 13.0D, 8.0D, 13.0D); + public static final VoxelShape HALF_6 = Block.box(5.0D, 0.0D, 5.0D, 11.0D, 8.0D, 11.0D); public static final VoxelShape QUARTER_16 = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 4.0D, 16.0D); public static final VoxelShape QUARTER_12 = Block.box(3.0D, 0.0D, 3.0D, 13.0D, 4.0D, 13.0D); public static final VoxelShape FLAT_16 = Block.box(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D); - public static final VoxelShape FLAT_MEDIUM = Block.box(2.0D, 0.0D, 2.0D, 14.0D, 2.0D, 14.0D); - public static final VoxelShape POLE_8 = Block.box(5.0D, 0.0D, 5.0D, 11.0D, 16.0D, 11.0D); - public static final VoxelShape POLE_4 = Block.box(6.0D, 0.0D, 6.0D, 10.0D, 16.0D, 10.0D); + public static final VoxelShape DOUBLE_FLAT_14 = Block.box(2.0D, 0.0D, 2.0D, 14.0D, 2.0D, 14.0D); + public static final VoxelShape FULL_8 = Block.box(5.0D, 0.0D, 5.0D, 11.0D, 16.0D, 11.0D); + public static final VoxelShape FULL_4 = Block.box(6.0D, 0.0D, 6.0D, 10.0D, 16.0D, 10.0D); public static final VoxelShape VASE = Block.box(3.0D, 0.0D, 3.0D, 13.0D, 14.0D, 13.0D); public static final DirectionProperty HORIZONTAL_FACING_SHIFT = ModBlockStateProperties.HORIZONTAL_FACING_SHIFT; diff --git a/src/main/resources/assets/ultramarine/models/block/bamboo_tea_basket.json b/src/main/resources/assets/ultramarine/models/block/bamboo_tea_basket.json new file mode 100644 index 00000000..328d808c --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/bamboo_tea_basket.json @@ -0,0 +1,92 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "2": "ultramarine:block/bamboo_tea_basket", + "particle": "ultramarine:block/bamboo_mat" + }, + "elements": [ + { + "from": [2.75, 0, 1.75], + "to": [13.25, 3, 12.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.625, 7]}, + "faces": { + "north": {"uv": [14, 3.5, 11.25, 4.25], "texture": "#2"}, + "east": {"uv": [14, 2.5, 11.25, 3.25], "texture": "#2"}, + "south": {"uv": [14, 1.5, 11.25, 2.25], "texture": "#2"}, + "west": {"uv": [14, 4.5, 11.25, 5.25], "texture": "#2"}, + "up": {"uv": [6, 9, 3.25, 11.75], "texture": "#2"}, + "down": {"uv": [9, 13.5, 6.25, 10.75], "texture": "#2"} + } + }, + { + "from": [2, 3, 1], + "to": [14, 7.5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.625, 7]}, + "faces": { + "north": {"uv": [12.25, 10.75, 9.25, 12], "texture": "#2"}, + "east": {"uv": [13.75, 9, 10.75, 10.25], "texture": "#2"}, + "south": {"uv": [13.75, 7.5, 10.75, 8.75], "texture": "#2"}, + "west": {"uv": [14.25, 0, 11.25, 1.25], "texture": "#2"}, + "up": {"uv": [10.5, 7.5, 7.5, 10.5], "texture": "#2"}, + "down": {"uv": [3, 12, 0, 9], "texture": "#2"} + } + }, + { + "from": [1.25, 7.5, 0.25], + "to": [14.75, 24, 13.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.625, 7]}, + "faces": { + "north": {"uv": [3.5, 4.5, 0, 8.75], "texture": "#2"}, + "east": {"uv": [7.25, 0, 3.75, 4.25], "texture": "#2"}, + "south": {"uv": [3.5, 0, 0, 4.25], "texture": "#2"}, + "west": {"uv": [7.25, 4.5, 3.75, 8.75], "texture": "#2"}, + "up": {"uv": [11, 0, 7.5, 3.5], "texture": "#2"}, + "down": {"uv": [11, 7.25, 7.5, 3.75], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-120, 30, -180], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-120, 30, -180], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_lefthand": { + "scale": [0.3, 0.3, 0.3] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0.25, -2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [180, 0, 180] + }, + "fixed": { + "rotation": [0, -82.5, 0], + "translation": [4.25, 32, 16.75], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "bone", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/bamboo_tea_basket_diagonal.json b/src/main/resources/assets/ultramarine/models/block/bamboo_tea_basket_diagonal.json new file mode 100644 index 00000000..8866dbce --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/bamboo_tea_basket_diagonal.json @@ -0,0 +1,92 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "2": "ultramarine:block/bamboo_tea_basket", + "particle": "ultramarine:block/bamboo_mat" + }, + "elements": [ + { + "from": [2.75, 0, 1.75], + "to": [13.25, 3, 12.25], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [14, 3.5, 11.25, 4.25], "texture": "#2"}, + "east": {"uv": [14, 2.5, 11.25, 3.25], "texture": "#2"}, + "south": {"uv": [14, 1.5, 11.25, 2.25], "texture": "#2"}, + "west": {"uv": [14, 4.5, 11.25, 5.25], "texture": "#2"}, + "up": {"uv": [6, 9, 3.25, 11.75], "texture": "#2"}, + "down": {"uv": [9, 13.5, 6.25, 10.75], "texture": "#2"} + } + }, + { + "from": [2, 3, 1], + "to": [14, 7.5, 13], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [12.25, 10.75, 9.25, 12], "texture": "#2"}, + "east": {"uv": [13.75, 9, 10.75, 10.25], "texture": "#2"}, + "south": {"uv": [13.75, 7.5, 10.75, 8.75], "texture": "#2"}, + "west": {"uv": [14.25, 0, 11.25, 1.25], "texture": "#2"}, + "up": {"uv": [10.5, 7.5, 7.5, 10.5], "texture": "#2"}, + "down": {"uv": [3, 12, 0, 9], "texture": "#2"} + } + }, + { + "from": [1.25, 7.5, 0.25], + "to": [14.75, 24, 13.75], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3.5, 4.5, 0, 8.75], "texture": "#2"}, + "east": {"uv": [7.25, 0, 3.75, 4.25], "texture": "#2"}, + "south": {"uv": [3.5, 0, 0, 4.25], "texture": "#2"}, + "west": {"uv": [7.25, 4.5, 3.75, 8.75], "texture": "#2"}, + "up": {"uv": [11, 0, 7.5, 3.5], "texture": "#2"}, + "down": {"uv": [11, 7.25, 7.5, 3.75], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-120, 30, -180], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-120, 30, -180], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_lefthand": { + "scale": [0.3, 0.3, 0.3] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0.25, -2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [180, 0, 180] + }, + "fixed": { + "rotation": [0, -82.5, 0], + "translation": [4.25, 32, 16.75], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "bone", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/bamboo_tea_busket.json b/src/main/resources/assets/ultramarine/models/block/bamboo_tea_busket.json deleted file mode 100644 index b1fee5a7..00000000 --- a/src/main/resources/assets/ultramarine/models/block/bamboo_tea_busket.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "textures": { - "2": "block/texture" - }, - "elements": [ - { - "from": [2.75, 0, 3.75], - "to": [13.25, 3, 14.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.625, 9]}, - "faces": { - "north": {"uv": [11.25, 1.5, 14, 2.25], "texture": "#2"}, - "east": {"uv": [11.25, 2.5, 14, 3.25], "texture": "#2"}, - "south": {"uv": [11.25, 3.5, 14, 4.25], "texture": "#2"}, - "west": {"uv": [11.25, 4.5, 14, 5.25], "texture": "#2"}, - "up": {"uv": [6, 11.75, 3.25, 9], "texture": "#2"}, - "down": {"uv": [9, 10.75, 6.25, 13.5], "texture": "#2"} - } - }, - { - "from": [2, 3, 3], - "to": [14, 7.5, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.625, 9]}, - "faces": { - "north": {"uv": [10.75, 7.5, 13.75, 8.75], "texture": "#2"}, - "east": {"uv": [10.75, 9, 13.75, 10.25], "texture": "#2"}, - "south": {"uv": [9.25, 10.75, 12.25, 12], "texture": "#2"}, - "west": {"uv": [11.25, 0, 14.25, 1.25], "texture": "#2"}, - "up": {"uv": [10.5, 10.5, 7.5, 7.5], "texture": "#2"}, - "down": {"uv": [3, 9, 0, 12], "texture": "#2"} - } - }, - { - "from": [1.25, 7.5, 2.25], - "to": [14.75, 24, 15.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.625, 9]}, - "faces": { - "north": {"uv": [0, 0, 3.5, 4.25], "texture": "#2"}, - "east": {"uv": [3.75, 0, 7.25, 4.25], "texture": "#2"}, - "south": {"uv": [0, 4.5, 3.5, 8.75], "texture": "#2"}, - "west": {"uv": [3.75, 4.5, 7.25, 8.75], "texture": "#2"}, - "up": {"uv": [11, 3.5, 7.5, 0], "texture": "#2"}, - "down": {"uv": [11, 3.75, 7.5, 7.25], "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "scale": [0.3, 0.3, 0.3] - }, - "thirdperson_lefthand": { - "scale": [0.3, 0.3, 0.3] - }, - "firstperson_righthand": { - "scale": [0.3, 0.3, 0.3] - }, - "firstperson_lefthand": { - "scale": [0.3, 0.3, 0.3] - }, - "ground": { - "scale": [0.3, 0.3, 0.3] - }, - "gui": { - "rotation": [16.5, 56.5, 0], - "translation": [-0.5, -0.25, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [0, -82.5, 0], - "translation": [4.25, 32, 16.75], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "bone", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1, 2] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/bamboo_tea_busket_diagonal.json b/src/main/resources/assets/ultramarine/models/block/bamboo_tea_busket_diagonal.json deleted file mode 100644 index 39dd8972..00000000 --- a/src/main/resources/assets/ultramarine/models/block/bamboo_tea_busket_diagonal.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "textures": { - "2": "bamboo_tea_busket" - }, - "elements": [ - { - "from": [2.75, 0, 2.75], - "to": [13.25, 3, 13.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 8.625, 8]}, - "faces": { - "north": {"uv": [11.25, 1.5, 14, 2.25], "texture": "#2"}, - "east": {"uv": [11.25, 2.5, 14, 3.25], "texture": "#2"}, - "south": {"uv": [11.25, 3.5, 14, 4.25], "texture": "#2"}, - "west": {"uv": [11.25, 4.5, 14, 5.25], "texture": "#2"}, - "up": {"uv": [6, 11.75, 3.25, 9], "texture": "#2"}, - "down": {"uv": [9, 10.75, 6.25, 13.5], "texture": "#2"} - } - }, - { - "from": [2, 3, 2], - "to": [14, 7.5, 14], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 8.625, 8]}, - "faces": { - "north": {"uv": [10.75, 7.5, 13.75, 8.75], "texture": "#2"}, - "east": {"uv": [10.75, 9, 13.75, 10.25], "texture": "#2"}, - "south": {"uv": [9.25, 10.75, 12.25, 12], "texture": "#2"}, - "west": {"uv": [11.25, 0, 14.25, 1.25], "texture": "#2"}, - "up": {"uv": [10.5, 10.5, 7.5, 7.5], "texture": "#2"}, - "down": {"uv": [3, 9, 0, 12], "texture": "#2"} - } - }, - { - "from": [1.25, 7.5, 1.25], - "to": [14.75, 24, 14.75], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 8.625, 8]}, - "faces": { - "north": {"uv": [0, 0, 3.5, 4.25], "texture": "#2"}, - "east": {"uv": [3.75, 0, 7.25, 4.25], "texture": "#2"}, - "south": {"uv": [0, 4.5, 3.5, 8.75], "texture": "#2"}, - "west": {"uv": [3.75, 4.5, 7.25, 8.75], "texture": "#2"}, - "up": {"uv": [11, 3.5, 7.5, 0], "texture": "#2"}, - "down": {"uv": [11, 3.75, 7.5, 7.25], "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "scale": [0.3, 0.3, 0.3] - }, - "thirdperson_lefthand": { - "scale": [0.3, 0.3, 0.3] - }, - "firstperson_righthand": { - "scale": [0.3, 0.3, 0.3] - }, - "firstperson_lefthand": { - "scale": [0.3, 0.3, 0.3] - }, - "ground": { - "scale": [0.3, 0.3, 0.3] - }, - "gui": { - "rotation": [16.5, 56.5, 0], - "translation": [-0.5, -0.25, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [0, -82.5, 0], - "translation": [4.25, 32, 16.75], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "bone", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1, 2] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_basket.json b/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_basket.json new file mode 100644 index 00000000..ba482c2f --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_basket.json @@ -0,0 +1,92 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "2": "ultramarine:block/empty_bamboo_tea_basket", + "particle": "ultramarine:block/bamboo_mat" + }, + "elements": [ + { + "from": [2.75, 0, 1.75], + "to": [13.25, 3, 12.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [14, 3.5, 11.25, 4.25], "texture": "#2"}, + "east": {"uv": [14, 2.5, 11.25, 3.25], "texture": "#2"}, + "south": {"uv": [14, 1.5, 11.25, 2.25], "texture": "#2"}, + "west": {"uv": [14, 4.5, 11.25, 5.25], "texture": "#2"}, + "up": {"uv": [6, 9, 3.25, 11.75], "texture": "#2"}, + "down": {"uv": [9, 13.5, 6.25, 10.75], "texture": "#2"} + } + }, + { + "from": [2, 3, 1], + "to": [14, 7.5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [12.25, 10.75, 9.25, 12], "texture": "#2"}, + "east": {"uv": [13.75, 9, 10.75, 10.25], "texture": "#2"}, + "south": {"uv": [13.75, 7.5, 10.75, 8.75], "texture": "#2"}, + "west": {"uv": [14.25, 0, 11.25, 1.25], "texture": "#2"}, + "up": {"uv": [10.5, 7.5, 7.5, 10.5], "texture": "#2"}, + "down": {"uv": [3, 12, 0, 9], "texture": "#2"} + } + }, + { + "from": [1.25, 7.5, 0.25], + "to": [14.75, 24, 13.75], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3.5, 4.5, 0, 8.75], "texture": "#2"}, + "east": {"uv": [7.25, 0, 3.75, 4.25], "texture": "#2"}, + "south": {"uv": [3.5, 0, 0, 4.25], "texture": "#2"}, + "west": {"uv": [7.25, 4.5, 3.75, 8.75], "texture": "#2"}, + "up": {"uv": [11, 0, 7.5, 3.5], "texture": "#2"}, + "down": {"uv": [11, 7.25, 7.5, 3.75], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [-120, 30, -180], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [-120, 30, -180], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_lefthand": { + "scale": [0.3, 0.3, 0.3] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 45, 0], + "translation": [0.25, -2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [180, 0, 180] + }, + "fixed": { + "rotation": [0, -82.5, 0], + "translation": [4.25, 32, 16.75], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "bone", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_basket_diagonal.json b/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_basket_diagonal.json new file mode 100644 index 00000000..52fa1615 --- /dev/null +++ b/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_basket_diagonal.json @@ -0,0 +1,84 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [64, 64], + "textures": { + "2": "ultramarine:block/empty_bamboo_tea_basket", + "particle": "ultramarine:block/bamboo_mat" + }, + "elements": [ + { + "from": [2.75, 0, 1.75], + "to": [13.25, 3, 12.25], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [14, 3.5, 11.25, 4.25], "texture": "#2"}, + "east": {"uv": [14, 2.5, 11.25, 3.25], "texture": "#2"}, + "south": {"uv": [14, 1.5, 11.25, 2.25], "texture": "#2"}, + "west": {"uv": [14, 4.5, 11.25, 5.25], "texture": "#2"}, + "up": {"uv": [6, 9, 3.25, 11.75], "texture": "#2"}, + "down": {"uv": [9, 13.5, 6.25, 10.75], "texture": "#2"} + } + }, + { + "from": [2, 3, 1], + "to": [14, 7.5, 13], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [12.25, 10.75, 9.25, 12], "texture": "#2"}, + "east": {"uv": [13.75, 9, 10.75, 10.25], "texture": "#2"}, + "south": {"uv": [13.75, 7.5, 10.75, 8.75], "texture": "#2"}, + "west": {"uv": [14.25, 0, 11.25, 1.25], "texture": "#2"}, + "up": {"uv": [10.5, 7.5, 7.5, 10.5], "texture": "#2"}, + "down": {"uv": [3, 12, 0, 9], "texture": "#2"} + } + }, + { + "from": [1.25, 7.5, 0.25], + "to": [14.75, 24, 13.75], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3.5, 4.5, 0, 8.75], "texture": "#2"}, + "east": {"uv": [7.25, 0, 3.75, 4.25], "texture": "#2"}, + "south": {"uv": [3.5, 0, 0, 4.25], "texture": "#2"}, + "west": {"uv": [7.25, 4.5, 3.75, 8.75], "texture": "#2"}, + "up": {"uv": [11, 0, 7.5, 3.5], "texture": "#2"}, + "down": {"uv": [11, 7.25, 7.5, 3.75], "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "scale": [0.3, 0.3, 0.3] + }, + "thirdperson_lefthand": { + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_righthand": { + "scale": [0.3, 0.3, 0.3] + }, + "firstperson_lefthand": { + "scale": [0.3, 0.3, 0.3] + }, + "ground": { + "scale": [0.3, 0.3, 0.3] + }, + "gui": { + "rotation": [16.5, 56.5, 0], + "translation": [-0.5, -0.25, 0], + "scale": [0.8, 0.8, 0.8] + }, + "fixed": { + "rotation": [0, -82.5, 0], + "translation": [4.25, 32, 16.75], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "bone", + "origin": [0, 0, 0], + "color": 0, + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_busket.json b/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_busket.json deleted file mode 100644 index b1fee5a7..00000000 --- a/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_busket.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "textures": { - "2": "block/texture" - }, - "elements": [ - { - "from": [2.75, 0, 3.75], - "to": [13.25, 3, 14.25], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.625, 9]}, - "faces": { - "north": {"uv": [11.25, 1.5, 14, 2.25], "texture": "#2"}, - "east": {"uv": [11.25, 2.5, 14, 3.25], "texture": "#2"}, - "south": {"uv": [11.25, 3.5, 14, 4.25], "texture": "#2"}, - "west": {"uv": [11.25, 4.5, 14, 5.25], "texture": "#2"}, - "up": {"uv": [6, 11.75, 3.25, 9], "texture": "#2"}, - "down": {"uv": [9, 10.75, 6.25, 13.5], "texture": "#2"} - } - }, - { - "from": [2, 3, 3], - "to": [14, 7.5, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.625, 9]}, - "faces": { - "north": {"uv": [10.75, 7.5, 13.75, 8.75], "texture": "#2"}, - "east": {"uv": [10.75, 9, 13.75, 10.25], "texture": "#2"}, - "south": {"uv": [9.25, 10.75, 12.25, 12], "texture": "#2"}, - "west": {"uv": [11.25, 0, 14.25, 1.25], "texture": "#2"}, - "up": {"uv": [10.5, 10.5, 7.5, 7.5], "texture": "#2"}, - "down": {"uv": [3, 9, 0, 12], "texture": "#2"} - } - }, - { - "from": [1.25, 7.5, 2.25], - "to": [14.75, 24, 15.75], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8.625, 9]}, - "faces": { - "north": {"uv": [0, 0, 3.5, 4.25], "texture": "#2"}, - "east": {"uv": [3.75, 0, 7.25, 4.25], "texture": "#2"}, - "south": {"uv": [0, 4.5, 3.5, 8.75], "texture": "#2"}, - "west": {"uv": [3.75, 4.5, 7.25, 8.75], "texture": "#2"}, - "up": {"uv": [11, 3.5, 7.5, 0], "texture": "#2"}, - "down": {"uv": [11, 3.75, 7.5, 7.25], "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "scale": [0.3, 0.3, 0.3] - }, - "thirdperson_lefthand": { - "scale": [0.3, 0.3, 0.3] - }, - "firstperson_righthand": { - "scale": [0.3, 0.3, 0.3] - }, - "firstperson_lefthand": { - "scale": [0.3, 0.3, 0.3] - }, - "ground": { - "scale": [0.3, 0.3, 0.3] - }, - "gui": { - "rotation": [16.5, 56.5, 0], - "translation": [-0.5, -0.25, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [0, -82.5, 0], - "translation": [4.25, 32, 16.75], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "bone", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1, 2] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_busket_diagonal.json b/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_busket_diagonal.json deleted file mode 100644 index 14b43f1e..00000000 --- a/src/main/resources/assets/ultramarine/models/block/empty_bamboo_tea_busket_diagonal.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [64, 64], - "textures": { - "2": "empty_bamboo_tea_bucket" - }, - "elements": [ - { - "from": [2.75, 0, 3.75], - "to": [13.25, 3, 14.25], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 8.625, 8]}, - "faces": { - "north": {"uv": [11.25, 1.5, 14, 2.25], "texture": "#2"}, - "east": {"uv": [11.25, 2.5, 14, 3.25], "texture": "#2"}, - "south": {"uv": [11.25, 3.5, 14, 4.25], "texture": "#2"}, - "west": {"uv": [11.25, 4.5, 14, 5.25], "texture": "#2"}, - "up": {"uv": [6, 11.75, 3.25, 9], "texture": "#2"}, - "down": {"uv": [9, 10.75, 6.25, 13.5], "texture": "#2"} - } - }, - { - "from": [2, 3, 3], - "to": [14, 7.5, 15], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 8.625, 8]}, - "faces": { - "north": {"uv": [10.75, 7.5, 13.75, 8.75], "texture": "#2"}, - "east": {"uv": [10.75, 9, 13.75, 10.25], "texture": "#2"}, - "south": {"uv": [9.25, 10.75, 12.25, 12], "texture": "#2"}, - "west": {"uv": [11.25, 0, 14.25, 1.25], "texture": "#2"}, - "up": {"uv": [10.5, 10.5, 7.5, 7.5], "texture": "#2"}, - "down": {"uv": [3, 9, 0, 12], "texture": "#2"} - } - }, - { - "from": [1.25, 7.5, 2.25], - "to": [14.75, 24, 15.75], - "rotation": {"angle": 45, "axis": "y", "origin": [8, 8.625, 8]}, - "faces": { - "north": {"uv": [0, 0, 3.5, 4.25], "texture": "#2"}, - "east": {"uv": [3.75, 0, 7.25, 4.25], "texture": "#2"}, - "south": {"uv": [0, 4.5, 3.5, 8.75], "texture": "#2"}, - "west": {"uv": [3.75, 4.5, 7.25, 8.75], "texture": "#2"}, - "up": {"uv": [11, 3.5, 7.5, 0], "texture": "#2"}, - "down": {"uv": [11, 3.75, 7.5, 7.25], "texture": "#2"} - } - } - ], - "display": { - "thirdperson_righthand": { - "scale": [0.3, 0.3, 0.3] - }, - "thirdperson_lefthand": { - "scale": [0.3, 0.3, 0.3] - }, - "firstperson_righthand": { - "scale": [0.3, 0.3, 0.3] - }, - "firstperson_lefthand": { - "scale": [0.3, 0.3, 0.3] - }, - "ground": { - "scale": [0.3, 0.3, 0.3] - }, - "gui": { - "rotation": [16.5, 56.5, 0], - "translation": [-0.5, -0.25, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [0, -82.5, 0], - "translation": [4.25, 32, 16.75], - "scale": [2, 2, 2] - } - }, - "groups": [ - { - "name": "bone", - "origin": [0, 0, 0], - "color": 0, - "children": [0, 1, 2] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/ultramarine/models/block/sack.json b/src/main/resources/assets/ultramarine/models/block/sack.json index 0bacaaca..edfb38ec 100644 --- a/src/main/resources/assets/ultramarine/models/block/sack.json +++ b/src/main/resources/assets/ultramarine/models/block/sack.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "block/texture", - "particle": "block/texture" + "0": "ultramarine:block/sack", + "particle": "ultramarine:item/silk" }, "elements": [ { @@ -35,25 +35,36 @@ ], "display": { "thirdperson_righthand": { - "rotation": [90, 0, 0], - "translation": [-6, -2, -4] + "rotation": [75, 45, 0], + "translation": [0, 1.5, 2], + "scale": [0.375, 0.375, 0.375] }, "thirdperson_lefthand": { - "translation": [0, 2.5, 0], - "scale": [0.5, 0.5, 0.5] + "rotation": [75, 45, 0], + "translation": [0, 1.5, 2], + "scale": [0.375, 0.375, 0.375] }, "firstperson_righthand": { - "scale": [0.3, 0.3, 0.3] + "rotation": [0, 45, 0], + "translation": [0, 3.25, 0], + "scale": [0.4, 0.4, 0.4] }, "firstperson_lefthand": { - "scale": [0.3, 0.3, 0.3] + "rotation": [0, 45, 0], + "translation": [0, 3.25, 0], + "scale": [0.4, 0.4, 0.4] }, "ground": { - "scale": [0.3, 0.3, 0.3] + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] }, "gui": { - "rotation": [32, -36, 0], - "translation": [0, 3.25, 0] + "rotation": [30, -45, 0], + "translation": [0, 2.5, 0], + "scale": [0.8, 0.8, 0.8] + }, + "head": { + "translation": [0, 14.25, 0] } }, "groups": [ diff --git a/src/main/resources/assets/ultramarine/textures/block/bamboo_tea_busket.png b/src/main/resources/assets/ultramarine/textures/block/bamboo_tea_basket.png similarity index 100% rename from src/main/resources/assets/ultramarine/textures/block/bamboo_tea_busket.png rename to src/main/resources/assets/ultramarine/textures/block/bamboo_tea_basket.png diff --git a/src/main/resources/assets/ultramarine/textures/block/empty_bamboo_tea_bucket.png b/src/main/resources/assets/ultramarine/textures/block/empty_bamboo_tea_basket.png similarity index 100% rename from src/main/resources/assets/ultramarine/textures/block/empty_bamboo_tea_bucket.png rename to src/main/resources/assets/ultramarine/textures/block/empty_bamboo_tea_basket.png