From 27b77f4e879ca321dcec49302f8a49ee3289e45d Mon Sep 17 00:00:00 2001 From: 3944Realms Date: Sat, 22 Mar 2025 17:30:56 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=9A1.20.1-1.4.4-beta=20?= =?UTF-8?q?+=2016=E7=A7=8D=E6=B7=B7=E5=87=9D=E5=9C=9F=E6=A0=85=E6=A0=8F?= =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87=E5=88=87=E7=9F=B3=E6=9C=BA=E5=90=88?= =?UTF-8?q?=E6=88=90=20-=20=E5=88=A0=E9=99=A4=E4=BA=86=E4=BA=9B=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 +- .../2a65ee2815744be1ef1ffdae1c9a37f2a9cbe2ac | 4 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 18 ++++- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 34 +++++++++- .../b7c2bce3e3ce09bbcda589ad1e9064dec8443add | 3 +- .../c2c8caf4e6d2025aead744a92fe438836ccb67fe | 34 +++++++++- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 4 +- .../caa32374a77dc770aca5457990ea4b5e86a82a61 | 17 +++++ .../blockstates/black_concrete_barrier.json | 19 ++++++ .../blockstates/blue_concrete_barrier.json | 19 ++++++ .../blockstates/brown_concrete_barrier.json | 19 ++++++ .../blockstates/cyan_concrete_barrier.json | 19 ++++++ .../blockstates/gray_concrete_barrier.json | 19 ++++++ .../blockstates/green_concrete_barrier.json | 19 ++++++ .../light_blue_concrete_barrier.json | 19 ++++++ .../light_gray_concrete_barrier.json | 19 ++++++ .../blockstates/lime_concrete_barrier.json | 19 ++++++ .../blockstates/magenta_concrete_barrier.json | 19 ++++++ .../blockstates/orange_concrete_barrier.json | 19 ++++++ .../blockstates/pink_concrete_barrier.json | 19 ++++++ .../blockstates/purple_concrete_barrier.json | 19 ++++++ .../blockstates/red_concrete_barrier.json | 19 ++++++ .../blockstates/white_concrete_barrier.json | 19 ++++++ .../blockstates/yellow_concrete_barrier.json | 19 ++++++ .../assets/modernlifepatch/lang/en_us.json | 16 +++++ .../assets/modernlifepatch/lang/zh_cn.json | 16 +++++ .../models/block/black_concrete_barrier.json | 7 ++ .../models/block/blue_concrete_barrier.json | 7 ++ .../models/block/brown_concrete_barrier.json | 7 ++ .../models/block/cyan_concrete_barrier.json | 7 ++ .../models/block/gray_concrete_barrier.json | 7 ++ .../models/block/green_concrete_barrier.json | 7 ++ .../block/light_blue_concrete_barrier.json | 7 ++ .../block/light_gray_concrete_barrier.json | 7 ++ .../models/block/lime_concrete_barrier.json | 7 ++ .../block/magenta_concrete_barrier.json | 7 ++ .../models/block/orange_concrete_barrier.json | 7 ++ .../models/block/pink_concrete_barrier.json | 7 ++ .../models/block/purple_concrete_barrier.json | 7 ++ .../models/block/red_concrete_barrier.json | 7 ++ .../models/block/white_concrete_barrier.json | 7 ++ .../models/block/yellow_concrete_barrier.json | 7 ++ .../models/item/black_concrete_barrier.json | 3 + .../models/item/blue_concrete_barrier.json | 3 + .../models/item/brown_concrete_barrier.json | 3 + .../models/item/cyan_concrete_barrier.json | 3 + .../models/item/gray_concrete_barrier.json | 3 + .../models/item/green_concrete_barrier.json | 3 + .../item/light_blue_concrete_barrier.json | 3 + .../item/light_gray_concrete_barrier.json | 3 + .../models/item/lime_concrete_barrier.json | 3 + .../models/item/magenta_concrete_barrier.json | 3 + .../models/item/orange_concrete_barrier.json | 3 + .../models/item/pink_concrete_barrier.json | 3 + .../models/item/purple_concrete_barrier.json | 3 + .../models/item/red_concrete_barrier.json | 3 + .../models/item/white_concrete_barrier.json | 3 + .../models/item/yellow_concrete_barrier.json | 3 + ...rier_from_black_concrete_stonecutting.json | 35 ++++++++++ ...rrier_from_blue_concrete_stonecutting.json | 35 ++++++++++ ...rier_from_brown_concrete_stonecutting.json | 35 ++++++++++ ...rrier_from_cyan_concrete_stonecutting.json | 35 ++++++++++ ...rrier_from_gray_concrete_stonecutting.json | 35 ++++++++++ ...rier_from_green_concrete_stonecutting.json | 35 ++++++++++ ...from_light_blue_concrete_stonecutting.json | 35 ++++++++++ ...from_light_gray_concrete_stonecutting.json | 35 ++++++++++ ...rrier_from_lime_concrete_stonecutting.json | 35 ++++++++++ ...er_from_magenta_concrete_stonecutting.json | 35 ++++++++++ ...ier_from_orange_concrete_stonecutting.json | 35 ++++++++++ ...rrier_from_pink_concrete_stonecutting.json | 35 ++++++++++ ...ier_from_purple_concrete_stonecutting.json | 35 ++++++++++ ...arrier_from_red_concrete_stonecutting.json | 35 ++++++++++ ...rier_from_white_concrete_stonecutting.json | 35 ++++++++++ ...ier_from_yellow_concrete_stonecutting.json | 35 ++++++++++ ...rier_from_black_concrete_stonecutting.json | 8 +++ ...rrier_from_blue_concrete_stonecutting.json | 8 +++ ...rier_from_brown_concrete_stonecutting.json | 8 +++ ...rrier_from_cyan_concrete_stonecutting.json | 8 +++ ...rrier_from_gray_concrete_stonecutting.json | 8 +++ ...rier_from_green_concrete_stonecutting.json | 8 +++ ...from_light_blue_concrete_stonecutting.json | 8 +++ ...from_light_gray_concrete_stonecutting.json | 8 +++ ...rrier_from_lime_concrete_stonecutting.json | 8 +++ ...er_from_magenta_concrete_stonecutting.json | 8 +++ ...ier_from_orange_concrete_stonecutting.json | 8 +++ ...rrier_from_pink_concrete_stonecutting.json | 8 +++ ...ier_from_purple_concrete_stonecutting.json | 8 +++ ...arrier_from_red_concrete_stonecutting.json | 8 +++ ...rier_from_white_concrete_stonecutting.json | 8 +++ ...ier_from_yellow_concrete_stonecutting.json | 8 +++ .../tags/blocks/mineable/pickaxe.json | 20 ++++++ .../blocks/black_concrete_barrier.json | 21 ++++++ .../blocks/blue_concrete_barrier.json | 21 ++++++ .../blocks/brown_concrete_barrier.json | 21 ++++++ .../blocks/cyan_concrete_barrier.json | 21 ++++++ .../blocks/gray_concrete_barrier.json | 21 ++++++ .../blocks/green_concrete_barrier.json | 21 ++++++ .../blocks/light_blue_concrete_barrier.json | 21 ++++++ .../blocks/light_gray_concrete_barrier.json | 21 ++++++ .../blocks/lime_concrete_barrier.json | 21 ++++++ .../blocks/magenta_concrete_barrier.json | 21 ++++++ .../blocks/orange_concrete_barrier.json | 21 ++++++ .../blocks/pink_concrete_barrier.json | 21 ++++++ .../blocks/purple_concrete_barrier.json | 21 ++++++ .../blocks/red_concrete_barrier.json | 21 ++++++ .../blocks/white_concrete_barrier.json | 21 ++++++ .../blocks/yellow_concrete_barrier.json | 21 ++++++ .../content/blocks/ModBlocks.java | 35 ++++++++++ .../content/item/ModItems.java | 17 +++++ .../datagen/DataGeneratorHandler.java | 1 + .../datagen/lang/ModLangKeyValue.java | 34 ++++++++++ .../provider/ModBlockModelProvider.java | 58 +++++++++------- .../provider/ModBlockStatesProvider.java | 52 +++++++++++++++ .../datagen/provider/ModBlockTagProvider.java | 22 ++++++- .../datagen/provider/ModRecipeProvider.java | 17 +++++ .../provider/loot/ModBlockLootTables.java | 16 +++++ .../modernlifepatch/mixin/MLPMixinPlugin.java | 12 ++++ .../modernlifepatch/models/block/barrier.json | 66 +++++++++++++++++++ .../modernlifepatch/tags/items/outside.json | 20 +++++- 119 files changed, 1969 insertions(+), 39 deletions(-) create mode 100644 src/generated/resources/.cache/caa32374a77dc770aca5457990ea4b5e86a82a61 create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/black_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/blue_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/brown_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/cyan_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/gray_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/green_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/light_blue_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/light_gray_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/lime_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/magenta_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/orange_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/pink_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/purple_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/red_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/white_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/blockstates/yellow_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/black_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/blue_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/brown_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/cyan_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/gray_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/green_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/light_blue_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/light_gray_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/lime_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/magenta_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/orange_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/pink_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/purple_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/red_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/white_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/block/yellow_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/black_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/blue_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/brown_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/cyan_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/gray_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/green_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/light_blue_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/light_gray_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/lime_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/magenta_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/orange_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/pink_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/purple_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/red_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/white_concrete_barrier.json create mode 100644 src/generated/resources/assets/modernlifepatch/models/item/yellow_concrete_barrier.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/black_concrete_barrier_from_black_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/blue_concrete_barrier_from_blue_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/brown_concrete_barrier_from_brown_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/gray_concrete_barrier_from_gray_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/green_concrete_barrier_from_green_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/lime_concrete_barrier_from_lime_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/orange_concrete_barrier_from_orange_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/pink_concrete_barrier_from_pink_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/purple_concrete_barrier_from_purple_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/red_concrete_barrier_from_red_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/white_concrete_barrier_from_white_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/decorations/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/black_concrete_barrier_from_black_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/blue_concrete_barrier_from_blue_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/brown_concrete_barrier_from_brown_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/gray_concrete_barrier_from_gray_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/green_concrete_barrier_from_green_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/lime_concrete_barrier_from_lime_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/orange_concrete_barrier_from_orange_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/pink_concrete_barrier_from_pink_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/purple_concrete_barrier_from_purple_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/red_concrete_barrier_from_red_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/white_concrete_barrier_from_white_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/recipes/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/black_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/blue_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/brown_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/cyan_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/gray_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/green_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/light_blue_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/light_gray_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/lime_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/magenta_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/orange_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/pink_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/purple_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/red_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/white_concrete_barrier.json create mode 100644 src/generated/resources/data/modernlifepatch/loot_tables/blocks/yellow_concrete_barrier.json create mode 100644 src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockStatesProvider.java create mode 100644 src/main/resources/assets/modernlifepatch/models/block/barrier.json diff --git a/build.gradle b/build.gradle index d5961fd..3f69bbc 100644 --- a/build.gradle +++ b/build.gradle @@ -95,6 +95,7 @@ minecraft { } server { + workingDirectory project.file('run') property 'forge.enabledGameTestNamespaces', mod_id args '-mixin.config=modernlifepatch.mixins.json' } @@ -108,8 +109,7 @@ minecraft { data { // example of overriding the workingDirectory set in configureEach above - workingDirectory project.file('run-data') - + property('gradle.task', 'runData') // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), '-mixin.config=modernlifepatch.mixins.json' } diff --git a/src/generated/resources/.cache/2a65ee2815744be1ef1ffdae1c9a37f2a9cbe2ac b/src/generated/resources/.cache/2a65ee2815744be1ef1ffdae1c9a37f2a9cbe2ac index 960960d..3a12059 100644 --- a/src/generated/resources/.cache/2a65ee2815744be1ef1ffdae1c9a37f2a9cbe2ac +++ b/src/generated/resources/.cache/2a65ee2815744be1ef1ffdae1c9a37f2a9cbe2ac @@ -1,2 +1,2 @@ -// 1.20.1 2025-02-23T15:27:02.7913922 Languages: zh_cn -e226afd730bb6a400c7d958e5b5de12115ca55c9 assets/modernlifepatch/lang/zh_cn.json +// 1.20.1 2025-03-22T17:17:58.368858 Languages: zh_cn +9aac62625f71f21c06dd95ef1be69105fa7315c5 assets/modernlifepatch/lang/zh_cn.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index aab4328..e08984b 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,5 +1,21 @@ -// 1.20.1 2025-02-22T12:37:42.6884778 Loot Tables +// 1.20.1 2025-03-22T17:17:58.3749573 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 +1309c36dc6e32fc0cd00efdea78b848b716914c4 data/modernlifepatch/loot_tables/blocks/cyan_concrete_barrier.json +1ecc1e884951b9d16269a8a6b0b273207d42ca74 data/modernlifepatch/loot_tables/blocks/gray_concrete_barrier.json +18f69dee8c0a312bffa549f8e269a8d7fd4171fc data/modernlifepatch/loot_tables/blocks/green_concrete_barrier.json 1ee070aa7f3d869c7610d021206ae1a3d680d050 data/modernlifepatch/loot_tables/blocks/large_mirror.json +8322a838fa68f4675fbc68423b3e7475bf5bce0e data/modernlifepatch/loot_tables/blocks/light_blue_concrete_barrier.json +aa57274d1d5d32f7a9cfd9059dc5603813b9db08 data/modernlifepatch/loot_tables/blocks/light_gray_concrete_barrier.json +629b98cb072f82599ce2c2472161196acd7ac9fe data/modernlifepatch/loot_tables/blocks/lime_concrete_barrier.json +c923d1747d2cad0bfec9f6ad0a113406398e4174 data/modernlifepatch/loot_tables/blocks/magenta_concrete_barrier.json 1b5b1090f47e29526af1cd0df979d4f216abeb07 data/modernlifepatch/loot_tables/blocks/massive_mirror.json 384f868a4d71fa14dafb4bdca2fd0fd877507025 data/modernlifepatch/loot_tables/blocks/mirror.json +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 +0689a21f845ac71fa47d8b3efe1de28e3bc88cc9 data/modernlifepatch/loot_tables/blocks/red_concrete_barrier.json c76a70b5a42ede00cb92bdc4f5c292bb6c961071 data/modernlifepatch/loot_tables/blocks/tall_mirror.json +a0005faec56eca6ecd1911aec51fbaa0447955c9 data/modernlifepatch/loot_tables/blocks/white_concrete_barrier.json +bca84922278c797a2075ec5965dbaf237b712973 data/modernlifepatch/loot_tables/blocks/yellow_concrete_barrier.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index a30010d..1945d3e 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,36 @@ -// 1.20.1 2025-02-23T01:22:49.9804054 Recipes +// 1.20.1 2025-03-22T17:26:13.9133045 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 +1873fc03fe38bfa71ad8a1a8d6ab9801c8d25d28 data/minecraft/advancements/recipes/decorations/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json +386001dd44c7d6fbbbfdd27e31bc339de5bed0fe data/minecraft/advancements/recipes/decorations/gray_concrete_barrier_from_gray_concrete_stonecutting.json +9e710f274cd73db3bd2efbde109b91b38ad40b0e data/minecraft/advancements/recipes/decorations/green_concrete_barrier_from_green_concrete_stonecutting.json +07fe275e9e17da53ed30855c80f887bdd8f79272 data/minecraft/advancements/recipes/decorations/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json +04a061d26698df6f1732e386cfcc56ba6767c671 data/minecraft/advancements/recipes/decorations/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json +f6488549be3cbd4fe0a2661e4de92f456d05087c data/minecraft/advancements/recipes/decorations/lime_concrete_barrier_from_lime_concrete_stonecutting.json +c1cbc4036079d7f5a39214653f4fdecedd2c1f30 data/minecraft/advancements/recipes/decorations/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json +874e8738b041c219b8ad9438c4fb9faddf2cfd2e data/minecraft/advancements/recipes/decorations/orange_concrete_barrier_from_orange_concrete_stonecutting.json +ccdcf8117b49d5074d0140eec9159c5a134137b6 data/minecraft/advancements/recipes/decorations/pink_concrete_barrier_from_pink_concrete_stonecutting.json +0a3d2aea5f29b88e3cc8049935a8adad936e689f data/minecraft/advancements/recipes/decorations/purple_concrete_barrier_from_purple_concrete_stonecutting.json +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 +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 +a02c991f8cc9098f2aa6f46325badfc8a8e4b1ea data/minecraft/recipes/cyan_concrete_barrier_from_cyan_concrete_stonecutting.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 +6ed761863a4e8d09bdfa6af922431c6e4365ffea data/minecraft/recipes/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json +8ba9c95e2dd167a5492cd775bb5d6ae213122732 data/minecraft/recipes/lime_concrete_barrier_from_lime_concrete_stonecutting.json +6d088056e9f4ed7c16ac029ad62fa57c734f5e55 data/minecraft/recipes/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json +e5ea65dde85bbe8dea1a37dc76c898966cf2ceeb data/minecraft/recipes/orange_concrete_barrier_from_orange_concrete_stonecutting.json +99c0a624f0bd9b2b7b5beade985976a7f35c0454 data/minecraft/recipes/pink_concrete_barrier_from_pink_concrete_stonecutting.json +d2e0bc434ca37601f727810ff9cb7f1205ceb6b3 data/minecraft/recipes/purple_concrete_barrier_from_purple_concrete_stonecutting.json +3652ee4dd0846ef825ff7d8bc10afd62c1d2dee7 data/minecraft/recipes/red_concrete_barrier_from_red_concrete_stonecutting.json +9d4629cfb681a773d0b8bd22f4b90a910db6a47c data/minecraft/recipes/white_concrete_barrier_from_white_concrete_stonecutting.json +0af5a2ba87016df6c827710204397aebb74b75fc data/minecraft/recipes/yellow_concrete_barrier_from_yellow_concrete_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 diff --git a/src/generated/resources/.cache/b7c2bce3e3ce09bbcda589ad1e9064dec8443add b/src/generated/resources/.cache/b7c2bce3e3ce09bbcda589ad1e9064dec8443add index f5cefaa..949ae6c 100644 --- a/src/generated/resources/.cache/b7c2bce3e3ce09bbcda589ad1e9064dec8443add +++ b/src/generated/resources/.cache/b7c2bce3e3ce09bbcda589ad1e9064dec8443add @@ -1 +1,2 @@ -// 1.20.1 2025-02-22T12:37:42.7086672 Tags for minecraft:block mod id modernlifepatch +// 1.20.1 2025-03-22T17:17:58.3789517 Tags for minecraft:block mod id modernlifepatch +6c0e9dd6279be17974bfd06138256cf56c74f602 data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/src/generated/resources/.cache/c2c8caf4e6d2025aead744a92fe438836ccb67fe b/src/generated/resources/.cache/c2c8caf4e6d2025aead744a92fe438836ccb67fe index 09b3936..cd77e47 100644 --- a/src/generated/resources/.cache/c2c8caf4e6d2025aead744a92fe438836ccb67fe +++ b/src/generated/resources/.cache/c2c8caf4e6d2025aead744a92fe438836ccb67fe @@ -1 +1,33 @@ -// 1.20.1 2025-02-22T12:37:42.6884778 Block States: modernlifepatch +// 1.20.1 2025-03-22T17:17:58.3718469 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 +1d98d956d488daefb2b6b8631979dfae4a0273d4 assets/modernlifepatch/blockstates/cyan_concrete_barrier.json +ff61b2512130e43fdad61348d4e9e5cbca0e17b0 assets/modernlifepatch/blockstates/gray_concrete_barrier.json +dd4e4b47f65b94d9180346f9790b85ec8e299524 assets/modernlifepatch/blockstates/green_concrete_barrier.json +4077fecd41e271e4ed79752ab178552e5ec674a4 assets/modernlifepatch/blockstates/light_blue_concrete_barrier.json +48052319b883a2e59d7efde11434bb09a3f24393 assets/modernlifepatch/blockstates/light_gray_concrete_barrier.json +2bdff859c4e1faaa729ac338307c7af10c3eb5b1 assets/modernlifepatch/blockstates/lime_concrete_barrier.json +2ecef4d6a4b9aa021eaddee4cce32c1f14f93f4f assets/modernlifepatch/blockstates/magenta_concrete_barrier.json +9c674b4a2db2532fe1ab23c5523d70b6cbee1902 assets/modernlifepatch/blockstates/orange_concrete_barrier.json +278c013ed5021074ef846ae8297619043e9eaf98 assets/modernlifepatch/blockstates/pink_concrete_barrier.json +a3b9c0099e3f65bfd14015a629a709f5b90bf75e assets/modernlifepatch/blockstates/purple_concrete_barrier.json +b6e93648de3ec4921410b4acd4003b1fd4baded0 assets/modernlifepatch/blockstates/red_concrete_barrier.json +c4e8d556ce255d18da5a5c926bf3da963fb40f1a assets/modernlifepatch/blockstates/white_concrete_barrier.json +bea52888b9b32d9866643be4a99cd9802c1a1322 assets/modernlifepatch/blockstates/yellow_concrete_barrier.json +507562e8509a8c83a4c2cebb4cbb682e94315ef4 assets/modernlifepatch/models/item/black_concrete_barrier.json +fd17c7f34bb615f8113659d2f2c9b8e06d3bf0a3 assets/modernlifepatch/models/item/blue_concrete_barrier.json +31968e21ff06436df0828990e3521536a2997926 assets/modernlifepatch/models/item/brown_concrete_barrier.json +b745fdc77b1c8f87e654ef81eca4e95a5672ab71 assets/modernlifepatch/models/item/cyan_concrete_barrier.json +b3e601ef38191f0e5c23a41145c1e280244b673d assets/modernlifepatch/models/item/gray_concrete_barrier.json +84a0567e3f014560778f924f2b8d8c9fd4c7f93f assets/modernlifepatch/models/item/green_concrete_barrier.json +3c734794d9c1fcf7664bb9d3faeef5d4d1ee298e assets/modernlifepatch/models/item/light_blue_concrete_barrier.json +53d8a0955735f262b6209005567f590a716163e1 assets/modernlifepatch/models/item/light_gray_concrete_barrier.json +88adeb6343ab5e6e36658df72cc8e8e82be4dcaa assets/modernlifepatch/models/item/lime_concrete_barrier.json +0fb4649f0b6b149e79e111b2bd59e04a92ee34ac assets/modernlifepatch/models/item/magenta_concrete_barrier.json +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 +864d1685c60fcdaca3825e7d05af6eff438cf9cb assets/modernlifepatch/models/item/red_concrete_barrier.json +1feb32683f4f57640577fccf962c04ab48c2ce9d assets/modernlifepatch/models/item/white_concrete_barrier.json +9c3f0791c55bc96bbb9123a1024258053ead327a assets/modernlifepatch/models/item/yellow_concrete_barrier.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 7ff3a57..c7165a8 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2025-02-23T15:27:02.795393 Languages: en_us -52c96d3608bb79f1e560ac298dbc43e3523cec8d assets/modernlifepatch/lang/en_us.json +// 1.20.1 2025-03-22T17:17:58.3769694 Languages: en_us +b3129455faabbd0e9af01f161b45e3e1272d54a7 assets/modernlifepatch/lang/en_us.json diff --git a/src/generated/resources/.cache/caa32374a77dc770aca5457990ea4b5e86a82a61 b/src/generated/resources/.cache/caa32374a77dc770aca5457990ea4b5e86a82a61 new file mode 100644 index 0000000..a1ff638 --- /dev/null +++ b/src/generated/resources/.cache/caa32374a77dc770aca5457990ea4b5e86a82a61 @@ -0,0 +1,17 @@ +// 1.20.1 2025-03-22T17:17:58.3769694 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 +bfdfab5b6efcb0d6a878778fa6c1b13687f9615f assets/modernlifepatch/models/block/cyan_concrete_barrier.json +278ca527ea91906ea0d5de90f2191c5ec5ebe052 assets/modernlifepatch/models/block/gray_concrete_barrier.json +0e7b7f208d7bfd035eaa418a09cb2689a6a50735 assets/modernlifepatch/models/block/green_concrete_barrier.json +225be6d26ad1250d38b280980b6a461125e1aabb assets/modernlifepatch/models/block/light_blue_concrete_barrier.json +5834552e5a416416d9b45cec0d1106eb8dab46c1 assets/modernlifepatch/models/block/light_gray_concrete_barrier.json +6a07aef2efbf0baa8cf1372840fba267fcdeaf55 assets/modernlifepatch/models/block/lime_concrete_barrier.json +c6b6df16d7bc531f4828255c760be1ad01918401 assets/modernlifepatch/models/block/magenta_concrete_barrier.json +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 +3c61a1ef01205029ba38f1232759ba11d7c3bdca assets/modernlifepatch/models/block/red_concrete_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/black_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/black_concrete_barrier.json new file mode 100644 index 0000000..ca458be --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/black_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/black_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/black_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/black_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/black_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/blue_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/blue_concrete_barrier.json new file mode 100644 index 0000000..50e66ad --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/blue_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/blue_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/blue_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/blue_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/blue_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/brown_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/brown_concrete_barrier.json new file mode 100644 index 0000000..82ed9f0 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/brown_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/brown_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/brown_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/brown_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/brown_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/cyan_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/cyan_concrete_barrier.json new file mode 100644 index 0000000..8e237a4 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/cyan_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/cyan_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/cyan_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/cyan_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/cyan_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/gray_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/gray_concrete_barrier.json new file mode 100644 index 0000000..c3f0db0 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/gray_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/gray_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/gray_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/gray_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/gray_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/green_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/green_concrete_barrier.json new file mode 100644 index 0000000..590c050 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/green_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/green_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/green_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/green_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/green_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/light_blue_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/light_blue_concrete_barrier.json new file mode 100644 index 0000000..9e84904 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/light_blue_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/light_blue_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/light_blue_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/light_blue_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/light_blue_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/light_gray_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/light_gray_concrete_barrier.json new file mode 100644 index 0000000..d8f1974 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/light_gray_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/light_gray_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/light_gray_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/light_gray_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/light_gray_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/lime_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/lime_concrete_barrier.json new file mode 100644 index 0000000..62ffce8 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/lime_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/lime_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/lime_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/lime_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/lime_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/magenta_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/magenta_concrete_barrier.json new file mode 100644 index 0000000..a2e6f6d --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/magenta_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/magenta_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/magenta_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/magenta_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/magenta_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/orange_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/orange_concrete_barrier.json new file mode 100644 index 0000000..65db46c --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/orange_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/orange_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/orange_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/orange_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/orange_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/pink_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/pink_concrete_barrier.json new file mode 100644 index 0000000..8987e05 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/pink_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/pink_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/pink_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/pink_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/pink_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/purple_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/purple_concrete_barrier.json new file mode 100644 index 0000000..cfbb103 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/purple_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/purple_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/purple_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/purple_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/purple_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/red_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/red_concrete_barrier.json new file mode 100644 index 0000000..eaa7344 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/red_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/red_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/red_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/red_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/red_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/white_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/white_concrete_barrier.json new file mode 100644 index 0000000..230f31f --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/white_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/white_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/white_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/white_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/white_concrete_barrier", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/blockstates/yellow_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/blockstates/yellow_concrete_barrier.json new file mode 100644 index 0000000..8ecff2a --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/blockstates/yellow_concrete_barrier.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "modernlifepatch:block/yellow_concrete_barrier", + "y": 270 + }, + "facing=north": { + "model": "modernlifepatch:block/yellow_concrete_barrier", + "y": 180 + }, + "facing=south": { + "model": "modernlifepatch:block/yellow_concrete_barrier" + }, + "facing=west": { + "model": "modernlifepatch:block/yellow_concrete_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 f20bb3f..07e9da8 100644 --- a/src/generated/resources/assets/modernlifepatch/lang/en_us.json +++ b/src/generated/resources/assets/modernlifepatch/lang/en_us.json @@ -1,8 +1,24 @@ { + "block.modernlifepatch.black_concrete_barrier": "Black Concrete Barrier", + "block.modernlifepatch.blue_concrete_barrier": "Blue Concrete Barrier", + "block.modernlifepatch.brown_concrete_barrier": "Brown Concrete Barrier", + "block.modernlifepatch.cyan_concrete_barrier": "Cyan Concrete Barrier", + "block.modernlifepatch.gray_concrete_barrier": "Gray Concrete Barrier", + "block.modernlifepatch.green_concrete_barrier": "Green Concrete Barrier", "block.modernlifepatch.large_mirror": "Large Mirror", + "block.modernlifepatch.light_blue_concrete_barrier": "Light Blue Concrete Barrier", + "block.modernlifepatch.light_gray_concrete_barrier": "Light Gray Concrete Barrier", + "block.modernlifepatch.lime_concrete_barrier": "Lime Concrete Barrier", + "block.modernlifepatch.magenta_concrete_barrier": "Magenta Concrete Barrier", "block.modernlifepatch.massive_mirror": "Massive Mirror", "block.modernlifepatch.mirror": "Mirror", + "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.red_concrete_barrier": "Red Concrete Barrier", "block.modernlifepatch.tall_mirror": "Tall Mirror", + "block.modernlifepatch.white_concrete_barrier": "White Concrete Barrier", + "block.modernlifepatch.yellow_concrete_barrier": "Yellow Concrete Barrier", "gui.tag_filter.modernlifepatch.bathroom": "BathRoom", "gui.tag_filter.modernlifepatch.bedchamber": "Bedchamber", "gui.tag_filter.modernlifepatch.door": "Door", diff --git a/src/generated/resources/assets/modernlifepatch/lang/zh_cn.json b/src/generated/resources/assets/modernlifepatch/lang/zh_cn.json index d68a416..067c169 100644 --- a/src/generated/resources/assets/modernlifepatch/lang/zh_cn.json +++ b/src/generated/resources/assets/modernlifepatch/lang/zh_cn.json @@ -1,8 +1,24 @@ { + "block.modernlifepatch.black_concrete_barrier": "黑色混凝土栅栏", + "block.modernlifepatch.blue_concrete_barrier": "蓝色混凝土栅栏", + "block.modernlifepatch.brown_concrete_barrier": "棕色混凝土栅栏", + "block.modernlifepatch.cyan_concrete_barrier": "青色混凝土栅栏", + "block.modernlifepatch.gray_concrete_barrier": "灰色混凝土栅栏", + "block.modernlifepatch.green_concrete_barrier": "绿色混凝土栅栏", "block.modernlifepatch.large_mirror": "大型镜子", + "block.modernlifepatch.light_blue_concrete_barrier": "淡蓝色混凝土栅栏", + "block.modernlifepatch.light_gray_concrete_barrier": "淡灰色混凝土栅栏", + "block.modernlifepatch.lime_concrete_barrier": "黄绿色混凝土栅栏", + "block.modernlifepatch.magenta_concrete_barrier": "品红色混凝土栅栏", "block.modernlifepatch.massive_mirror": "超大型镜子", "block.modernlifepatch.mirror": "镜子", + "block.modernlifepatch.orange_concrete_barrier": "橙色混凝土栅栏", + "block.modernlifepatch.pink_concrete_barrier": "粉红色混凝土栅栏", + "block.modernlifepatch.purple_concrete_barrier": "紫色混凝土栅栏", + "block.modernlifepatch.red_concrete_barrier": "红色混凝土栅栏", "block.modernlifepatch.tall_mirror": "高镜子", + "block.modernlifepatch.white_concrete_barrier": "白色混凝土栅栏", + "block.modernlifepatch.yellow_concrete_barrier": "黄色混凝土栅栏", "gui.tag_filter.modernlifepatch.bathroom": "卫生间", "gui.tag_filter.modernlifepatch.bedchamber": "寝室", "gui.tag_filter.modernlifepatch.door": "门", diff --git a/src/generated/resources/assets/modernlifepatch/models/block/black_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/black_concrete_barrier.json new file mode 100644 index 0000000..4943401 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/black_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/black_concrete", + "particle": "minecraft:block/black_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/blue_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/blue_concrete_barrier.json new file mode 100644 index 0000000..602d8fb --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/blue_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/blue_concrete", + "particle": "minecraft:block/blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/brown_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/brown_concrete_barrier.json new file mode 100644 index 0000000..c5e707d --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/brown_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/brown_concrete", + "particle": "minecraft:block/brown_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/cyan_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/cyan_concrete_barrier.json new file mode 100644 index 0000000..06b26e1 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/cyan_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/cyan_concrete", + "particle": "minecraft:block/cyan_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/gray_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/gray_concrete_barrier.json new file mode 100644 index 0000000..261ae30 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/gray_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/gray_concrete", + "particle": "minecraft:block/gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/green_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/green_concrete_barrier.json new file mode 100644 index 0000000..21717a4 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/green_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/green_concrete", + "particle": "minecraft:block/green_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/light_blue_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/light_blue_concrete_barrier.json new file mode 100644 index 0000000..5c25858 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/light_blue_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/light_blue_concrete", + "particle": "minecraft:block/light_blue_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/light_gray_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/light_gray_concrete_barrier.json new file mode 100644 index 0000000..967d348 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/light_gray_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/light_gray_concrete", + "particle": "minecraft:block/light_gray_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/lime_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/lime_concrete_barrier.json new file mode 100644 index 0000000..4c57810 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/lime_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/lime_concrete", + "particle": "minecraft:block/lime_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/magenta_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/magenta_concrete_barrier.json new file mode 100644 index 0000000..2f77141 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/magenta_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/magenta_concrete", + "particle": "minecraft:block/magenta_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/orange_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/orange_concrete_barrier.json new file mode 100644 index 0000000..d9a70da --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/orange_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/orange_concrete", + "particle": "minecraft:block/orange_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/pink_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/pink_concrete_barrier.json new file mode 100644 index 0000000..8d7b8fe --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/pink_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/pink_concrete", + "particle": "minecraft:block/pink_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/purple_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/purple_concrete_barrier.json new file mode 100644 index 0000000..1c2c3dc --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/purple_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/purple_concrete", + "particle": "minecraft:block/purple_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/red_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/red_concrete_barrier.json new file mode 100644 index 0000000..3d29a79 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/red_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/red_concrete", + "particle": "minecraft:block/red_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/white_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/white_concrete_barrier.json new file mode 100644 index 0000000..1e476c5 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/white_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/white_concrete", + "particle": "minecraft:block/white_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/block/yellow_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/block/yellow_concrete_barrier.json new file mode 100644 index 0000000..e766865 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/block/yellow_concrete_barrier.json @@ -0,0 +1,7 @@ +{ + "parent": "modernlifepatch:block/barrier", + "textures": { + "0": "minecraft:block/yellow_concrete", + "particle": "minecraft:block/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/black_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/black_concrete_barrier.json new file mode 100644 index 0000000..f949ab1 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/black_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/black_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/blue_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/blue_concrete_barrier.json new file mode 100644 index 0000000..5a31492 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/blue_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/blue_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/brown_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/brown_concrete_barrier.json new file mode 100644 index 0000000..d903514 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/brown_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/brown_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/cyan_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/cyan_concrete_barrier.json new file mode 100644 index 0000000..e0528b8 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/cyan_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/cyan_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/gray_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/gray_concrete_barrier.json new file mode 100644 index 0000000..8903fdf --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/gray_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/gray_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/green_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/green_concrete_barrier.json new file mode 100644 index 0000000..3862da6 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/green_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/green_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/light_blue_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/light_blue_concrete_barrier.json new file mode 100644 index 0000000..3e08ccb --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/light_blue_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/light_blue_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/light_gray_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/light_gray_concrete_barrier.json new file mode 100644 index 0000000..b84aec0 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/light_gray_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/light_gray_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/lime_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/lime_concrete_barrier.json new file mode 100644 index 0000000..ef6bd64 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/lime_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/lime_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/magenta_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/magenta_concrete_barrier.json new file mode 100644 index 0000000..73a4150 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/magenta_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/magenta_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/orange_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/orange_concrete_barrier.json new file mode 100644 index 0000000..5ba6618 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/orange_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/orange_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/pink_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/pink_concrete_barrier.json new file mode 100644 index 0000000..7440648 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/pink_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/pink_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/purple_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/purple_concrete_barrier.json new file mode 100644 index 0000000..c1fd44a --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/purple_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/purple_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/red_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/red_concrete_barrier.json new file mode 100644 index 0000000..d623fa8 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/red_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/red_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/white_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/white_concrete_barrier.json new file mode 100644 index 0000000..b92cf48 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/white_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/white_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/assets/modernlifepatch/models/item/yellow_concrete_barrier.json b/src/generated/resources/assets/modernlifepatch/models/item/yellow_concrete_barrier.json new file mode 100644 index 0000000..c9cbcb0 --- /dev/null +++ b/src/generated/resources/assets/modernlifepatch/models/item/yellow_concrete_barrier.json @@ -0,0 +1,3 @@ +{ + "parent": "modernlifepatch:block/yellow_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/black_concrete_barrier_from_black_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/black_concrete_barrier_from_black_concrete_stonecutting.json new file mode 100644 index 0000000..770ab16 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/black_concrete_barrier_from_black_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_black_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:black_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:black_concrete_barrier_from_black_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_black_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:black_concrete_barrier_from_black_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/blue_concrete_barrier_from_blue_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/blue_concrete_barrier_from_blue_concrete_stonecutting.json new file mode 100644 index 0000000..03236fd --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/blue_concrete_barrier_from_blue_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:blue_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:blue_concrete_barrier_from_blue_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_blue_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:blue_concrete_barrier_from_blue_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/brown_concrete_barrier_from_brown_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/brown_concrete_barrier_from_brown_concrete_stonecutting.json new file mode 100644 index 0000000..cc23022 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/brown_concrete_barrier_from_brown_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brown_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:brown_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:brown_concrete_barrier_from_brown_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_brown_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:brown_concrete_barrier_from_brown_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json new file mode 100644 index 0000000..a07e704 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cyan_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cyan_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cyan_concrete_barrier_from_cyan_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cyan_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cyan_concrete_barrier_from_cyan_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/gray_concrete_barrier_from_gray_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/gray_concrete_barrier_from_gray_concrete_stonecutting.json new file mode 100644 index 0000000..c5fffa1 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/gray_concrete_barrier_from_gray_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gray_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:gray_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:gray_concrete_barrier_from_gray_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_gray_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:gray_concrete_barrier_from_gray_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/green_concrete_barrier_from_green_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/green_concrete_barrier_from_green_concrete_stonecutting.json new file mode 100644 index 0000000..0acd37a --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/green_concrete_barrier_from_green_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:green_concrete_barrier_from_green_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:green_concrete_barrier_from_green_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json new file mode 100644 index 0000000..ec0630e --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_blue_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:light_blue_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:light_blue_concrete_barrier_from_light_blue_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_light_blue_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:light_blue_concrete_barrier_from_light_blue_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json new file mode 100644 index 0000000..4f7a611 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_gray_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:light_gray_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:light_gray_concrete_barrier_from_light_gray_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_light_gray_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:light_gray_concrete_barrier_from_light_gray_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/lime_concrete_barrier_from_lime_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/lime_concrete_barrier_from_lime_concrete_stonecutting.json new file mode 100644 index 0000000..441639f --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/lime_concrete_barrier_from_lime_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lime_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:lime_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:lime_concrete_barrier_from_lime_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_lime_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:lime_concrete_barrier_from_lime_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json new file mode 100644 index 0000000..a33c946 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_magenta_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:magenta_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:magenta_concrete_barrier_from_magenta_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_magenta_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:magenta_concrete_barrier_from_magenta_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/orange_concrete_barrier_from_orange_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/orange_concrete_barrier_from_orange_concrete_stonecutting.json new file mode 100644 index 0000000..8e1747f --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/orange_concrete_barrier_from_orange_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_orange_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:orange_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:orange_concrete_barrier_from_orange_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_orange_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:orange_concrete_barrier_from_orange_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/pink_concrete_barrier_from_pink_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/pink_concrete_barrier_from_pink_concrete_stonecutting.json new file mode 100644 index 0000000..da1e125 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/pink_concrete_barrier_from_pink_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_pink_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:pink_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:pink_concrete_barrier_from_pink_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_pink_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:pink_concrete_barrier_from_pink_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/purple_concrete_barrier_from_purple_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/purple_concrete_barrier_from_purple_concrete_stonecutting.json new file mode 100644 index 0000000..2c509d3 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/purple_concrete_barrier_from_purple_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_purple_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:purple_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:purple_concrete_barrier_from_purple_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_purple_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:purple_concrete_barrier_from_purple_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/red_concrete_barrier_from_red_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/red_concrete_barrier_from_red_concrete_stonecutting.json new file mode 100644 index 0000000..3e7461d --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/red_concrete_barrier_from_red_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_red_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:red_concrete_barrier_from_red_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_red_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:red_concrete_barrier_from_red_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/white_concrete_barrier_from_white_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/white_concrete_barrier_from_white_concrete_stonecutting.json new file mode 100644 index 0000000..b143fc5 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/white_concrete_barrier_from_white_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:white_concrete_barrier_from_white_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:white_concrete_barrier_from_white_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json new file mode 100644 index 0000000..aaaec1f --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:yellow_concrete_barrier_from_yellow_concrete_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_concrete": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:yellow_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_yellow_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:yellow_concrete_barrier_from_yellow_concrete_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/black_concrete_barrier_from_black_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/black_concrete_barrier_from_black_concrete_stonecutting.json new file mode 100644 index 0000000..9853bdc --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/black_concrete_barrier_from_black_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:black_concrete" + }, + "result": "modernlifepatch:black_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/blue_concrete_barrier_from_blue_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/blue_concrete_barrier_from_blue_concrete_stonecutting.json new file mode 100644 index 0000000..04b0639 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/blue_concrete_barrier_from_blue_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:blue_concrete" + }, + "result": "modernlifepatch:blue_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/brown_concrete_barrier_from_brown_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/brown_concrete_barrier_from_brown_concrete_stonecutting.json new file mode 100644 index 0000000..545de4f --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/brown_concrete_barrier_from_brown_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:brown_concrete" + }, + "result": "modernlifepatch:brown_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json new file mode 100644 index 0000000..4ae3d36 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/cyan_concrete_barrier_from_cyan_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:cyan_concrete" + }, + "result": "modernlifepatch:cyan_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/gray_concrete_barrier_from_gray_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/gray_concrete_barrier_from_gray_concrete_stonecutting.json new file mode 100644 index 0000000..511677b --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/gray_concrete_barrier_from_gray_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:gray_concrete" + }, + "result": "modernlifepatch:gray_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/green_concrete_barrier_from_green_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/green_concrete_barrier_from_green_concrete_stonecutting.json new file mode 100644 index 0000000..8fcb5ea --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/green_concrete_barrier_from_green_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:green_concrete" + }, + "result": "modernlifepatch:green_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json new file mode 100644 index 0000000..2ed232c --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/light_blue_concrete_barrier_from_light_blue_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:light_blue_concrete" + }, + "result": "modernlifepatch:light_blue_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json new file mode 100644 index 0000000..70af6b8 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/light_gray_concrete_barrier_from_light_gray_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:light_gray_concrete" + }, + "result": "modernlifepatch:light_gray_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/lime_concrete_barrier_from_lime_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/lime_concrete_barrier_from_lime_concrete_stonecutting.json new file mode 100644 index 0000000..88a6486 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/lime_concrete_barrier_from_lime_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:lime_concrete" + }, + "result": "modernlifepatch:lime_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json new file mode 100644 index 0000000..e268de2 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/magenta_concrete_barrier_from_magenta_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:magenta_concrete" + }, + "result": "modernlifepatch:magenta_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/orange_concrete_barrier_from_orange_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/orange_concrete_barrier_from_orange_concrete_stonecutting.json new file mode 100644 index 0000000..3349ae8 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/orange_concrete_barrier_from_orange_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:orange_concrete" + }, + "result": "modernlifepatch:orange_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/pink_concrete_barrier_from_pink_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/pink_concrete_barrier_from_pink_concrete_stonecutting.json new file mode 100644 index 0000000..242903a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/pink_concrete_barrier_from_pink_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:pink_concrete" + }, + "result": "modernlifepatch:pink_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/purple_concrete_barrier_from_purple_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/purple_concrete_barrier_from_purple_concrete_stonecutting.json new file mode 100644 index 0000000..c70d6cd --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/purple_concrete_barrier_from_purple_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:purple_concrete" + }, + "result": "modernlifepatch:purple_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/red_concrete_barrier_from_red_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/red_concrete_barrier_from_red_concrete_stonecutting.json new file mode 100644 index 0000000..27c00af --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/red_concrete_barrier_from_red_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:red_concrete" + }, + "result": "modernlifepatch:red_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/white_concrete_barrier_from_white_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/white_concrete_barrier_from_white_concrete_stonecutting.json new file mode 100644 index 0000000..40787d5 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/white_concrete_barrier_from_white_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:white_concrete" + }, + "result": "modernlifepatch:white_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json b/src/generated/resources/data/minecraft/recipes/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json new file mode 100644 index 0000000..0c4fba9 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "minecraft:yellow_concrete" + }, + "result": "modernlifepatch:yellow_concrete_barrier" +} \ 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 new file mode 100644 index 0000000..0a78353 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -0,0 +1,20 @@ +{ + "values": [ + "modernlifepatch:white_concrete_barrier", + "modernlifepatch:orange_concrete_barrier", + "modernlifepatch:magenta_concrete_barrier", + "modernlifepatch:light_blue_concrete_barrier", + "modernlifepatch:yellow_concrete_barrier", + "modernlifepatch:lime_concrete_barrier", + "modernlifepatch:pink_concrete_barrier", + "modernlifepatch:gray_concrete_barrier", + "modernlifepatch:light_gray_concrete_barrier", + "modernlifepatch:cyan_concrete_barrier", + "modernlifepatch:purple_concrete_barrier", + "modernlifepatch:blue_concrete_barrier", + "modernlifepatch:brown_concrete_barrier", + "modernlifepatch:green_concrete_barrier", + "modernlifepatch:red_concrete_barrier", + "modernlifepatch:black_concrete_barrier" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/black_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/black_concrete_barrier.json new file mode 100644 index 0000000..247b63e --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/black_concrete_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:black_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/black_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/blue_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/blue_concrete_barrier.json new file mode 100644 index 0000000..35d5fc4 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/blue_concrete_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:blue_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/blue_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/brown_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/brown_concrete_barrier.json new file mode 100644 index 0000000..6ef783f --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/brown_concrete_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:brown_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/brown_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/cyan_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/cyan_concrete_barrier.json new file mode 100644 index 0000000..7c9f234 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/cyan_concrete_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:cyan_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/cyan_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/gray_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/gray_concrete_barrier.json new file mode 100644 index 0000000..7fd18d8 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/gray_concrete_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:gray_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/gray_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/green_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/green_concrete_barrier.json new file mode 100644 index 0000000..ee7565f --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/green_concrete_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:green_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/green_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/light_blue_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/light_blue_concrete_barrier.json new file mode 100644 index 0000000..f75999c --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/light_blue_concrete_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:light_blue_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/light_blue_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/light_gray_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/light_gray_concrete_barrier.json new file mode 100644 index 0000000..fae5602 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/light_gray_concrete_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:light_gray_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/light_gray_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/lime_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/lime_concrete_barrier.json new file mode 100644 index 0000000..ecc2ad3 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/lime_concrete_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:lime_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/lime_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/magenta_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/magenta_concrete_barrier.json new file mode 100644 index 0000000..5b5bcd4 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/magenta_concrete_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:magenta_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/magenta_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/orange_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/orange_concrete_barrier.json new file mode 100644 index 0000000..ccc5044 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/orange_concrete_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:orange_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/orange_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/pink_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/pink_concrete_barrier.json new file mode 100644 index 0000000..7409c7f --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/pink_concrete_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:pink_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/pink_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/purple_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/purple_concrete_barrier.json new file mode 100644 index 0000000..fb34ed7 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/purple_concrete_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:purple_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/purple_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/red_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/red_concrete_barrier.json new file mode 100644 index 0000000..01a22fd --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/red_concrete_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:red_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/red_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/white_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/white_concrete_barrier.json new file mode 100644 index 0000000..2ca5d38 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/white_concrete_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:white_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/white_concrete_barrier" +} \ No newline at end of file diff --git a/src/generated/resources/data/modernlifepatch/loot_tables/blocks/yellow_concrete_barrier.json b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/yellow_concrete_barrier.json new file mode 100644 index 0000000..8a00a29 --- /dev/null +++ b/src/generated/resources/data/modernlifepatch/loot_tables/blocks/yellow_concrete_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:yellow_concrete_barrier" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "modernlifepatch:blocks/yellow_concrete_barrier" +} \ No newline at end of file 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 7210f6a..2d78ff5 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/content/blocks/ModBlocks.java +++ b/src/main/java/com/r3944realms/modernlifepatch/content/blocks/ModBlocks.java @@ -1,5 +1,6 @@ package com.r3944realms.modernlifepatch.content.blocks; +import com.dairymoose.modernlife.blocks.BarrierBlock; import com.r3944realms.modernlifepatch.ModernLifePatch; import com.r3944realms.modernlifepatch.content.blocks.type.mirror.MirrorBlock; import com.r3944realms.modernlifepatch.content.blocks.type.mirror.MirrorPart; @@ -27,6 +28,40 @@ public class ModBlocks { () -> new MirrorBlock(BlockBehaviour.Properties.copy(Blocks.GLASS), MirrorPart.MirrorType.LARGE_MIRROR)); public static final RegistryObject MASSIVE_MIRROR = BLOCKS.register("massive_mirror" , () -> new MirrorBlock(BlockBehaviour.Properties.copy(Blocks.GLASS), MirrorPart.MirrorType.MASSIVE_MIRROR)); + //BARRIER + public static final RegistryObject LIGHT_GRAY_CONCRETE_BARRIER = BLOCKS.register("light_gray_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.LIGHT_GRAY_CONCRETE))); + public static final RegistryObject WHITE_CONCRETE_BARRIER = BLOCKS.register("white_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.WHITE_CONCRETE))); + public static final RegistryObject ORANGE_CONCRETE_BARRIER = BLOCKS.register("orange_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.ORANGE_CONCRETE))); + public static final RegistryObject MAGENTA_CONCRETE_BARRIER = BLOCKS.register("magenta_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.MAGENTA_CONCRETE))); + public static final RegistryObject LIGHT_BLUE_CONCRETE_BARRIER = BLOCKS.register("light_blue_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.LIGHT_BLUE_CONCRETE))); + public static final RegistryObject YELLOW_CONCRETE_BARRIER = BLOCKS.register("yellow_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.YELLOW_CONCRETE))); + public static final RegistryObject LIME_CONCRETE_BARRIER = BLOCKS.register("lime_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.LIME_CONCRETE))); + public static final RegistryObject PINK_CONCRETE_BARRIER = BLOCKS.register("pink_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.PINK_CONCRETE))); + public static final RegistryObject GRAY_CONCRETE_BARRIER = BLOCKS.register("gray_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.GRAY_CONCRETE))); + public static final RegistryObject CYAN_CONCRETE_BARRIER = BLOCKS.register("cyan_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.CYAN_CONCRETE))); + public static final RegistryObject PURPLE_CONCRETE_BARRIER = BLOCKS.register("purple_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.PURPLE_CONCRETE))); + public static final RegistryObject BLUE_CONCRETE_BARRIER = BLOCKS.register("blue_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.BLUE_CONCRETE))); + public static final RegistryObject BROWN_CONCRETE_BARRIER = BLOCKS.register("brown_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.BROWN_CONCRETE))); + public static final RegistryObject GREEN_CONCRETE_BARRIER = BLOCKS.register("green_concrete_barrier", + () -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.GREEN_CONCRETE))); + public static final RegistryObject RED_CONCRETE_BARRIER = BLOCKS.register("red_concrete_barrier", + () -> 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))); + @SuppressWarnings("UnusedReturnValue") public static RegistryObject registerBlockItem(String name , RegistryObject block){ return ModItems.register(name,() -> new BlockItem(block.get(),new Item.Properties())); 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 cf057c7..b808d58 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/content/item/ModItems.java +++ b/src/main/java/com/r3944realms/modernlifepatch/content/item/ModItems.java @@ -19,6 +19,23 @@ public class ModItems { public static final RegistryObject TALL_MIRROR_ITEM = ModBlocks.registerBlockItem("tall_mirror", ModBlocks.TALL_MIRROR); public static final RegistryObject LARGE_MIRROR_ITEM = ModBlocks.registerBlockItem("large_mirror", ModBlocks.LARGE_MIRROR); public static final RegistryObject MASSIVE_MIRROR_ITEM = ModBlocks.registerBlockItem("massive_mirror", ModBlocks.MASSIVE_MIRROR); + //BARRIER_ITEM + public static final RegistryObject LIGHT_GRAY_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("light_gray_concrete_barrier", ModBlocks.LIGHT_GRAY_CONCRETE_BARRIER); + public static final RegistryObject WHITE_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("white_concrete_barrier", ModBlocks.WHITE_CONCRETE_BARRIER); + public static final RegistryObject ORANGE_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("orange_concrete_barrier", ModBlocks.ORANGE_CONCRETE_BARRIER); + public static final RegistryObject MAGENTA_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("magenta_concrete_barrier", ModBlocks.MAGENTA_CONCRETE_BARRIER); + public static final RegistryObject LIGHT_BLUE_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("light_blue_concrete_barrier", ModBlocks.LIGHT_BLUE_CONCRETE_BARRIER); + public static final RegistryObject YELLOW_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("yellow_concrete_barrier", ModBlocks.YELLOW_CONCRETE_BARRIER); + public static final RegistryObject LIME_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("lime_concrete_barrier", ModBlocks.LIME_CONCRETE_BARRIER); + public static final RegistryObject PINK_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("pink_concrete_barrier", ModBlocks.PINK_CONCRETE_BARRIER); + public static final RegistryObject GRAY_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("gray_concrete_barrier", ModBlocks.GRAY_CONCRETE_BARRIER); + public static final RegistryObject CYAN_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("cyan_concrete_barrier", ModBlocks.CYAN_CONCRETE_BARRIER); + public static final RegistryObject PURPLE_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("purple_concrete_barrier", ModBlocks.PURPLE_CONCRETE_BARRIER); + public static final RegistryObject BLUE_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("blue_concrete_barrier", ModBlocks.BLUE_CONCRETE_BARRIER); + public static final RegistryObject BROWN_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("brown_concrete_barrier", ModBlocks.BROWN_CONCRETE_BARRIER); + 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 RegistryObject register(String name, Supplier sup) { return ITEMS.register(name, sup); } diff --git a/src/main/java/com/r3944realms/modernlifepatch/datagen/DataGeneratorHandler.java b/src/main/java/com/r3944realms/modernlifepatch/datagen/DataGeneratorHandler.java index c155ba9..2fa5070 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/DataGeneratorHandler.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/DataGeneratorHandler.java @@ -27,6 +27,7 @@ public class DataGeneratorHandler { generator.addProvider(event.includeClient(), new ModLanguageProvider(output, LanguageEnum.SimpleChinese)); generator.addProvider(event.includeClient(), new ModItemModelProvider(output, existingFileHelper)); generator.addProvider(event.includeClient(), new ModBlockModelProvider(output, existingFileHelper)); + generator.addProvider(event.includeClient(), new ModBlockStatesProvider(output, existingFileHelper)); generator.addProvider(event.includeServer(), new ModLootTableProvider(output)); generator.addProvider(event.includeServer(), new ModRecipeProvider(output)); generator.addProvider(event.includeServer(), modBlockTagProvider); 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 6e24939..58322c3 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/lang/ModLangKeyValue.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/lang/ModLangKeyValue.java @@ -136,8 +136,42 @@ public enum ModLangKeyValue { CANVAS_HOVER_DESC_SIZE_EXTRA_LARGE_SQUARE(getHoverTextKey("canvas", "extra_large_square_size"), "Extra Large square", "超大型方寸画作"), CANVAS_HOVER_DESC_SIZE_MASSIVE_SQUARE(getHoverTextKey("canvas", "massive_square_size"),"Massive square print","巨大方寸画作"), CANVAS_HOVER_DESC_SIZE_CUSTOM(getHoverTextKey("canvas", "custom_size"), "Custom print", "自定义尺寸画作"), + //BARRIER + LIGHT_GRAY_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.LIGHT_GRAY_CONCRETE_BARRIER_ITEM.get()), "Light Gray Concrete Barrier", "淡灰色混凝土栅栏"), + LIGHT_GRAY_CONCRETE_BARRIER(getBlockKey(ModBlocks.LIGHT_GRAY_CONCRETE_BARRIER.get()), copyEnglish(LIGHT_GRAY_CONCRETE_BARRIER_ITEM), copySimpleChinese(LIGHT_GRAY_CONCRETE_BARRIER_ITEM)), + WHITE_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.WHITE_CONCRETE_BARRIER_ITEM.get()), "White Concrete Barrier", "白色混凝土栅栏"), + WHITE_CONCRETE_BARRIER(getBlockKey(ModBlocks.WHITE_CONCRETE_BARRIER.get()), copyEnglish(WHITE_CONCRETE_BARRIER_ITEM), copySimpleChinese(WHITE_CONCRETE_BARRIER_ITEM)), + ORANGE_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.ORANGE_CONCRETE_BARRIER_ITEM.get()), "Orange Concrete Barrier", "橙色混凝土栅栏"), + ORANGE_CONCRETE_BARRIER(getBlockKey(ModBlocks.ORANGE_CONCRETE_BARRIER.get()), copyEnglish(ORANGE_CONCRETE_BARRIER_ITEM), copySimpleChinese(ORANGE_CONCRETE_BARRIER_ITEM)), + MAGENTA_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.MAGENTA_CONCRETE_BARRIER_ITEM.get()), "Magenta Concrete Barrier", "品红色混凝土栅栏"), + MAGENTA_CONCRETE_BARRIER(getBlockKey(ModBlocks.MAGENTA_CONCRETE_BARRIER.get()), copyEnglish(MAGENTA_CONCRETE_BARRIER_ITEM), copySimpleChinese(MAGENTA_CONCRETE_BARRIER_ITEM)), + LIGHT_BLUE_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.LIGHT_BLUE_CONCRETE_BARRIER_ITEM.get()), "Light Blue Concrete Barrier", "淡蓝色混凝土栅栏"), + LIGHT_BLUE_CONCRETE_BARRIER(getBlockKey(ModBlocks.LIGHT_BLUE_CONCRETE_BARRIER.get()), copyEnglish(LIGHT_BLUE_CONCRETE_BARRIER_ITEM), copySimpleChinese(LIGHT_BLUE_CONCRETE_BARRIER_ITEM)), + YELLOW_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.YELLOW_CONCRETE_BARRIER_ITEM.get()), "Yellow Concrete Barrier", "黄色混凝土栅栏"), + YELLOW_CONCRETE_BARRIER(getBlockKey(ModBlocks.YELLOW_CONCRETE_BARRIER.get()), copyEnglish(YELLOW_CONCRETE_BARRIER_ITEM), copySimpleChinese(YELLOW_CONCRETE_BARRIER_ITEM)), + LIME_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.LIME_CONCRETE_BARRIER_ITEM.get()), "Lime Concrete Barrier", "黄绿色混凝土栅栏"), + LIME_CONCRETE_BARRIER(getBlockKey(ModBlocks.LIME_CONCRETE_BARRIER.get()), copyEnglish(LIME_CONCRETE_BARRIER_ITEM), copySimpleChinese(LIME_CONCRETE_BARRIER_ITEM)), + PINK_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.PINK_CONCRETE_BARRIER_ITEM.get()), "Pink Concrete Barrier", "粉红色混凝土栅栏"), + PINK_CONCRETE_BARRIER(getBlockKey(ModBlocks.PINK_CONCRETE_BARRIER.get()), copyEnglish(PINK_CONCRETE_BARRIER_ITEM), copySimpleChinese(PINK_CONCRETE_BARRIER_ITEM)), + GRAY_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.GRAY_CONCRETE_BARRIER_ITEM.get()), "Gray Concrete Barrier", "灰色混凝土栅栏"), + GRAY_CONCRETE_BARRIER(getBlockKey(ModBlocks.GRAY_CONCRETE_BARRIER.get()), copyEnglish(GRAY_CONCRETE_BARRIER_ITEM), copySimpleChinese(GRAY_CONCRETE_BARRIER_ITEM)), + CYAN_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.CYAN_CONCRETE_BARRIER_ITEM.get()), "Cyan Concrete Barrier", "青色混凝土栅栏"), + CYAN_CONCRETE_BARRIER(getBlockKey(ModBlocks.CYAN_CONCRETE_BARRIER.get()), copyEnglish(CYAN_CONCRETE_BARRIER_ITEM), copySimpleChinese(CYAN_CONCRETE_BARRIER_ITEM)), + PURPLE_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.PURPLE_CONCRETE_BARRIER_ITEM.get()), "Purple Concrete Barrier", "紫色混凝土栅栏"), + PURPLE_CONCRETE_BARRIER(getBlockKey(ModBlocks.PURPLE_CONCRETE_BARRIER.get()), copyEnglish(PURPLE_CONCRETE_BARRIER_ITEM), copySimpleChinese(PURPLE_CONCRETE_BARRIER_ITEM)), + BLUE_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.BLUE_CONCRETE_BARRIER_ITEM.get()), "Blue Concrete Barrier", "蓝色混凝土栅栏"), + BLUE_CONCRETE_BARRIER(getBlockKey(ModBlocks.BLUE_CONCRETE_BARRIER.get()), copyEnglish(BLUE_CONCRETE_BARRIER_ITEM), copySimpleChinese(BLUE_CONCRETE_BARRIER_ITEM)), + BROWN_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.BROWN_CONCRETE_BARRIER_ITEM.get()), "Brown Concrete Barrier", "棕色混凝土栅栏"), + BROWN_CONCRETE_BARRIER(getBlockKey(ModBlocks.BROWN_CONCRETE_BARRIER.get()), copyEnglish(BROWN_CONCRETE_BARRIER_ITEM), copySimpleChinese(BROWN_CONCRETE_BARRIER_ITEM)), + GREEN_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.GREEN_CONCRETE_BARRIER_ITEM.get()), "Green Concrete Barrier", "绿色混凝土栅栏"), + GREEN_CONCRETE_BARRIER(getBlockKey(ModBlocks.GREEN_CONCRETE_BARRIER.get()), copyEnglish(GREEN_CONCRETE_BARRIER_ITEM), copySimpleChinese(GREEN_CONCRETE_BARRIER_ITEM)), + RED_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.RED_CONCRETE_BARRIER_ITEM.get()), "Red Concrete Barrier", "红色混凝土栅栏"), + 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)), ; + private final String key; private final String US_EN; private final String SIM_CN; 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 75eac92..2ec07e2 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockModelProvider.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockModelProvider.java @@ -1,42 +1,50 @@ 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; -import net.minecraftforge.client.model.generators.BlockModelBuilder; -import net.minecraftforge.client.model.generators.BlockStateProvider; -import net.minecraftforge.client.model.generators.ModelProvider; +import net.minecraftforge.client.model.generators.BlockModelProvider; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.ForgeRegistries; -public class ModBlockModelProvider extends BlockStateProvider { +import java.util.Objects; + +public class ModBlockModelProvider extends BlockModelProvider { + private static final ResourceLocation MODERN_LIFE_BARRIER = new ResourceLocation(ModernLifePatch.MOD_ID, "block/barrier"); public ModBlockModelProvider(PackOutput packOutput, ExistingFileHelper existingFileHelper) { super(packOutput, ModernLifePatch.MOD_ID, existingFileHelper); } - - public void registerStatesAndModels(Block block) { - this.simpleBlock(block, this.cubeAll(block)); - } - public ResourceLocation blockTextureSuffix(Block block,String suffix) { - ResourceLocation name = key(block); - return new ResourceLocation(name.getNamespace(), ModelProvider.BLOCK_FOLDER + "/" + name.getPath() + suffix); - } - private ResourceLocation key(Block block) { - return ForgeRegistries.BLOCKS.getKey(block); - } - @Override - protected void registerStatesAndModels() { - + protected void registerModels() { + registerBarrierModel(ModBlocks.LIGHT_GRAY_CONCRETE_BARRIER.get(), new ResourceLocation("block/light_gray_concrete")); + registerBarrierModel(ModBlocks.WHITE_CONCRETE_BARRIER.get(), new ResourceLocation("block/white_concrete")); + registerBarrierModel(ModBlocks.ORANGE_CONCRETE_BARRIER.get(), new ResourceLocation("block/orange_concrete")); + registerBarrierModel(ModBlocks.MAGENTA_CONCRETE_BARRIER.get(), new ResourceLocation("block/magenta_concrete")); + registerBarrierModel(ModBlocks.LIGHT_BLUE_CONCRETE_BARRIER.get(), new ResourceLocation("block/light_blue_concrete")); + registerBarrierModel(ModBlocks.YELLOW_CONCRETE_BARRIER.get(), new ResourceLocation("block/yellow_concrete")); + registerBarrierModel(ModBlocks.LIME_CONCRETE_BARRIER.get(), new ResourceLocation("block/lime_concrete")); + registerBarrierModel(ModBlocks.PINK_CONCRETE_BARRIER.get(), new ResourceLocation("block/pink_concrete")); + registerBarrierModel(ModBlocks.GRAY_CONCRETE_BARRIER.get(), new ResourceLocation("block/gray_concrete")); + registerBarrierModel(ModBlocks.CYAN_CONCRETE_BARRIER.get(), new ResourceLocation("block/cyan_concrete")); + registerBarrierModel(ModBlocks.PURPLE_CONCRETE_BARRIER.get(), new ResourceLocation("block/purple_concrete")); + registerBarrierModel(ModBlocks.BLUE_CONCRETE_BARRIER.get(), new ResourceLocation("block/blue_concrete")); + registerBarrierModel(ModBlocks.BROWN_CONCRETE_BARRIER.get(), new ResourceLocation("block/brown_concrete")); + 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")); } - - public void generateJasmineBlockState(Block block) { - BlockModelBuilder model = models().cubeAll(name(block), blockTexture(block)); - simpleBlock(block,model); - } - public String name(Block block) { - return key(block).getPath(); + public void registerBarrierModel(Block barrierBlock, ResourceLocation vanillaBlock) { + withExistingParent( + Objects.requireNonNull( + ForgeRegistries.BLOCKS.getKey(barrierBlock)).getPath(), + MODERN_LIFE_BARRIER) + .texture("0", Objects.requireNonNull( + vanillaBlock)) + .texture("particle",Objects.requireNonNull( + vanillaBlock)); } } diff --git a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockStatesProvider.java b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockStatesProvider.java new file mode 100644 index 0000000..ac19dd0 --- /dev/null +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockStatesProvider.java @@ -0,0 +1,52 @@ +package com.r3944realms.modernlifepatch.datagen.provider; + +import com.r3944realms.modernlifepatch.ModernLifePatch; +import com.r3944realms.modernlifepatch.content.blocks.ModBlocks; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +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; + +public class ModBlockStatesProvider extends BlockStateProvider { + public ModBlockStatesProvider(PackOutput packOutput, ExistingFileHelper existingFileHelper) { + super(packOutput, ModernLifePatch.MOD_ID, existingFileHelper); + } + + private ResourceLocation key(Block block) { + return ForgeRegistries.BLOCKS.getKey(block); + } + + @Override + protected void registerStatesAndModels() { + registerBarrierStates(ModBlocks.LIGHT_GRAY_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/light_gray_concrete_barrier")); + registerBarrierStates(ModBlocks.WHITE_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/white_concrete_barrier")); + registerBarrierStates(ModBlocks.ORANGE_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/orange_concrete_barrier")); + registerBarrierStates(ModBlocks.MAGENTA_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/magenta_concrete_barrier")); + registerBarrierStates(ModBlocks.LIGHT_BLUE_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/light_blue_concrete_barrier")); + registerBarrierStates(ModBlocks.YELLOW_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/yellow_concrete_barrier")); + registerBarrierStates(ModBlocks.LIME_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/lime_concrete_barrier")); + registerBarrierStates(ModBlocks.PINK_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/pink_concrete_barrier")); + registerBarrierStates(ModBlocks.GRAY_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/gray_concrete_barrier")); + registerBarrierStates(ModBlocks.CYAN_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/cyan_concrete_barrier")); + registerBarrierStates(ModBlocks.PURPLE_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/purple_concrete_barrier")); + registerBarrierStates(ModBlocks.BLUE_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/blue_concrete_barrier")); + registerBarrierStates(ModBlocks.BROWN_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/brown_concrete_barrier")); + 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")); + } + public void registerBarrierStates(Block block, ResourceLocation location) { + ModelFile.ExistingModelFile existingFile = models().getExistingFile(location); + horizontalBlock(block, existingFile, 0); + simpleBlockItem(block, existingFile); + } + + public String name(Block block) { + return key(block).getPath(); + } +} 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 8ffae67..1fcd5c3 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockTagProvider.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModBlockTagProvider.java @@ -1,8 +1,10 @@ package com.r3944realms.modernlifepatch.datagen.provider; import com.r3944realms.modernlifepatch.ModernLifePatch; +import com.r3944realms.modernlifepatch.content.blocks.ModBlocks; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; +import net.minecraft.tags.BlockTags; import net.minecraftforge.common.data.BlockTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.NotNull; @@ -19,6 +21,24 @@ public class ModBlockTagProvider extends BlockTagsProvider { @Override protected void addTags(HolderLookup.@NotNull Provider pProvider) { - + tag(BlockTags.MINEABLE_WITH_PICKAXE) + .add( + ModBlocks.WHITE_CONCRETE_BARRIER.get(), + ModBlocks.ORANGE_CONCRETE_BARRIER.get(), + ModBlocks.MAGENTA_CONCRETE_BARRIER.get(), + ModBlocks.LIGHT_BLUE_CONCRETE_BARRIER.get(), + ModBlocks.YELLOW_CONCRETE_BARRIER.get(), + ModBlocks.LIME_CONCRETE_BARRIER.get(), + ModBlocks.PINK_CONCRETE_BARRIER.get(), + ModBlocks.GRAY_CONCRETE_BARRIER.get(), + ModBlocks.LIGHT_GRAY_CONCRETE_BARRIER.get(), + ModBlocks.CYAN_CONCRETE_BARRIER.get(), + ModBlocks.PURPLE_CONCRETE_BARRIER.get(), + ModBlocks.BLUE_CONCRETE_BARRIER.get(), + ModBlocks.BROWN_CONCRETE_BARRIER.get(), + ModBlocks.GREEN_CONCRETE_BARRIER.get(), + ModBlocks.RED_CONCRETE_BARRIER.get(), + ModBlocks.BLACK_CONCRETE_BARRIER.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 f8d4913..0ff4047 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModRecipeProvider.java +++ b/src/main/java/com/r3944realms/modernlifepatch/datagen/provider/ModRecipeProvider.java @@ -41,5 +41,22 @@ public class ModRecipeProvider extends RecipeProvider { .pattern("@@@") .unlockedBy("has_item_mirror", has(ModItems.MIRROR_ITEM.get())) .save(pWriter); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.LIGHT_GRAY_CONCRETE_BARRIER_ITEM.get(), Items.LIGHT_GRAY_CONCRETE,2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.WHITE_CONCRETE_BARRIER_ITEM.get(), Items.WHITE_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.ORANGE_CONCRETE_BARRIER_ITEM.get(), Items.ORANGE_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.MAGENTA_CONCRETE_BARRIER_ITEM.get(), Items.MAGENTA_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.LIGHT_BLUE_CONCRETE_BARRIER_ITEM.get(), Items.LIGHT_BLUE_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.YELLOW_CONCRETE_BARRIER_ITEM.get(), Items.YELLOW_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.LIME_CONCRETE_BARRIER_ITEM.get(), Items.LIME_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.PINK_CONCRETE_BARRIER_ITEM.get(), Items.PINK_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.GRAY_CONCRETE_BARRIER_ITEM.get(), Items.GRAY_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.CYAN_CONCRETE_BARRIER_ITEM.get(), Items.CYAN_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.PURPLE_CONCRETE_BARRIER_ITEM.get(), Items.PURPLE_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.BLUE_CONCRETE_BARRIER_ITEM.get(), Items.BLUE_CONCRETE, 2); + stonecutterResultFromBase(pWriter, RecipeCategory.DECORATIONS, ModItems.BROWN_CONCRETE_BARRIER_ITEM.get(), Items.BROWN_CONCRETE, 2); + 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); + } } 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 86dd112..aa2dd49 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 @@ -22,6 +22,22 @@ public class ModBlockLootTables extends BlockLootSubProvider { this.dropSelf(ModBlocks.TALL_MIRROR.get()); this.dropSelf(ModBlocks.LARGE_MIRROR.get()); this.dropSelf(ModBlocks.MASSIVE_MIRROR.get()); + this.dropSelf(ModBlocks.WHITE_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.ORANGE_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.MAGENTA_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.LIGHT_BLUE_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.YELLOW_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.LIME_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.PINK_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.GRAY_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.LIGHT_GRAY_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.CYAN_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.PURPLE_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.BLUE_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.BROWN_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.GREEN_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.RED_CONCRETE_BARRIER.get()); + this.dropSelf(ModBlocks.BLACK_CONCRETE_BARRIER.get()); } @Override diff --git a/src/main/java/com/r3944realms/modernlifepatch/mixin/MLPMixinPlugin.java b/src/main/java/com/r3944realms/modernlifepatch/mixin/MLPMixinPlugin.java index 254d093..8815ad5 100644 --- a/src/main/java/com/r3944realms/modernlifepatch/mixin/MLPMixinPlugin.java +++ b/src/main/java/com/r3944realms/modernlifepatch/mixin/MLPMixinPlugin.java @@ -20,9 +20,21 @@ public class MLPMixinPlugin implements IMixinConfigPlugin { @Override public boolean shouldApplyMixin(String s, String s1) { + boolean isRegister = s.split("com\\.r3944realms\\.modernlifepatch\\.mixin\\.")[0].split("\\.")[0].equals("runData"); + if (isRegister) { + return isDataGeneration(); + } return true; } + private boolean isDataGeneration() { + // 使用你的逻辑来检查是否在数据生成阶段 + String environment = System.getProperty("gradle.task"); + return "runData".equals(environment); + } + + + @Override public void acceptTargets(Set set, Set set1) { diff --git a/src/main/resources/assets/modernlifepatch/models/block/barrier.json b/src/main/resources/assets/modernlifepatch/models/block/barrier.json new file mode 100644 index 0000000..7fd4cea --- /dev/null +++ b/src/main/resources/assets/modernlifepatch/models/block/barrier.json @@ -0,0 +1,66 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "block/0", + "particle": "block/0" + }, + "elements": [ + { + "from": [0, 0, 12], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 4, 16], "texture": "#0"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 4, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 16, 4], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 4], "texture": "#0"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "translation": [0, 3, -4], + "scale": [0.55, 0.55, 0.55] + }, + "thirdperson_lefthand": { + "translation": [0, 3, -4], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson_righthand": { + "rotation": [0, -90, 25], + "translation": [2.63, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "firstperson_lefthand": { + "rotation": [0, -90, 25], + "translation": [2.63, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [20, 20, 0], + "translation": [-1.75, 1.75, 0], + "scale": [0.7, 0.7, 0.7] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, 4.75] + } + }, + "groups": [ + { + "name": "VoxelShapes", + "origin": [8, 8, 8], + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/modernlifepatch/tags/items/outside.json b/src/main/resources/data/modernlifepatch/tags/items/outside.json index 93c2ec2..4e72d6e 100644 --- a/src/main/resources/data/modernlifepatch/tags/items/outside.json +++ b/src/main/resources/data/modernlifepatch/tags/items/outside.json @@ -1,8 +1,6 @@ { "replace": false, "values": [ - "modernlife:grass_ramp", - "modernlife:end_stone_ramp", "modernlife:cobblestone_ramp", "modernlife:stone_ramp", "modernlife:stone_bricks_ramp", @@ -138,6 +136,22 @@ "modernlife:warped_deck", "modernlife:floor_mat", "modernlife:lantern_post", - "modernlife:street_light" + "modernlife:street_light", + "modernlifepatch:white_concrete_barrier", + "modernlifepatch:orange_concrete_barrier", + "modernlifepatch:magenta_concrete_barrier", + "modernlifepatch:light_blue_concrete_barrier", + "modernlifepatch:yellow_concrete_barrier", + "modernlifepatch:lime_concrete_barrier", + "modernlifepatch:pink_concrete_barrier", + "modernlifepatch:gray_concrete_barrier", + "modernlifepatch:light_gray_concrete_barrier", + "modernlifepatch:cyan_concrete_barrier", + "modernlifepatch:purple_concrete_barrier", + "modernlifepatch:blue_concrete_barrier", + "modernlifepatch:brown_concrete_barrier", + "modernlifepatch:green_concrete_barrier", + "modernlifepatch:red_concrete_barrier", + "modernlifepatch:black_concrete_barrier" ] } \ No newline at end of file