diff --git a/gradle.properties b/gradle.properties index 323a8a2..af371e6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -43,7 +43,7 @@ mod_name=Modern Life Patch # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=MIT # The mod version. See https://semver.org/ -mod_version=1.20.1-1.4.5-beta +mod_version=1.20.1-1.4.7-beta # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/generated/resources/.cache/2a65ee2815744be1ef1ffdae1c9a37f2a9cbe2ac b/src/generated/resources/.cache/2a65ee2815744be1ef1ffdae1c9a37f2a9cbe2ac index 30ba88d..2374e50 100644 --- a/src/generated/resources/.cache/2a65ee2815744be1ef1ffdae1c9a37f2a9cbe2ac +++ b/src/generated/resources/.cache/2a65ee2815744be1ef1ffdae1c9a37f2a9cbe2ac @@ -1,2 +1,2 @@ -// 1.20.1 2025-03-24T00:28:40.6686164 Languages: zh_cn -38d834d9f261f188838eae0300297ba94237bb6c assets/modernlifepatch/lang/zh_cn.json +// 1.20.1 2025-03-24T10:47:19.6116707 Languages: zh_cn +6aeaf89b678252a7560e5a569075edb0394582f9 assets/modernlifepatch/lang/zh_cn.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 0dceadf..63b6754 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20.1 2025-03-24T00:28:40.6686164 Loot Tables +// 1.20.1 2025-03-24T10:47:19.616683 Loot Tables 31db597883f9eaa6c1c8f2fe1f9ef45f26e71d62 data/modernlifepatch/loot_tables/blocks/black_concrete_barrier.json 821c7620abe5e839afd07d6d5d08623f588903b4 data/modernlifepatch/loot_tables/blocks/blue_concrete_barrier.json b9a1d28d64a5c6890ce591b47ee6d7ff6d4e29dc data/modernlifepatch/loot_tables/blocks/brown_concrete_barrier.json @@ -21,9 +21,11 @@ b27a4d6e1dfdd3a6e3220f8b191fd5ede0fe1cb1 data/modernlifepatch/loot_tables/blocks f8ef8fa122ea979d871e79b040178e4cc1b8b21a data/modernlifepatch/loot_tables/blocks/orange_concrete_barrier.json 9fbc555c8b3f42dbf72a217f9ceead9cc5fb9992 data/modernlifepatch/loot_tables/blocks/pink_concrete_barrier.json 68f069c8639165a1952af61025bff350919cbad6 data/modernlifepatch/loot_tables/blocks/purple_concrete_barrier.json +7b420f5bc648b2a31079cd32381150d56b25033c data/modernlifepatch/loot_tables/blocks/quartz_block_barrier.json 0689a21f845ac71fa47d8b3efe1de28e3bc88cc9 data/modernlifepatch/loot_tables/blocks/red_concrete_barrier.json be827424e5238e710a25dc04872885aa62dd8f5f data/modernlifepatch/loot_tables/blocks/seven_block.json 30cbba30e4344378a8449d1301fb6eafeba72a37 data/modernlifepatch/loot_tables/blocks/six_block.json +c5498fd329084798a85be33dc68f227bbb09bea6 data/modernlifepatch/loot_tables/blocks/smooth_quartz_barrier.json c76a70b5a42ede00cb92bdc4f5c292bb6c961071 data/modernlifepatch/loot_tables/blocks/tall_mirror.json 033961ef19f6e56e8e0c2bd9aea9c446270587f7 data/modernlifepatch/loot_tables/blocks/three_block.json a28d8ca4f4d81a674e80be80ec2ca9ff5dc70191 data/modernlifepatch/loot_tables/blocks/two_block.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 425f289..0c529ef 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2025-03-24T00:28:40.6686164 Recipes +// 1.20.1 2025-03-24T10:47:19.616683 Recipes 2f62b2d36534a48a65e8cfedc1e45ac3e0089ff9 data/minecraft/advancements/recipes/decorations/black_concrete_barrier_from_black_concrete_stonecutting.json a888d18dbf22aa8b46a077bae7f6b717d9885572 data/minecraft/advancements/recipes/decorations/blue_concrete_barrier_from_blue_concrete_stonecutting.json f0ed2368d1265cce94f7e843f4de55e328902ae6 data/minecraft/advancements/recipes/decorations/brown_concrete_barrier_from_brown_concrete_stonecutting.json @@ -15,10 +15,14 @@ ccdcf8117b49d5074d0140eec9159c5a134137b6 data/minecraft/advancements/recipes/dec 29bc8df14af9fa6b2de522f302bdd6a859e0d2e5 data/minecraft/advancements/recipes/decorations/red_concrete_barrier_from_red_concrete_stonecutting.json ee261066eaa0b85e6ab2303d51bae481bedaa36e data/minecraft/advancements/recipes/decorations/white_concrete_barrier_from_white_concrete_stonecutting.json 2f17e2b2c8da515dac4945bdcaf4dd10a11bf3b2 data/minecraft/advancements/recipes/decorations/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json +f0f9049d3bfd8b354cbb69de8c32d4779c6c78c8 data/minecraft/advancements/recipes/misc/bullet.json +7435650651ae68134d158a4298fdeace83917678 data/minecraft/advancements/recipes/misc/bullet_2.json 988414c0a5be7c371c55a2c843d61a32ab063819 data/minecraft/advancements/recipes/misc/eight_block_from_null_block_stonecutting.json 32864de09f51166fe2b22ef1bf6fb0fd4f9d294e data/minecraft/advancements/recipes/misc/five_block_from_null_block_stonecutting.json 094353c62e4e78bd7f645bff89c8c59db3af4f64 data/minecraft/advancements/recipes/misc/four_block_from_null_block_stonecutting.json +ae108c0b8c0426126a129fb90211e4ac8be37402 data/minecraft/advancements/recipes/misc/four_bullet_magazine.json 644fbc1ab8b8062cd1a8582956fc4ea1b11743b8 data/minecraft/advancements/recipes/misc/nine_block_from_null_block_stonecutting.json +b028df590e453b614487f5587bd4e1a6638daad9 data/minecraft/advancements/recipes/misc/nine_bullet_extended_magazine.json f6b6d2e5bc534b6d7d136a4e69066857c6227266 data/minecraft/advancements/recipes/misc/null_block_from_eight.json 04a0c3901e4e444651529801c645506a41600ca0 data/minecraft/advancements/recipes/misc/null_block_from_eight_block_stonecutting.json 01aceacee682e62e75f60f7c79829833f1d848b3 data/minecraft/advancements/recipes/misc/null_block_from_five.json @@ -43,16 +47,20 @@ ab990b3930cfd57580a8a97f347e1070546908d1 data/minecraft/advancements/recipes/mis db9deb52abf2efbf492e44ff14bb5acfccd1308a data/minecraft/advancements/recipes/misc/one_block_from_null_block_stonecutting.json 2bcbdcf91704e86c7a7e525aac04e049620f4fd3 data/minecraft/advancements/recipes/misc/seven_block_from_null_block_stonecutting.json 3c167e359e82b8485bf7c2ff1317a42d2b579ae3 data/minecraft/advancements/recipes/misc/six_block_from_null_block_stonecutting.json +84d1d343d6a4f5a0abf44efa5234bbaeabc642ed data/minecraft/advancements/recipes/misc/six_bullet_bullet_strip.json 64059807e58379223e9f18ecc233c91dfe865c7e data/minecraft/advancements/recipes/misc/three_block_from_null_block_stonecutting.json 5387372f36268279d7d70d364d44d44e027f7002 data/minecraft/advancements/recipes/misc/two_block_from_null_block_stonecutting.json ff91a2160897fb7afdd6451927bc7bdb230dd152 data/minecraft/advancements/recipes/misc/zero_block_from_null_block_stonecutting.json 64a306dd145f33a183b9f9fed47780e2bd6e50de data/minecraft/recipes/black_concrete_barrier_from_black_concrete_stonecutting.json a9722f24564f23327e9f7a47ef7b1b89b305de96 data/minecraft/recipes/blue_concrete_barrier_from_blue_concrete_stonecutting.json 6a768ef562363272a9bfa756514a33c124872ae1 data/minecraft/recipes/brown_concrete_barrier_from_brown_concrete_stonecutting.json +0959b0d8a1b70c0385b4241cdfad1f89e6f1dd9f data/minecraft/recipes/bullet.json +bfb01f7dd0d92f1744d41a4be87e2e283c4b3810 data/minecraft/recipes/bullet_2.json a02c991f8cc9098f2aa6f46325badfc8a8e4b1ea data/minecraft/recipes/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json df5f3709de5126ed352b330e6fe08361c0671423 data/minecraft/recipes/eight_block_from_null_block_stonecutting.json d05a1ec64e03335ef1cdbbe3de0415bf0b789387 data/minecraft/recipes/five_block_from_null_block_stonecutting.json ba6976e77b3f19dd535a5c663e818e84e2887ce8 data/minecraft/recipes/four_block_from_null_block_stonecutting.json +3638aacb6d663d39eb0e87d2c8030185599e5a2b data/minecraft/recipes/four_bullet_magazine.json 52f98c10ded4ca90a97d33a12776d96cd42d11c5 data/minecraft/recipes/gray_concrete_barrier_from_gray_concrete_stonecutting.json 8667f777866cc54160a52b00af8cc8dd57ecb345 data/minecraft/recipes/green_concrete_barrier_from_green_concrete_stonecutting.json a43e06a168f47b4ff95d26f9d0f8aaaf773bfc72 data/minecraft/recipes/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json @@ -60,6 +68,7 @@ a43e06a168f47b4ff95d26f9d0f8aaaf773bfc72 data/minecraft/recipes/light_blue_concr 8ba9c95e2dd167a5492cd775bb5d6ae213122732 data/minecraft/recipes/lime_concrete_barrier_from_lime_concrete_stonecutting.json 6d088056e9f4ed7c16ac029ad62fa57c734f5e55 data/minecraft/recipes/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json b0ee7718d311f7b2b4983a8e3b943baae5e0e4f6 data/minecraft/recipes/nine_block_from_null_block_stonecutting.json +0f690022cc0f7162a036a9e995b70cc05e153d88 data/minecraft/recipes/nine_bullet_extended_magazine.json 50f38b5cbde42c30375fc5e03b4236bb87d9bb43 data/minecraft/recipes/null_block_from_eight.json 8eca141b1ff65c9dc19557421ad1c7f557ab74fa data/minecraft/recipes/null_block_from_eight_block_stonecutting.json c25ac5c0f82c651723dda7cb48342889f1fdc385 data/minecraft/recipes/null_block_from_five.json @@ -88,6 +97,7 @@ d2e0bc434ca37601f727810ff9cb7f1205ceb6b3 data/minecraft/recipes/purple_concrete_ 3652ee4dd0846ef825ff7d8bc10afd62c1d2dee7 data/minecraft/recipes/red_concrete_barrier_from_red_concrete_stonecutting.json 03ea9a3b9a04c26b01c147149d847bc1ec8f91e5 data/minecraft/recipes/seven_block_from_null_block_stonecutting.json 057bc3387dba64b5220ff42b49310a50a041cc30 data/minecraft/recipes/six_block_from_null_block_stonecutting.json +10ff762d1fc2892dfbcbe438e77ec333fad910c1 data/minecraft/recipes/six_bullet_bullet_strip.json fc264bf36dc4b2d7ff4c089523740904abb67cb6 data/minecraft/recipes/three_block_from_null_block_stonecutting.json de65a15aa31006a2ff1b14d47452b410a16ccf44 data/minecraft/recipes/two_block_from_null_block_stonecutting.json 9d4629cfb681a773d0b8bd22f4b90a910db6a47c data/minecraft/recipes/white_concrete_barrier_from_white_concrete_stonecutting.json @@ -95,11 +105,15 @@ de65a15aa31006a2ff1b14d47452b410a16ccf44 data/minecraft/recipes/two_block_from_n 620c5bea1a315f4f4d84274d74b2e07d21807b0e data/minecraft/recipes/zero_block_from_null_block_stonecutting.json 829d226e46b965c74cdc812972e5e4a6feee89d3 data/modernlifepatch/advancements/recipes/decorations/large_mirror.json 9d1914bb2bddd1bbadd0b58f3f7e5eb992f984c8 data/modernlifepatch/advancements/recipes/decorations/massive_mirror.json -e31f330892c0abe33cce7f858b1e2cb23125e29c data/modernlifepatch/advancements/recipes/decorations/mirror.json +94a737ff42179d0caaf7b0f73701fb8d1e54dd2a data/modernlifepatch/advancements/recipes/decorations/quartz_block_barrier.json +b5ce34d4d0fc82adaf4fb0982d74dd8fd10a3f7f data/modernlifepatch/advancements/recipes/decorations/smooth_quartz_barrier.json 1a1423565c4e8c9d2b2a4157c61ab00ea154e474 data/modernlifepatch/advancements/recipes/decorations/tall_mirror.json +e31f330892c0abe33cce7f858b1e2cb23125e29c data/modernlifepatch/advancements/recipes/misc/mirror.json 50bbd11db7daa8589f9874aef9cc5643bb22098d data/modernlifepatch/advancements/recipes/misc/null_block.json c7af367b61d30ea781a72a6a72e86677bc5b0136 data/modernlifepatch/recipes/large_mirror.json 89bab02b61801049313724df763ab216dbf1f09c data/modernlifepatch/recipes/massive_mirror.json 28133e9320816c3ffc37e11191f19dffd41da17c data/modernlifepatch/recipes/mirror.json f8485dfe69854d05a945a18c579664c446aff5e1 data/modernlifepatch/recipes/null_block.json +f1edaf2c9ee61959bd64bb7e35a717b41969d8b9 data/modernlifepatch/recipes/quartz_block_barrier.json +d2bcf4f75604965f615ad5fb5c4b496f85f0375f data/modernlifepatch/recipes/smooth_quartz_barrier.json fc2a0f648922c5e671df5e33e7634c1a54c78739 data/modernlifepatch/recipes/tall_mirror.json diff --git a/src/generated/resources/.cache/afa868b98b0ef12e8bba28037a3b5894bca9836c b/src/generated/resources/.cache/afa868b98b0ef12e8bba28037a3b5894bca9836c index e9da8e7..2f33c8e 100644 --- a/src/generated/resources/.cache/afa868b98b0ef12e8bba28037a3b5894bca9836c +++ b/src/generated/resources/.cache/afa868b98b0ef12e8bba28037a3b5894bca9836c @@ -1 +1,12 @@ -// 1.20.1 2025-02-22T12:37:42.7086672 Tags for minecraft:item mod id modernlifepatch +// 1.20.1 2025-03-24T10:47:19.616683 Tags for minecraft:item mod id modernlifepatch +00de6eaabb51f87a46be0039344b94204e8d501b data/modernlifepatch/tags/items/bathroom.json +b3b3c0c03825f206ac0114b92dde340575823667 data/modernlifepatch/tags/items/bedchamber.json +732da337904859b5b97ce51bde1cc7f7a5d80abe data/modernlifepatch/tags/items/door.json +6d128d771d93102db48fe3efeb9bd5f228495c92 data/modernlifepatch/tags/items/general.json +39d060574b2353a8af213b9eedf7f74af5cfff59 data/modernlifepatch/tags/items/kitchen.json +1f1537346f8e42f6ff55126419e8c6c44db1a17e data/modernlifepatch/tags/items/lounge.json +2cdbaac0403a9e98a3345cdba52bcbc904c97bd8 data/modernlifepatch/tags/items/m_tool.json +f690267c62fcfeb6d17e37a99088445cfb68dd9f data/modernlifepatch/tags/items/outside.json +6cf052eddbeb8b14de7afea7f421f37a6f771948 data/modernlifepatch/tags/items/seat.json +3a84ab7484352351e22d622807ab8f7f4e0b620c data/modernlifepatch/tags/items/shelf.json +3d3a2dc84920c00497ffe8ca37ced9269e394c77 data/modernlifepatch/tags/items/table.json diff --git a/src/generated/resources/.cache/b7c2bce3e3ce09bbcda589ad1e9064dec8443add b/src/generated/resources/.cache/b7c2bce3e3ce09bbcda589ad1e9064dec8443add index 8a683f6..b27dff3 100644 --- a/src/generated/resources/.cache/b7c2bce3e3ce09bbcda589ad1e9064dec8443add +++ b/src/generated/resources/.cache/b7c2bce3e3ce09bbcda589ad1e9064dec8443add @@ -1,2 +1,2 @@ -// 1.20.1 2025-03-24T00:28:40.6686164 Tags for minecraft:block mod id modernlifepatch -1df2526d955c0973f92de75ee1b079733245d628 data/minecraft/tags/blocks/mineable/pickaxe.json +// 1.20.1 2025-03-24T11:02:54.6277698 Tags for minecraft:block mod id modernlifepatch +a6b7c3095f838c64a42bc8e4dad328ffac8f796a data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/src/generated/resources/.cache/c2c8caf4e6d2025aead744a92fe438836ccb67fe b/src/generated/resources/.cache/c2c8caf4e6d2025aead744a92fe438836ccb67fe index c66ef94..3176d54 100644 --- a/src/generated/resources/.cache/c2c8caf4e6d2025aead744a92fe438836ccb67fe +++ b/src/generated/resources/.cache/c2c8caf4e6d2025aead744a92fe438836ccb67fe @@ -1,4 +1,4 @@ -// 1.20.1 2025-03-24T00:28:40.6686164 Block States: modernlifepatch +// 1.20.1 2025-03-24T10:47:19.616683 Block States: modernlifepatch 6dcfec708d429da81fb2776dda9af3023908da59 assets/modernlifepatch/blockstates/black_concrete_barrier.json e2016906e5c3589daac72c5cb7d603e4eeb6621f assets/modernlifepatch/blockstates/blue_concrete_barrier.json 4f993c3d5452903f0c09bdd60edfb01316c52ebb assets/modernlifepatch/blockstates/brown_concrete_barrier.json @@ -18,9 +18,11 @@ f2af69c750fc937d13177b3d0bc7db27c7680138 assets/modernlifepatch/blockstates/one_ 9c674b4a2db2532fe1ab23c5523d70b6cbee1902 assets/modernlifepatch/blockstates/orange_concrete_barrier.json 278c013ed5021074ef846ae8297619043e9eaf98 assets/modernlifepatch/blockstates/pink_concrete_barrier.json a3b9c0099e3f65bfd14015a629a709f5b90bf75e assets/modernlifepatch/blockstates/purple_concrete_barrier.json +7e10c47295142dbd6b63d2a1d052ace5dd753fe6 assets/modernlifepatch/blockstates/quartz_block_barrier.json b6e93648de3ec4921410b4acd4003b1fd4baded0 assets/modernlifepatch/blockstates/red_concrete_barrier.json 3f651298532e843ffb0fbbfd3cf866bfdf0fcef5 assets/modernlifepatch/blockstates/seven_block.json f78e6379e5cba21992fb16167c3650f8aa56bf76 assets/modernlifepatch/blockstates/six_block.json +2a9a67a4b8ac8d790de5b40db8cc99b471a88a6c assets/modernlifepatch/blockstates/smooth_quartz_barrier.json 24cd8eaef736271e6da513ee99f9da97bcbd12b2 assets/modernlifepatch/blockstates/three_block.json 8485233b180d03a927c1f39ae9896a4d5bb1d3b6 assets/modernlifepatch/blockstates/two_block.json c4e8d556ce255d18da5a5c926bf3da963fb40f1a assets/modernlifepatch/blockstates/white_concrete_barrier.json @@ -56,9 +58,11 @@ c043971dd5e167cba09647250a66ab7eefa2a97a assets/modernlifepatch/models/item/nine 6e55165c8604cb1fff47a9a1b5ab1af60620b274 assets/modernlifepatch/models/item/orange_concrete_barrier.json 8f8d499631adf1fb5c8344e4f9534b7309ba2c5d assets/modernlifepatch/models/item/pink_concrete_barrier.json 3cbaeb4fe8b2afa39d5abb0cc9b3ec959ac8ee16 assets/modernlifepatch/models/item/purple_concrete_barrier.json +98d40fd38a81284295147a39f429e809565d9b3c assets/modernlifepatch/models/item/quartz_block_barrier.json 864d1685c60fcdaca3825e7d05af6eff438cf9cb assets/modernlifepatch/models/item/red_concrete_barrier.json 1ae02ba84d6831857ea6a483fba5fb10145c795f assets/modernlifepatch/models/item/seven_block.json 9b0c86cd54cf9c0fa28ae721a646e15342521d74 assets/modernlifepatch/models/item/six_block.json +461bbfab1e521e5450df4dad7cd3a64d84299db7 assets/modernlifepatch/models/item/smooth_quartz_barrier.json 675cb937d8a7037f06d59647fb075490eb03c616 assets/modernlifepatch/models/item/three_block.json ae1e95a89db61abc03cf8c1a3db6ba11b0f6af9e assets/modernlifepatch/models/item/two_block.json 1feb32683f4f57640577fccf962c04ab48c2ce9d assets/modernlifepatch/models/item/white_concrete_barrier.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index d706a81..8c9d91d 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2025-03-24T00:28:40.6686164 Languages: en_us -e0718e56ec9db4a903b91654ee21cc5effbc50b3 assets/modernlifepatch/lang/en_us.json +// 1.20.1 2025-03-24T10:47:19.616683 Languages: en_us +9203b3022dbbabf42c979cb473e76db411d65928 assets/modernlifepatch/lang/en_us.json diff --git a/src/generated/resources/.cache/caa32374a77dc770aca5457990ea4b5e86a82a61 b/src/generated/resources/.cache/caa32374a77dc770aca5457990ea4b5e86a82a61 index a1ff638..6899bbf 100644 --- a/src/generated/resources/.cache/caa32374a77dc770aca5457990ea4b5e86a82a61 +++ b/src/generated/resources/.cache/caa32374a77dc770aca5457990ea4b5e86a82a61 @@ -1,4 +1,4 @@ -// 1.20.1 2025-03-22T17:17:58.3769694 Block Models: modernlifepatch +// 1.20.1 2025-03-24T10:47:19.616683 Block Models: modernlifepatch f4ea0d1cb24bebbfe97a7c171dea09e7a1ecf079 assets/modernlifepatch/models/block/black_concrete_barrier.json 5d4d46839d475c269e64aae6622e7e756011cdbf assets/modernlifepatch/models/block/blue_concrete_barrier.json 8a75e83adc494c8d55d7b1e6e2fe5bb78164d5f2 assets/modernlifepatch/models/block/brown_concrete_barrier.json @@ -12,6 +12,8 @@ c6b6df16d7bc531f4828255c760be1ad01918401 assets/modernlifepatch/models/block/mag d79a133bb4fa9cbbced6ffb198f2a6fe7ffb3546 assets/modernlifepatch/models/block/orange_concrete_barrier.json 7507729a4ba98d5fe574c1ab8d6c71a72ceae07e assets/modernlifepatch/models/block/pink_concrete_barrier.json 08690e199f8325c6802e5eed7b93da606a413980 assets/modernlifepatch/models/block/purple_concrete_barrier.json +d76a63d0df6430ae203949050b75d107865edce0 assets/modernlifepatch/models/block/quartz_block_barrier.json 3c61a1ef01205029ba38f1232759ba11d7c3bdca assets/modernlifepatch/models/block/red_concrete_barrier.json +5925b323b84c5099e8ef862ce7d2fed930379047 assets/modernlifepatch/models/block/smooth_quartz_barrier.json dca56f2d184fa83ab10141a8a79f2ee278d4f377 assets/modernlifepatch/models/block/white_concrete_barrier.json c593a92e9930b132e12a9d7a3a3a322b5b4abf20 assets/modernlifepatch/models/block/yellow_concrete_barrier.json diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/quartz_block_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/quartz_block_barrier.json new file mode 100644 index 0000000..2e47a3b --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/quartz_block_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/quartz_block_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/quartz_block_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/quartz_block_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/quartz_block_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/smooth_quartz_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/smooth_quartz_barrier.json new file mode 100644 index 0000000..eb8db41 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/smooth_quartz_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/smooth_quartz_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/smooth_quartz_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/smooth_quartz_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/smooth_quartz_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/lang/en_us.json b/src/generated/resources/assets/modernlifepatch/lang/en_us.json index 0dfa380..9e3fe6f 100644 --- a/src/generated/resources/assets/modernlifepatch/lang/en_us.json +++ b/src/generated/resources/assets/modernlifepatch/lang/en_us.json @@ -21,9 +21,11 @@ "block.modernlifepatch.orange_concrete_barrier": "Orange Concrete Barrier", "block.modernlifepatch.pink_concrete_barrier": "Pink Concrete Barrier", "block.modernlifepatch.purple_concrete_barrier": "Purple Concrete Barrier", + "block.modernlifepatch.quartz_block_barrier": "Quartz Block Barrier", "block.modernlifepatch.red_concrete_barrier": "Red Concrete Barrier", "block.modernlifepatch.seven_block": "Seven", "block.modernlifepatch.six_block": "Six", + "block.modernlifepatch.smooth_quartz_barrier": "Smooth Quartz Block", "block.modernlifepatch.tall_mirror": "Tall Mirror", "block.modernlifepatch.three_block": "Three", "block.modernlifepatch.two_block": "Two", diff --git a/src/generated/resources/assets/modernlifepatch/lang/zh_cn.json b/src/generated/resources/assets/modernlifepatch/lang/zh_cn.json index fd1d3fb..3f53fe1 100644 --- a/src/generated/resources/assets/modernlifepatch/lang/zh_cn.json +++ b/src/generated/resources/assets/modernlifepatch/lang/zh_cn.json @@ -21,9 +21,11 @@ "block.modernlifepatch.orange_concrete_barrier": "橙色混凝土栅栏", "block.modernlifepatch.pink_concrete_barrier": "粉红色混凝土栅栏", "block.modernlifepatch.purple_concrete_barrier": "紫色混凝土栅栏", + "block.modernlifepatch.quartz_block_barrier": "石英栅栏", "block.modernlifepatch.red_concrete_barrier": "红色混凝土栅栏", "block.modernlifepatch.seven_block": "七", "block.modernlifepatch.six_block": "六", + "block.modernlifepatch.smooth_quartz_barrier": "平滑石英栅栏", "block.modernlifepatch.tall_mirror": "高镜子", "block.modernlifepatch.three_block": "三", "block.modernlifepatch.two_block": "二", diff --git a/src/generated/resources/assets/modernlifepatch/models/block/quartz_block_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/quartz_block_barrier.json new file mode 100644 index 0000000..f8a0611 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/quartz_block_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/quartz_block_top", + "particle": "minecraft:block/quartz_block_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/smooth_quartz_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/smooth_quartz_barrier.json new file mode 100644 index 0000000..0ecac48 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/smooth_quartz_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/quartz_block_bottom", + "particle": "minecraft:block/quartz_block_bottom" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/quartz_block_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/quartz_block_barrier.json new file mode 100644 index 0000000..90fc915 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/quartz_block_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/quartz_block_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/smooth_quartz_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/smooth_quartz_barrier.json new file mode 100644 index 0000000..346233f --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/smooth_quartz_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/smooth_quartz_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/bullet.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/bullet.json new file mode 100644 index 0000000..2675477 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/bullet.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:copper_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:bullet" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_copper", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:bullet" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/bullet_2.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/bullet_2.json new file mode 100644 index 0000000..ff34e28 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/bullet_2.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bullet_strip": { + "conditions": { + "items": [ + { + "items": [ + "modernlife:bullet_strip" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:bullet_2" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bullet_strip", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:bullet_2" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/four_bullet_magazine.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/four_bullet_magazine.json new file mode 100644 index 0000000..5d952d9 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/four_bullet_magazine.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bullet": { + "conditions": { + "items": [ + { + "items": [ + "modernlife:bullet" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:four_bullet_magazine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bullet", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:four_bullet_magazine" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/nine_bullet_extended_magazine.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/nine_bullet_extended_magazine.json new file mode 100644 index 0000000..1056062 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/nine_bullet_extended_magazine.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bullet": { + "conditions": { + "items": [ + { + "items": [ + "modernlife:bullet" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:nine_bullet_extended_magazine" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bullet", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:nine_bullet_extended_magazine" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/misc/six_bullet_bullet_strip.json b/src/generated/resources/data/minecraft/advancements/recipes/misc/six_bullet_bullet_strip.json new file mode 100644 index 0000000..75d9bc6 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/misc/six_bullet_bullet_strip.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bullet": { + "conditions": { + "items": [ + { + "items": [ + "modernlife:bullet" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:six_bullet_bullet_strip" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bullet", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:six_bullet_bullet_strip" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/resources/data/modernlife/recipes/bullet.json b/src/generated/resources/data/minecraft/recipes/bullet.json similarity index 77% rename from src/main/resources/data/modernlife/recipes/bullet.json rename to src/generated/resources/data/minecraft/recipes/bullet.json index 4d46372..537b9d2 100644 --- a/src/main/resources/data/modernlife/recipes/bullet.json +++ b/src/generated/resources/data/minecraft/recipes/bullet.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "minecraft:copper_ingot" @@ -9,7 +10,6 @@ } ], "result": { - "item": "modernlife:bullet", - "count": 1 + "item": "modernlife:bullet" } -} \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/resources/data/modernlife/recipes/bullet_2.json b/src/generated/resources/data/minecraft/recipes/bullet_2.json similarity index 66% rename from src/main/resources/data/modernlife/recipes/bullet_2.json rename to src/generated/resources/data/minecraft/recipes/bullet_2.json index 776c2d3..90abf14 100644 --- a/src/main/resources/data/modernlife/recipes/bullet_2.json +++ b/src/generated/resources/data/minecraft/recipes/bullet_2.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "modernlife:bullet_strip" } ], "result": { - "item": "modernlife:bullet", - "count": 6 + "count": 6, + "item": "modernlife:bullet" } } \ No newline at end of file diff --git a/src/main/resources/data/modernlife/recipes/gun_magazine.json b/src/generated/resources/data/minecraft/recipes/four_bullet_magazine.json similarity index 81% rename from src/main/resources/data/modernlife/recipes/gun_magazine.json rename to src/generated/resources/data/minecraft/recipes/four_bullet_magazine.json index 49acc10..cfda3db 100644 --- a/src/main/resources/data/modernlife/recipes/gun_magazine.json +++ b/src/generated/resources/data/minecraft/recipes/four_bullet_magazine.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "modernlife:bullet" @@ -15,7 +16,6 @@ } ], "result": { - "item": "modernlife:gun_magazine", - "count": 1 + "item": "modernlife:gun_magazine" } } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/nine_bullet_extended_magazine.json b/src/generated/resources/data/minecraft/recipes/nine_bullet_extended_magazine.json new file mode 100644 index 0000000..257fc5d --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/nine_bullet_extended_magazine.json @@ -0,0 +1,36 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "modernlife:bullet" + }, + { + "item": "modernlife:bullet" + }, + { + "item": "modernlife:bullet" + }, + { + "item": "modernlife:bullet" + }, + { + "item": "modernlife:bullet" + }, + { + "item": "modernlife:bullet" + }, + { + "item": "modernlife:bullet" + }, + { + "item": "modernlife:bullet" + }, + { + "item": "modernlife:bullet" + } + ], + "result": { + "item": "modernlife:extended_gun_magazine" + } +} \ No newline at end of file diff --git a/src/main/resources/data/modernlife/recipes/bullet_strip.json b/src/generated/resources/data/minecraft/recipes/six_bullet_bullet_strip.json similarity index 85% rename from src/main/resources/data/modernlife/recipes/bullet_strip.json rename to src/generated/resources/data/minecraft/recipes/six_bullet_bullet_strip.json index 9d99074..d6acb54 100644 --- a/src/main/resources/data/modernlife/recipes/bullet_strip.json +++ b/src/generated/resources/data/minecraft/recipes/six_bullet_bullet_strip.json @@ -1,5 +1,6 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "modernlife:bullet" @@ -21,7 +22,6 @@ } ], "result": { - "item": "modernlife:bullet_strip", - "count": 1 + "item": "modernlife:bullet_strip" } } \ No newline at end of file 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 7161b50..5f879d9 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -16,6 +16,8 @@ "modernlifepatch:green_concrete_barrier", "modernlifepatch:red_concrete_barrier", "modernlifepatch:black_concrete_barrier", + "modernlifepatch:quartz_block_barrier", + "modernlifepatch:smooth_quartz_barrier", "modernlifepatch:null_block", "modernlifepatch:one_block", "modernlifepatch:two_block", diff --git a/src/generated/resources/data/modernlifepatch/advancements/recipes/decorations/quartz_block_barrier.json b/src/generated/resources/data/modernlifepatch/advancements/recipes/decorations/quartz_block_barrier.json new file mode 100644 index 0000000..cbb2294 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/advancements/recipes/decorations/quartz_block_barrier.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item_quartz_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:quartz_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modernlifepatch:quartz_block_barrier" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item_quartz_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "modernlifepatch:quartz_block_barrier" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/advancements/recipes/decorations/smooth_quartz_barrier.json b/src/generated/resources/data/modernlifepatch/advancements/recipes/decorations/smooth_quartz_barrier.json new file mode 100644 index 0000000..1c4a1db --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/advancements/recipes/decorations/smooth_quartz_barrier.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item_smooth_quartz_slab": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:smooth_quartz_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "modernlifepatch:smooth_quartz_barrier" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_item_smooth_quartz_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "modernlifepatch:smooth_quartz_barrier" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/advancements/recipes/decorations/mirror.json b/src/generated/resources/data/modernlifepatch/advancements/recipes/misc/mirror.json similarity index 100% rename from src/generated/resources/data/modernlifepatch/advancements/recipes/decorations/mirror.json rename to src/generated/resources/data/modernlifepatch/advancements/recipes/misc/mirror.json diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/quartz_block_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/quartz_block_barrier.json new file mode 100644 index 0000000..d98a9bd --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/quartz_block_barrier.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "modernlifepatch:quartz_block_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/quartz_block_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/smooth_quartz_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/smooth_quartz_barrier.json new file mode 100644 index 0000000..3d87167 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/smooth_quartz_barrier.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "modernlifepatch:smooth_quartz_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/smooth_quartz_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/recipes/quartz_block_barrier.json b/src/generated/resources/data/modernlifepatch/recipes/quartz_block_barrier.json new file mode 100644 index 0000000..875fcba --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/recipes/quartz_block_barrier.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "@": { + "item": "minecraft:quartz_slab" + } + }, + "pattern": [ + "@", + "@" + ], + "result": { + "count": 2, + "item": "modernlifepatch:quartz_block_barrier" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/recipes/smooth_quartz_barrier.json b/src/generated/resources/data/modernlifepatch/recipes/smooth_quartz_barrier.json new file mode 100644 index 0000000..bcc052d --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/recipes/smooth_quartz_barrier.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "@": { + "item": "minecraft:smooth_quartz_slab" + } + }, + "pattern": [ + "@", + "@" + ], + "result": { + "count": 2, + "item": "modernlifepatch:smooth_quartz_barrier" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/modernlifepatch/tags/items/bathroom.json b/src/generated/resources/data/modernlifepatch/tags/items/bathroom.json similarity index 87% rename from src/main/resources/data/modernlifepatch/tags/items/bathroom.json rename to src/generated/resources/data/modernlifepatch/tags/items/bathroom.json index 645919d..c604d96 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/bathroom.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/bathroom.json @@ -1,20 +1,16 @@ { - "replace": false, "values": [ - "modernlifepatch:mirror", - "modernlifepatch:tall_mirror", - "modernlifepatch:large_mirror", - "modernlifepatch:massive_mirror", "modernlife:mirror", "modernlife:tall_mirror", "modernlife:large_mirror", "modernlife:massive_mirror", + "modernlifepatch:mirror", + "modernlifepatch:tall_mirror", + "modernlifepatch:large_mirror", + "modernlifepatch:massive_mirror", "modernlife:shower_head", "modernlife:bathroom_ceramic_tile", - "modernlife:washing_machine", "modernlife:dryer", "modernlife:bathtub" - - ] } \ No newline at end of file diff --git a/src/main/resources/data/modernlifepatch/tags/items/bedchamber.json b/src/generated/resources/data/modernlifepatch/tags/items/bedchamber.json similarity index 94% rename from src/main/resources/data/modernlifepatch/tags/items/bedchamber.json rename to src/generated/resources/data/modernlifepatch/tags/items/bedchamber.json index 4bdce4c..a7ca4bd 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/bedchamber.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/bedchamber.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "modernlife:acacia_night_stand", "modernlife:birch_night_stand", diff --git a/src/main/resources/data/modernlifepatch/tags/items/door.json b/src/generated/resources/data/modernlifepatch/tags/items/door.json similarity index 97% rename from src/main/resources/data/modernlifepatch/tags/items/door.json rename to src/generated/resources/data/modernlifepatch/tags/items/door.json index 9f6fe88..e03ee90 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/door.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/door.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "modernlife:acacia_glass_door", "modernlife:modern_white_door", @@ -23,6 +22,5 @@ "modernlife:glass_oak_trapdoor", "modernlife:glass_spruce_trapdoor", "modernlife:glass_warped_trapdoor" - ] } \ No newline at end of file diff --git a/src/main/resources/data/modernlifepatch/tags/items/general.json b/src/generated/resources/data/modernlifepatch/tags/items/general.json similarity index 95% rename from src/main/resources/data/modernlifepatch/tags/items/general.json rename to src/generated/resources/data/modernlifepatch/tags/items/general.json index 79c00f4..827a8de 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/general.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/general.json @@ -1,7 +1,5 @@ { - "replace": false, "values": [ - "modernlife:warning_alarm", "modernlife:monitor", "modernlife:dual_monitor", "modernlife:steam_radiator", @@ -14,8 +12,6 @@ "modernlife:metal_duct", "modernlife:glass_panel", "modernlife:tile_light", - "modernlife:inverted_tile_light", - "modernlife:inverted_light_bulb", "modernlife:beige_ceramic_tile", "modernlife:white_ceramic_tile", "modernlife:brown_ceramic_tile", @@ -94,5 +90,4 @@ "modernlifepatch:nine_block", "modernlifepatch:zero_block" ] - } \ No newline at end of file diff --git a/src/main/resources/data/modernlifepatch/tags/items/kitchen.json b/src/generated/resources/data/modernlifepatch/tags/items/kitchen.json similarity index 99% rename from src/main/resources/data/modernlifepatch/tags/items/kitchen.json rename to src/generated/resources/data/modernlifepatch/tags/items/kitchen.json index d1fb40f..0373208 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/kitchen.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/kitchen.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "modernlife:kitchen_sink", "modernlife:acacia_kitchen_cabinet", @@ -96,7 +95,5 @@ "modernlife:microwave", "modernlife:stove", "modernlife:refrigerator" - - ] } \ No newline at end of file diff --git a/src/main/resources/data/modernlifepatch/tags/items/lounge.json b/src/generated/resources/data/modernlifepatch/tags/items/lounge.json similarity index 90% rename from src/main/resources/data/modernlifepatch/tags/items/lounge.json rename to src/generated/resources/data/modernlifepatch/tags/items/lounge.json index 92e752c..5c1aa88 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/lounge.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/lounge.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "modernlife:air_conditioner", "modernlife:metal_grate", diff --git a/src/main/resources/data/modernlifepatch/tags/items/m_tool.json b/src/generated/resources/data/modernlifepatch/tags/items/m_tool.json similarity index 94% rename from src/main/resources/data/modernlifepatch/tags/items/m_tool.json rename to src/generated/resources/data/modernlifepatch/tags/items/m_tool.json index 499f094..8316de4 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/m_tool.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/m_tool.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "modernlife:bullet_strip", "modernlife:gun_magazine", diff --git a/src/main/resources/data/modernlifepatch/tags/items/outside.json b/src/generated/resources/data/modernlifepatch/tags/items/outside.json similarity index 97% rename from src/main/resources/data/modernlifepatch/tags/items/outside.json rename to src/generated/resources/data/modernlifepatch/tags/items/outside.json index 4e72d6e..9d9d033 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/outside.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/outside.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "modernlife:cobblestone_ramp", "modernlife:stone_ramp", @@ -152,6 +151,8 @@ "modernlifepatch:brown_concrete_barrier", "modernlifepatch:green_concrete_barrier", "modernlifepatch:red_concrete_barrier", - "modernlifepatch:black_concrete_barrier" + "modernlifepatch:black_concrete_barrier", + "modernlifepatch:quartz_block_barrier", + "modernlifepatch:smooth_quartz_barrier" ] } \ No newline at end of file diff --git a/src/main/resources/data/modernlifepatch/tags/items/seat.json b/src/generated/resources/data/modernlifepatch/tags/items/seat.json similarity index 97% rename from src/main/resources/data/modernlifepatch/tags/items/seat.json rename to src/generated/resources/data/modernlifepatch/tags/items/seat.json index d50bc24..eef51d0 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/seat.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/seat.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "modernlife:black_sofa", "modernlife:blue_sofa", @@ -33,6 +32,5 @@ "modernlife:oak_chair", "modernlife:spruce_chair", "modernlife:warped_chair" - ] } \ No newline at end of file diff --git a/src/main/resources/data/modernlifepatch/tags/items/shelf.json b/src/generated/resources/data/modernlifepatch/tags/items/shelf.json similarity index 97% rename from src/main/resources/data/modernlifepatch/tags/items/shelf.json rename to src/generated/resources/data/modernlifepatch/tags/items/shelf.json index b9f14bf..cdeed11 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/shelf.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/shelf.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "modernlife:modern_oak_bookshelf", "modernlife:modern_acacia_bookshelf", @@ -25,8 +24,5 @@ "modernlife:double_oak_wall_shelf", "modernlife:double_spruce_wall_shelf", "modernlife:double_warped_wall_shelf" - - - ] } \ No newline at end of file diff --git a/src/main/resources/data/modernlifepatch/tags/items/table.json b/src/generated/resources/data/modernlifepatch/tags/items/table.json similarity index 98% rename from src/main/resources/data/modernlifepatch/tags/items/table.json rename to src/generated/resources/data/modernlifepatch/tags/items/table.json index c9a2713..6169e9c 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/table.json +++ b/src/generated/resources/data/modernlifepatch/tags/items/table.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "modernlife:acacia_round_table", "modernlife:birch_round_table", diff --git a/src/main/java/com/r3944realms/modernlifepatch/content/blocks/ModBlocks.java b/src/main/java/com/r3944realms/modernlifepatch/content/blocks/ModBlocks.java index 69a9c45..fb41d04 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/content/blocks/ModBlocks.java +++ b/src/main/java/com/r3944realms/modernlifepatch/content/blocks/ModBlocks.java @@ -62,6 +62,10 @@ public class ModBlocks { () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.RED_CONCRETE))); public static final RegistryObject BLACK_CONCRETE_BARRIER = BLOCKS.register("black_concrete_barrier", () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.BLACK_CONCRETE))); + public static final RegistryObject QUARTZ_BLOCK_BARRIER = BLOCKS.register("quartz_block_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.QUARTZ_BLOCK))); + public static final RegistryObject SMOOTH_QUARTZ_BARRIER = BLOCKS.register("smooth_quartz_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.SMOOTH_QUARTZ))); //NUMBER public static final RegistryObject NULL_BLOCK = BLOCKS.register("null_block", () -> new NumberBlock(BlockBehaviour.Properties.copy(Blocks.STONE))); diff --git a/src/main/java/com/r3944realms/modernlifepatch/content/item/ModItems.java b/src/main/java/com/r3944realms/modernlifepatch/content/item/ModItems.java index ae201f5..afad5d8 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/content/item/ModItems.java +++ b/src/main/java/com/r3944realms/modernlifepatch/content/item/ModItems.java @@ -36,6 +36,8 @@ public class ModItems { public static final RegistryObject GREEN_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("green_concrete_barrier", ModBlocks.GREEN_CONCRETE_BARRIER); public static final RegistryObject RED_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("red_concrete_barrier", ModBlocks.RED_CONCRETE_BARRIER); public static final RegistryObject BLACK_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("black_concrete_barrier", ModBlocks.BLACK_CONCRETE_BARRIER); + public static final RegistryObject QUARTZ_BLOCK_BARRIER = ModBlocks.registerBlockItem("quartz_block_barrier", ModBlocks.QUARTZ_BLOCK_BARRIER); + public static final RegistryObject SMOOTH_QUARTZ_BARRIER = ModBlocks.registerBlockItem("smooth_quartz_barrier", ModBlocks.SMOOTH_QUARTZ_BARRIER); //NUMBER public static final RegistryObject NULL_BLOCK_ITEM = ModBlocks.registerBlockItem("null_block", ModBlocks.NULL_BLOCK); public static final RegistryObject ONE_BLOCK_ITEM = ModBlocks.registerBlockItem("one_block", ModBlocks.ONE_BLOCK); diff --git a/src/main/java/com/r3944realms/modernlifepatch/datagen/lang/ModLangKeyValue.java b/src/main/java/com/r3944realms/modernlifepatch/datagen/lang/ModLangKeyValue.java index 5a0c33b..a13dca0 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/lang/ModLangKeyValue.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/lang/ModLangKeyValue.java @@ -169,6 +169,10 @@ public enum ModLangKeyValue { RED_CONCRETE_BARRIER(getBlockKey(ModBlocks.RED_CONCRETE_BARRIER.get()), copyEnglish(RED_CONCRETE_BARRIER_ITEM), copySimpleChinese(RED_CONCRETE_BARRIER_ITEM)), BLACK_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.BLACK_CONCRETE_BARRIER_ITEM.get()), "Black Concrete Barrier", "黑色混凝土栅栏"), BLACK_CONCRETE_BARRIER(getBlockKey(ModBlocks.BLACK_CONCRETE_BARRIER.get()), copyEnglish(BLACK_CONCRETE_BARRIER_ITEM), copySimpleChinese(BLACK_CONCRETE_BARRIER_ITEM)), + QUARTZ_BLOCK_BARRIER(getBlockKey(ModBlocks.QUARTZ_BLOCK_BARRIER.get()), "Quartz Block Barrier", "石英栅栏"), + QUARTZ_BLOCK_BARRIER_ITEM(getItemKey(ModItems.QUARTZ_BLOCK_BARRIER.get()), getEnglish(QUARTZ_BLOCK_BARRIER), getSimpleChinese(QUARTZ_BLOCK_BARRIER)), + SMOOTH_QUARTZ_BARRIER(getBlockKey(ModBlocks.SMOOTH_QUARTZ_BARRIER.get()), "Smooth Quartz Block", "平滑石英栅栏"), + SMOOTH_QUARTZ_BARRIER_ITEM(getItemKey(ModItems.SMOOTH_QUARTZ_BARRIER.get()), getEnglish(SMOOTH_QUARTZ_BARRIER), getSimpleChinese(SMOOTH_QUARTZ_BARRIER)), NULL_BLOCK(getBlockKey(ModBlocks.NULL_BLOCK), "Null Block", "空值"), NULL_BLOCK_ITEM(getItemKey(ModItems.NULL_BLOCK_ITEM.get()), getEnglish(NULL_BLOCK), getSimpleChinese(NULL_BLOCK)), ONE_BLOCK_ITEM(getItemKey(ModItems.ONE_BLOCK_ITEM.get()), "One", "一"), diff --git a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockModelProvider.java b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockModelProvider.java index 2ec07e2..3628e50 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockModelProvider.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockModelProvider.java @@ -2,7 +2,6 @@ package com.r3944realms.modernlifepatch.datagen.provider; import com.r3944realms.modernlifepatch.ModernLifePatch; import com.r3944realms.modernlifepatch.content.blocks.ModBlocks; -import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; @@ -36,6 +35,8 @@ public class ModBlockModelProvider extends BlockModelProvider { registerBarrierModel(ModBlocks.GREEN_CONCRETE_BARRIER.get(), new ResourceLocation("block/green_concrete")); registerBarrierModel(ModBlocks.RED_CONCRETE_BARRIER.get(), new ResourceLocation("block/red_concrete")); registerBarrierModel(ModBlocks.BLACK_CONCRETE_BARRIER.get(), new ResourceLocation("block/black_concrete")); + registerBarrierModel(ModBlocks.QUARTZ_BLOCK_BARRIER.get(), new ResourceLocation("block/quartz_block_top")); + registerBarrierModel(ModBlocks.SMOOTH_QUARTZ_BARRIER.get(), new ResourceLocation("block/quartz_block_bottom")); } public void registerBarrierModel(Block barrierBlock, ResourceLocation vanillaBlock) { withExistingParent( diff --git a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockStatesProvider.java b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockStatesProvider.java index d1c41fe..ea5e54f 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockStatesProvider.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockStatesProvider.java @@ -8,7 +8,6 @@ import net.minecraft.world.level.block.Block; import net.minecraftforge.client.model.generators.BlockModelBuilder; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.client.model.generators.ModelProvider; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.ForgeRegistries; @@ -39,6 +38,8 @@ public class ModBlockStatesProvider extends BlockStateProvider { registerBarrierStates(ModBlocks.GREEN_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/green_concrete_barrier")); registerBarrierStates(ModBlocks.RED_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/red_concrete_barrier")); registerBarrierStates(ModBlocks.BLACK_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/black_concrete_barrier")); + registerBarrierStates(ModBlocks.QUARTZ_BLOCK_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/quartz_block_barrier")); + registerBarrierStates(ModBlocks.SMOOTH_QUARTZ_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/smooth_quartz_barrier")); registerNumberStates(ModBlocks.NULL_BLOCK.get(), "null"); registerNumberStates(ModBlocks.ONE_BLOCK.get(), "one"); registerNumberStates(ModBlocks.TWO_BLOCK.get(), "two"); diff --git a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockTagProvider.java b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockTagProvider.java index a88162b..5dd5fdf 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockTagProvider.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockTagProvider.java @@ -39,6 +39,8 @@ public class ModBlockTagProvider extends BlockTagsProvider { ModBlocks.GREEN_CONCRETE_BARRIER.get(), ModBlocks.RED_CONCRETE_BARRIER.get(), ModBlocks.BLACK_CONCRETE_BARRIER.get(), + ModBlocks.QUARTZ_BLOCK_BARRIER.get(), + ModBlocks.SMOOTH_QUARTZ_BARRIER.get(), ModBlocks.NULL_BLOCK.get(), ModBlocks.ONE_BLOCK.get(), ModBlocks.TWO_BLOCK.get(), diff --git a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModItemTagProvider.java b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModItemTagProvider.java index 183636d..ca1eb01 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModItemTagProvider.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModItemTagProvider.java @@ -1,6 +1,9 @@ package com.r3944realms.modernlifepatch.datagen.provider; +import com.dairymoose.modernlife.core.CustomBlocks; import com.r3944realms.modernlifepatch.ModernLifePatch; +import com.r3944realms.modernlifepatch.content.item.ModItems; +import com.r3944realms.modernlifepatch.content.tag.ModTags; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.ItemTagsProvider; @@ -21,6 +24,566 @@ public class ModItemTagProvider extends ItemTagsProvider { @Override protected void addTags(HolderLookup.@NotNull Provider pProvider) { - + //BATHROOM + { + this.tag(ModTags.Items.BATHROOM) + .add( + CustomBlocks.ITEM_MIRROR.get(), + CustomBlocks.ITEM_TALL_MIRROR.get(), + CustomBlocks.ITEM_LARGE_MIRROR.get(), + CustomBlocks.ITEM_MASSIVE_MIRROR.get(), + ModItems.MIRROR_ITEM.get(), + ModItems.TALL_MIRROR_ITEM.get(), + ModItems.LARGE_MIRROR_ITEM.get(), + ModItems.MASSIVE_MIRROR_ITEM.get(), + CustomBlocks.ITEM_SHOWER_HEAD.get(), + CustomBlocks.ITEM_BATHROOM_CERAMIC_TILE.get(), + CustomBlocks.ITEM_DRYER.get(), + CustomBlocks.ITEM_BATHTUB.get() + ); + } + //BEDCHAMBER + { + this.tag(ModTags.Items.BEDCHAMBER) + .add( + CustomBlocks.ITEM_ACACIA_NIGHT_STAND.get(), + CustomBlocks.ITEM_BIRCH_NIGHT_STAND.get(), + CustomBlocks.ITEM_CRIMSON_NIGHT_STAND.get(), + CustomBlocks.ITEM_DARK_OAK_NIGHT_STAND.get(), + CustomBlocks.ITEM_JUNGLE_NIGHT_STAND.get(), + CustomBlocks.ITEM_OAK_NIGHT_STAND.get(), + CustomBlocks.ITEM_SPRUCE_NIGHT_STAND.get(), + CustomBlocks.ITEM_WARPED_NIGHT_STAND.get(), + CustomBlocks.ITEM_ALARM_CLOCK.get(), + CustomBlocks.ITEM_DELUXE_BED.get() + ); + } + //DOOR + { + this.tag(ModTags.Items.DOOR) + .add( + CustomBlocks.ITEM_ACACIA_GLASS_DOOR.get(), + CustomBlocks.ITEM_MODERN_WHITE_DOOR.get(), + CustomBlocks.ITEM_BIRCH_GLASS_DOOR.get(), + CustomBlocks.ITEM_CRIMSON_GLASS_DOOR.get(), + CustomBlocks.ITEM_DARK_OAK_GLASS_DOOR.get(), + CustomBlocks.ITEM_GLASS_DOOR.get(), + CustomBlocks.ITEM_IRON_GLASS_DOOR.get(), + CustomBlocks.ITEM_JUNGLE_GLASS_DOOR.get(), + CustomBlocks.ITEM_OAK_GLASS_DOOR.get(), + CustomBlocks.ITEM_SPRUCE_GLASS_DOOR.get(), + CustomBlocks.ITEM_WARPED_GLASS_DOOR.get(), + CustomBlocks.ITEM_JAIL_DOOR.get(), + CustomBlocks.ITEM_GLASS_TRAPDOOR.get(), + CustomBlocks.ITEM_GLASS_ACACIA_TRAPDOOR.get(), + CustomBlocks.ITEM_GLASS_BIRCH_TRAPDOOR.get(), + CustomBlocks.ITEM_GLASS_CRIMSON_TRAPDOOR.get(), + CustomBlocks.ITEM_GLASS_DARK_OAK_TRAPDOOR.get(), + CustomBlocks.ITEM_GLASS_IRON_TRAPDOOR.get(), + CustomBlocks.ITEM_GLASS_JUNGLE_TRAPDOOR.get(), + CustomBlocks.ITEM_GLASS_OAK_TRAPDOOR.get(), + CustomBlocks.ITEM_GLASS_SPRUCE_TRAPDOOR.get(), + CustomBlocks.ITEM_GLASS_WARPED_TRAPDOOR.get() + ); + } + //GENERAL + { + this.tag(ModTags.Items.GENERAL) + .add( + CustomBlocks.ITEM_MONITOR.get(), + CustomBlocks.ITEM_DUAL_MONITOR.get(), + CustomBlocks.ITEM_RADIATOR.get(), + CustomBlocks.ITEM_CCTV_CAMERA.get(), + CustomBlocks.ITEM_CCTV_SCREEN.get(), + CustomBlocks.ITEM_GLASS_STAIRS.get(), + CustomBlocks.ITEM_METAL_CATWALK.get(), + CustomBlocks.ITEM_CEILING_FAN.get(), + CustomBlocks.ITEM_ELECTRICAL_OUTLET.get(), + CustomBlocks.ITEM_METAL_DUCT.get(), + CustomBlocks.ITEM_GLASS_PANEL.get(), + CustomBlocks.ITEM_TILE_LIGHT.get(), + CustomBlocks.ITEM_BEIGE_CERAMIC_TILE.get(), + CustomBlocks.ITEM_WHITE_CERAMIC_TILE.get(), + CustomBlocks.ITEM_BROWN_CERAMIC_TILE.get(), + CustomBlocks.ITEM_ROCKY_CERAMIC_TILE.get(), + CustomBlocks.ITEM_BLACK_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_BLUE_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_BROWN_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_CYAN_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_GRAY_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_GREEN_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_LIGHT_BLUE_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_LIGHT_GRAY_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_LIME_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_MAGENTA_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_ORANGE_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_PINK_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_PURPLE_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_RED_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_WHITE_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_YELLOW_PAINTED_DRYWALL.get(), + CustomBlocks.ITEM_TRASH_CAN.get(), + CustomBlocks.ITEM_WINCH.get(), + CustomBlocks.ITEM_WINCH_ANCHOR.get(), + CustomBlocks.ITEM_TURNTABLE.get(), + CustomBlocks.ITEM_SPEEDOMETER.get(), + CustomBlocks.ITEM_PAVED_ROAD.get(), + CustomBlocks.ITEM_BATTERY.get(), + CustomBlocks.ITEM_BICYCLE.get(), + CustomBlocks.ITEM_MOTORBOAT.get(), + CustomBlocks.ITEM_TIRE.get(), + CustomBlocks.ITEM_CHESS_BOARD.get(), + CustomBlocks.ITEM_COFFEE_MUG.get(), + CustomBlocks.ITEM_INSET_LIGHT.get(), + CustomBlocks.ITEM_MUSIC_STAND.get(), + CustomBlocks.ITEM_PRINTER.get(), + CustomBlocks.ITEM_PHOTOCOPIER.get(), + CustomBlocks.ITEM_CAMERA.get(), + CustomBlocks.ITEM_GAS_CAN.get(), + CustomBlocks.ITEM_CHESS_ROOK.get(), + CustomBlocks.ITEM_CHESS_BISHOP.get(), + CustomBlocks.ITEM_CHESS_PAWN.get(), + CustomBlocks.ITEM_CHESS_KNIGHT.get(), + CustomBlocks.ITEM_CHESS_KING.get(), + CustomBlocks.ITEM_CHESS_QUEEN.get(), + CustomBlocks.ITEM_CHESS_ROOK_W.get(), + CustomBlocks.ITEM_CHESS_BISHOP_W.get(), + CustomBlocks.ITEM_CHESS_PAWN_W.get(), + CustomBlocks.ITEM_CHESS_KNIGHT_W.get(), + CustomBlocks.ITEM_CHESS_KING_W.get(), + CustomBlocks.ITEM_CHESS_QUEEN_W.get(), + CustomBlocks.ITEM_MEMORY_CARD.get(), + CustomBlocks.ITEM_ROAD_MARKER.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE_INCLINE.get(), + CustomBlocks.ITEM_ROAD_MARKER_YELLOW.get(), + CustomBlocks.ITEM_ROAD_MARKER_YELLOW_INCLINE.get(), + CustomBlocks.ITEM_ROAD_MARKER_DOUBLE_YELLOW.get(), + CustomBlocks.ITEM_ROAD_MARKER_DOUBLE_YELLOW_INCLINE.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE_SHOULDER_LEFT.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE_SHOULDER_LEFT_INCLINE.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE_SHOULDER_RIGHT.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE_SHOULDER_RIGHT_INCLINE.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE_CORNER_LEFT.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE_CORNER_LEFT_INCLINE.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE_CORNER_RIGHT.get(), + CustomBlocks.ITEM_ROAD_MARKER_WHITE_CORNER_RIGHT_INCLINE.get(), + ModItems.NULL_BLOCK_ITEM.get(), + ModItems.ONE_BLOCK_ITEM.get(), + ModItems.TWO_BLOCK_ITEM.get(), + ModItems.THREE_BLOCK_ITEM.get(), + ModItems.FOUR_BLOCK_ITEM.get(), + ModItems.FIVE_BLOCK_ITEM.get(), + ModItems.SIX_BLOCK_ITEM.get(), + ModItems.SEVEN_BLOCK_ITEM.get(), + ModItems.EIGHT_BLOCK_ITEM.get(), + ModItems.NINE_BLOCK_ITEM.get(), + ModItems.ZERO_BLOCK_ITEM.get() + ); + } + //KITCHEN + { + this.tag(ModTags.Items.KITCHEN) + .add( + CustomBlocks.ITEM_KITCHEN_SINK.get(), + CustomBlocks.ITEM_ACACIA_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_BIRCH_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_DARK_OAK_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CRIMSON_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_JUNGLE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_OAK_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_SPRUCE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_WARPED_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_COBBLESTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_STONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_STONE_BRICKS_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CRACKED_STONE_BRICKS_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_MOSSY_STONE_BRICKS_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CHISELED_STONE_BRICKS_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CLAY_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_SAND_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_RED_SAND_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_SMOOTH_STONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_GRAVEL_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_GRANITE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_POLISHED_GRANITE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_DIORITE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_POLISHED_DIORITE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_OBSIDIAN_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_ANDESITE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_POLISHED_ANDESITE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_MOSSY_COBBLESTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_BRICKS_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_TERRACOTTA_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_SANDSTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CHISELED_SANDSTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CUT_SANDSTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_RED_SANDSTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CHISELED_RED_SANDSTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CUT_RED_SANDSTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_PRISMARINE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_PRISMARINE_BRICKS_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_DARK_PRISMARINE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_BLACKSTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_POLISHED_BLACKSTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_POLISHED_BLACKSTONE_BRICKS_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CHISELED_POLISHED_BLACKSTONE_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_NETHERRACK_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_NETHER_BRICKS_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_CHISELED_NETHER_BRICKS_KITCHEN_CABINET.get(), + CustomBlocks.ITEM_ACACIA_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_BIRCH_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CRIMSON_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_DARK_OAK_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_JUNGLE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_OAK_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_SPRUCE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_WARPED_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_COBBLESTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_STONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_STONE_BRICKS_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CRACKED_STONE_BRICKS_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_MOSSY_STONE_BRICKS_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CHISELED_STONE_BRICKS_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CLAY_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_SAND_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_RED_SAND_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_SMOOTH_STONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_GRAVEL_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_GRANITE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_POLISHED_GRANITE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_DIORITE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_POLISHED_DIORITE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_OBSIDIAN_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_ANDESITE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_POLISHED_ANDESITE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_MOSSY_COBBLESTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_BRICKS_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_TERRACOTTA_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_SANDSTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CHISELED_SANDSTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CUT_SANDSTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_RED_SANDSTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CHISELED_RED_SANDSTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CUT_RED_SANDSTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_PRISMARINE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_PRISMARINE_BRICKS_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_DARK_PRISMARINE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_BLACKSTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_POLISHED_BLACKSTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_POLISHED_BLACKSTONE_BRICKS_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CHISELED_POLISHED_BLACKSTONE_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_NETHERRACK_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_NETHER_BRICKS_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_CHISELED_NETHER_BRICKS_KITCHEN_DRAWER_CABINET.get(), + CustomBlocks.ITEM_HOT_WATER_HEATER.get(), + CustomBlocks.ITEM_MICROWAVE.get(), + CustomBlocks.ITEM_STOVE.get(), + CustomBlocks.ITEM_REFRIGERATOR.get() + ); + } + //LOUNGE + { + this.tag(ModTags.Items.LOUNGE) + .add( + CustomBlocks.ITEM_AIR_CONDITIONER.get(), + CustomBlocks.ITEM_METAL_GRATE.get(), + CustomBlocks.ITEM_LIGHT_BULB.get(), + CustomBlocks.ITEM_ARROW_SLIT.get(), + CustomBlocks.ITEM_OLD_TV.get(), + CustomBlocks.ITEM_FLATSCREEN_TV.get() + ); + } + //TOOL + { + this.tag(ModTags.Items.TOOL) + .add( + CustomBlocks.ITEM_BULLET_STRIP.get(), + CustomBlocks.ITEM_MAGAZINE.get(), + CustomBlocks.ITEM_EXTENDED_MAGAZINE.get(), + CustomBlocks.ITEM_GUITAR.get(), + CustomBlocks.ITEM_GUITAR_AMPLIFIER.get(), + CustomBlocks.ITEM_SEED_SPREADER.get(), + CustomBlocks.ITEM_POWER_TRANSMITTER.get(), + CustomBlocks.ITEM_POWER_RECEIVER.get(), + CustomBlocks.ITEM_HANDGUN.get(), + CustomBlocks.ITEM_FLASHLIGHT.get() + ); + } + //OUTSIDE + { + this.tag(ModTags.Items.OUTSIDE) + .add( + CustomBlocks.ITEM_COBBLESTONE_RAMP.get(), + CustomBlocks.ITEM_STONE_RAMP.get(), + CustomBlocks.ITEM_STONE_BRICKS_RAMP.get(), + CustomBlocks.ITEM_CRACKED_STONE_BRICKS_RAMP.get(), + CustomBlocks.ITEM_MOSSY_STONE_BRICKS_RAMP.get(), + CustomBlocks.ITEM_CHISELED_STONE_BRICKS_RAMP.get(), + CustomBlocks.ITEM_CLAY_RAMP.get(), + CustomBlocks.ITEM_SAND_RAMP.get(), + CustomBlocks.ITEM_RED_SAND_RAMP.get(), + CustomBlocks.ITEM_SMOOTH_STONE_RAMP.get(), + CustomBlocks.ITEM_DIRT_RAMP.get(), + CustomBlocks.ITEM_DEEPSLATE_RAMP.get(), + CustomBlocks.ITEM_COBBLED_DEEPSLATE_RAMP.get(), + CustomBlocks.ITEM_QUARTZ_RAMP.get(), + CustomBlocks.ITEM_SMOOTH_QUARTZ_RAMP.get(), + CustomBlocks.ITEM_CHISELED_QUARTZ_RAMP.get(), + CustomBlocks.ITEM_QUARTZ_BRICKS_RAMP.get(), + CustomBlocks.ITEM_QUARTZ_PILLAR_RAMP.get(), + CustomBlocks.ITEM_GLASS_RAMP.get(), + CustomBlocks.ITEM_ACACIA_LOG_RAMP.get(), + CustomBlocks.ITEM_STRIPPED_ACACIA_LOG_RAMP.get(), + CustomBlocks.ITEM_BIRCH_LOG_RAMP.get(), + CustomBlocks.ITEM_STRIPPED_BIRCH_LOG_RAMP.get(), + CustomBlocks.ITEM_CRIMSON_LOG_RAMP.get(), + CustomBlocks.ITEM_STRIPPED_CRIMSON_LOG_RAMP.get(), + CustomBlocks.ITEM_DARK_OAK_LOG_RAMP.get(), + CustomBlocks.ITEM_STRIPPED_DARK_OAK_LOG_RAMP.get(), + CustomBlocks.ITEM_JUNGLE_LOG_RAMP.get(), + CustomBlocks.ITEM_STRIPPED_JUNGLE_LOG_RAMP.get(), + CustomBlocks.ITEM_OAK_LOG_RAMP.get(), + CustomBlocks.ITEM_STRIPPED_OAK_LOG_RAMP.get(), + CustomBlocks.ITEM_SPRUCE_LOG_RAMP.get(), + CustomBlocks.ITEM_STRIPPED_SPRUCE_LOG_RAMP.get(), + CustomBlocks.ITEM_WARPED_LOG_RAMP.get(), + CustomBlocks.ITEM_STRIPPED_WARPED_LOG_RAMP.get(), + CustomBlocks.ITEM_GRAVEL_RAMP.get(), + CustomBlocks.ITEM_GRANITE_RAMP.get(), + CustomBlocks.ITEM_POLISHED_GRANITE_RAMP.get(), + CustomBlocks.ITEM_DIORITE_RAMP.get(), + CustomBlocks.ITEM_POLISHED_DIORITE_RAMP.get(), + CustomBlocks.ITEM_OBSIDIAN_RAMP.get(), + CustomBlocks.ITEM_ANDESITE_RAMP.get(), + CustomBlocks.ITEM_POLISHED_ANDESITE_RAMP.get(), + CustomBlocks.ITEM_MOSSY_COBBLESTONE_RAMP.get(), + CustomBlocks.ITEM_BRICKS_RAMP.get(), + CustomBlocks.ITEM_TERRACOTTA_RAMP.get(), + CustomBlocks.ITEM_SANDSTONE_RAMP.get(), + CustomBlocks.ITEM_CHISELED_SANDSTONE_RAMP.get(), + CustomBlocks.ITEM_CUT_SANDSTONE_RAMP.get(), + CustomBlocks.ITEM_RED_SANDSTONE_RAMP.get(), + CustomBlocks.ITEM_CHISELED_RED_SANDSTONE_RAMP.get(), + CustomBlocks.ITEM_CUT_RED_SANDSTONE_RAMP.get(), + CustomBlocks.ITEM_PRISMARINE_RAMP.get(), + CustomBlocks.ITEM_PRISMARINE_BRICKS_RAMP.get(), + CustomBlocks.ITEM_DARK_PRISMARINE_RAMP.get(), + CustomBlocks.ITEM_BLACKSTONE_RAMP.get(), + CustomBlocks.ITEM_POLISHED_BLACKSTONE_RAMP.get(), + CustomBlocks.ITEM_POLISHED_BLACKSTONE_BRICKS_RAMP.get(), + CustomBlocks.ITEM_CHISELED_POLISHED_BLACKSTONE_RAMP.get(), + CustomBlocks.ITEM_NETHERRACK_RAMP.get(), + CustomBlocks.ITEM_NETHER_BRICKS_RAMP.get(), + CustomBlocks.ITEM_CHISELED_NETHER_BRICKS_RAMP.get(), + CustomBlocks.ITEM_ACACIA_RAMP.get(), + CustomBlocks.ITEM_BIRCH_RAMP.get(), + CustomBlocks.ITEM_CRIMSON_RAMP.get(), + CustomBlocks.ITEM_DARK_OAK_RAMP.get(), + CustomBlocks.ITEM_JUNGLE_RAMP.get(), + CustomBlocks.ITEM_OAK_RAMP.get(), + CustomBlocks.ITEM_SPRUCE_RAMP.get(), + CustomBlocks.ITEM_WARPED_RAMP.get(), + CustomBlocks.ITEM_PAVED_ROAD_RAMP.get(), + CustomBlocks.ITEM_PAVED_ROAD_RAMP.get(), + CustomBlocks.ITEM_JAIL_BARS.get(), + CustomBlocks.ITEM_ACACIA_BARRIER.get(), + CustomBlocks.ITEM_BIRCH_BARRIER.get(), + CustomBlocks.ITEM_CRIMSON_BARRIER.get(), + CustomBlocks.ITEM_DARK_OAK_BARRIER.get(), + CustomBlocks.ITEM_OAK_BARRIER.get(), + CustomBlocks.ITEM_SPRUCE_BARRIER.get(), + CustomBlocks.ITEM_WARPED_BARRIER.get(), + CustomBlocks.ITEM_COBBLESTONE_BARRIER.get(), + CustomBlocks.ITEM_STONE_BARRIER.get(), + CustomBlocks.ITEM_STONE_BRICKS_BARRIER.get(), + CustomBlocks.ITEM_CRACKED_STONE_BRICKS_BARRIER.get(), + CustomBlocks.ITEM_MOSSY_STONE_BRICKS_BARRIER.get(), + CustomBlocks.ITEM_CHISELED_STONE_BRICKS_BARRIER.get(), + CustomBlocks.ITEM_CLAY_BARRIER.get(), + CustomBlocks.ITEM_SAND_BARRIER.get(), + CustomBlocks.ITEM_RED_SAND_BARRIER.get(), + CustomBlocks.ITEM_SMOOTH_STONE_BARRIER.get(), + CustomBlocks.ITEM_GRAVEL_BARRIER.get(), + CustomBlocks.ITEM_GRANITE_BARRIER.get(), + CustomBlocks.ITEM_JUNGLE_BARRIER.get(), + CustomBlocks.ITEM_POLISHED_GRANITE_BARRIER.get(), + CustomBlocks.ITEM_DIORITE_BARRIER.get(), + CustomBlocks.ITEM_POLISHED_DIORITE_BARRIER.get(), + CustomBlocks.ITEM_OBSIDIAN_BARRIER.get(), + CustomBlocks.ITEM_ANDESITE_BARRIER.get(), + CustomBlocks.ITEM_POLISHED_ANDESITE_BARRIER.get(), + CustomBlocks.ITEM_MOSSY_COBBLESTONE_BARRIER.get(), + CustomBlocks.ITEM_BRICKS_BARRIER.get(), + CustomBlocks.ITEM_TERRACOTTA_BARRIER.get(), + CustomBlocks.ITEM_SANDSTONE_BARRIER.get(), + CustomBlocks.ITEM_CHISELED_SANDSTONE_BARRIER.get(), + CustomBlocks.ITEM_CUT_SANDSTONE_BARRIER.get(), + CustomBlocks.ITEM_RED_SANDSTONE_BARRIER.get(), + CustomBlocks.ITEM_CHISELED_RED_SANDSTONE_BARRIER.get(), + CustomBlocks.ITEM_CUT_RED_SANDSTONE_BARRIER.get(), + CustomBlocks.ITEM_PRISMARINE_BARRIER.get(), + CustomBlocks.ITEM_PRISMARINE_BRICKS_BARRIER.get(), + CustomBlocks.ITEM_BLACKSTONE_BARRIER.get(), + CustomBlocks.ITEM_POLISHED_BLACKSTONE_BARRIER.get(), + CustomBlocks.ITEM_POLISHED_BLACKSTONE_BRICKS_BARRIER.get(), + CustomBlocks.ITEM_CHISELED_POLISHED_BLACKSTONE_BARRIER.get(), + CustomBlocks.ITEM_NETHERRACK_BARRIER.get(), + CustomBlocks.ITEM_NETHER_BRICKS_BARRIER.get(), + CustomBlocks.ITEM_CHISELED_NETHER_BRICKS_BARRIER.get(), + CustomBlocks.ITEM_VINYL_SIDING.get(), + CustomBlocks.ITEM_RED_VINYL_SIDING.get(), + CustomBlocks.ITEM_GREEN_VINYL_SIDING.get(), + CustomBlocks.ITEM_BLUE_VINYL_SIDING.get(), + CustomBlocks.ITEM_GRAY_VINYL_SIDING.get(), + CustomBlocks.ITEM_FOUR_PANEL_WINDOW.get(), + CustomBlocks.ITEM_SIX_PANEL_WINDOW.get(), + CustomBlocks.ITEM_ACACIA_DECK.get(), + CustomBlocks.ITEM_BIRCH_DECK.get(), + CustomBlocks.ITEM_CRIMSON_DECK.get(), + CustomBlocks.ITEM_DARK_OAK_DECK.get(), + CustomBlocks.ITEM_DARK_OAK_DECK.get(), + CustomBlocks.ITEM_JUNGLE_DECK.get(), + CustomBlocks.ITEM_OAK_DECK.get(), + CustomBlocks.ITEM_SPRUCE_DECK.get(), + CustomBlocks.ITEM_WARPED_DECK.get(), + CustomBlocks.ITEM_FLOOR_MAT.get(), + CustomBlocks.ITEM_LANTERN_POST.get(), + CustomBlocks.ITEM_STREET_LIGHT.get(), + ModItems.WHITE_CONCRETE_BARRIER_ITEM.get(), + ModItems.ORANGE_CONCRETE_BARRIER_ITEM.get(), + ModItems.MAGENTA_CONCRETE_BARRIER_ITEM.get(), + ModItems.LIGHT_BLUE_CONCRETE_BARRIER_ITEM.get(), + ModItems.YELLOW_CONCRETE_BARRIER_ITEM.get(), + ModItems.LIME_CONCRETE_BARRIER_ITEM.get(), + ModItems.PINK_CONCRETE_BARRIER_ITEM.get(), + ModItems.GRAY_CONCRETE_BARRIER_ITEM.get(), + ModItems.LIGHT_GRAY_CONCRETE_BARRIER_ITEM.get(), + ModItems.CYAN_CONCRETE_BARRIER_ITEM.get(), + ModItems.PURPLE_CONCRETE_BARRIER_ITEM.get(), + ModItems.BLUE_CONCRETE_BARRIER_ITEM.get(), + ModItems.BROWN_CONCRETE_BARRIER_ITEM.get(), + ModItems.GREEN_CONCRETE_BARRIER_ITEM.get(), + ModItems.RED_CONCRETE_BARRIER_ITEM.get(), + ModItems.BLACK_CONCRETE_BARRIER_ITEM.get(), + ModItems.QUARTZ_BLOCK_BARRIER.get(), + ModItems.SMOOTH_QUARTZ_BARRIER.get() + ); + } + //SEAT + { + this.tag(ModTags.Items.SEAT) + .add( + CustomBlocks.ITEM_BLACK_SOFA.get(), + CustomBlocks.ITEM_BLUE_SOFA.get(), + CustomBlocks.ITEM_BROWN_SOFA.get(), + CustomBlocks.ITEM_CYAN_SOFA.get(), + CustomBlocks.ITEM_GRAY_SOFA.get(), + CustomBlocks.ITEM_GREEN_SOFA.get(), + CustomBlocks.ITEM_LIGHT_BLUE_SOFA.get(), + CustomBlocks.ITEM_LIGHT_GRAY_SOFA.get(), + CustomBlocks.ITEM_LIME_SOFA.get(), + CustomBlocks.ITEM_MAGENTA_SOFA.get(), + CustomBlocks.ITEM_ORANGE_SOFA.get(), + CustomBlocks.ITEM_PINK_SOFA.get(), + CustomBlocks.ITEM_PURPLE_SOFA.get(), + CustomBlocks.ITEM_RED_SOFA.get(), + CustomBlocks.ITEM_WHITE_SOFA.get(), + CustomBlocks.ITEM_YELLOW_SOFA.get(), + CustomBlocks.ITEM_ACACIA_MINI_STOOL.get(), + CustomBlocks.ITEM_BIRCH_MINI_STOOL.get(), + CustomBlocks.ITEM_CRIMSON_MINI_STOOL.get(), + CustomBlocks.ITEM_DARK_OAK_MINI_STOOL.get(), + CustomBlocks.ITEM_JUNGLE_MINI_STOOL.get(), + CustomBlocks.ITEM_OAK_MINI_STOOL.get(), + CustomBlocks.ITEM_SPRUCE_MINI_STOOL.get(), + CustomBlocks.ITEM_WARPED_MINI_STOOL.get(), + CustomBlocks.ITEM_ACACIA_CHAIR.get(), + CustomBlocks.ITEM_BIRCH_CHAIR.get(), + CustomBlocks.ITEM_CRIMSON_CHAIR.get(), + CustomBlocks.ITEM_DARK_OAK_CHAIR.get(), + CustomBlocks.ITEM_JUNGLE_CHAIR.get(), + CustomBlocks.ITEM_OAK_CHAIR.get(), + CustomBlocks.ITEM_SPRUCE_CHAIR.get(), + CustomBlocks.ITEM_WARPED_CHAIR.get() + ); + } + //SHELF + { + this.tag(ModTags.Items.SHELF) + .add( + CustomBlocks.ITEM_MODERN_OAK_BOOKSHELF.get(), + CustomBlocks.ITEM_MODERN_ACACIA_BOOKSHELF.get(), + CustomBlocks.ITEM_MODERN_BIRCH_BOOKSHELF.get(), + CustomBlocks.ITEM_MODERN_DARK_OAK_BOOKSHELF.get(), + CustomBlocks.ITEM_MODERN_CRIMSON_BOOKSHELF.get(), + CustomBlocks.ITEM_MODERN_JUNGLE_BOOKSHELF.get(), + CustomBlocks.ITEM_MODERN_SPRUCE_BOOKSHELF.get(), + CustomBlocks.ITEM_MODERN_WARPED_BOOKSHELF.get(), + CustomBlocks.ITEM_ACACIA_WALL_SHELF.get(), + CustomBlocks.ITEM_BIRCH_WALL_SHELF.get(), + CustomBlocks.ITEM_CRIMSON_WALL_SHELF.get(), + CustomBlocks.ITEM_DARK_OAK_WALL_SHELF.get(), + CustomBlocks.ITEM_JUNGLE_WALL_SHELF.get(), + CustomBlocks.ITEM_OAK_WALL_SHELF.get(), + CustomBlocks.ITEM_SPRUCE_WALL_SHELF.get(), + CustomBlocks.ITEM_WARPED_WALL_SHELF.get(), + CustomBlocks.ITEM_DOUBLE_ACACIA_WALL_SHELF.get(), + CustomBlocks.ITEM_DOUBLE_BIRCH_WALL_SHELF.get(), + CustomBlocks.ITEM_DOUBLE_CRIMSON_WALL_SHELF.get(), + CustomBlocks.ITEM_DOUBLE_DARK_OAK_WALL_SHELF.get(), + CustomBlocks.ITEM_DOUBLE_JUNGLE_WALL_SHELF.get(), + CustomBlocks.ITEM_DOUBLE_OAK_WALL_SHELF.get(), + CustomBlocks.ITEM_DOUBLE_SPRUCE_WALL_SHELF.get(), + CustomBlocks.ITEM_DOUBLE_WARPED_WALL_SHELF.get() + ); + } + //TABLE + { + this.tag(ModTags.Items.TABLE) + .add( + CustomBlocks.ITEM_ACACIA_ROUND_TABLE.get(), + CustomBlocks.ITEM_BIRCH_ROUND_TABLE.get(), + CustomBlocks.ITEM_BIRCH_ROUND_TABLE.get(), + CustomBlocks.ITEM_DARK_OAK_ROUND_TABLE.get(), + CustomBlocks.ITEM_CRIMSON_ROUND_TABLE.get(), + CustomBlocks.ITEM_OAK_ROUND_TABLE.get(), + CustomBlocks.ITEM_JUNGLE_ROUND_TABLE.get(), + CustomBlocks.ITEM_SPRUCE_ROUND_TABLE.get(), + CustomBlocks.ITEM_WARPED_ROUND_TABLE.get(), + CustomBlocks.ITEM_ACACIA_SMALL_TABLE.get(), + CustomBlocks.ITEM_BIRCH_SMALL_TABLE.get(), + CustomBlocks.ITEM_CRIMSON_SMALL_TABLE.get(), + CustomBlocks.ITEM_DARK_OAK_SMALL_TABLE.get(), + CustomBlocks.ITEM_JUNGLE_SMALL_TABLE.get(), + CustomBlocks.ITEM_OAK_SMALL_TABLE.get(), + CustomBlocks.ITEM_SPRUCE_SMALL_TABLE.get(), + CustomBlocks.ITEM_WARPED_SMALL_TABLE.get(), + CustomBlocks.ITEM_ACACIA_COFFEE_TABLE.get(), + CustomBlocks.ITEM_BIRCH_COFFEE_TABLE.get(), + CustomBlocks.ITEM_CRIMSON_COFFEE_TABLE.get(), + CustomBlocks.ITEM_DARK_OAK_COFFEE_TABLE.get(), + CustomBlocks.ITEM_JUNGLE_COFFEE_TABLE.get(), + CustomBlocks.ITEM_OAK_COFFEE_TABLE.get(), + CustomBlocks.ITEM_SPRUCE_COFFEE_TABLE.get(), + CustomBlocks.ITEM_WARPED_COFFEE_TABLE.get(), + CustomBlocks.ITEM_GLASS_ACACIA_COFFEE_TABLE.get(), + CustomBlocks.ITEM_GLASS_BIRCH_COFFEE_TABLE.get(), + CustomBlocks.ITEM_GLASS_CRIMSON_COFFEE_TABLE.get(), + CustomBlocks.ITEM_GLASS_DARK_OAK_COFFEE_TABLE.get(), + CustomBlocks.ITEM_GLASS_JUNGLE_COFFEE_TABLE.get(), + CustomBlocks.ITEM_GLASS_OAK_COFFEE_TABLE.get(), + CustomBlocks.ITEM_GLASS_SPRUCE_COFFEE_TABLE.get(), + CustomBlocks.ITEM_GLASS_WARPED_COFFEE_TABLE.get(), + CustomBlocks.ITEM_GLASS_SLAB.get(), + CustomBlocks.ITEM_ACACIA_PICNIC_TABLE.get(), + CustomBlocks.ITEM_BIRCH_PICNIC_TABLE.get(), + CustomBlocks.ITEM_CRIMSON_PICNIC_TABLE.get(), + CustomBlocks.ITEM_DARK_OAK_PICNIC_TABLE.get(), + CustomBlocks.ITEM_JUNGLE_PICNIC_TABLE.get(), + CustomBlocks.ITEM_OAK_PICNIC_TABLE.get(), + CustomBlocks.ITEM_SPRUCE_PICNIC_TABLE.get() + ); + } } } diff --git a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModRecipeProvider.java b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModRecipeProvider.java index 0eadfee..a94e833 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModRecipeProvider.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModRecipeProvider.java @@ -1,5 +1,6 @@ package com.r3944realms.modernlifepatch.datagen.provider; +import com.dairymoose.modernlife.core.CustomBlocks; import com.r3944realms.modernlifepatch.content.item.ModItems; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; @@ -18,7 +19,28 @@ public class ModRecipeProvider extends RecipeProvider { @Override protected void buildRecipes(@NotNull Consumer pWriter) { - ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, ModItems.MIRROR_ITEM.get(), 1) + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, CustomBlocks.ITEM_MAGAZINE.get()) + .requires(CustomBlocks.ITEM_BULLET.get(), 4) + .unlockedBy("has_bullet", has(CustomBlocks.ITEM_BULLET.get())) + .save(pWriter, "four_bullet_magazine"); + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, CustomBlocks.ITEM_EXTENDED_MAGAZINE.get()) + .requires(CustomBlocks.ITEM_BULLET.get(), 9) + .unlockedBy("has_bullet", has(CustomBlocks.ITEM_BULLET.get())) + .save(pWriter,"nine_bullet_extended_magazine"); + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, CustomBlocks.ITEM_BULLET.get()) + .requires(Items.COPPER_INGOT) + .requires(Items.GUNPOWDER) + .unlockedBy("has_copper", has(Items.COPPER_INGOT)) + .save(pWriter, "bullet"); + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, CustomBlocks.ITEM_BULLET.get(), 6) + .requires(CustomBlocks.ITEM_BULLET_STRIP.get()) + .unlockedBy("has_bullet_strip", has(CustomBlocks.ITEM_BULLET_STRIP.get())) + .save(pWriter, "bullet_2"); + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, CustomBlocks.ITEM_BULLET_STRIP.get()) + .requires(CustomBlocks.ITEM_BULLET.get(), 6) + .unlockedBy("has_bullet", has(CustomBlocks.ITEM_BULLET.get())) + .save(pWriter, "six_bullet_bullet_strip"); + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.MIRROR_ITEM.get(), 1) .requires(Tags.Items.GLASS_PANES) .requires(Items.IRON_INGOT) .requires(ItemTags.WOODEN_SLABS) @@ -58,6 +80,18 @@ public class ModRecipeProvider extends RecipeProvider { stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.GREEN_CONCRETE_BARRIER_ITEM.get(), Items.GREEN_CONCRETE, 2); stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.RED_CONCRETE_BARRIER_ITEM.get(), Items.RED_CONCRETE, 2); stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.BLACK_CONCRETE_BARRIER_ITEM.get(), Items.BLACK_CONCRETE, 2); + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, ModItems.SMOOTH_QUARTZ_BARRIER.get(), 2) + .define('@', Items.SMOOTH_QUARTZ_SLAB) + .pattern("@") + .pattern("@") + .unlockedBy("has_item_smooth_quartz_slab", has(Items.SMOOTH_QUARTZ_SLAB)) + .save(pWriter); + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, ModItems.QUARTZ_BLOCK_BARRIER.get(), 2) + .define('@', Items.QUARTZ_SLAB) + .pattern("@") + .pattern("@") + .unlockedBy("has_item_quartz_slab", has(Items.QUARTZ_SLAB)) + .save(pWriter); ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.NULL_BLOCK_ITEM.get(), 2) .define('#', Items.WHITE_DYE) .define('$', Items.RED_DYE) diff --git a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/loot/ModBlockLootTables.java b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/loot/ModBlockLootTables.java index 0b9c0e6..3ef1c82 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/loot/ModBlockLootTables.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/loot/ModBlockLootTables.java @@ -38,6 +38,8 @@ public class ModBlockLootTables extends BlockLootSubProvider { this.dropSelf(ModBlocks.GREEN_CONCRETE_BARRIER.get()); this.dropSelf(ModBlocks.RED_CONCRETE_BARRIER.get()); this.dropSelf(ModBlocks.BLACK_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.QUARTZ_BLOCK_BARRIER.get()); + this.dropSelf(ModBlocks.SMOOTH_QUARTZ_BARRIER.get()); this.dropSelf(ModBlocks.NULL_BLOCK.get()); this.dropSelf(ModBlocks.ONE_BLOCK.get()); this.dropSelf(ModBlocks.TWO_BLOCK.get()); diff --git a/src/main/java/com/r3944realms/modernlifepatch/mixin/item/MixinCamera.java b/src/main/java/com/r3944realms/modernlifepatch/mixin/item/MixinCamera.java index c8c615a..4807a6c 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/mixin/item/MixinCamera.java +++ b/src/main/java/com/r3944realms/modernlifepatch/mixin/item/MixinCamera.java @@ -1,9 +1,6 @@ package com.r3944realms.modernlifepatch.mixin.item; import com.dairymoose.modernlife.items.CameraItem; -import com.dairymoose.modernlife.util.CanvasData; -import com.mojang.blaze3d.platform.NativeImage; -import com.r3944realms.modernlifepatch.ModernLifePatch; import com.r3944realms.modernlifepatch.datagen.lang.ModLangKeyValue; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; @@ -12,11 +9,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.List; diff --git a/src/main/resources/data/modernlife/recipes/extended_gun_magazine.json b/src/main/resources/data/modernlife/recipes/extended_gun_magazine.json deleted file mode 100644 index 053ac9e..0000000 --- a/src/main/resources/data/modernlife/recipes/extended_gun_magazine.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], - "key": { - "#": { - "item": "modernlife:bullet" - } - }, - "result": { - "item": "modernlife:extended_gun_magazine", - "count": 1 - } -} diff --git a/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/birch_deck_support.json b/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/birch_deck_support.json index 53febda..0780be0 100644 --- a/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/birch_deck_support.json +++ b/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/birch_deck_support.json @@ -2,7 +2,8 @@ "credit": "Made with Blockbench", "textures": { "4": "modernlife:block/birch_planks_deck", - "5": "block/birch_planks" + "5": "block/birch_planks", + "particle": "block/birch_planks" }, "elements": [ { diff --git a/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/oak_deck_support.json b/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/oak_deck_support.json index 19d59f2..e5def46 100644 --- a/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/oak_deck_support.json +++ b/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/oak_deck_support.json @@ -2,7 +2,8 @@ "credit": "Made with Blockbench", "textures": { "2": "block/oak_planks", - "118": "modernlife:block/oak_planks_deck" + "118": "modernlife:block/oak_planks_deck", + "particle": "block/oak_log" }, "elements": [ { diff --git a/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/power_receiver.json b/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/power_receiver.json index 4ae6697..66fee80 100644 --- a/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/power_receiver.json +++ b/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/power_receiver.json @@ -1,6 +1,6 @@ { "credit": "Made with Blockbench", - "render_type": "minecraft:translucent", + "render_type": "minecraft:cutout", "textures": { "1": "modernlife:block/power_receiver_top", "3": "modernlife:block/power_receiver_side", diff --git a/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/power_transmitter.json b/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/power_transmitter.json index 245396c..4f67a59 100644 --- a/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/power_transmitter.json +++ b/src/main/resources/resourcepacks/modernlifepatch/assets/modernlife/models/block/power_transmitter.json @@ -1,6 +1,5 @@ { "credit": "Made with Blockbench", - "render_type": "minecraft:cutout", "textures": { "1": "modernlife:block/power_transmitter_top", "2": "modernlife:block/power_transmitter_bottom",