diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 8b6aec20..c0344d78 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -43,6 +43,7 @@ be5378f86704c9eb26ed483db31a0c364e35ae0f assets/ultramarine/blockstates/blue_and 647b84ffadf961ca42365ff391f5a16994a2a32c assets/ultramarine/blockstates/blue_and_yellow_carved_wood_variant_1.json 197005cd3a92e9486b184895251e5c17fb603137 assets/ultramarine/blockstates/blue_and_yellow_carved_wood_variant_2.json 61956f5548bed8889ab3d9271b5d8d21b960c8c8 assets/ultramarine/blockstates/blue_and_yellow_carved_wood_variant_3.json +839909acb77c9660f2341b13d861083cc0a6ce07 assets/ultramarine/blockstates/blue_and_yellow_gutou.json 5e93240c01b9af97d07a1d28863711e405fe972d assets/ultramarine/blockstates/blue_book.json 944339f46f5d4cf94cec957b9990cd668600c866 assets/ultramarine/blockstates/blue_carved_tiger_eye_rafter.json c3608a98e6604391e10eb7fd6ccca71976a33f91 assets/ultramarine/blockstates/blue_carved_tiger_eye_rafter_end.json @@ -85,6 +86,8 @@ fd69d00634ae271291dc1cf1a48780ae16546e15 assets/ultramarine/blockstates/brownish 2b871703542814a8f38edddae08c9d50fd7cf541 assets/ultramarine/blockstates/brush_tools.json 750a669bd45c5f1060849d58def2a48fc6406f39 assets/ultramarine/blockstates/cabbage_basket.json 4340bfe3896a8824fac4e44fa459c6c3bbf395eb assets/ultramarine/blockstates/carriage.json +1f27e729be29b721745dad3f11e05e99681f9efc assets/ultramarine/blockstates/carved_dark_oak_beam.json +d6a57662aff04c9c318a41dd3a6aa227f9648db9 assets/ultramarine/blockstates/carved_dark_oak_beam_edge.json fe88dba8d0efaf5f07049cf4f33fbdec7e08b3b5 assets/ultramarine/blockstates/carved_red_pillar.json f3e85a59ce80312d9b84da73c9e30a48e7f5f374 assets/ultramarine/blockstates/carved_red_pillar_base.json fa8237c3d5738a33c75565dd3fa47cdd5a697934 assets/ultramarine/blockstates/carved_red_pillar_head.json @@ -152,8 +155,6 @@ ea7f93cc44de852cd06a8a90d6db89e9eca7857d assets/ultramarine/blockstates/dark_blu 39fd8966b8324a5063af0d5134a8bd0b088aecb7 assets/ultramarine/blockstates/eggplant_basket.json cbec3e06118ae5f3abad51b1eaf1735b509862f2 assets/ultramarine/blockstates/empty_bamboo_tea_basket.json 5e22d345364df1358f93e8d2fa4115dccef78dbb assets/ultramarine/blockstates/empty_tuanhua_slab.json -e4c15295e1aa8bd4ae9f9a9c978ac9e4722b4b0c assets/ultramarine/blockstates/engraved_dark_oak_beam.json -3af8edcc0acf205faa1873b52f1ddab3702d1932 assets/ultramarine/blockstates/engraved_dark_oak_beam_edge.json 9a20c8a091e5807f1122f3a3559ce09ecc18ad11 assets/ultramarine/blockstates/flame_arch_wall_pattern.json ce7cb9a741909d750564eed0cd43e154750d1747 assets/ultramarine/blockstates/food_hamper.json 3454640b13268c08fd43fb4dc79c74d22bda9a89 assets/ultramarine/blockstates/fruit_box.json @@ -212,7 +213,6 @@ d47f8bad09c990d1a8e52f0259f39d54109e896d assets/ultramarine/blockstates/green_we 71516dab45b908f32543ade78913364b6a0c260c assets/ultramarine/blockstates/green_weathered_stone.json 4078374dcb66a23b3f9da806a6d4ffee747c2e15 assets/ultramarine/blockstates/green_white_red_carved_wood.json bed6b9037d6d74c2eb98a44c9a081d8948c74afe assets/ultramarine/blockstates/gunny_sack.json -2a3f049020f3d6e8d05b34afd7d8ae1310caa153 assets/ultramarine/blockstates/gutou.json eb40263a84596055e6ecccb6c8b2411bbac3f684 assets/ultramarine/blockstates/hanging_painting_fan.json 9012e0ba6aa9fdd3a7ca6fa8ec5de7706f04813b assets/ultramarine/blockstates/hematite_ore.json c12b8daaa87659de80d25b6db03263785d67ba15 assets/ultramarine/blockstates/high_table_with_white_top.json @@ -460,6 +460,7 @@ ef0b2a9f215d53570dd7aed64f3f07a4d89c7bef assets/ultramarine/models/block/blue_an b9f3f4bcaab459445d8dd8552ea67efa896d5e9a assets/ultramarine/models/block/blue_and_yellow_carved_wood_variant_1.json 60dca25c7a30b637ec02535fb65006109e42fd49 assets/ultramarine/models/block/blue_and_yellow_carved_wood_variant_2.json b6fb8a2be7f4a64d3a3a47cbf5cc4c75b0defb87 assets/ultramarine/models/block/blue_and_yellow_carved_wood_variant_3.json +ce663515e22089850682f5e7b20f06a7d279d72c assets/ultramarine/models/block/blue_and_yellow_gutou.json 5acf192a41f1ce1198649133c711154be87c264b assets/ultramarine/models/block/blue_carved_wood.json d10a4e1ae77fd0b5688b633d07638abd0e6b786b assets/ultramarine/models/block/blue_carved_wooden_slab.json 8317897679661b958ac6987f83fa19c588788741 assets/ultramarine/models/block/blue_carved_wooden_slab_top.json @@ -575,7 +576,7 @@ a1fb8c034cb43dd2d2e7625a4ae2cf53eef6a781 assets/ultramarine/models/block/gray_ro 34b60a03703c4d14ece3f571fff5d85b9a8577e6 assets/ultramarine/models/block/green_and_dark_blue_fangxin.json 87fbc6b7d85f79523cb4e7ad4084ab1681dc0a6c assets/ultramarine/models/block/green_and_dark_blue_fangxin_horizontal.json 8cca2e9f3e9d07e9fc40242709cec594dacf5de6 assets/ultramarine/models/block/green_and_yellow_zhaotou.json -c56e1e3cb58b5d235419357f34b44ff28b4f73e3 assets/ultramarine/models/block/green_blue_black_gutou.json +0e4a014e038d4ade88a2edd075984bf4828ff5e2 assets/ultramarine/models/block/green_blue_black_gutou.json 87825bb7deab191637e742cb737deaf50b969fe5 assets/ultramarine/models/block/green_carved_wood.json e1be10fa2fb650c9a0252d6519c6c5c251cd5a91 assets/ultramarine/models/block/green_carved_wooden_slab.json f34d0f78e48fc119395d606eab7d259f5fb9788b assets/ultramarine/models/block/green_carved_wooden_slab_top.json @@ -596,7 +597,6 @@ f9e216a4643c2b10f1f8284b60395d78c8c5ae7f assets/ultramarine/models/block/green_r e79b59a928e54299007485875fe3b8a5e922ec82 assets/ultramarine/models/block/green_weathered_bricks.json e7628526c952ba33ffcbd7ebe1b6395937e7e6ce assets/ultramarine/models/block/green_weathered_stone.json f4a1f911c9e6b9a3a2565a30a3d1574ee1a4d9c1 assets/ultramarine/models/block/green_white_red_carved_wood.json -4c2e42ae10e8ae6e3c5da820f5141f33b5068a25 assets/ultramarine/models/block/gutou.json 7e3203c1159163dc4f11b8e95aa687c460c6a0e5 assets/ultramarine/models/block/hematite_ore.json 8c0af41bc29f6f8162143a7e06c6da9b8bcd2586 assets/ultramarine/models/block/jade_ore.json 744c1581f5783256ad1e6bed5aa3c412cd1b9d59 assets/ultramarine/models/block/layered_cyan_floor_tiles.json @@ -765,6 +765,7 @@ fc7ccd42d55aeacc62dde0920a0b0fbeb6ca3ead assets/ultramarine/models/item/blue_and d3d1a23e920a82433921e2140768598382906bd5 assets/ultramarine/models/item/blue_and_yellow_carved_wood_variant_1.json 2362d55a645b68766b1088fc2311296de32da3c3 assets/ultramarine/models/item/blue_and_yellow_carved_wood_variant_2.json a50f16134fdf026d91e3b2572397bde578a4bdf1 assets/ultramarine/models/item/blue_and_yellow_carved_wood_variant_3.json +16d79d3a9a7f015cf71bf94974026a1c3e3937ee assets/ultramarine/models/item/blue_and_yellow_gutou.json 2e1baab96c5f3b1c5c98bd3d0ba393c17c1903ad assets/ultramarine/models/item/blue_book.json e3b887de08fc9f9efe2ed967be9e063bca603d28 assets/ultramarine/models/item/blue_carved_tiger_eye_rafter.json 59b731a169a2754358e3c1e40d29d420d0050475 assets/ultramarine/models/item/blue_carved_tiger_eye_rafter_end.json @@ -809,6 +810,8 @@ d937d9e7eb374a0253890e264bc3a9341070a81a assets/ultramarine/models/item/brownish a754bf9e1e6afed0ef51ddc021d9f431cc20758b assets/ultramarine/models/item/brush_tools.json 4d576d1629ec0d63189935b2d0c9a2546c20600b assets/ultramarine/models/item/cabbage_basket.json fafc49d5aa5fe1a0acf433e2e1f1ae0cbfd861a4 assets/ultramarine/models/item/carriage.json +345ec502560dae47f64c4c3d47d9eb8120b86673 assets/ultramarine/models/item/carved_dark_oak_beam.json +481572d9a3a8799c01d9ddca6b243c2879412cf8 assets/ultramarine/models/item/carved_dark_oak_beam_edge.json a05dac8cf6dad155bcc3ebdf2c46fddcdbb6ec34 assets/ultramarine/models/item/carved_red_pillar.json 375b9657455b41c6153296d47917d370cc00cf1d assets/ultramarine/models/item/carved_red_pillar_base.json cea5a281f3c0f11898508ce1ea5800896299b093 assets/ultramarine/models/item/carved_red_pillar_head.json @@ -880,8 +883,6 @@ fac368bba104c843cf0ecc8fe16bbdd48cd07931 assets/ultramarine/models/item/dark_oak b7caf86408bad0448c1fe860cc51530b4176f26a assets/ultramarine/models/item/eggplant_basket.json 3fcf1354ca54d10519e3c7d0d335d352c2e3f7fa assets/ultramarine/models/item/empty_bamboo_tea_basket.json 910a60bef3b80302961f23a269648d01376ea40c assets/ultramarine/models/item/empty_tuanhua_slab.json -5f7a78cac95bca16a5d991d7b7530813a31e8cc8 assets/ultramarine/models/item/engraved_dark_oak_beam.json -f6cdcc92d69719b02e745c8bac6ab46ab618e98b assets/ultramarine/models/item/engraved_dark_oak_beam_edge.json 9a8fccad5fa741e91a7829be032d94e7da12c2c6 assets/ultramarine/models/item/flame_arch_wall_pattern.json 3c4fc9ad38273e2b781eb092bc95c80bf25893e1 assets/ultramarine/models/item/food_hamper.json a63ed4466f84de3112cd44e1673f727bab7e6f9b assets/ultramarine/models/item/fruit_box.json @@ -945,7 +946,6 @@ e0670476a0e639de7008751ed00fee6f1fbe48bd assets/ultramarine/models/item/green_wa 538326f4ed9f179930bc4653af2cf2eef42d24cd assets/ultramarine/models/item/green_weathered_stone.json 3991733180fdf8f48325bd056ef633d03b0c604e assets/ultramarine/models/item/green_white_red_carved_wood.json ded4a7d882a9853ba5e250e847fd58534dfec6d4 assets/ultramarine/models/item/gunny_sack.json -576f8afb32d82ac7f9d7fe2a3552bcc06e4cfbf6 assets/ultramarine/models/item/gutou.json 514719233e5a91172793feda3c0dbdda50eb9095 assets/ultramarine/models/item/hanging_painting_fan.json ca880f9c634d12a56370dc3fb3bbb83e3116a34c assets/ultramarine/models/item/hematite_dust.json 0443d7397f3f94e6ad3f3b58c6bdb716d7918f00 assets/ultramarine/models/item/hematite_ore.json @@ -1179,9 +1179,9 @@ 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 -3847ed801bcb60593fcbe292260609120813ed3d data/minecraft/tags/blocks/mineable/axe.json +b167a140e898cb94f4a6567dcab3afbac3ee3181 data/minecraft/tags/blocks/mineable/axe.json 133ea1a4ce05c3a4696a95395d626b3e0d5e861e data/minecraft/tags/blocks/mineable/hoe.json -a7a24ec9a2494a3a9b0e836dccebfde05fee844e data/minecraft/tags/blocks/mineable/pickaxe.json +360e5afdaf90d3cd866696c8d1e83179505464c7 data/minecraft/tags/blocks/mineable/pickaxe.json 17545dd0c9613eb0477c89b2b64307a497bc1d58 data/minecraft/tags/blocks/needs_iron_tool.json 9a78734519a787b16bc1a768f35bcbf3e480d116 data/minecraft/tags/blocks/needs_stone_tool.json 3186ba1b362c329daa8cf80a8536319b79fa838a data/minecraft/tags/blocks/planks.json @@ -1349,7 +1349,7 @@ fc5581237e1675859fd9fcd2da4386c4ba25c8f9 data/ultramarine/loot_tables/blocks/blu 27d9c0fb85497816840365f068b7fc0fe7af7d90 data/ultramarine/loot_tables/blocks/blue_and_green_chuihua.json 843c01ba09fcb2391de26440acbaa79bc607c97f data/ultramarine/loot_tables/blocks/blue_and_green_double_layer_zhaotou.json 2f3f0094be0a7d8957944496cac76fad77b91ee9 data/ultramarine/loot_tables/blocks/blue_and_green_fangxin_edge.json -634f639e109d466f82c20d75a74653132a48a52f data/ultramarine/loot_tables/blocks/blue_and_green_zhaotou.json +b22da59ec189f6e0bb9b33a528af65de30681e02 data/ultramarine/loot_tables/blocks/blue_and_green_zhaotou.json 6f85f7d2e2945b890b817e4fd438877b7f5f0a4d data/ultramarine/loot_tables/blocks/blue_and_white_carved_wood.json 4d144d42a3224b839ea9b420ebc92a3f78393c3b data/ultramarine/loot_tables/blocks/blue_and_white_fangxin.json a817686c2d0b06f27ad72bf2217a20ee8fd95081 data/ultramarine/loot_tables/blocks/blue_and_white_porcelain_bowl.json @@ -1358,6 +1358,7 @@ bc837aa0223ebfc58380935f908fb59125c3b531 data/ultramarine/loot_tables/blocks/blu b65a626660f1aef3f94c264dad5712723f3ccb34 data/ultramarine/loot_tables/blocks/blue_and_yellow_carved_wood_variant_1.json b316bc7b0f9f8b15bc7488814d29632a88277c5a data/ultramarine/loot_tables/blocks/blue_and_yellow_carved_wood_variant_2.json bdc356c6621fa9c5d83bb4dc5184642672c48be3 data/ultramarine/loot_tables/blocks/blue_and_yellow_carved_wood_variant_3.json +1e742956c127fcc35d5c8bc840cc32b4e4dbb44a data/ultramarine/loot_tables/blocks/blue_and_yellow_gutou.json af4dce5aa5f5d2ed893bc5e8349099f50fb47406 data/ultramarine/loot_tables/blocks/blue_book.json ca4c14b2e194943b2e8295f31913431b98f7b60c data/ultramarine/loot_tables/blocks/blue_carved_tiger_eye_rafter.json 59a83efa3e6056969c0e492dba63a85db534bad9 data/ultramarine/loot_tables/blocks/blue_carved_tiger_eye_rafter_end.json @@ -1398,6 +1399,8 @@ ce1d13f0ef66b425ad476a5eb52fd3a1d3c0068f data/ultramarine/loot_tables/blocks/bro c1d4f2c15a276843b47f3d860875f16bb638f628 data/ultramarine/loot_tables/blocks/brush_tools.json 50d6bbc78b6dc90fbab7ff336b251afe47e0e0ab data/ultramarine/loot_tables/blocks/cabbage_basket.json 33ddb398cc2ad5532a2d8b9bb25664c4dff5afa3 data/ultramarine/loot_tables/blocks/carriage.json +c7c713bb28ec0caf1a332d39b95e4256241f6af1 data/ultramarine/loot_tables/blocks/carved_dark_oak_beam.json +7331dcc1d45349d328bfb53be0586edf550c1e99 data/ultramarine/loot_tables/blocks/carved_dark_oak_beam_edge.json 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 @@ -1461,8 +1464,6 @@ cb5587e8bff163819cd692fea08cd563267069b7 data/ultramarine/loot_tables/blocks/dar 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 3ec5d8a3995897fd2dc0d11f0c2a91ad1dfa3b03 data/ultramarine/loot_tables/blocks/flame_arch_wall_pattern.json dcf20a7d6a956690c7e97d7a66a704cff735c97b data/ultramarine/loot_tables/blocks/food_hamper.json 30390226578e7790884c4d881582dc6265030ed0 data/ultramarine/loot_tables/blocks/fruit_box.json @@ -1517,7 +1518,6 @@ e70f5c8c8fabd11e83f303ad7a48b1fe122b5e32 data/ultramarine/loot_tables/blocks/gre 7bcea80f03b7f4c5284c1964c2ec498d537fd7a0 data/ultramarine/loot_tables/blocks/green_weathered_stone.json 8453f869e979f172b52e2ac1cf82e67fee30426c data/ultramarine/loot_tables/blocks/green_white_red_carved_wood.json 642b8eab201ca2784a84d8ba8e8dfe5a1eee098a data/ultramarine/loot_tables/blocks/gunny_sack.json -89a9b4810b6680755c51f1c2be7bf04d8b88eac1 data/ultramarine/loot_tables/blocks/gutou.json ed2a2cbe97a91252ed6dac2dde9c9e0c862489e9 data/ultramarine/loot_tables/blocks/hanging_painting_fan.json 38f7471ae5cb27305e88eeb9b3f2c1d9b47b86c7 data/ultramarine/loot_tables/blocks/hematite_ore.json bf551b15793e5486042eabca1885609ad8d83a92 data/ultramarine/loot_tables/blocks/high_table_with_white_top.json @@ -1831,5 +1831,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 -2bc7ec4f0dc00266e3cb75809281507ae6195385 data/ultramarine/tags/blocks/mineable_with_shears.json +dfffb28b1097fa91b6ca74bc75bd2909bfa5e407 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/blue_and_yellow_gutou.json b/src/generated/resources/assets/ultramarine/blockstates/blue_and_yellow_gutou.json new file mode 100644 index 00000000..e96af4d5 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/blue_and_yellow_gutou.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "ultramarine:block/blue_and_yellow_gutou", + "x": 180 + }, + "facing=up": { + "model": "ultramarine:block/blue_and_yellow_gutou" + }, + "facing=north": { + "model": "ultramarine:block/blue_and_yellow_gutou", + "x": 90 + }, + "facing=south": { + "model": "ultramarine:block/blue_and_yellow_gutou", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "ultramarine:block/blue_and_yellow_gutou", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "ultramarine:block/blue_and_yellow_gutou", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/carved_dark_oak_beam.json b/src/generated/resources/assets/ultramarine/blockstates/carved_dark_oak_beam.json new file mode 100644 index 00000000..ce137b50 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/carved_dark_oak_beam.json @@ -0,0 +1,108 @@ +{ + "variants": { + "facing=down,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 180 + }, + "facing=up,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam" + }, + "facing=north,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 90 + }, + "facing=south,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 90, + "y": 180 + }, + "facing=west,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 90, + "y": 270 + }, + "facing=east,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 90, + "y": 90 + }, + "facing=down,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 180 + }, + "facing=up,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored" + }, + "facing=north,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 90 + }, + "facing=south,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 90, + "y": 180 + }, + "facing=west,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 90, + "y": 270 + }, + "facing=east,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 90, + "y": 90 + }, + "facing=down,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 180 + }, + "facing=up,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam" + }, + "facing=north,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 90 + }, + "facing=south,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 90, + "y": 180 + }, + "facing=west,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 90, + "y": 270 + }, + "facing=east,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam", + "x": 90, + "y": 90 + }, + "facing=down,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 180 + }, + "facing=up,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored" + }, + "facing=north,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 90 + }, + "facing=south,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 90, + "y": 180 + }, + "facing=west,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 90, + "y": 270 + }, + "facing=east,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_mirrored", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/carved_dark_oak_beam_edge.json b/src/generated/resources/assets/ultramarine/blockstates/carved_dark_oak_beam_edge.json new file mode 100644 index 00000000..9a9cc2a2 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/carved_dark_oak_beam_edge.json @@ -0,0 +1,108 @@ +{ + "variants": { + "facing=down,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 180 + }, + "facing=up,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam_edge" + }, + "facing=north,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 90 + }, + "facing=south,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 90, + "y": 180 + }, + "facing=west,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 90, + "y": 270 + }, + "facing=east,type=left": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 90, + "y": 90 + }, + "facing=down,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 180 + }, + "facing=up,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored" + }, + "facing=north,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 90 + }, + "facing=south,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 90, + "y": 180 + }, + "facing=west,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 90, + "y": 270 + }, + "facing=east,type=right": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 90, + "y": 90 + }, + "facing=down,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 180 + }, + "facing=up,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam_edge" + }, + "facing=north,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 90 + }, + "facing=south,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 90, + "y": 180 + }, + "facing=west,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 90, + "y": 270 + }, + "facing=east,type=top": { + "model": "ultramarine:block/carved_dark_oak_beam_edge", + "x": 90, + "y": 90 + }, + "facing=down,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 180 + }, + "facing=up,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored" + }, + "facing=north,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 90 + }, + "facing=south,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 90, + "y": 180 + }, + "facing=west,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 90, + "y": 270 + }, + "facing=east,type=bottom": { + "model": "ultramarine:block/carved_dark_oak_beam_edge_mirrored", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/engraved_dark_oak_beam.json b/src/generated/resources/assets/ultramarine/blockstates/engraved_dark_oak_beam.json deleted file mode 100644 index 32366410..00000000 --- a/src/generated/resources/assets/ultramarine/blockstates/engraved_dark_oak_beam.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "variants": { - "facing=down,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 180 - }, - "facing=up,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam" - }, - "facing=north,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 90 - }, - "facing=south,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 90, - "y": 180 - }, - "facing=west,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 90, - "y": 270 - }, - "facing=east,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 90, - "y": 90 - }, - "facing=down,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 180 - }, - "facing=up,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored" - }, - "facing=north,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 90 - }, - "facing=south,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 90, - "y": 180 - }, - "facing=west,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 90, - "y": 270 - }, - "facing=east,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 90, - "y": 90 - }, - "facing=down,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 180 - }, - "facing=up,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam" - }, - "facing=north,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 90 - }, - "facing=south,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 90, - "y": 180 - }, - "facing=west,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 90, - "y": 270 - }, - "facing=east,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam", - "x": 90, - "y": 90 - }, - "facing=down,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 180 - }, - "facing=up,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored" - }, - "facing=north,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 90 - }, - "facing=south,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 90, - "y": 180 - }, - "facing=west,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 90, - "y": 270 - }, - "facing=east,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_mirrored", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/engraved_dark_oak_beam_edge.json b/src/generated/resources/assets/ultramarine/blockstates/engraved_dark_oak_beam_edge.json deleted file mode 100644 index fed75dac..00000000 --- a/src/generated/resources/assets/ultramarine/blockstates/engraved_dark_oak_beam_edge.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "variants": { - "facing=down,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 180 - }, - "facing=up,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge" - }, - "facing=north,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 90 - }, - "facing=south,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 90, - "y": 180 - }, - "facing=west,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 90, - "y": 270 - }, - "facing=east,type=left": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 90, - "y": 90 - }, - "facing=down,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 180 - }, - "facing=up,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored" - }, - "facing=north,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 90 - }, - "facing=south,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 90, - "y": 180 - }, - "facing=west,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 90, - "y": 270 - }, - "facing=east,type=right": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 90, - "y": 90 - }, - "facing=down,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 180 - }, - "facing=up,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge" - }, - "facing=north,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 90 - }, - "facing=south,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 90, - "y": 180 - }, - "facing=west,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 90, - "y": 270 - }, - "facing=east,type=top": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge", - "x": 90, - "y": 90 - }, - "facing=down,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 180 - }, - "facing=up,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored" - }, - "facing=north,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 90 - }, - "facing=south,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 90, - "y": 180 - }, - "facing=west,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 90, - "y": 270 - }, - "facing=east,type=bottom": { - "model": "ultramarine:block/engraved_dark_oak_beam_edge_mirrored", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/blockstates/gutou.json b/src/generated/resources/assets/ultramarine/blockstates/gutou.json deleted file mode 100644 index d97b028e..00000000 --- a/src/generated/resources/assets/ultramarine/blockstates/gutou.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "variants": { - "facing=down": { - "model": "ultramarine:block/gutou", - "x": 180 - }, - "facing=up": { - "model": "ultramarine:block/gutou" - }, - "facing=north": { - "model": "ultramarine:block/gutou", - "x": 90 - }, - "facing=south": { - "model": "ultramarine:block/gutou", - "x": 90, - "y": 180 - }, - "facing=west": { - "model": "ultramarine:block/gutou", - "x": 90, - "y": 270 - }, - "facing=east": { - "model": "ultramarine:block/gutou", - "x": 90, - "y": 90 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/blue_and_yellow_gutou.json b/src/generated/resources/assets/ultramarine/models/block/blue_and_yellow_gutou.json new file mode 100644 index 00000000..88cba09d --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/blue_and_yellow_gutou.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "side": "ultramarine:block/blue_and_yellow_gutou_side", + "bottom": "minecraft:block/green_wool", + "top": "minecraft:block/green_wool" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/green_blue_black_gutou.json b/src/generated/resources/assets/ultramarine/models/block/green_blue_black_gutou.json index 3d552550..82067cbc 100644 --- a/src/generated/resources/assets/ultramarine/models/block/green_blue_black_gutou.json +++ b/src/generated/resources/assets/ultramarine/models/block/green_blue_black_gutou.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/cube_bottom_top", "textures": { "side": "ultramarine:block/green_blue_black_gutou_side", - "bottom": "minecraft:block/green_wool", - "top": "minecraft:block/green_wool" + "bottom": "minecraft:block/black_wool", + "top": "minecraft:block/white_wool" } } \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/gutou.json b/src/generated/resources/assets/ultramarine/models/block/gutou.json deleted file mode 100644 index 8629f018..00000000 --- a/src/generated/resources/assets/ultramarine/models/block/gutou.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "side": "ultramarine:block/gutou_side", - "bottom": "minecraft:block/black_wool", - "top": "minecraft:block/white_wool" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/blue_and_yellow_gutou.json b/src/generated/resources/assets/ultramarine/models/item/blue_and_yellow_gutou.json new file mode 100644 index 00000000..40844b6d --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/blue_and_yellow_gutou.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/blue_and_yellow_gutou" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/carved_dark_oak_beam.json b/src/generated/resources/assets/ultramarine/models/item/carved_dark_oak_beam.json new file mode 100644 index 00000000..1481293d --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/carved_dark_oak_beam.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/carved_dark_oak_beam" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/carved_dark_oak_beam_edge.json b/src/generated/resources/assets/ultramarine/models/item/carved_dark_oak_beam_edge.json new file mode 100644 index 00000000..4760abf0 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/carved_dark_oak_beam_edge.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/carved_dark_oak_beam_edge" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/engraved_dark_oak_beam.json b/src/generated/resources/assets/ultramarine/models/item/engraved_dark_oak_beam.json deleted file mode 100644 index 0511c124..00000000 --- a/src/generated/resources/assets/ultramarine/models/item/engraved_dark_oak_beam.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ultramarine:block/engraved_dark_oak_beam" -} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/engraved_dark_oak_beam_edge.json b/src/generated/resources/assets/ultramarine/models/item/engraved_dark_oak_beam_edge.json deleted file mode 100644 index c73bdc35..00000000 --- a/src/generated/resources/assets/ultramarine/models/item/engraved_dark_oak_beam_edge.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ultramarine:block/engraved_dark_oak_beam_edge" -} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/gutou.json b/src/generated/resources/assets/ultramarine/models/item/gutou.json deleted file mode 100644 index b61528aa..00000000 --- a/src/generated/resources/assets/ultramarine/models/item/gutou.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "ultramarine:block/gutou" -} \ 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 57fbfb19..b458c872 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -8,33 +8,25 @@ "ultramarine:bamboo_mat", "ultramarine:bamboo_mat_slab", "ultramarine:bamboo_mat_stairs", - "ultramarine:engraved_dark_oak_beam", - "ultramarine:engraved_dark_oak_beam_edge", - "ultramarine:gilded_dark_oak", - "ultramarine:chiseled_gilded_dark_oak", - "ultramarine:gilded_dark_oak_slab", - "ultramarine:gilded_dark_oak_stairs", - "ultramarine:gilded_dark_oak_beam_head", - "ultramarine:gilded_dark_oak_bracket", "ultramarine:red_carved_wood", "ultramarine:red_carved_wooden_slab", "ultramarine:red_carved_wooden_stairs", - "ultramarine:orange_and_blue_carved_wood", - "ultramarine:orange_and_green_carved_wood", "ultramarine:blue_carved_wood", "ultramarine:blue_carved_wooden_slab", "ultramarine:blue_carved_wooden_stairs", "ultramarine:blue_carved_wooden_bracket_stairs", "ultramarine:blue_carved_wooden_bracket", - "ultramarine:green_and_blue_carved_wood", - "ultramarine:green_carved_wood", - "ultramarine:green_carved_wooden_slab", - "ultramarine:green_carved_wooden_stairs", - "ultramarine:green_carved_wooden_bracket", "ultramarine:cyan_carved_wood", "ultramarine:cyan_carved_wooden_slab", "ultramarine:cyan_carved_wooden_stairs", "ultramarine:cyan_carved_wooden_bracket", + "ultramarine:green_carved_wood", + "ultramarine:green_carved_wooden_slab", + "ultramarine:green_carved_wooden_stairs", + "ultramarine:green_carved_wooden_bracket", + "ultramarine:orange_and_blue_carved_wood", + "ultramarine:orange_and_green_carved_wood", + "ultramarine:green_and_blue_carved_wood", "ultramarine:dark_green_and_dark_blue_carved_wood", "ultramarine:dark_blue_and_dark_green_carved_wood", "ultramarine:black_white_green_carved_wood", @@ -43,110 +35,118 @@ "ultramarine:blue_and_white_carved_wood", "ultramarine:blue_white_red_carved_wood", "ultramarine:green_white_red_carved_wood", - "ultramarine:red_and_cyan_carved_architrave", - "ultramarine:red_and_cyan_carved_architrave_slab", - "ultramarine:red_and_blue_carved_architrave", - "ultramarine:red_and_blue_carved_architrave_slab", - "ultramarine:empty_tuanhua_slab", - "ultramarine:full_tuanhua_slab", - "ultramarine:red_and_cyan_tuanhua_slab", - "ultramarine:red_carved_architrave", - "ultramarine:stripped_dark_oak_pillar_base", "ultramarine:blue_and_yellow_carved_wood_variant_1", "ultramarine:blue_and_yellow_carved_wood_variant_2", "ultramarine:blue_and_yellow_carved_wood_variant_3", + "ultramarine:yellow_and_green_carved_wood", + "ultramarine:yellow_green_blue_carved_wood", + "ultramarine:carved_dark_oak_beam", + "ultramarine:carved_dark_oak_beam_edge", + "ultramarine:gilded_dark_oak", + "ultramarine:chiseled_gilded_dark_oak", + "ultramarine:gilded_dark_oak_slab", + "ultramarine:gilded_dark_oak_stairs", + "ultramarine:gilded_dark_oak_bracket", + "ultramarine:spruce_pillar_base", + "ultramarine:stripped_dark_oak_pillar_base", "ultramarine:gilded_dark_oak_pillar_head_variant_1", "ultramarine:gilded_dark_oak_pillar_head_variant_2", "ultramarine:gilded_dark_oak_pillar_head_variant_3", "ultramarine:gilded_dark_oak_pillar_head_variant_4", "ultramarine:gilded_dark_oak_pillar_head_variant_5", "ultramarine:cyan_and_white_pillar_base", + "ultramarine:cyan_and_white_decorated_pillar", "ultramarine:cyan_and_white_pillar_head", - "ultramarine:qing_green_beam_head", - "ultramarine:yellow_and_green_carved_wood", - "ultramarine:spruce_pillar_base", - "ultramarine:white_and_red_slab", - "ultramarine:yellow_green_blue_carved_wood", "ultramarine:stone_pillar_base", - "ultramarine:bookshelf", - "ultramarine:bookshelf_variant", - "ultramarine:carved_wooden_railing", "ultramarine:green_fangxin", "ultramarine:green_fangxin_edge", + "ultramarine:blue_fangxin", "ultramarine:blue_fangxin_edge", + "ultramarine:cyan_and_blue_fangxin", "ultramarine:cyan_and_blue_fangxin_edge", "ultramarine:cyan_and_blue_fangxin_edge_variant", + "ultramarine:cyan_blue_white_fangxin", "ultramarine:cyan_blue_white_fangxin_edge", "ultramarine:blue_and_green_fangxin_edge", "ultramarine:yellow_and_green_fangxin_edge", + "ultramarine:dark_blue_fangxin", "ultramarine:dark_blue_fangxin_edge", - "ultramarine:blue_fangxin", - "ultramarine:cyan_and_blue_fangxin", - "ultramarine:cyan_blue_white_fangxin", "ultramarine:blue_and_white_fangxin", "ultramarine:green_and_dark_blue_fangxin", - "ultramarine:dark_blue_fangxin", - "ultramarine:blue_zhaotou_edge", - "ultramarine:green_and_blue_zhaotou", - "ultramarine:blue_and_green_zhaotou", - "ultramarine:blue_and_green_double_layer_zhaotou", "ultramarine:white_and_cyan_fangxin", - "ultramarine:white_and_blue_fangxin", "ultramarine:white_and_cyan_fangxin_edge", + "ultramarine:white_and_blue_fangxin", "ultramarine:white_and_blue_fangxin_edge", - "ultramarine:cyan_and_red_zhaotou", - "ultramarine:cyan_and_blue_zhaotou", + "ultramarine:red_cyan_blue_fangxin", "ultramarine:red_cyan_blue_fangxin_edge", "ultramarine:blue_cyan_blue_fangxin_edge", - "ultramarine:blue_cyan_red_fangxin_edge", "ultramarine:blue_cyan_red_fangxin", - "ultramarine:red_cyan_blue_fangxin", + "ultramarine:blue_cyan_red_fangxin_edge", "ultramarine:cyan_blue_cyan_fangxin", "ultramarine:red_blue_red_fangxin", + "ultramarine:cyan_and_yellow_fangxin_edge", + "ultramarine:blue_zhaotou_edge", + "ultramarine:green_and_blue_zhaotou", + "ultramarine:blue_and_green_zhaotou", + "ultramarine:blue_and_green_double_layer_zhaotou", + "ultramarine:cyan_and_red_zhaotou", + "ultramarine:cyan_and_blue_zhaotou", "ultramarine:gray_black_red_zhaotou", "ultramarine:blue_green_red_zhaotou", - "ultramarine:cyan_and_yellow_fangxin_edge", - "ultramarine:gutou", "ultramarine:red_and_blue_zhaotou", "ultramarine:green_and_yellow_zhaotou", "ultramarine:red_green_blue_zhaotou", - "ultramarine:blue_green_yellow_gutou", "ultramarine:white_blue_green_zhaotou", - "ultramarine:cyan_and_white_decorated_pillar", "ultramarine:green_blue_black_gutou", + "ultramarine:blue_green_yellow_gutou", + "ultramarine:blue_and_yellow_gutou", + "ultramarine:gilded_dark_oak_beam_head", + "ultramarine:qing_green_beam_head", + "ultramarine:red_and_cyan_carved_architrave", + "ultramarine:red_and_cyan_carved_architrave_slab", + "ultramarine:red_and_blue_carved_architrave", + "ultramarine:red_and_blue_carved_architrave_slab", + "ultramarine:empty_tuanhua_slab", + "ultramarine:full_tuanhua_slab", + "ultramarine:red_and_cyan_tuanhua_slab", + "ultramarine:red_carved_architrave", + "ultramarine:white_and_red_slab", "ultramarine:gilded_dark_oak_long_queti", "ultramarine:gilded_dark_oak_long_queti_edge", "ultramarine:horizontal_gilded_dark_oak_queti", "ultramarine:vertical_gilded_dark_oak_queti", "ultramarine:wooden_queti", - "ultramarine:tall_wooden_queti_edge", "ultramarine:wooden_queti_edge", - "ultramarine:short_glazed_queti", + "ultramarine:tall_wooden_queti_edge", "ultramarine:large_wooden_queti_edge", + "ultramarine:short_glazed_queti", + "ultramarine:thick_carved_queti", + "ultramarine:short_thick_glazed_queti", "ultramarine:wooden_gualuo", "ultramarine:large_wooden_gualuo", "ultramarine:large_wooden_gualuo_edge", - "ultramarine:short_thick_glazed_queti", - "ultramarine:thick_carved_queti", "ultramarine:blue_and_green_chuihua", "ultramarine:cyan_and_yellow_chuihua", "ultramarine:gilded_dark_oak_chuihua", "ultramarine:qing_golden_dragon_ceiling", + "ultramarine:carved_wooden_railing", + "ultramarine:small_wooden_guardian_lion", + "ultramarine:bookshelf", + "ultramarine:bookshelf_variant", "ultramarine:abacus", "ultramarine:brush_tools", - "ultramarine:bamboo_tea_basket", - "ultramarine:empty_bamboo_tea_basket", "ultramarine:ruler", - "ultramarine:bottle_gourd", "ultramarine:chessboard", "ultramarine:memorial_tablet", + "ultramarine:bottle_gourd", + "ultramarine:bamboo_tea_basket", + "ultramarine:empty_bamboo_tea_basket", + "ultramarine:fruit_box", + "ultramarine:wooden_crate", "ultramarine:carriage", "ultramarine:wooden_poles", "ultramarine:teahouse_flag", "ultramarine:knife_rest", - "ultramarine:small_wooden_guardian_lion", - "ultramarine:fruit_box", - "ultramarine:wooden_crate", "ultramarine:food_hamper", "ultramarine:plated_ham", "ultramarine:plated_fish", @@ -155,41 +155,41 @@ "ultramarine:warped_cabinet", "ultramarine:ebony_cabinet", "ultramarine:large_tea_table", - "ultramarine:ebony_chair", - "ultramarine:wooden_stool", - "ultramarine:large_landscape_painting_screen", "ultramarine:chess_table", "ultramarine:high_table_with_white_top", "ultramarine:censer_table", - "ultramarine:porcelain_inlaid_grand_chair", "ultramarine:porcelain_inlaid_table", - "ultramarine:chair_with_yellow_cushion", - "ultramarine:painted_chair", "ultramarine:small_table", "ultramarine:small_ebony_table", "ultramarine:large_table", - "ultramarine:painted_screen", + "ultramarine:ebony_chair", + "ultramarine:chair_with_yellow_cushion", + "ultramarine:painted_chair", + "ultramarine:wooden_stool", + "ultramarine:porcelain_inlaid_grand_chair", "ultramarine:oak_bed", + "ultramarine:large_landscape_painting_screen", + "ultramarine:painted_screen", + "ultramarine:carved_wooden_door", + "ultramarine:song_wooden_door", + "ultramarine:song_wooden_window", "ultramarine:royal_rosewood_window", "ultramarine:tall_royal_rosewood_window", "ultramarine:rosewood_panel", "ultramarine:rosewood_door_panel", "ultramarine:large_rosewood_panel", "ultramarine:large_rosewood_panel_edge", - "ultramarine:carved_wooden_door", "ultramarine:carved_wooden_door_panel", - "ultramarine:song_wooden_door", - "ultramarine:song_wooden_window", - "ultramarine:bamboo_curtain", "ultramarine:plaque", + "ultramarine:bamboo_curtain", "ultramarine:octagonal_palace_lantern", "ultramarine:square_palace_lantern", "ultramarine:small_red_lantern", - "ultramarine:standing_lamp", - "ultramarine:small_standing_lamp", "ultramarine:white_sky_lantern", "ultramarine:red_sky_lantern", "ultramarine:yellow_sky_lantern", + "ultramarine:standing_lamp", + "ultramarine:small_standing_lamp", "ultramarine:red_candle", "ultramarine:octagonal_palace_lantern", "ultramarine:square_palace_lantern", diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 10f402d4..a5bd8367 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -13,6 +13,8 @@ "ultramarine:brownish_red_stone_brick_slab", "ultramarine:brownish_red_stone_brick_stairs", "ultramarine:brownish_red_stone_brick_wall", + "ultramarine:white_and_pink_mixed_bricks", + "ultramarine:green_weathered_bricks", "ultramarine:pale_yellow_stone", "ultramarine:pale_yellow_stone_slab", "ultramarine:pale_yellow_stone_stairs", @@ -26,6 +28,7 @@ "ultramarine:polished_weathered_stone_slab", "ultramarine:polished_weathered_stone_stairs", "ultramarine:polished_weathered_stone_wall", + "ultramarine:green_weathered_stone", "ultramarine:light_cyan_floor_tile", "ultramarine:light_cyan_floor_tile_slab", "ultramarine:light_cyan_floor_tile_stairs", @@ -34,36 +37,21 @@ "ultramarine:cyan_floor_tile_slab", "ultramarine:cyan_floor_tile_stairs", "ultramarine:cyan_floor_tile_wall", - "ultramarine:green_glazed_tiles", - "ultramarine:green_glazed_tile_slab", - "ultramarine:green_glazed_tile_stairs", - "ultramarine:white_and_pink_mixed_bricks", - "ultramarine:weathered_red_stone_tile", - "ultramarine:blue_and_black_tile", - "ultramarine:green_weathered_stone", - "ultramarine:green_weathered_bricks", "ultramarine:dark_cyan_floor_tile", "ultramarine:layered_cyan_floor_tiles", "ultramarine:vertical_cyan_floor_tiles", "ultramarine:mixed_cyan_floor_tiles", "ultramarine:chiseled_cyan_floor_tile", "ultramarine:cut_cyan_floor_tiles", + "ultramarine:weathered_red_stone_tile", + "ultramarine:blue_and_black_tile", + "ultramarine:green_glazed_tiles", + "ultramarine:green_glazed_tile_slab", + "ultramarine:green_glazed_tile_stairs", "ultramarine:black_floor_tiles", "ultramarine:black_floor_tiles_little_mossy", "ultramarine:black_floor_tiles_moderate_mossy", "ultramarine:black_floor_tiles_very_mossy", - "ultramarine:carved_red_pillar", - "ultramarine:carved_red_pillar_base", - "ultramarine:carved_red_pillar_head", - "ultramarine:white_marble_railing", - "ultramarine:white_marble_railing_slant", - "ultramarine:carved_stone_panel_edge", - "ultramarine:carved_stone_queti_part", - "ultramarine:carved_stone_beam", - "ultramarine:carved_stone_queti", - "ultramarine:golden_glazed_roof_charm", - "ultramarine:golden_glazed_roof_charm_accessory", - "ultramarine:green_glazed_roof_charm", "ultramarine:black_roof_ridge_upper", "ultramarine:black_roof_ridge_lower", "ultramarine:black_roof_ridge_connection", @@ -82,40 +70,52 @@ "ultramarine:yellow_main_roof_ridge_panel", "ultramarine:yellow_main_roof_ridge_plate", "ultramarine:yellow_main_roof_ridge_stairs", - "ultramarine:knife", - "ultramarine:clay_doll_male", - "ultramarine:clay_doll_female", - "ultramarine:blue_and_white_porcelain_flowerpot", - "ultramarine:terracotta_flowerpot", - "ultramarine:black_iron_flowerpot", - "ultramarine:blue_porcelain_flowerpot", + "ultramarine:carved_red_pillar", + "ultramarine:carved_red_pillar_base", + "ultramarine:carved_red_pillar_head", + "ultramarine:carved_stone_panel_edge", + "ultramarine:carved_stone_queti_part", + "ultramarine:carved_stone_beam", + "ultramarine:carved_stone_queti", + "ultramarine:golden_glazed_roof_charm", + "ultramarine:golden_glazed_roof_charm_accessory", + "ultramarine:green_glazed_roof_charm", + "ultramarine:white_marble_railing", + "ultramarine:white_marble_railing_slant", + "ultramarine:small_stone_guardian_lion", + "ultramarine:small_jade_guardian_lion", + "ultramarine:small_yellow_glazed_guardian_lion", + "ultramarine:small_green_glazed_guardian_lion", + "ultramarine:xumi_stone_monolith", "ultramarine:blue_and_white_porcelain_vase", "ultramarine:large_blue_and_white_porcelain_vase", "ultramarine:short_blue_and_white_porcelain_pot", "ultramarine:tall_blue_and_white_porcelain_pot", "ultramarine:blue_and_white_porcelain_bowl", - "ultramarine:knocker", - "ultramarine:sundial", - "ultramarine:broom", - "ultramarine:stone_pedestal", - "ultramarine:porcelain_teapot", - "ultramarine:terracotta_pot", "ultramarine:bronze_mirror", "ultramarine:bronze_censer", "ultramarine:royal_censer", + "ultramarine:porcelain_teapot", "ultramarine:jade_pendant", "ultramarine:imperial_jade_seal", + "ultramarine:clay_doll_male", + "ultramarine:clay_doll_female", + "ultramarine:blue_and_white_porcelain_flowerpot", + "ultramarine:terracotta_flowerpot", + "ultramarine:black_iron_flowerpot", + "ultramarine:blue_porcelain_flowerpot", + "ultramarine:knife", + "ultramarine:sundial", + "ultramarine:broom", + "ultramarine:stone_pedestal", + "ultramarine:terracotta_pot", "ultramarine:bronze_ding", - "ultramarine:small_stone_guardian_lion", - "ultramarine:small_jade_guardian_lion", - "ultramarine:small_yellow_glazed_guardian_lion", - "ultramarine:small_green_glazed_guardian_lion", - "ultramarine:xumi_stone_monolith", "ultramarine:plated_mooncakes", "ultramarine:plated_mung_bean_cakes", "ultramarine:wine_pot", "ultramarine:glazed_tile_grid_window", "ultramarine:stone_flower_window", + "ultramarine:knocker", "ultramarine:stone_lamp", "ultramarine:tricolor_candlestick", "ultramarine:jade_candlestick", diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/blue_and_green_zhaotou.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/blue_and_green_zhaotou.json index 0a70e7c4..3abd27f9 100644 --- a/src/generated/resources/data/ultramarine/loot_tables/blocks/blue_and_green_zhaotou.json +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/blue_and_green_zhaotou.json @@ -8,7 +8,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:air" + "name": "ultramarine:blue_and_green_zhaotou" } ] } diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/engraved_dark_oak_beam.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/blue_and_yellow_gutou.json similarity index 66% rename from src/generated/resources/data/ultramarine/loot_tables/blocks/engraved_dark_oak_beam.json rename to src/generated/resources/data/ultramarine/loot_tables/blocks/blue_and_yellow_gutou.json index 453926dc..237fe88d 100644 --- a/src/generated/resources/data/ultramarine/loot_tables/blocks/engraved_dark_oak_beam.json +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/blue_and_yellow_gutou.json @@ -2,13 +2,13 @@ "type": "minecraft:block", "pools": [ { - "name": "engraved_dark_oak_beam", + "name": "blue_and_yellow_gutou", "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "ultramarine:engraved_dark_oak_beam" + "name": "ultramarine:blue_and_yellow_gutou" } ] } diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/gutou.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/carved_dark_oak_beam.json similarity index 67% rename from src/generated/resources/data/ultramarine/loot_tables/blocks/gutou.json rename to src/generated/resources/data/ultramarine/loot_tables/blocks/carved_dark_oak_beam.json index 010b628a..eba238da 100644 --- a/src/generated/resources/data/ultramarine/loot_tables/blocks/gutou.json +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/carved_dark_oak_beam.json @@ -2,13 +2,13 @@ "type": "minecraft:block", "pools": [ { - "name": "gutou", + "name": "carved_dark_oak_beam", "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "ultramarine:gutou" + "name": "ultramarine:carved_dark_oak_beam" } ] } diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/engraved_dark_oak_beam_edge.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/carved_dark_oak_beam_edge.json similarity index 64% rename from src/generated/resources/data/ultramarine/loot_tables/blocks/engraved_dark_oak_beam_edge.json rename to src/generated/resources/data/ultramarine/loot_tables/blocks/carved_dark_oak_beam_edge.json index de845f2d..9426db06 100644 --- a/src/generated/resources/data/ultramarine/loot_tables/blocks/engraved_dark_oak_beam_edge.json +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/carved_dark_oak_beam_edge.json @@ -2,13 +2,13 @@ "type": "minecraft:block", "pools": [ { - "name": "engraved_dark_oak_beam_edge", + "name": "carved_dark_oak_beam_edge", "rolls": 1.0, "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "ultramarine:engraved_dark_oak_beam_edge" + "name": "ultramarine:carved_dark_oak_beam_edge" } ] } 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 d8c3c918..cfc6ff3f 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 @@ -9,10 +9,13 @@ "ultramarine:medium_yellow_carved_pattern", "ultramarine:yellow_carved_zhaotou_pattern", "ultramarine:long_yellow_carved_zhaotou_pattern", + "ultramarine:carved_zhaotou_pattern", "ultramarine:flame_arch_wall_pattern", "ultramarine:golden_dragon_fangxin_pattern", "ultramarine:blue_fangxin_pattern", "ultramarine:blue_fangxin_pattern_edge", + "ultramarine:green_fangxin_pattern", + "ultramarine:green_fangxin_pattern_edge", "ultramarine:light_blue_su_style_caihua", "ultramarine:yellow_su_style_caihua", "ultramarine:light_yellow_su_style_caihua", @@ -20,23 +23,20 @@ "ultramarine:large_white_su_style_caihua", "ultramarine:large_green_su_style_caihua", "ultramarine:large_gray_su_style_caihua", - "ultramarine:carved_zhaotou_pattern", - "ultramarine:green_fangxin_pattern", - "ultramarine:green_fangxin_pattern_edge", "ultramarine:brush_and_inkstone", - "ultramarine:sack", - "ultramarine:red_silk_fabric_roll", - "ultramarine:green_silk_fabric_roll", - "ultramarine:purple_silk_fabric_roll", "ultramarine:painting_scroll", - "ultramarine:back_cushion", "ultramarine:book_stack", - "ultramarine:boots", - "ultramarine:long_pillow", "ultramarine:paper", "ultramarine:blue_book", - "ultramarine:chinese_herbs_bag", "ultramarine:bamboo_slips", + "ultramarine:back_cushion", + "ultramarine:boots", + "ultramarine:long_pillow", + "ultramarine:red_silk_fabric_roll", + "ultramarine:green_silk_fabric_roll", + "ultramarine:purple_silk_fabric_roll", + "ultramarine:sack", + "ultramarine:chinese_herbs_bag", "ultramarine:long_hanging_painting", "ultramarine:white_landscape_painting", "ultramarine:horizontal_old_landscape_painting", @@ -48,11 +48,11 @@ "ultramarine:hanging_painting_fan", "ultramarine:sincere_calligraphy", "ultramarine:yellow_cushion", + "ultramarine:paper_strip_seal", "ultramarine:large_blue_curtain", "ultramarine:medium_blue_curtain", "ultramarine:small_blue_curtain", "ultramarine:red_curtain", - "ultramarine:red_curtain_corner", - "ultramarine:paper_strip_seal" + "ultramarine:red_curtain_corner" ] } \ No newline at end of file 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 46f9dfa6..ae7d73c3 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java @@ -182,8 +182,8 @@ public class BlockRegistry { // DARK OAK - public static final RegistryObject ENGRAVED_DARK_OAK_BEAM = BLOCKS.register("engraved_dark_oak_beam", () -> new ChiralDirectionalBlock(BaseBlockProperty.WOOD)); - public static final RegistryObject ENGRAVED_DARK_OAK_BEAM_EDGE = BLOCKS.register("engraved_dark_oak_beam_edge", () -> new ChiralDirectionalBlock(BaseBlockProperty.WOOD)); + public static final RegistryObject CARVED_DARK_OAK_BEAM = BLOCKS.register("carved_dark_oak_beam", () -> new ChiralDirectionalBlock(BaseBlockProperty.WOOD)); + public static final RegistryObject CARVED_DARK_OAK_BEAM_EDGE = BLOCKS.register("carved_dark_oak_beam_edge", () -> new ChiralDirectionalBlock(BaseBlockProperty.WOOD)); public static final RegistryObject GILDED_DARK_OAK = BLOCKS.register("gilded_dark_oak", () -> new BaseBlock(BaseBlockProperty.WOOD)); public static final RegistryObject CHISELED_GILDED_DARK_OAK = BLOCKS.register("chiseled_gilded_dark_oak", () -> new BaseBlock(BaseBlockProperty.WOOD)); public static final RegistryObject GILDED_DARK_OAK_SLAB = BLOCKS.register("gilded_dark_oak_slab", () -> new BaseSlab(BaseBlockProperty.WOOD)); @@ -254,9 +254,9 @@ public class BlockRegistry { // GUTOU - public static final RegistryObject GUTOU = BLOCKS.register("gutou", () -> new BaseDirectionalBlock(BaseBlockProperty.WOOD)); - public static final RegistryObject BLUE_GREEN_YELLOW_GUTOU = BLOCKS.register("blue_green_yellow_gutou", () -> new BaseDirectionalBlock(BaseBlockProperty.WOOD)); public static final RegistryObject GREEN_BLUE_BLACK_GUTOU = BLOCKS.register("green_blue_black_gutou", () -> new BaseDirectionalBlock(BaseBlockProperty.WOOD)); + public static final RegistryObject BLUE_GREEN_YELLOW_GUTOU = BLOCKS.register("blue_green_yellow_gutou", () -> new BaseDirectionalBlock(BaseBlockProperty.WOOD)); + public static final RegistryObject BLUE_AND_YELLOW_GUTOU = BLOCKS.register("blue_and_yellow_gutou", () -> new BaseDirectionalBlock(BaseBlockProperty.WOOD)); // RAFTERS 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 73cb177d..c14eee37 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java @@ -178,8 +178,8 @@ public class ItemRegistry { // DARK OAK - public static final RegistryObject ENGRAVED_DARK_OAK_BEAM = fromBlock(BlockRegistry.ENGRAVED_DARK_OAK_BEAM, ModCreativeTab.DECORATIVE_BLOCKS); - public static final RegistryObject ENGRAVED_DARK_OAK_BEAM_EDGE = fromBlock(BlockRegistry.ENGRAVED_DARK_OAK_BEAM_EDGE, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject CARVED_DARK_OAK_BEAM = fromBlock(BlockRegistry.CARVED_DARK_OAK_BEAM, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject CARVED_DARK_OAK_BEAM_EDGE = fromBlock(BlockRegistry.CARVED_DARK_OAK_BEAM_EDGE, ModCreativeTab.DECORATIVE_BLOCKS); public static final RegistryObject GILDED_DARK_OAK = fromBlock(BlockRegistry.GILDED_DARK_OAK, ModCreativeTab.DECORATIVE_BLOCKS); public static final RegistryObject CHISELED_GILDED_DARK_OAK = fromBlock(BlockRegistry.CHISELED_GILDED_DARK_OAK, ModCreativeTab.DECORATIVE_BLOCKS); public static final RegistryObject GILDED_DARK_OAK_SLAB = fromBlock(BlockRegistry.GILDED_DARK_OAK_SLAB, ModCreativeTab.DECORATIVE_BLOCKS); @@ -250,9 +250,9 @@ public class ItemRegistry { // GUTOU - public static final RegistryObject GUTOU = fromBlock(BlockRegistry.GUTOU, ModCreativeTab.DECORATIVE_BLOCKS); - public static final RegistryObject BLUE_GREEN_YELLOW_GUTOU = fromBlock(BlockRegistry.BLUE_GREEN_YELLOW_GUTOU, ModCreativeTab.DECORATIVE_BLOCKS); public static final RegistryObject GREEN_BLUE_BLACK_GUTOU = fromBlock(BlockRegistry.GREEN_BLUE_BLACK_GUTOU, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject BLUE_GREEN_YELLOW_GUTOU = fromBlock(BlockRegistry.BLUE_GREEN_YELLOW_GUTOU, ModCreativeTab.DECORATIVE_BLOCKS); + public static final RegistryObject BLUE_AND_YELLOW_GUTOU = fromBlock(BlockRegistry.BLUE_AND_YELLOW_GUTOU, ModCreativeTab.DECORATIVE_BLOCKS); // RAFTERS diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java index e986ba9a..499a47ea 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java +++ b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java @@ -100,8 +100,8 @@ protected void registerStatesAndModels() { simpleBlock(BlockRegistry.CARVED_RED_PILLAR.get()); sideBottomTop(BlockRegistry.CARVED_RED_PILLAR_BASE.get()); directionalSideEnd(BlockRegistry.CARVED_RED_PILLAR_HEAD.get(), sideLoc(BlockRegistry.CARVED_RED_PILLAR_HEAD.get()), modBlockLoc(BlockRegistry.CARVED_RED_PILLAR.get())); - chiralDirectionalBlock(BlockRegistry.ENGRAVED_DARK_OAK_BEAM.get()); - chiralDirectionalBlock(BlockRegistry.ENGRAVED_DARK_OAK_BEAM_EDGE.get()); + chiralDirectionalBlock(BlockRegistry.CARVED_DARK_OAK_BEAM.get()); + chiralDirectionalBlock(BlockRegistry.CARVED_DARK_OAK_BEAM_EDGE.get()); simpleBlock(BlockRegistry.GILDED_DARK_OAK.get()); simpleBlock(BlockRegistry.CHISELED_GILDED_DARK_OAK.get()); slabSideEnd(BlockRegistry.GILDED_DARK_OAK_SLAB.get(), BlockRegistry.GILDED_DARK_OAK.get(), sideLoc(BlockRegistry.GILDED_DARK_OAK_SLAB.get()), blockLoc(BlockRegistry.GILDED_DARK_OAK.get())); @@ -229,14 +229,14 @@ protected void registerStatesAndModels() { directionalSideEnd(BlockRegistry.GRAY_BLACK_RED_ZHAOTOU.get(), sideLoc(BlockRegistry.GRAY_BLACK_RED_ZHAOTOU.get()), mcLoc(BLOCK + "blue_wool")); directionalSideEnd(BlockRegistry.BLUE_GREEN_RED_ZHAOTOU.get(), sideLoc(BlockRegistry.BLUE_GREEN_RED_ZHAOTOU.get()), mcLoc(BLOCK + "blue_wool")); directionalSideEnd(BlockRegistry.CYAN_AND_YELLOW_FANGXIN_EDGE.get(), sideLoc(BlockRegistry.CYAN_AND_YELLOW_FANGXIN_EDGE.get()), mcLoc(BLOCK + "blue_wool")); - directionalSideBottomTop(BlockRegistry.GUTOU.get(), sideLoc(BlockRegistry.GUTOU.get()), mcLoc(BLOCK + "black_wool"), mcLoc(BLOCK + "white_wool")); + directionalSideBottomTop(BlockRegistry.GREEN_BLUE_BLACK_GUTOU.get(), sideLoc(BlockRegistry.GREEN_BLUE_BLACK_GUTOU.get()), mcLoc(BLOCK + "black_wool"), mcLoc(BLOCK + "white_wool")); directionalSideBottomTop(BlockRegistry.RED_AND_BLUE_ZHAOTOU.get(), sideLoc(BlockRegistry.RED_AND_BLUE_ZHAOTOU.get()), mcLoc(BLOCK + "red_wool"), mcLoc(BLOCK + "blue_wool")); directionalSideEnd(BlockRegistry.GREEN_AND_YELLOW_ZHAOTOU.get(), sideLoc(BlockRegistry.GREEN_AND_YELLOW_ZHAOTOU.get()), endLoc(BlockRegistry.CYAN_AND_BLUE_FANGXIN_EDGE.get())); directionalSideEnd(BlockRegistry.RED_GREEN_BLUE_ZHAOTOU.get(), sideLoc(BlockRegistry.RED_GREEN_BLUE_ZHAOTOU.get()), endLoc(BlockRegistry.CYAN_AND_BLUE_FANGXIN_EDGE.get())); directionalSideEnd(BlockRegistry.BLUE_GREEN_YELLOW_GUTOU.get(), sideLoc(BlockRegistry.BLUE_GREEN_YELLOW_GUTOU.get()), mcLoc(BLOCK + "green_wool")); directionalSideEnd(BlockRegistry.WHITE_BLUE_GREEN_ZHAOTOU.get(), sideLoc(BlockRegistry.WHITE_BLUE_GREEN_ZHAOTOU.get()), endLoc(BlockRegistry.WHITE_BLUE_GREEN_ZHAOTOU.get())); directionalSideEnd(BlockRegistry.CYAN_AND_WHITE_DECORATED_PILLAR.get(), sideLoc(BlockRegistry.CYAN_AND_WHITE_DECORATED_PILLAR.get()), mcLoc(BLOCK + "red_terracotta")); - directionalSideEnd(BlockRegistry.GREEN_BLUE_BLACK_GUTOU.get(), sideLoc(BlockRegistry.GREEN_BLUE_BLACK_GUTOU.get()), mcLoc(BLOCK + "green_wool")); + directionalSideEnd(BlockRegistry.BLUE_AND_YELLOW_GUTOU.get(), sideLoc(BlockRegistry.BLUE_AND_YELLOW_GUTOU.get()), mcLoc(BLOCK + "green_wool")); shiftedTiles(BlockRegistry.GRAY_ROOF_TILES.get(), "gray", RoofTiles.RoofTileType.NORMAL); diff --git a/src/main/resources/assets/ultramarine/lang/en_us.json b/src/main/resources/assets/ultramarine/lang/en_us.json index bf48a62f..ea42eef4 100644 --- a/src/main/resources/assets/ultramarine/lang/en_us.json +++ b/src/main/resources/assets/ultramarine/lang/en_us.json @@ -249,8 +249,8 @@ "block.ultramarine.carved_red_pillar_base": "Carved Red Pillar Base", "block.ultramarine.carved_red_pillar": "Carved Red Pillar", "block.ultramarine.carved_red_pillar_head": "Carved Red Pillar Head", - "block.ultramarine.engraved_dark_oak_beam_edge": "Engraved Dark Oak Beam Edge", - "block.ultramarine.engraved_dark_oak_beam": "Engraved Dark Oak Beam", + "block.ultramarine.carved_dark_oak_beam_edge": "Engraved Dark Oak Beam Edge", + "block.ultramarine.carved_dark_oak_beam": "Engraved Dark Oak Beam", "block.ultramarine.gilded_dark_oak_slab": "Gilded Dark Oak Slab", "block.ultramarine.gilded_dark_oak_rafter": "Gilded Dark Oak Rafter", "block.ultramarine.gilded_dark_oak_rafter_end": "Gilded Dark Oak Rafter End", @@ -280,7 +280,7 @@ "block.ultramarine.green_and_dark_blue_fangxin": "Green and Dark Blue Fangxin", "block.ultramarine.dark_blue_fangxin": "Dark Blue Fangxin", "block.ultramarine.cyan_and_yellow_fangxin_edge": "Cyan and Yellow Fangxin Edge", - "block.ultramarine.gutou": "Gutou", + "block.ultramarine.green_blue_black_gutou": "green_blue_black_gutou", "block.ultramarine.wooden_gualuo": "Wooden Gualuo", "block.ultramarine.large_wooden_gualuo": "Large Wooden Gualuo Center", "block.ultramarine.large_wooden_gualuo_edge": "Large Wooden Gualuo Edge", @@ -424,7 +424,7 @@ "block.ultramarine.cyan_and_white_decorated_pillar": "Cyan and White Decorated Pillar", "block.ultramarine.blue_and_yellow_carved_wood_variant_3": "Blue and Yellow Carved Wood", "block.ultramarine.yellow_green_blue_carved_wood": "Yellow Green Blue Carved Wood", - "block.ultramarine.green_blue_black_gutou": "Green Blue Black Gutou", + "block.ultramarine.blue_and_yellow_gutou": "Green Blue Black Gutou", "block.ultramarine.carved_wooden_railing": "Carved Wooden Railing", "block.ultramarine.stone_pillar_base": "Stone Pillar Base", "block.ultramarine.bookshelf": "Bookshelf", diff --git a/src/main/resources/assets/ultramarine/lang/zh_cn.json b/src/main/resources/assets/ultramarine/lang/zh_cn.json index c23f030d..39f46c27 100644 --- a/src/main/resources/assets/ultramarine/lang/zh_cn.json +++ b/src/main/resources/assets/ultramarine/lang/zh_cn.json @@ -248,8 +248,8 @@ "block.ultramarine.carved_red_pillar_base": "雕花红柱础", "block.ultramarine.carved_red_pillar": "雕花红柱子", "block.ultramarine.carved_red_pillar_head": "雕花找头红柱子", - "block.ultramarine.engraved_dark_oak_beam_edge": "雕花深色橡木横梁边缘", - "block.ultramarine.engraved_dark_oak_beam": "雕花深色橡木横梁", + "block.ultramarine.carved_dark_oak_beam_edge": "雕花深色橡木横梁边缘", + "block.ultramarine.carved_dark_oak_beam": "雕花深色橡木横梁", "block.ultramarine.gilded_dark_oak_slab": "黑金深色橡木台阶", "block.ultramarine.gilded_dark_oak_rafter": "黑金深色橡木椽身", "block.ultramarine.gilded_dark_oak_rafter_end": "黑金深色橡木椽头", @@ -279,7 +279,7 @@ "block.ultramarine.green_and_dark_blue_fangxin": "绿深蓝枋心中心", "block.ultramarine.dark_blue_fangxin": "深蓝枋心中心", "block.ultramarine.cyan_and_yellow_fangxin_edge": "青黄枋心外侧", - "block.ultramarine.gutou": "箍头", + "block.ultramarine.green_blue_black_gutou": "箍头", "block.ultramarine.wooden_gualuo": "木挂落", "block.ultramarine.large_wooden_gualuo": "大木挂落中心", "block.ultramarine.large_wooden_gualuo_edge": "大木挂落边缘", @@ -423,7 +423,7 @@ "block.ultramarine.cyan_and_white_decorated_pillar": "青白束带", "block.ultramarine.blue_and_yellow_carved_wood_variant_3": "蓝黄雕花方块", "block.ultramarine.yellow_green_blue_carved_wood": "黄绿蓝雕花方块", - "block.ultramarine.green_blue_black_gutou": "绿蓝黑箍头", + "block.ultramarine.blue_and_yellow_gutou": "绿蓝黑箍头", "block.ultramarine.carved_wooden_railing": "木雕花栅栏", "block.ultramarine.stone_pillar_base": "石花纹柱础", "block.ultramarine.bookshelf": "中式书架", diff --git a/src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam.json b/src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam.json similarity index 96% rename from src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam.json rename to src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam.json index 94cea1eb..b8fec7cf 100644 --- a/src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam.json +++ b/src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "2": "ultramarine:block/engraved_dark_oak_beam", + "2": "ultramarine:block/carved_dark_oak_beam", "particle": "block/dark_oak_log" }, "elements": [ diff --git a/src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam_edge.json b/src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam_edge.json similarity index 95% rename from src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam_edge.json rename to src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam_edge.json index 393ee784..cd1f58d7 100644 --- a/src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam_edge.json +++ b/src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam_edge.json @@ -3,7 +3,7 @@ "texture_size": [64, 64], "ambientocclusion": false, "textures": { - "1": "ultramarine:block/engraved_dark_oak_beam_edge", + "1": "ultramarine:block/carved_dark_oak_beam_edge", "particle": "block/dark_oak_log" }, "elements": [ diff --git a/src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam_edge_mirrored.json b/src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam_edge_mirrored.json similarity index 95% rename from src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam_edge_mirrored.json rename to src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam_edge_mirrored.json index 956ed312..117c0766 100644 --- a/src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam_edge_mirrored.json +++ b/src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam_edge_mirrored.json @@ -3,7 +3,7 @@ "texture_size": [64, 64], "ambientocclusion": false, "textures": { - "1": "ultramarine:block/engraved_dark_oak_beam_edge", + "1": "ultramarine:block/carved_dark_oak_beam_edge", "particle": "block/dark_oak_log" }, "elements": [ diff --git a/src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam_mirrored.json b/src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam_mirrored.json similarity index 95% rename from src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam_mirrored.json rename to src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam_mirrored.json index b9a05ee1..34a1ab9b 100644 --- a/src/main/resources/assets/ultramarine/models/block/engraved_dark_oak_beam_mirrored.json +++ b/src/main/resources/assets/ultramarine/models/block/carved_dark_oak_beam_mirrored.json @@ -2,7 +2,7 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "2": "ultramarine:block/engraved_dark_oak_beam", + "2": "ultramarine:block/carved_dark_oak_beam", "particle": "block/dark_oak_log" }, "elements": [ diff --git a/src/main/resources/assets/ultramarine/textures/block/blue_and_yellow_gutou_side.png b/src/main/resources/assets/ultramarine/textures/block/blue_and_yellow_gutou_side.png new file mode 100644 index 00000000..531986ea Binary files /dev/null and b/src/main/resources/assets/ultramarine/textures/block/blue_and_yellow_gutou_side.png differ diff --git a/src/main/resources/assets/ultramarine/textures/block/engraved_dark_oak_beam.png b/src/main/resources/assets/ultramarine/textures/block/carved_dark_oak_beam.png similarity index 100% rename from src/main/resources/assets/ultramarine/textures/block/engraved_dark_oak_beam.png rename to src/main/resources/assets/ultramarine/textures/block/carved_dark_oak_beam.png diff --git a/src/main/resources/assets/ultramarine/textures/block/engraved_dark_oak_beam_edge.png b/src/main/resources/assets/ultramarine/textures/block/carved_dark_oak_beam_edge.png similarity index 100% rename from src/main/resources/assets/ultramarine/textures/block/engraved_dark_oak_beam_edge.png rename to src/main/resources/assets/ultramarine/textures/block/carved_dark_oak_beam_edge.png diff --git a/src/main/resources/assets/ultramarine/textures/block/green_blue_black_gutou_side.png b/src/main/resources/assets/ultramarine/textures/block/green_blue_black_gutou_side.png index 531986ea..6fe0b156 100644 Binary files a/src/main/resources/assets/ultramarine/textures/block/green_blue_black_gutou_side.png and b/src/main/resources/assets/ultramarine/textures/block/green_blue_black_gutou_side.png differ diff --git a/src/main/resources/assets/ultramarine/textures/block/gutou_side.png b/src/main/resources/assets/ultramarine/textures/block/gutou_side.png deleted file mode 100644 index 6fe0b156..00000000 Binary files a/src/main/resources/assets/ultramarine/textures/block/gutou_side.png and /dev/null differ