From 3ccd39e51ac84d6fb15e4d09221ad52656c53362 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sun, 13 Aug 2023 22:51:33 +0300 Subject: [PATCH] Registration rework and minor fixes --- ...te_tiles_from_nii_wall_1_stonecutting.json | 35 ++ .../building_blocks/big_green_tiles.json | 48 +++ .../big_green_tiles_cracked.json | 35 ++ .../brick_tiles_from_bricks_stonecutting.json | 35 ++ ..._from_glazed_brick_tiles_stonecutting.json | 35 ++ .../bricks_from_brick_tiles_stonecutting.json | 35 ++ ..._from_glazed_brick_tiles_stonecutting.json | 35 ++ .../building_blocks/cracked_brick_tiles.json | 35 ++ .../cracked_dark_brick_tiles.json | 35 ++ .../cracked_glazed_brick_tiles.json | 35 ++ .../building_blocks/cracked_green_bricks.json | 35 ++ .../cracked_green_bricks_2.json | 35 ++ .../building_blocks/cracked_nii_wall_1.json | 35 ++ .../building_blocks/dark_brick_tiles.json | 48 +++ ...e_bricks_from_nii_wall_1_stonecutting.json | 35 ++ ...k_tiles_from_brick_tiles_stonecutting.json | 35 ++ ..._brick_tiles_from_bricks_stonecutting.json | 35 ++ ...ariated_light_blue_tiles_stonecutting.json | 35 ++ .../recipes/building_blocks/green_bricks.json | 48 +++ .../building_blocks/green_bricks_2.json | 48 +++ ...ariated_light_blue_tiles_stonecutting.json | 35 ++ ...ariated_light_blue_tiles_stonecutting.json | 35 ++ .../building_blocks/mossy_brick_tiles.json | 61 +++ .../mossy_dark_brick_tiles.json | 61 +++ .../building_blocks/mossy_green_bricks.json | 61 +++ .../building_blocks/mossy_green_bricks_2.json | 61 +++ .../building_blocks/mossy_red_bricks.json | 61 +++ .../recipes/building_blocks/nii_floor.json | 61 +++ ...1_from_big_diorite_tiles_stonecutting.json | 35 ++ ...ll_1_from_diorite_bricks_stonecutting.json | 35 ++ ..._1_from_polished_diorite_stonecutting.json | 35 ++ ...from_small_diorite_tiles_stonecutting.json | 35 ++ ...wall_2_from_smooth_stone_stonecutting.json | 35 ++ ...wall_3_from_stone_bricks_stonecutting.json | 35 ++ .../nii_wall_3_from_stone_stonecutting.json | 35 ++ ..._diorite_from_nii_wall_1_stonecutting.json | 35 ++ .../recipes/building_blocks/red_bricks.json | 48 +++ .../small_cracked_yellow_tiles.json | 35 ++ ...te_tiles_from_nii_wall_1_stonecutting.json | 35 ++ ...ariated_light_blue_tiles_stonecutting.json | 35 ++ .../building_blocks/small_yellow_tiles.json | 48 +++ ...th_stone_from_nii_wall_2_stonecutting.json | 35 ++ ...e_bricks_from_nii_wall_3_stonecutting.json | 35 ++ .../stone_bricks_from_stone_stonecutting.json | 35 ++ .../stone_from_nii_wall_3_stonecutting.json | 35 ++ .../stone_from_stone_bricks_stonecutting.json | 35 ++ ..._glazed_light_blue_tiles_stonecutting.json | 35 ++ ...s_from_light_blue_bricks_stonecutting.json | 35 ++ ...es_from_light_blue_tiles_stonecutting.json | 35 ++ ...m_small_light_blue_tiles_stonecutting.json | 35 ++ .../recipes/decorations/rake.json | 61 +++ .../su/a71/new_soviet/DataGeneration.java | 11 +- .../java/su/a71/new_soviet/NewSoviet.java | 1 - .../su/a71/new_soviet/items/RakeItem.java | 1 + .../registration/NSE_BaseRegistration.java | 37 ++ .../new_soviet/registration/NSE_Blocks.java | 406 ++++++++---------- .../new_soviet/registration/NSE_Custom.java | 43 +- .../new_soviet/registration/NSE_Items.java | 44 +- .../assets/new_soviet/lang/en_us.json | 2 +- .../custom/appliances/fan_base_particle.png | Bin 0 -> 287 bytes .../electronics/brown_television_particle.png | Bin 0 -> 328 bytes .../custom/electronics/radio_particle.png | Bin 0 -> 276 bytes .../electronics/red_television_particle.png | Bin 0 -> 308 bytes .../electronics/television_particle.png | Bin 0 -> 326 bytes .../custom/furniture/table_lamp_particle.png | Bin 0 -> 390 bytes 65 files changed, 2301 insertions(+), 289 deletions(-) create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_diorite_tiles_from_nii_wall_1_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_green_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_green_tiles_cracked.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brick_tiles_from_bricks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brick_tiles_from_glazed_brick_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bricks_from_brick_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bricks_from_glazed_brick_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_brick_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_dark_brick_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_brick_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_bricks.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_bricks_2.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_nii_wall_1.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_brick_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/diorite_bricks_from_nii_wall_1_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_brick_tiles_from_brick_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_brick_tiles_from_bricks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_bricks.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_bricks_2.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_bricks_from_variated_light_blue_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_brick_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_dark_brick_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_green_bricks.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_green_bricks_2.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_red_bricks.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_floor.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_big_diorite_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_diorite_bricks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_polished_diorite_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_small_diorite_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_2_from_smooth_stone_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_3_from_stone_bricks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_3_from_stone_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/polished_diorite_from_nii_wall_1_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_bricks.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_yellow_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_diorite_tiles_from_nii_wall_1_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_yellow_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/smooth_stone_from_nii_wall_2_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_bricks_from_nii_wall_3_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_bricks_from_stone_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_from_nii_wall_3_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_from_stone_bricks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_glazed_light_blue_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_light_blue_bricks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_light_blue_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_small_light_blue_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/decorations/rake.json create mode 100644 src/main/java/su/a71/new_soviet/registration/NSE_BaseRegistration.java create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_base_particle.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/brown_television_particle.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/radio_particle.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/red_television_particle.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/television_particle.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/furniture/table_lamp_particle.png diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_diorite_tiles_from_nii_wall_1_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_diorite_tiles_from_nii_wall_1_stonecutting.json new file mode 100644 index 0000000..4209e42 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_diorite_tiles_from_nii_wall_1_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_nii_wall_1": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:nii_wall_1" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:big_diorite_tiles_from_nii_wall_1_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_nii_wall_1", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:big_diorite_tiles_from_nii_wall_1_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_green_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_green_tiles.json new file mode 100644 index 0000000..cbab9a1 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_green_tiles.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_big_diorite_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:big_diorite_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_green_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:big_green_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_dye", + "has_big_diorite_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:big_green_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_green_tiles_cracked.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_green_tiles_cracked.json new file mode 100644 index 0000000..bbf21f0 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/big_green_tiles_cracked.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_big_green_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:big_green_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:big_green_tiles_cracked" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_big_green_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:big_green_tiles_cracked" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brick_tiles_from_bricks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brick_tiles_from_bricks_stonecutting.json new file mode 100644 index 0000000..2a9cd4c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brick_tiles_from_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:brick_tiles_from_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:brick_tiles_from_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brick_tiles_from_glazed_brick_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brick_tiles_from_glazed_brick_tiles_stonecutting.json new file mode 100644 index 0000000..b830368 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brick_tiles_from_glazed_brick_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glazed_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:glazed_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:brick_tiles_from_glazed_brick_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_glazed_brick_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:brick_tiles_from_glazed_brick_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bricks_from_brick_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bricks_from_brick_tiles_stonecutting.json new file mode 100644 index 0000000..f95a0dc --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bricks_from_brick_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:bricks_from_brick_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_brick_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:bricks_from_brick_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bricks_from_glazed_brick_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bricks_from_glazed_brick_tiles_stonecutting.json new file mode 100644 index 0000000..a3457bd --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/bricks_from_glazed_brick_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glazed_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:glazed_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:bricks_from_glazed_brick_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_glazed_brick_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:bricks_from_glazed_brick_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_brick_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_brick_tiles.json new file mode 100644 index 0000000..8a21975 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_brick_tiles.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_brick_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_brick_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_brick_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_dark_brick_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_dark_brick_tiles.json new file mode 100644 index 0000000..aefa656 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_dark_brick_tiles.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:dark_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_dark_brick_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_brick_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_dark_brick_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_brick_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_brick_tiles.json new file mode 100644 index 0000000..bec091a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_brick_tiles.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glazed_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:glazed_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_glazed_brick_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_glazed_brick_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_glazed_brick_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_bricks.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_bricks.json new file mode 100644 index 0000000..f22d76e --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_bricks.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_bricks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:green_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_green_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_green_bricks" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_bricks_2.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_bricks_2.json new file mode 100644 index 0000000..797cb91 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_bricks_2.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_bricks_2": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:green_bricks_2" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_green_bricks_2" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_bricks_2", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_green_bricks_2" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_nii_wall_1.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_nii_wall_1.json new file mode 100644 index 0000000..3802062 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_nii_wall_1.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_nii_wall_1": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:nii_wall_1" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_nii_wall_1" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_nii_wall_1", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_nii_wall_1" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_brick_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_brick_tiles.json new file mode 100644 index 0000000..dc29719 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dark_brick_tiles.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_brown_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:brown_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:dark_brick_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_brick_tiles", + "has_brown_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:dark_brick_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/diorite_bricks_from_nii_wall_1_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/diorite_bricks_from_nii_wall_1_stonecutting.json new file mode 100644 index 0000000..d0f23ac --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/diorite_bricks_from_nii_wall_1_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_nii_wall_1": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:nii_wall_1" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:diorite_bricks_from_nii_wall_1_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_nii_wall_1", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:diorite_bricks_from_nii_wall_1_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_brick_tiles_from_brick_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_brick_tiles_from_brick_tiles_stonecutting.json new file mode 100644 index 0000000..8dcb7c9 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_brick_tiles_from_brick_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:glazed_brick_tiles_from_brick_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_brick_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:glazed_brick_tiles_from_brick_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_brick_tiles_from_bricks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_brick_tiles_from_bricks_stonecutting.json new file mode 100644 index 0000000..10eecf7 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_brick_tiles_from_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:glazed_brick_tiles_from_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:glazed_brick_tiles_from_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..f9a21f6 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:glazed_light_blue_tiles_from_variated_light_blue_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_variated_light_blue_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:variated_light_blue_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_variated_light_blue_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:glazed_light_blue_tiles_from_variated_light_blue_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_bricks.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_bricks.json new file mode 100644 index 0000000..f1e5df2 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_bricks.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_green_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:green_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_dye", + "has_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:green_bricks" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_bricks_2.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_bricks_2.json new file mode 100644 index 0000000..fa47cec --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_bricks_2.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_green_bricks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:green_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:green_bricks_2" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_bricks", + "has_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:green_bricks_2" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_bricks_from_variated_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_bricks_from_variated_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..c48d3fc --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_bricks_from_variated_light_blue_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:light_blue_bricks_from_variated_light_blue_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_variated_light_blue_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:variated_light_blue_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_variated_light_blue_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:light_blue_bricks_from_variated_light_blue_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..17746ed --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:light_blue_tiles_from_variated_light_blue_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_variated_light_blue_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:variated_light_blue_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_variated_light_blue_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:light_blue_tiles_from_variated_light_blue_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_brick_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_brick_tiles.json new file mode 100644 index 0000000..2a46873 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_brick_tiles.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_mossy_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:mossy_brick_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vine": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_mossy_brick_tiles", + "has_brick_tiles", + "has_vine", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:mossy_brick_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_dark_brick_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_dark_brick_tiles.json new file mode 100644 index 0000000..0c1fa4c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_dark_brick_tiles.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_dark_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_mossy_dark_brick_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_dark_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:mossy_dark_brick_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vine": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_dark_brick_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_mossy_dark_brick_tiles", + "has_dark_brick_tiles", + "has_vine", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:mossy_dark_brick_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_green_bricks.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_green_bricks.json new file mode 100644 index 0000000..1f31658 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_green_bricks.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_bricks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_green_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_mossy_green_bricks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_green_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:mossy_green_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vine": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_green_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_mossy_green_bricks", + "has_green_bricks", + "has_vine", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:mossy_green_bricks" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_green_bricks_2.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_green_bricks_2.json new file mode 100644 index 0000000..dc7391a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_green_bricks_2.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_bricks_2": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_green_bricks_2" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_mossy_green_bricks_2": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_green_bricks_2" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:mossy_green_bricks_2" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vine": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_green_bricks_2" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_mossy_green_bricks_2", + "has_green_bricks_2", + "has_vine", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:mossy_green_bricks_2" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_red_bricks.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_red_bricks.json new file mode 100644 index 0000000..2812767 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/mossy_red_bricks.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_mossy_red_bricks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_red_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_red_bricks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_red_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:mossy_red_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vine": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:mossy_red_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_mossy_red_bricks", + "has_red_bricks", + "has_vine", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:mossy_red_bricks" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_floor.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_floor.json new file mode 100644 index 0000000..c32386d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_floor.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobblestone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cobblestone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_diorite": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:diorite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_granite": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:granite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:nii_floor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_granite", + "has_diorite", + "has_cobblestone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:nii_floor" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_big_diorite_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_big_diorite_tiles_stonecutting.json new file mode 100644 index 0000000..af684f9 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_big_diorite_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_big_diorite_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:big_diorite_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:nii_wall_1_from_big_diorite_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_big_diorite_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:nii_wall_1_from_big_diorite_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_diorite_bricks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_diorite_bricks_stonecutting.json new file mode 100644 index 0000000..c600585 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_diorite_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_diorite_bricks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:diorite_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:nii_wall_1_from_diorite_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_diorite_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:nii_wall_1_from_diorite_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_polished_diorite_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_polished_diorite_stonecutting.json new file mode 100644 index 0000000..ec10af6 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_polished_diorite_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_diorite": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:polished_diorite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:nii_wall_1_from_polished_diorite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_diorite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:nii_wall_1_from_polished_diorite_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_small_diorite_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_small_diorite_tiles_stonecutting.json new file mode 100644 index 0000000..e99e78a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_1_from_small_diorite_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_diorite_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:small_diorite_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:nii_wall_1_from_small_diorite_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_diorite_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:nii_wall_1_from_small_diorite_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_2_from_smooth_stone_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_2_from_smooth_stone_stonecutting.json new file mode 100644 index 0000000..f38effc --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_2_from_smooth_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_smooth_stone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:smooth_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:nii_wall_2_from_smooth_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_smooth_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:nii_wall_2_from_smooth_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_3_from_stone_bricks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_3_from_stone_bricks_stonecutting.json new file mode 100644 index 0000000..c58808d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_3_from_stone_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:nii_wall_3_from_stone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:nii_wall_3_from_stone_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_3_from_stone_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_3_from_stone_stonecutting.json new file mode 100644 index 0000000..620ea5a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/nii_wall_3_from_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:nii_wall_3_from_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:nii_wall_3_from_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/polished_diorite_from_nii_wall_1_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/polished_diorite_from_nii_wall_1_stonecutting.json new file mode 100644 index 0000000..c9ad02a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/polished_diorite_from_nii_wall_1_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_nii_wall_1": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:nii_wall_1" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_diorite_from_nii_wall_1_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_nii_wall_1", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_diorite_from_nii_wall_1_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_bricks.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_bricks.json new file mode 100644 index 0000000..d69511d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_bricks.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_red_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:red_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:red_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bricks", + "has_red_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:red_bricks" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_yellow_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_yellow_tiles.json new file mode 100644 index 0000000..da192bc --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_yellow_tiles.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_yellow_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:small_yellow_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:small_cracked_yellow_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_yellow_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:small_cracked_yellow_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_diorite_tiles_from_nii_wall_1_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_diorite_tiles_from_nii_wall_1_stonecutting.json new file mode 100644 index 0000000..65692c9 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_diorite_tiles_from_nii_wall_1_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_nii_wall_1": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:nii_wall_1" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:small_diorite_tiles_from_nii_wall_1_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_nii_wall_1", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:small_diorite_tiles_from_nii_wall_1_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..a5a0e08 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:small_light_blue_tiles_from_variated_light_blue_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_variated_light_blue_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:variated_light_blue_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_variated_light_blue_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:small_light_blue_tiles_from_variated_light_blue_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_yellow_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_yellow_tiles.json new file mode 100644 index 0000000..416fc99 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_yellow_tiles.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:small_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:small_yellow_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:yellow_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_small_white_tiles", + "has_yellow_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:small_yellow_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/smooth_stone_from_nii_wall_2_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/smooth_stone_from_nii_wall_2_stonecutting.json new file mode 100644 index 0000000..370af79 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/smooth_stone_from_nii_wall_2_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_nii_wall_2": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:nii_wall_2" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:smooth_stone_from_nii_wall_2_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_nii_wall_2", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:smooth_stone_from_nii_wall_2_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_bricks_from_nii_wall_3_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_bricks_from_nii_wall_3_stonecutting.json new file mode 100644 index 0000000..3b1799f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_bricks_from_nii_wall_3_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_nii_wall_3": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:nii_wall_3" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:stone_bricks_from_nii_wall_3_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_nii_wall_3", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:stone_bricks_from_nii_wall_3_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_bricks_from_stone_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_bricks_from_stone_stonecutting.json new file mode 100644 index 0000000..bdeadb3 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_bricks_from_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:stone_bricks_from_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:stone_bricks_from_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_from_nii_wall_3_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_from_nii_wall_3_stonecutting.json new file mode 100644 index 0000000..587c5d0 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_from_nii_wall_3_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_nii_wall_3": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:nii_wall_3" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:stone_from_nii_wall_3_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_nii_wall_3", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:stone_from_nii_wall_3_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_from_stone_bricks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_from_stone_bricks_stonecutting.json new file mode 100644 index 0000000..81a3e0c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/stone_from_stone_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:stone_from_stone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:stone_from_stone_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_glazed_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_glazed_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..4ae60ea --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_glazed_light_blue_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glazed_light_blue_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:glazed_light_blue_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:variated_light_blue_tiles_from_glazed_light_blue_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_glazed_light_blue_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:variated_light_blue_tiles_from_glazed_light_blue_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_light_blue_bricks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_light_blue_bricks_stonecutting.json new file mode 100644 index 0000000..5e6801e --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_light_blue_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_blue_bricks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:light_blue_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:variated_light_blue_tiles_from_light_blue_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_light_blue_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:variated_light_blue_tiles_from_light_blue_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..8e2dd6d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_light_blue_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_blue_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:light_blue_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:variated_light_blue_tiles_from_light_blue_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_light_blue_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:variated_light_blue_tiles_from_light_blue_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_small_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_small_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..8ed26ea --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/variated_light_blue_tiles_from_small_light_blue_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_light_blue_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:small_light_blue_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:variated_light_blue_tiles_from_small_light_blue_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_light_blue_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:variated_light_blue_tiles_from_small_light_blue_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/rake.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/rake.json new file mode 100644 index 0000000..4c5bf08 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/rake.json @@ -0,0 +1,61 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_nugget": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_stick": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:stick" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:rake" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stick", + "has_iron_ingot", + "has_iron_nugget", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:rake" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/DataGeneration.java b/src/main/java/su/a71/new_soviet/DataGeneration.java index bb52b0a..c7b3684 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -64,7 +64,6 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Blocks.CRACKED_SAND_BRICKS); addDrop(NSE_Blocks.MOSSY_SAND_BRICKS); addDrop(NSE_Blocks.BIG_SAND_BRICKS); - //bricks addDrop(NSE_Blocks.BRICK_TILES); addDrop(NSE_Blocks.CRACKED_BRICK_TILES); addDrop(NSE_Blocks.MOSSY_BRICK_TILES); @@ -73,7 +72,6 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Blocks.CRACKED_DARK_BRICK_TILES); addDrop(NSE_Blocks.MOSSY_DARK_BRICK_TILES); addDrop(NSE_Blocks.DIRTY_DARK_BRICK_TILES); - //teal addDrop(NSE_Blocks.TEAL_TILES); addDrop(NSE_Blocks.CRACKED_TEAL_TILES); addDrop(NSE_Blocks.MOSSY_TEAL_TILES); @@ -100,12 +98,10 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Blocks.CRACKED_CALCITE_TILES); addDrop(NSE_Blocks.MOSSY_CALCITE_TILES); addDrop(NSE_Blocks.DIAGONAL_CALCITE_TILES); - //nii walls addDrop(NSE_Blocks.NII_WALL_1); addDrop(NSE_Blocks.CRACKED_NII_WALL_1); addDrop(NSE_Blocks.NII_WALL_2); addDrop(NSE_Blocks.NII_WALL_3); - //dripstone addDrop(NSE_Blocks.DRIPSTONE_TILES); addDrop(NSE_Blocks.CRACKED_DRIPSTONE_TILES); addDrop(NSE_Blocks.MOSSY_DRIPSTONE_TILES); @@ -254,7 +250,6 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.CRACKED_SAND_BRICKS) .add(NSE_Blocks.MOSSY_SAND_BRICKS) .add(NSE_Blocks.BIG_SAND_BRICKS) - //bricks .add(NSE_Blocks.BRICK_TILES) .add(NSE_Blocks.CRACKED_BRICK_TILES) .add(NSE_Blocks.MOSSY_BRICK_TILES) @@ -268,7 +263,6 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.RED_BRICKS) .add(NSE_Blocks.CRACKED_RED_BRICKS) .add(NSE_Blocks.MOSSY_RED_BRICKS) - //teal .add(NSE_Blocks.TEAL_TILES) .add(NSE_Blocks.CRACKED_TEAL_TILES) .add(NSE_Blocks.MOSSY_TEAL_TILES) @@ -295,12 +289,10 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.CRACKED_CALCITE_TILES) .add(NSE_Blocks.MOSSY_CALCITE_TILES) .add(NSE_Blocks.DIAGONAL_CALCITE_TILES) - //nii walls .add(NSE_Blocks.NII_WALL_1) .add(NSE_Blocks.CRACKED_NII_WALL_1) .add(NSE_Blocks.NII_WALL_2) .add(NSE_Blocks.NII_WALL_3) - //dripstone .add(NSE_Blocks.DRIPSTONE_TILES) .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES) .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES) @@ -630,7 +622,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS_2, NSE_Blocks.GREEN_BRICKS_2); offerCrackingRecipe(exporter, NSE_Blocks.BIG_GREEN_TILES_CRACKED, NSE_Blocks.BIG_GREEN_TILES); - //Mos.Ru-ciepe + // Mossy variants mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES, NSE_Blocks.SAND_TILES); mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_BRICKS, NSE_Blocks.SAND_BRICKS); mossRecipe(exporter, NSE_Blocks.MOSSY_TEAL_TILES, NSE_Blocks.TEAL_TILES); @@ -650,7 +642,6 @@ public class DataGeneration implements DataGeneratorEntrypoint { mossRecipe(exporter, NSE_Blocks.MOSSY_BRICK_TILES, NSE_Blocks.BRICK_TILES); mossRecipe(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); - warningStripeRecipe(exporter, NSE_Blocks.INDUSTRIAL_WARNING, Items.BLACK_DYE); warningStripeRecipe(exporter, NSE_Blocks.RED_WARNING, Items.RED_DYE); warningStripeRecipe(exporter, NSE_Blocks.BLUE_WARNING, Items.BLUE_DYE); diff --git a/src/main/java/su/a71/new_soviet/NewSoviet.java b/src/main/java/su/a71/new_soviet/NewSoviet.java index 9cbc39a..bd22de2 100644 --- a/src/main/java/su/a71/new_soviet/NewSoviet.java +++ b/src/main/java/su/a71/new_soviet/NewSoviet.java @@ -27,7 +27,6 @@ public class NewSoviet implements ModInitializer { @Override public void onInitialize() { NSE_Blocks.init(); - NSE_Blocks.initFlame(); NSE_Items.init(); NSE_Custom.init(); } diff --git a/src/main/java/su/a71/new_soviet/items/RakeItem.java b/src/main/java/su/a71/new_soviet/items/RakeItem.java index 67a8626..6b37dc1 100644 --- a/src/main/java/su/a71/new_soviet/items/RakeItem.java +++ b/src/main/java/su/a71/new_soviet/items/RakeItem.java @@ -53,6 +53,7 @@ public class RakeItem extends MiningToolItem { return ActionResult.PASS; } + // YES public static Consumer createTillAction(BlockState result) { return context -> { context.getWorld().setBlockState(context.getBlockPos(), result, Block.NOTIFY_ALL | Block.REDRAW_ON_MAIN_THREAD); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_BaseRegistration.java b/src/main/java/su/a71/new_soviet/registration/NSE_BaseRegistration.java new file mode 100644 index 0000000..11a0e49 --- /dev/null +++ b/src/main/java/su/a71/new_soviet/registration/NSE_BaseRegistration.java @@ -0,0 +1,37 @@ +package su.a71.new_soviet.registration; + +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.util.Identifier; +import su.a71.new_soviet.NewSoviet; + +import java.util.Optional; +import java.util.function.Supplier; + +public class NSE_BaseRegistration { + + public static void registerItem(String name, Supplier supplier, ItemGroup tab) { + Registry.register(Registries.ITEM, new Identifier(NewSoviet.MOD_ID, name), supplier.get()); + + if (tab == null) return; // Sanity check for hidden items + Optional> key = Registries.ITEM_GROUP.getKey(tab); + key.ifPresent(itemGroupRegistryKey -> ItemGroupEvents.modifyEntriesEvent(itemGroupRegistryKey).register(content -> { + content.add(supplier.get()); + })); + } + + public static void registerBlock(String name, Supplier supplier, ItemGroup tab) { + Registry.register(Registries.BLOCK, new Identifier(NewSoviet.MOD_ID, name), supplier.get()); + BlockItem blockItem = new BlockItem(supplier.get(), new FabricItemSettings()); + registerItem(name, () -> blockItem, tab); + } + + public static void init() {} +} diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java index 510d220..6d3d88f 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java @@ -1,30 +1,22 @@ package su.a71.new_soviet.registration; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.minecraft.block.*; -import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; -import net.minecraft.resource.featuretoggle.FeatureFlag; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.text.Text; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; -import su.a71.new_soviet.NewSoviet; + import su.a71.new_soviet.blocks.ConcreteWithBarsBlock; import su.a71.new_soviet.sounds.Sounds; -import java.util.Optional; -import java.util.function.Supplier; - -public class NSE_Blocks { +public class NSE_Blocks extends NSE_BaseRegistration { // BUILDING BRICKS/TILES ==================== public static final Block SAND_TILES = new Block(FabricBlockSettings.create().sounds(Sounds.SAND_TILES_SOUNDS).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TERRACOTTA_BROWN)); @@ -41,7 +33,6 @@ public class NSE_Blocks { public static final Block MOSSY_SAND_BRICKS = new Block(FabricBlockSettings.copy(SAND_TILES)); public static final Block BIG_SAND_BRICKS = new Block(FabricBlockSettings.copy(SAND_TILES)); - //bricks public static final Block BRICK_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TERRACOTTA_BROWN)); public static final Block CRACKED_BRICK_TILES = new Block(FabricBlockSettings.copy(BRICK_TILES)); public static final Block MOSSY_BRICK_TILES = new Block(FabricBlockSettings.copy(BRICK_TILES)); @@ -52,11 +43,10 @@ public class NSE_Blocks { public static final Block DIRTY_DARK_BRICK_TILES = new Block(FabricBlockSettings.copy(DARK_BRICK_TILES)); public static final Block GLAZED_BRICK_TILES = new Block(FabricBlockSettings.copy(BRICK_TILES)); public static final Block CRACKED_GLAZED_BRICK_TILES = new Block(FabricBlockSettings.copy(BRICK_TILES)); - //red bricks public static final Block RED_BRICKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.DEEPSLATE_BRICKS).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.RED)); public static final Block CRACKED_RED_BRICKS = new Block(FabricBlockSettings.copy(RED_BRICKS)); public static final Block MOSSY_RED_BRICKS = new Block(FabricBlockSettings.copy(RED_BRICKS)); - //teal + public static final Block TEAL_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TEAL)); public static final Block CRACKED_TEAL_TILES = new Block(FabricBlockSettings.copy(TEAL_TILES)); public static final Block MOSSY_TEAL_TILES = new Block(FabricBlockSettings.copy(TEAL_TILES)); @@ -66,7 +56,6 @@ public class NSE_Blocks { public static final Block CRACKED_GLAZED_TEAL_TILES = new Block(FabricBlockSettings.copy(TEAL_TILES)); public static final Block VARIATED_TEAL_TILES = new Block(FabricBlockSettings.copy(TEAL_TILES)); - public static final Block BIG_GREEN_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.DECORATED_POT).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TEAL)); public static final Block BIG_GREEN_TILES_CRACKED = new Block(FabricBlockSettings.copy(BIG_GREEN_TILES)); public static final Block GREEN_BRICKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.NETHER_BRICKS).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.DARK_GREEN)); @@ -97,12 +86,11 @@ public class NSE_Blocks { public static final Block MOSSY_CALCITE_TILES = new Block(FabricBlockSettings.copy(Blocks.CALCITE)); public static final Block DIAGONAL_CALCITE_TILES = new Block(FabricBlockSettings.copy(Blocks.CALCITE)); - //NII WALLS public static final Block NII_WALL_1 = new Block(FabricBlockSettings.copy(Blocks.DIORITE)); public static final Block CRACKED_NII_WALL_1 = new Block(FabricBlockSettings.copy(NSE_Blocks.NII_WALL_1)); public static final Block NII_WALL_2 = new Block(FabricBlockSettings.copy(NSE_Blocks.NII_WALL_1).mapColor(DyeColor.LIGHT_GRAY)); public static final Block NII_WALL_3 = new Block(FabricBlockSettings.copy(NSE_Blocks.NII_WALL_1).mapColor(DyeColor.GRAY)); - //DRIPSTONE + public static final Block DRIPSTONE_TILES = new Block(FabricBlockSettings.copy(Blocks.DRIPSTONE_BLOCK)); public static final Block CRACKED_DRIPSTONE_TILES = new Block(FabricBlockSettings.copy(Blocks.DRIPSTONE_BLOCK)); public static final Block MOSSY_DRIPSTONE_TILES = new Block(FabricBlockSettings.copy(Blocks.DRIPSTONE_BLOCK)); @@ -211,7 +199,6 @@ public class NSE_Blocks { public static final DoorBlock CHISELED_SPRUCE_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.SPRUCE_DOOR), BlockSetType.SPRUCE); public static final DoorBlock CHISELED_BIRCH_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.BIRCH_DOOR), BlockSetType.BIRCH); - public static final Block NII_FLOOR = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.POLISHED_DEEPSLATE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.GRAY)); // Industrial ========== @@ -232,15 +219,15 @@ public class NSE_Blocks { public static final BarrelBlock CRATE = new BarrelBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.CHISELED_BOOKSHELF).nonOpaque().mapColor(MapColor.OAK_TAN).hardness(1.8f)); public static final WallBlock CONCRETE_WALL = new WallBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).mapColor(MapColor.STONE_GRAY)); - // MEAT ========== - public static final Block MEAT = new Block(FabricBlockSettings.create().velocityMultiplier(0.8f).sounds(Sounds.MEAT_SOUNDS).nonOpaque().mapColor(MapColor.DARK_RED).hardness(8f)); - public static final Block MEAT_EYE = new Block(FabricBlockSettings.copy(MEAT)); - public static final Block MEAT_TEETH = new Block(FabricBlockSettings.copy(MEAT)); // WALLPAPER BLOCKS ========== public static final Block GREEN_WALLPAPER = new Block(FabricBlockSettings.create().sounds(Sounds.WALLPAPER_BLOCK_SOUNDS).nonOpaque().mapColor(MapColor.DARK_GREEN).hardness(10f)); public static final Block BROWN_WALLPAPER = new Block(FabricBlockSettings.copy(GREEN_WALLPAPER).mapColor(MapColor.BROWN)); public static final Block BEIGE_WALLPAPER = new Block(FabricBlockSettings.copy(GREEN_WALLPAPER).mapColor(MapColor.DIRT_BROWN)); + // MEAT (cursed...) ========== + public static final Block MEAT = new Block(FabricBlockSettings.create().velocityMultiplier(0.8f).sounds(Sounds.MEAT_SOUNDS).nonOpaque().mapColor(MapColor.DARK_RED).hardness(8f)); + public static final Block MEAT_EYE = new Block(FabricBlockSettings.copy(MEAT)); + public static final Block MEAT_TEETH = new Block(FabricBlockSettings.copy(MEAT)); public static final SnowBlock PURPLE_GOO = new SnowBlock(FabricBlockSettings.copy(MEAT).hardness(1.2f).nonOpaque()); private static final ItemGroup NSE_BUILDING_TAB = FabricItemGroup.builder() @@ -248,222 +235,207 @@ public class NSE_Blocks { .displayName(Text.translatable("itemGroup.new_soviet.building_blocks")) .build(); - private static void register(String name, Supplier supplier, ItemGroup tab) - { - Registry.register(Registries.BLOCK, new Identifier(NewSoviet.MOD_ID, name), supplier.get()); - BlockItem blockItem = new BlockItem(supplier.get(), new FabricItemSettings()); - Registry.register(Registries.ITEM, new Identifier(NewSoviet.MOD_ID, name), blockItem); - - Optional> key = Registries.ITEM_GROUP.getKey(tab); - key.ifPresent(itemGroupRegistryKey -> ItemGroupEvents.modifyEntriesEvent(itemGroupRegistryKey).register(content -> { - content.add(blockItem); - })); - } - public static void init() { Registry.register(Registries.ITEM_GROUP, new Identifier("new_soviet", "building_blocks"), NSE_BUILDING_TAB); - register("sand_tiles", () -> SAND_TILES, NSE_BUILDING_TAB); - register("sand_tiles_stairs", () -> SAND_TILES_STAIRS, NSE_BUILDING_TAB); - register("cracked_sand_tiles", () -> CRACKED_SAND_TILES, NSE_BUILDING_TAB); - register("mossy_sand_tiles", () -> MOSSY_SAND_TILES, NSE_BUILDING_TAB); - register("small_sand_tiles", () -> SMALL_SAND_TILES, NSE_BUILDING_TAB); - register("small_cracked_sand_tiles", () -> SMALL_CRACKED_SAND_TILES, NSE_BUILDING_TAB); - register("herringbone_sand_tiles", () -> HERRINGBONE_SAND_TILES, NSE_BUILDING_TAB); - register("cross_sand_tiles", () -> CROSS_SAND_TILES, NSE_BUILDING_TAB); - register("big_sand_tiles", () -> BIG_SAND_TILES, NSE_BUILDING_TAB); - register("sand_bricks", () -> SAND_BRICKS, NSE_BUILDING_TAB); - register("cracked_sand_bricks", () -> CRACKED_SAND_BRICKS, NSE_BUILDING_TAB); - register("mossy_sand_bricks", () -> MOSSY_SAND_BRICKS, NSE_BUILDING_TAB); - register("big_sand_bricks", () -> BIG_SAND_BRICKS, NSE_BUILDING_TAB); + registerBlock("sand_tiles", () -> SAND_TILES, NSE_BUILDING_TAB); + registerBlock("sand_tiles_stairs", () -> SAND_TILES_STAIRS, NSE_BUILDING_TAB); + registerBlock("cracked_sand_tiles", () -> CRACKED_SAND_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_sand_tiles", () -> MOSSY_SAND_TILES, NSE_BUILDING_TAB); + registerBlock("small_sand_tiles", () -> SMALL_SAND_TILES, NSE_BUILDING_TAB); + registerBlock("small_cracked_sand_tiles", () -> SMALL_CRACKED_SAND_TILES, NSE_BUILDING_TAB); + registerBlock("herringbone_sand_tiles", () -> HERRINGBONE_SAND_TILES, NSE_BUILDING_TAB); + registerBlock("cross_sand_tiles", () -> CROSS_SAND_TILES, NSE_BUILDING_TAB); + registerBlock("big_sand_tiles", () -> BIG_SAND_TILES, NSE_BUILDING_TAB); + registerBlock("sand_bricks", () -> SAND_BRICKS, NSE_BUILDING_TAB); + registerBlock("cracked_sand_bricks", () -> CRACKED_SAND_BRICKS, NSE_BUILDING_TAB); + registerBlock("mossy_sand_bricks", () -> MOSSY_SAND_BRICKS, NSE_BUILDING_TAB); + registerBlock("big_sand_bricks", () -> BIG_SAND_BRICKS, NSE_BUILDING_TAB); //brick - register("brick_tiles", () -> BRICK_TILES, NSE_BUILDING_TAB); - register("cracked_brick_tiles", () -> CRACKED_BRICK_TILES, NSE_BUILDING_TAB); - register("mossy_brick_tiles", () -> MOSSY_BRICK_TILES, NSE_BUILDING_TAB); - register("dirty_brick_tiles", () -> DIRTY_BRICK_TILES, NSE_BUILDING_TAB); - register("dark_brick_tiles", () -> DARK_BRICK_TILES, NSE_BUILDING_TAB); - register("cracked_dark_brick_tiles", () -> CRACKED_DARK_BRICK_TILES, NSE_BUILDING_TAB); - register("mossy_dark_brick_tiles", () -> MOSSY_DARK_BRICK_TILES, NSE_BUILDING_TAB); - register("dirty_dark_brick_tiles", () -> DIRTY_DARK_BRICK_TILES, NSE_BUILDING_TAB); - register("glazed_brick_tiles", () -> GLAZED_BRICK_TILES, NSE_BUILDING_TAB); - register("cracked_glazed_brick_tiles", () -> CRACKED_GLAZED_BRICK_TILES, NSE_BUILDING_TAB); - //red bricks - register("red_bricks", () -> RED_BRICKS, NSE_BUILDING_TAB); - register("cracked_red_bricks", () -> CRACKED_RED_BRICKS, NSE_BUILDING_TAB); - register("mossy_red_bricks", () -> MOSSY_RED_BRICKS, NSE_BUILDING_TAB); - //teal - register("teal_tiles", () -> TEAL_TILES, NSE_BUILDING_TAB); - register("cracked_teal_tiles", () -> CRACKED_TEAL_TILES, NSE_BUILDING_TAB); - register("mossy_teal_tiles", () -> MOSSY_TEAL_TILES, NSE_BUILDING_TAB); - register("small_teal_tiles", () -> SMALL_TEAL_TILES, NSE_BUILDING_TAB); - register("small_cracked_teal_tiles", () -> SMALL_CRACKED_TEAL_TILES, NSE_BUILDING_TAB); - register("glazed_teal_tiles", () -> GLAZED_TEAL_TILES, NSE_BUILDING_TAB); - register("cracked_glazed_teal_tiles", () -> CRACKED_GLAZED_TEAL_TILES, NSE_BUILDING_TAB); - register("variated_teal_tiles", () -> VARIATED_TEAL_TILES, NSE_BUILDING_TAB); + registerBlock("brick_tiles", () -> BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_brick_tiles", () -> CRACKED_BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_brick_tiles", () -> MOSSY_BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("dirty_brick_tiles", () -> DIRTY_BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("dark_brick_tiles", () -> DARK_BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_dark_brick_tiles", () -> CRACKED_DARK_BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_dark_brick_tiles", () -> MOSSY_DARK_BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("dirty_dark_brick_tiles", () -> DIRTY_DARK_BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("glazed_brick_tiles", () -> GLAZED_BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_glazed_brick_tiles", () -> CRACKED_GLAZED_BRICK_TILES, NSE_BUILDING_TAB); + registerBlock("red_bricks", () -> RED_BRICKS, NSE_BUILDING_TAB); + registerBlock("cracked_red_bricks", () -> CRACKED_RED_BRICKS, NSE_BUILDING_TAB); + registerBlock("mossy_red_bricks", () -> MOSSY_RED_BRICKS, NSE_BUILDING_TAB); + registerBlock("teal_tiles", () -> TEAL_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_teal_tiles", () -> CRACKED_TEAL_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_teal_tiles", () -> MOSSY_TEAL_TILES, NSE_BUILDING_TAB); + registerBlock("small_teal_tiles", () -> SMALL_TEAL_TILES, NSE_BUILDING_TAB); + registerBlock("small_cracked_teal_tiles", () -> SMALL_CRACKED_TEAL_TILES, NSE_BUILDING_TAB); + registerBlock("glazed_teal_tiles", () -> GLAZED_TEAL_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_glazed_teal_tiles", () -> CRACKED_GLAZED_TEAL_TILES, NSE_BUILDING_TAB); + registerBlock("variated_teal_tiles", () -> VARIATED_TEAL_TILES, NSE_BUILDING_TAB); - register("big_green_tiles", () -> BIG_GREEN_TILES, NSE_BUILDING_TAB); - register("big_green_tiles_cracked", () -> BIG_GREEN_TILES_CRACKED, NSE_BUILDING_TAB); - register("green_bricks", () -> GREEN_BRICKS, NSE_BUILDING_TAB); - register("cracked_green_bricks", () -> CRACKED_GREEN_BRICKS, NSE_BUILDING_TAB); - register("mossy_green_bricks", () -> MOSSY_GREEN_BRICKS, NSE_BUILDING_TAB); - register("green_bricks_2", () -> GREEN_BRICKS_2, NSE_BUILDING_TAB); - register("cracked_green_bricks_2", () -> CRACKED_GREEN_BRICKS_2, NSE_BUILDING_TAB); - register("mossy_green_bricks_2", () -> MOSSY_GREEN_BRICKS_2, NSE_BUILDING_TAB); + registerBlock("big_green_tiles", () -> BIG_GREEN_TILES, NSE_BUILDING_TAB); + registerBlock("big_green_tiles_cracked", () -> BIG_GREEN_TILES_CRACKED, NSE_BUILDING_TAB); + registerBlock("green_bricks", () -> GREEN_BRICKS, NSE_BUILDING_TAB); + registerBlock("cracked_green_bricks", () -> CRACKED_GREEN_BRICKS, NSE_BUILDING_TAB); + registerBlock("mossy_green_bricks", () -> MOSSY_GREEN_BRICKS, NSE_BUILDING_TAB); + registerBlock("green_bricks_2", () -> GREEN_BRICKS_2, NSE_BUILDING_TAB); + registerBlock("cracked_green_bricks_2", () -> CRACKED_GREEN_BRICKS_2, NSE_BUILDING_TAB); + registerBlock("mossy_green_bricks_2", () -> MOSSY_GREEN_BRICKS_2, NSE_BUILDING_TAB); - register("aquamarine_tiles", () -> AQUAMARINE_TILES, NSE_BUILDING_TAB); - register("cracked_aquamarine_tiles", () -> CRACKED_AQUAMARINE_TILES, NSE_BUILDING_TAB); - register("mossy_aquamarine_tiles", () -> MOSSY_AQUAMARINE_TILES, NSE_BUILDING_TAB); - register("dirty_aquamarine_tiles", () -> DIRTY_AQUAMARINE_TILES, NSE_BUILDING_TAB); - register("small_aquamarine_tiles", () -> SMALL_AQUAMARINE_TILES, NSE_BUILDING_TAB); - register("small_cracked_aquamarine_tiles", () -> SMALL_CRACKED_AQUAMARINE_TILES, NSE_BUILDING_TAB); - register("glazed_aquamarine_tiles", () -> GLAZED_AQUAMARINE_TILES, NSE_BUILDING_TAB); - register("cracked_glazed_aquamarine_tiles", () -> CRACKED_GLAZED_AQUAMARINE_TILES, NSE_BUILDING_TAB); - register("small_diorite_tiles", () -> SMALL_DIORITE_TILES, NSE_BUILDING_TAB); - register("small_cracked_diorite_tiles", () -> SMALL_CRACKED_DIORITE_TILES, NSE_BUILDING_TAB); - register("big_diorite_tiles", () -> BIG_DIORITE_TILES, NSE_BUILDING_TAB); - register("diorite_bricks", () -> DIORITE_BRICKS, NSE_BUILDING_TAB); - register("cracked_diorite_bricks", () -> CRACKED_DIORITE_BRICKS, NSE_BUILDING_TAB); - register("mossy_diorite_bricks", () -> MOSSY_DIORITE_BRICKS, NSE_BUILDING_TAB); - register("calcite_tiles", () -> CALCITE_TILES, NSE_BUILDING_TAB); - register("cracked_calcite_tiles", () -> CRACKED_CALCITE_TILES, NSE_BUILDING_TAB); - register("mossy_calcite_tiles", () -> MOSSY_CALCITE_TILES, NSE_BUILDING_TAB); - register("diagonal_calcite_tiles", () -> DIAGONAL_CALCITE_TILES, NSE_BUILDING_TAB); + registerBlock("aquamarine_tiles", () -> AQUAMARINE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_aquamarine_tiles", () -> CRACKED_AQUAMARINE_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_aquamarine_tiles", () -> MOSSY_AQUAMARINE_TILES, NSE_BUILDING_TAB); + registerBlock("dirty_aquamarine_tiles", () -> DIRTY_AQUAMARINE_TILES, NSE_BUILDING_TAB); + registerBlock("small_aquamarine_tiles", () -> SMALL_AQUAMARINE_TILES, NSE_BUILDING_TAB); + registerBlock("small_cracked_aquamarine_tiles", () -> SMALL_CRACKED_AQUAMARINE_TILES, NSE_BUILDING_TAB); + registerBlock("glazed_aquamarine_tiles", () -> GLAZED_AQUAMARINE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_glazed_aquamarine_tiles", () -> CRACKED_GLAZED_AQUAMARINE_TILES, NSE_BUILDING_TAB); + registerBlock("small_diorite_tiles", () -> SMALL_DIORITE_TILES, NSE_BUILDING_TAB); + registerBlock("small_cracked_diorite_tiles", () -> SMALL_CRACKED_DIORITE_TILES, NSE_BUILDING_TAB); + registerBlock("big_diorite_tiles", () -> BIG_DIORITE_TILES, NSE_BUILDING_TAB); + registerBlock("diorite_bricks", () -> DIORITE_BRICKS, NSE_BUILDING_TAB); + registerBlock("cracked_diorite_bricks", () -> CRACKED_DIORITE_BRICKS, NSE_BUILDING_TAB); + registerBlock("mossy_diorite_bricks", () -> MOSSY_DIORITE_BRICKS, NSE_BUILDING_TAB); + registerBlock("calcite_tiles", () -> CALCITE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_calcite_tiles", () -> CRACKED_CALCITE_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_calcite_tiles", () -> MOSSY_CALCITE_TILES, NSE_BUILDING_TAB); + registerBlock("diagonal_calcite_tiles", () -> DIAGONAL_CALCITE_TILES, NSE_BUILDING_TAB); //nii walls - register("nii_wall_1", () -> NII_WALL_1, NSE_BUILDING_TAB); - register("cracked_nii_wall_1", () -> CRACKED_NII_WALL_1, NSE_BUILDING_TAB); - register("nii_wall_2", () -> NII_WALL_2, NSE_BUILDING_TAB); - register("nii_wall_3", () -> NII_WALL_3, NSE_BUILDING_TAB); + registerBlock("nii_wall_1", () -> NII_WALL_1, NSE_BUILDING_TAB); + registerBlock("cracked_nii_wall_1", () -> CRACKED_NII_WALL_1, NSE_BUILDING_TAB); + registerBlock("nii_wall_2", () -> NII_WALL_2, NSE_BUILDING_TAB); + registerBlock("nii_wall_3", () -> NII_WALL_3, NSE_BUILDING_TAB); //dripstone - register("dripstone_tiles", () -> DRIPSTONE_TILES, NSE_BUILDING_TAB); - register("cracked_dripstone_tiles", () -> CRACKED_DRIPSTONE_TILES, NSE_BUILDING_TAB); - register("mossy_dripstone_tiles", () -> MOSSY_DRIPSTONE_TILES, NSE_BUILDING_TAB); - register("dripstone_bricks", () -> DRIPSTONE_BRICKS, NSE_BUILDING_TAB); - register("deepslate_tiles", () -> DEEPSLATE_TILES, NSE_BUILDING_TAB); - register("cracked_deepslate_tiles", () -> CRACKED_DEEPSLATE_TILES, NSE_BUILDING_TAB); - register("mossy_deepslate_tiles", () -> MOSSY_DEEPSLATE_TILES, NSE_BUILDING_TAB); - register("small_deepslate_tiles", () -> SMALL_DEEPSLATE_TILES, NSE_BUILDING_TAB); - register("small_cracked_deepslate_tiles", () -> SMALL_CRACKED_DEEPSLATE_TILES, NSE_BUILDING_TAB); - register("diagonal_deepslate_tiles", () -> DIAGONAL_DEEPSLATE_TILES, NSE_BUILDING_TAB); - register("light_blue_tiles", () -> LIGHT_BLUE_TILES, NSE_BUILDING_TAB); - register("cracked_light_blue_tiles", () -> CRACKED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); - register("mossy_light_blue_tiles", () -> MOSSY_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); - register("variated_light_blue_tiles", () -> VARIATED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); - register("small_light_blue_tiles", () -> SMALL_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); - register("small_cracked_light_blue_tiles", () -> SMALL_CRACKED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); - register("glazed_light_blue_tiles", () -> GLAZED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); - register("cracked_glazed_light_blue_tiles", () -> CRACKED_GLAZED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); - register("light_blue_bricks", () -> LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB); - register("cracked_light_blue_bricks", () -> CRACKED_LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB); - register("mossy_light_blue_bricks", () -> MOSSY_LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB); - register("big_granite_tiles", () -> BIG_GRANITE_TILES, NSE_BUILDING_TAB); - register("small_granite_tiles", () -> SMALL_GRANITE_TILES, NSE_BUILDING_TAB); - register("small_cracked_granite_tiles", () -> SMALL_CRACKED_GRANITE_TILES, NSE_BUILDING_TAB); - register("green_white_tiles", () -> GREEN_WHITE_TILES, NSE_BUILDING_TAB); - register("cracked_green_white_tiles", () -> CRACKED_GREEN_WHITE_TILES, NSE_BUILDING_TAB); - register("mossy_green_white_tiles", () -> MOSSY_GREEN_WHITE_TILES, NSE_BUILDING_TAB); - register("tuff_tiles", () -> TUFF_TILES, NSE_BUILDING_TAB); - register("cracked_tuff_tiles", () -> CRACKED_TUFF_TILES, NSE_BUILDING_TAB); - register("mossy_tuff_tiles", () -> MOSSY_TUFF_TILES, NSE_BUILDING_TAB); - register("big_tuff_tiles", () -> BIG_TUFF_TILES, NSE_BUILDING_TAB); - register("tuff_bricks", () -> TUFF_BRICKS, NSE_BUILDING_TAB); - register("cracked_tuff_bricks", () -> CRACKED_TUFF_BRICKS, NSE_BUILDING_TAB); - register("mossy_tuff_bricks", () -> MOSSY_TUFF_BRICKS, NSE_BUILDING_TAB); - register("small_white_tiles", () -> SMALL_WHITE_TILES, NSE_BUILDING_TAB); - register("small_cracked_white_tiles", () -> SMALL_CRACKED_WHITE_TILES, NSE_BUILDING_TAB); - register("glazed_white_tiles", () -> GLAZED_WHITE_TILES, NSE_BUILDING_TAB); - register("cracked_glazed_white_tiles", () -> CRACKED_GLAZED_WHITE_TILES, NSE_BUILDING_TAB); + registerBlock("dripstone_tiles", () -> DRIPSTONE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_dripstone_tiles", () -> CRACKED_DRIPSTONE_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_dripstone_tiles", () -> MOSSY_DRIPSTONE_TILES, NSE_BUILDING_TAB); + registerBlock("dripstone_bricks", () -> DRIPSTONE_BRICKS, NSE_BUILDING_TAB); + registerBlock("deepslate_tiles", () -> DEEPSLATE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_deepslate_tiles", () -> CRACKED_DEEPSLATE_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_deepslate_tiles", () -> MOSSY_DEEPSLATE_TILES, NSE_BUILDING_TAB); + registerBlock("small_deepslate_tiles", () -> SMALL_DEEPSLATE_TILES, NSE_BUILDING_TAB); + registerBlock("small_cracked_deepslate_tiles", () -> SMALL_CRACKED_DEEPSLATE_TILES, NSE_BUILDING_TAB); + registerBlock("diagonal_deepslate_tiles", () -> DIAGONAL_DEEPSLATE_TILES, NSE_BUILDING_TAB); + registerBlock("light_blue_tiles", () -> LIGHT_BLUE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_light_blue_tiles", () -> CRACKED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_light_blue_tiles", () -> MOSSY_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); + registerBlock("variated_light_blue_tiles", () -> VARIATED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); + registerBlock("small_light_blue_tiles", () -> SMALL_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); + registerBlock("small_cracked_light_blue_tiles", () -> SMALL_CRACKED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); + registerBlock("glazed_light_blue_tiles", () -> GLAZED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_glazed_light_blue_tiles", () -> CRACKED_GLAZED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); + registerBlock("light_blue_bricks", () -> LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB); + registerBlock("cracked_light_blue_bricks", () -> CRACKED_LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB); + registerBlock("mossy_light_blue_bricks", () -> MOSSY_LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB); + registerBlock("big_granite_tiles", () -> BIG_GRANITE_TILES, NSE_BUILDING_TAB); + registerBlock("small_granite_tiles", () -> SMALL_GRANITE_TILES, NSE_BUILDING_TAB); + registerBlock("small_cracked_granite_tiles", () -> SMALL_CRACKED_GRANITE_TILES, NSE_BUILDING_TAB); + registerBlock("green_white_tiles", () -> GREEN_WHITE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_green_white_tiles", () -> CRACKED_GREEN_WHITE_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_green_white_tiles", () -> MOSSY_GREEN_WHITE_TILES, NSE_BUILDING_TAB); + registerBlock("tuff_tiles", () -> TUFF_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_tuff_tiles", () -> CRACKED_TUFF_TILES, NSE_BUILDING_TAB); + registerBlock("mossy_tuff_tiles", () -> MOSSY_TUFF_TILES, NSE_BUILDING_TAB); + registerBlock("big_tuff_tiles", () -> BIG_TUFF_TILES, NSE_BUILDING_TAB); + registerBlock("tuff_bricks", () -> TUFF_BRICKS, NSE_BUILDING_TAB); + registerBlock("cracked_tuff_bricks", () -> CRACKED_TUFF_BRICKS, NSE_BUILDING_TAB); + registerBlock("mossy_tuff_bricks", () -> MOSSY_TUFF_BRICKS, NSE_BUILDING_TAB); + registerBlock("small_white_tiles", () -> SMALL_WHITE_TILES, NSE_BUILDING_TAB); + registerBlock("small_cracked_white_tiles", () -> SMALL_CRACKED_WHITE_TILES, NSE_BUILDING_TAB); + registerBlock("glazed_white_tiles", () -> GLAZED_WHITE_TILES, NSE_BUILDING_TAB); + registerBlock("cracked_glazed_white_tiles", () -> CRACKED_GLAZED_WHITE_TILES, NSE_BUILDING_TAB); - register("small_yellow_tiles", () -> SMALL_YELLOW_TILES, NSE_BUILDING_TAB); - register("small_cracked_yellow_tiles", () -> SMALL_CRACKED_YELLOW_TILES, NSE_BUILDING_TAB); + registerBlock("small_yellow_tiles", () -> SMALL_YELLOW_TILES, NSE_BUILDING_TAB); + registerBlock("small_cracked_yellow_tiles", () -> SMALL_CRACKED_YELLOW_TILES, NSE_BUILDING_TAB); - register("whitewash", () -> WHITEWASH, NSE_BUILDING_TAB); - register("cracked_whitewash", () -> CRACKED_WHITEWASH, NSE_BUILDING_TAB); - register("very_cracked_whitewash", () -> VERY_CRACKED_WHITEWASH, NSE_BUILDING_TAB); + registerBlock("whitewash", () -> WHITEWASH, NSE_BUILDING_TAB); + registerBlock("cracked_whitewash", () -> CRACKED_WHITEWASH, NSE_BUILDING_TAB); + registerBlock("very_cracked_whitewash", () -> VERY_CRACKED_WHITEWASH, NSE_BUILDING_TAB); - register("white_concrete", () -> WHITE_CONCRETE, NSE_BUILDING_TAB); - register("cracked_white_concrete", () -> CRACKED_WHITE_CONCRETE, NSE_BUILDING_TAB); - register("white_concrete_with_bars", () -> WHITE_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); - register("beige_concrete", () -> BEIGE_CONCRETE, NSE_BUILDING_TAB); - register("cracked_beige_concrete", () -> CRACKED_BEIGE_CONCRETE, NSE_BUILDING_TAB); - register("beige_concrete_with_bars", () -> BEIGE_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); - register("blue_concrete", () -> BLUE_CONCRETE, NSE_BUILDING_TAB); - register("cracked_blue_concrete", () -> CRACKED_BLUE_CONCRETE, NSE_BUILDING_TAB); - register("blue_concrete_with_bars", () -> BLUE_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); - register("red_concrete", () -> RED_CONCRETE, NSE_BUILDING_TAB); - register("cracked_red_concrete", () -> CRACKED_RED_CONCRETE, NSE_BUILDING_TAB); - register("red_concrete_with_bars", () -> RED_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); - register("yellow_concrete", () -> YELLOW_CONCRETE, NSE_BUILDING_TAB); - register("cracked_yellow_concrete", () -> CRACKED_YELLOW_CONCRETE, NSE_BUILDING_TAB); - register("yellow_concrete_with_bars", () -> YELLOW_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); - register("green_concrete", () -> GREEN_CONCRETE, NSE_BUILDING_TAB); - register("cracked_green_concrete", () -> CRACKED_GREEN_CONCRETE, NSE_BUILDING_TAB); - register("green_concrete_with_bars", () -> GREEN_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); + registerBlock("white_concrete", () -> WHITE_CONCRETE, NSE_BUILDING_TAB); + registerBlock("cracked_white_concrete", () -> CRACKED_WHITE_CONCRETE, NSE_BUILDING_TAB); + registerBlock("white_concrete_with_bars", () -> WHITE_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); + registerBlock("beige_concrete", () -> BEIGE_CONCRETE, NSE_BUILDING_TAB); + registerBlock("cracked_beige_concrete", () -> CRACKED_BEIGE_CONCRETE, NSE_BUILDING_TAB); + registerBlock("beige_concrete_with_bars", () -> BEIGE_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); + registerBlock("blue_concrete", () -> BLUE_CONCRETE, NSE_BUILDING_TAB); + registerBlock("cracked_blue_concrete", () -> CRACKED_BLUE_CONCRETE, NSE_BUILDING_TAB); + registerBlock("blue_concrete_with_bars", () -> BLUE_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); + registerBlock("red_concrete", () -> RED_CONCRETE, NSE_BUILDING_TAB); + registerBlock("cracked_red_concrete", () -> CRACKED_RED_CONCRETE, NSE_BUILDING_TAB); + registerBlock("red_concrete_with_bars", () -> RED_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); + registerBlock("yellow_concrete", () -> YELLOW_CONCRETE, NSE_BUILDING_TAB); + registerBlock("cracked_yellow_concrete", () -> CRACKED_YELLOW_CONCRETE, NSE_BUILDING_TAB); + registerBlock("yellow_concrete_with_bars", () -> YELLOW_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); + registerBlock("green_concrete", () -> GREEN_CONCRETE, NSE_BUILDING_TAB); + registerBlock("cracked_green_concrete", () -> CRACKED_GREEN_CONCRETE, NSE_BUILDING_TAB); + registerBlock("green_concrete_with_bars", () -> GREEN_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); - register("nii_floor", () -> NII_FLOOR, NSE_BUILDING_TAB); + registerBlock("nii_floor", () -> NII_FLOOR, NSE_BUILDING_TAB); - register("herringbone_acacia_planks", () -> HERRINGBONE_ACACIA_PLANKS, NSE_BUILDING_TAB); - register("cross_acacia_planks", () -> CROSS_ACACIA_PLANKS, NSE_BUILDING_TAB); - register("herringbone_oak_planks", () -> HERRINGBONE_OAK_PLANKS, NSE_BUILDING_TAB); - register("cross_oak_planks", () -> CROSS_OAK_PLANKS, NSE_BUILDING_TAB); - register("herringbone_birch_planks", () -> HERRINGBONE_BIRCH_PLANKS, NSE_BUILDING_TAB); - register("cross_birch_planks", () -> CROSS_BIRCH_PLANKS, NSE_BUILDING_TAB); - register("herringbone_crimson_planks", () -> HERRINGBONE_CRIMSON_PLANKS, NSE_BUILDING_TAB); - register("cross_crimson_planks", () -> CROSS_CRIMSON_PLANKS, NSE_BUILDING_TAB); - register("herringbone_dark_oak_planks", () -> HERRINGBONE_DARK_OAK_PLANKS, NSE_BUILDING_TAB); - register("cross_dark_oak_planks", () -> CROSS_DARK_OAK_PLANKS, NSE_BUILDING_TAB); - register("herringbone_jungle_planks", () -> HERRINGBONE_JUNGLE_PLANKS, NSE_BUILDING_TAB); - register("cross_jungle_planks", () -> CROSS_JUNGLE_PLANKS, NSE_BUILDING_TAB); - register("herringbone_mangrove_planks", () -> HERRINGBONE_MANGROVE_PLANKS, NSE_BUILDING_TAB); - register("cross_mangrove_planks", () -> CROSS_MANGROVE_PLANKS, NSE_BUILDING_TAB); - register("herringbone_spruce_planks", () -> HERRINGBONE_SPRUCE_PLANKS, NSE_BUILDING_TAB); - register("cross_spruce_planks", () -> CROSS_SPRUCE_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_acacia_planks", () -> HERRINGBONE_ACACIA_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_acacia_planks", () -> CROSS_ACACIA_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_oak_planks", () -> HERRINGBONE_OAK_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_oak_planks", () -> CROSS_OAK_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_birch_planks", () -> HERRINGBONE_BIRCH_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_birch_planks", () -> CROSS_BIRCH_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_crimson_planks", () -> HERRINGBONE_CRIMSON_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_crimson_planks", () -> CROSS_CRIMSON_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_dark_oak_planks", () -> HERRINGBONE_DARK_OAK_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_dark_oak_planks", () -> CROSS_DARK_OAK_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_jungle_planks", () -> HERRINGBONE_JUNGLE_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_jungle_planks", () -> CROSS_JUNGLE_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_mangrove_planks", () -> HERRINGBONE_MANGROVE_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_mangrove_planks", () -> CROSS_MANGROVE_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_spruce_planks", () -> HERRINGBONE_SPRUCE_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_spruce_planks", () -> CROSS_SPRUCE_PLANKS, NSE_BUILDING_TAB); - register("herringbone_parquet", () -> HERRINGBONE_PARQUET, NSE_BUILDING_TAB); - register("straight_parquet", () -> STRAIGHT_PARQUET, NSE_BUILDING_TAB); - register("separated_parquet", () -> SEPARATED_PARQUET, NSE_BUILDING_TAB); + registerBlock("herringbone_parquet", () -> HERRINGBONE_PARQUET, NSE_BUILDING_TAB); + registerBlock("straight_parquet", () -> STRAIGHT_PARQUET, NSE_BUILDING_TAB); + registerBlock("separated_parquet", () -> SEPARATED_PARQUET, NSE_BUILDING_TAB); - register("green_linoleum", () -> GREEN_LINOLEUM, NSE_BUILDING_TAB); - register("blue_linoleum", () -> BLUE_LINOLEUM, NSE_BUILDING_TAB); - register("red_linoleum", () -> RED_LINOLEUM, NSE_BUILDING_TAB); - register("gray_linoleum", () -> GRAY_LINOLEUM, NSE_BUILDING_TAB); - register("orange_linoleum", () -> ORANGE_LINOLEUM, NSE_BUILDING_TAB); - register("brown_linoleum", () -> BROWN_LINOLEUM, NSE_BUILDING_TAB); - register("cyan_linoleum", () -> CYAN_LINOLEUM, NSE_BUILDING_TAB); - register("cross_orange_linoleum", () -> CROSS_ORANGE_LINOLEUM, NSE_BUILDING_TAB); - register("cross_brown_linoleum", () -> CROSS_BROWN_LINOLEUM, NSE_BUILDING_TAB); + registerBlock("green_linoleum", () -> GREEN_LINOLEUM, NSE_BUILDING_TAB); + registerBlock("blue_linoleum", () -> BLUE_LINOLEUM, NSE_BUILDING_TAB); + registerBlock("red_linoleum", () -> RED_LINOLEUM, NSE_BUILDING_TAB); + registerBlock("gray_linoleum", () -> GRAY_LINOLEUM, NSE_BUILDING_TAB); + registerBlock("orange_linoleum", () -> ORANGE_LINOLEUM, NSE_BUILDING_TAB); + registerBlock("brown_linoleum", () -> BROWN_LINOLEUM, NSE_BUILDING_TAB); + registerBlock("cyan_linoleum", () -> CYAN_LINOLEUM, NSE_BUILDING_TAB); + registerBlock("cross_orange_linoleum", () -> CROSS_ORANGE_LINOLEUM, NSE_BUILDING_TAB); + registerBlock("cross_brown_linoleum", () -> CROSS_BROWN_LINOLEUM, NSE_BUILDING_TAB); - register("chiseled_mangrove_door", () -> CHISELED_MANGROVE_DOOR, NSE_BUILDING_TAB); - register("chiseled_oak_door", () -> CHISELED_OAK_DOOR, NSE_BUILDING_TAB); - register("chiseled_spruce_door", () -> CHISELED_SPRUCE_DOOR, NSE_BUILDING_TAB); - register("chiseled_birch_door", () -> CHISELED_BIRCH_DOOR, NSE_BUILDING_TAB); + registerBlock("chiseled_mangrove_door", () -> CHISELED_MANGROVE_DOOR, NSE_BUILDING_TAB); + registerBlock("chiseled_oak_door", () -> CHISELED_OAK_DOOR, NSE_BUILDING_TAB); + registerBlock("chiseled_spruce_door", () -> CHISELED_SPRUCE_DOOR, NSE_BUILDING_TAB); + registerBlock("chiseled_birch_door", () -> CHISELED_BIRCH_DOOR, NSE_BUILDING_TAB); - register("industrial_warning", () -> INDUSTRIAL_WARNING, NSE_BUILDING_TAB); - register("gray_warning", () -> GRAY_WARNING, NSE_BUILDING_TAB); - register("red_warning", () -> RED_WARNING, NSE_BUILDING_TAB); - register("orange_warning", () -> ORANGE_WARNING, NSE_BUILDING_TAB); - register("yellow_warning", () -> YELLOW_WARNING, NSE_BUILDING_TAB); - register("lime_warning", () -> LIME_WARNING, NSE_BUILDING_TAB); - register("green_warning", () -> GREEN_WARNING, NSE_BUILDING_TAB); - register("cyan_warning", () -> CYAN_WARNING, NSE_BUILDING_TAB); - register("light_blue_warning", () -> LIGHT_BLUE_WARNING, NSE_BUILDING_TAB); - register("blue_warning", () -> BLUE_WARNING, NSE_BUILDING_TAB); - register("purple_warning", () -> PURPLE_WARNING, NSE_BUILDING_TAB); - register("magenta_warning", () -> MAGENTA_WARNING, NSE_BUILDING_TAB); + registerBlock("industrial_warning", () -> INDUSTRIAL_WARNING, NSE_BUILDING_TAB); + registerBlock("gray_warning", () -> GRAY_WARNING, NSE_BUILDING_TAB); + registerBlock("red_warning", () -> RED_WARNING, NSE_BUILDING_TAB); + registerBlock("orange_warning", () -> ORANGE_WARNING, NSE_BUILDING_TAB); + registerBlock("yellow_warning", () -> YELLOW_WARNING, NSE_BUILDING_TAB); + registerBlock("lime_warning", () -> LIME_WARNING, NSE_BUILDING_TAB); + registerBlock("green_warning", () -> GREEN_WARNING, NSE_BUILDING_TAB); + registerBlock("cyan_warning", () -> CYAN_WARNING, NSE_BUILDING_TAB); + registerBlock("light_blue_warning", () -> LIGHT_BLUE_WARNING, NSE_BUILDING_TAB); + registerBlock("blue_warning", () -> BLUE_WARNING, NSE_BUILDING_TAB); + registerBlock("purple_warning", () -> PURPLE_WARNING, NSE_BUILDING_TAB); + registerBlock("magenta_warning", () -> MAGENTA_WARNING, NSE_BUILDING_TAB); - register("metal_plating", () -> METAL_PLATING, NSE_BUILDING_TAB); - register("crate", () -> CRATE, NSE_BUILDING_TAB); - register("concrete_wall", () -> CONCRETE_WALL, NSE_BUILDING_TAB); // TODO: Broken + registerBlock("metal_plating", () -> METAL_PLATING, NSE_BUILDING_TAB); + registerBlock("crate", () -> CRATE, NSE_BUILDING_TAB); + registerBlock("concrete_wall", () -> CONCRETE_WALL, NSE_BUILDING_TAB); // TODO: Broken - register("meat", () -> MEAT, NSE_BUILDING_TAB); - register("meat_eye", () -> MEAT_EYE, NSE_BUILDING_TAB); - register("meat_teeth", () -> MEAT_TEETH, NSE_BUILDING_TAB); - register("purple_goo", () -> PURPLE_GOO, NSE_BUILDING_TAB); + registerBlock("green_wallpaper", () -> GREEN_WALLPAPER, NSE_BUILDING_TAB); + registerBlock("brown_wallpaper", () -> BROWN_WALLPAPER, NSE_BUILDING_TAB); + registerBlock("beige_wallpaper", () -> BEIGE_WALLPAPER, NSE_BUILDING_TAB); - register("green_wallpaper", () -> GREEN_WALLPAPER, NSE_BUILDING_TAB); - register("brown_wallpaper", () -> BROWN_WALLPAPER, NSE_BUILDING_TAB); - register("beige_wallpaper", () -> BEIGE_WALLPAPER, NSE_BUILDING_TAB); - } + registerBlock("meat", () -> MEAT, NSE_BUILDING_TAB); + registerBlock("meat_eye", () -> MEAT_EYE, NSE_BUILDING_TAB); + registerBlock("meat_teeth", () -> MEAT_TEETH, NSE_BUILDING_TAB); + registerBlock("purple_goo", () -> PURPLE_GOO, NSE_BUILDING_TAB); - public static void initFlame() { + // Flammable blocks! FlammableBlockRegistry flammableBlockRegistry = FlammableBlockRegistry.getDefaultInstance(); flammableBlockRegistry.add(HERRINGBONE_ACACIA_PLANKS, 20, 5); flammableBlockRegistry.add(CROSS_ACACIA_PLANKS, 20, 5); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java index cbbda57..4e3e934 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java @@ -1,33 +1,26 @@ package su.a71.new_soviet.registration; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.minecraft.block.AbstractBlock; -import net.minecraft.block.Block; import net.minecraft.block.MapColor; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.block.piston.PistonBehavior; -import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundEvent; import net.minecraft.text.Text; import net.minecraft.util.Identifier; + import su.a71.new_soviet.NewSoviet; import su.a71.new_soviet.blocks.*; import su.a71.new_soviet.entity.TVBlockEntity; -import java.util.Optional; -import java.util.function.Supplier; - -public class NSE_Custom { +public class NSE_Custom extends NSE_BaseRegistration { public static final TVBlock TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_YELLOW)); public static final TVBlock RED_TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_RED)); public static final TVBlock BROWN_TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_BROWN)); @@ -57,30 +50,18 @@ public class NSE_Custom { .displayName(Text.translatable("itemGroup.new_soviet.custom")) .build(); - - private static void register(String name, Supplier supplier, ItemGroup tab) { - Registry.register(Registries.BLOCK, new Identifier(NewSoviet.MOD_ID, name), supplier.get()); - BlockItem blockItem = new BlockItem(supplier.get(), new FabricItemSettings()); - Registry.register(Registries.ITEM, new Identifier(NewSoviet.MOD_ID, name), blockItem); - - Optional> key = Registries.ITEM_GROUP.getKey(tab); - key.ifPresent(itemGroupRegistryKey -> ItemGroupEvents.modifyEntriesEvent(itemGroupRegistryKey).register(content -> { - content.add(blockItem); - })); - } - public static void init() { Registry.register(Registries.ITEM_GROUP, new Identifier(NewSoviet.MOD_ID, "custom"), NSE_CUSTOM_TAB); - register("tv", () -> TV, NSE_CUSTOM_TAB); - register("red_tv", () -> RED_TV, NSE_CUSTOM_TAB); - register("brown_tv", () -> BROWN_TV, NSE_CUSTOM_TAB); - register("radio", () -> RADIO, NSE_CUSTOM_TAB); - register("lamp", () -> LAMP, NSE_CUSTOM_TAB); - register("light_bulb", () -> LIGHT_BULB, NSE_CUSTOM_TAB); - register("ceiling_fan", () -> CEILING_FAN, NSE_CUSTOM_TAB); - register("siren", () -> SIREN, NSE_CUSTOM_TAB); - register("landmine", () -> LANDMINE, NSE_CUSTOM_TAB); - register("switch", () -> SWITCH, NSE_CUSTOM_TAB); + registerBlock("tv", () -> TV, NSE_CUSTOM_TAB); + registerBlock("red_tv", () -> RED_TV, NSE_CUSTOM_TAB); + registerBlock("brown_tv", () -> BROWN_TV, NSE_CUSTOM_TAB); + registerBlock("radio", () -> RADIO, NSE_CUSTOM_TAB); + registerBlock("lamp", () -> LAMP, NSE_CUSTOM_TAB); + registerBlock("light_bulb", () -> LIGHT_BULB, NSE_CUSTOM_TAB); + registerBlock("ceiling_fan", () -> CEILING_FAN, NSE_CUSTOM_TAB); + registerBlock("siren", () -> SIREN, NSE_CUSTOM_TAB); + registerBlock("landmine", () -> LANDMINE, NSE_CUSTOM_TAB); + registerBlock("switch", () -> SWITCH, NSE_CUSTOM_TAB); Registry.register(Registries.SOUND_EVENT, new Identifier(NewSoviet.MOD_ID, "siren_sound"), SIREN_SOUND); Registry.register(Registries.SOUND_EVENT, new Identifier(NewSoviet.MOD_ID, "light_bulb_broken_sound"), LIGHT_BULB_BROKEN_SOUND); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java index e59eb1d..212e233 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java @@ -1,33 +1,29 @@ package su.a71.new_soviet.registration; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.*; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; -import net.minecraft.sound.SoundEvent; import net.minecraft.text.Text; import net.minecraft.util.Identifier; - -import java.util.Optional; -import java.util.function.Supplier; +import net.minecraft.util.Rarity; import su.a71.new_soviet.Materials.NSE_ToolMaterials; -import su.a71.new_soviet.NewSoviet; import su.a71.new_soviet.items.DiceItem; import su.a71.new_soviet.items.RakeItem; -public class NSE_Items { +public class NSE_Items extends NSE_BaseRegistration { // Like an iron axe but a hoe and slightly faster (-2.8f vs -3.1f) and a bit weaker (6 vs 6.5 damage) public static final ToolItem SICKLE = new HoeItem(ToolMaterials.IRON, 6, -2.8F, new Item.Settings()); - + // Like a hoe but... wait is this just a sickle upgrade? public static final RakeItem RAKE = new RakeItem(NSE_ToolMaterials.IRON_FOR_RAKE, 6, -2.6F, new Item.Settings()); - //public static final FoodComponent COCONUT_FC = (new FoodComponent.Builder()).hunger(4).saturationModifier(1.2F).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 100, 1), 1.0F).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 2400, 0), 1.0F).alwaysEdible().build(); public static final FoodComponent CONCENTRATE_FC = (new FoodComponent.Builder()).hunger(5).saturationModifier(1.0F).alwaysEdible().build(); public static final Item CONCENTRATE = new Item(new Item.Settings().food(CONCENTRATE_FC)); - //public static final Item COCONUT = new Item(new Item.Settings().food(COCONUT_FC).rarity(Rarity.EPIC)); + public static final FoodComponent COCONUT_FC = (new FoodComponent.Builder()).hunger(4).saturationModifier(1.2F).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 100, 1), 1.0F).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 2400, 0), 1.0F).alwaysEdible().build(); + public static final Item COCONUT = new Item(new Item.Settings().food(COCONUT_FC).rarity(Rarity.EPIC)); public static final DiceItem DICE_D6 = new DiceItem(6, "item.new_soviet.dice_d6.tooltip", new Item.Settings().maxCount(6)); public static final DiceItem DICE_D4 = new DiceItem(4, "item.new_soviet.dice_d4.tooltip", new Item.Settings().maxCount(6)); @@ -40,25 +36,15 @@ public class NSE_Items { .displayName(Text.translatable("itemGroup.new_soviet.items")) .build(); - private static void register(String name, Supplier supplier, ItemGroup tab) - { - Registry.register(Registries.ITEM, new Identifier(NewSoviet.MOD_ID, name), supplier.get()); - - Optional> key = Registries.ITEM_GROUP.getKey(tab); - key.ifPresent(itemGroupRegistryKey -> ItemGroupEvents.modifyEntriesEvent(itemGroupRegistryKey).register(content -> { - content.add(supplier.get()); - })); - } - public static void init() { Registry.register(Registries.ITEM_GROUP, new Identifier("new_soviet", "items"), NSE_ITEMS_TAB); - register("sickle", () -> SICKLE, NSE_ITEMS_TAB); - register("rake", () -> RAKE, NSE_ITEMS_TAB); - register("concentrate", () -> CONCENTRATE, NSE_ITEMS_TAB); - //register("coconut", () -> COCONUT, NSE_ITEMS_TAB); - register("dice_d6", () -> DICE_D6, NSE_ITEMS_TAB); - register("dice_d4", () -> DICE_D4, NSE_ITEMS_TAB); - register("dice_d20", () -> DICE_D20, NSE_ITEMS_TAB); - register("light_bulb_item", () -> LIGHT_BULB, NSE_ITEMS_TAB); + registerItem("sickle", () -> SICKLE, NSE_ITEMS_TAB); + registerItem("rake", () -> RAKE, NSE_ITEMS_TAB); + registerItem("concentrate", () -> CONCENTRATE, NSE_ITEMS_TAB); + registerItem("coconut", () -> COCONUT, null); + registerItem("dice_d6", () -> DICE_D6, NSE_ITEMS_TAB); + registerItem("dice_d4", () -> DICE_D4, NSE_ITEMS_TAB); + registerItem("dice_d20", () -> DICE_D20, NSE_ITEMS_TAB); + registerItem("light_bulb_item", () -> LIGHT_BULB, NSE_ITEMS_TAB); } } diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index 2911e9f..6c06512 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -192,7 +192,7 @@ "block.new_soviet.meat_eye": "Meat block with eye", "block.new_soviet.meat_teeth": "Meat block with teeth", "item.new_soviet.rake": "Rake", - "item.new_soviet.concentrate": "Concentrate", + "item.new_soviet.concentrate": "Nutrient Block", "block.new_soviet.switch": "Switch", "block.new_soviet.nii_wall_1": "Diorite RI Wall", "block.new_soviet.cracked_nii_wall_1": "Cracked Diorite RI Wall", diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_base_particle.png b/src/main/resources/assets/new_soviet/textures/block/custom/appliances/fan_base_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..04fa7939cd524ed6c2c28e8bcf95a72b2984a0ee GIT binary patch literal 287 zcmV+)0pR|LP)Px#*-1n}R5*>LQ!x(0Fbup}NL`{T6CFCUBJmEM!3%f;PvA2wJSRgpE6UQT3^XBe zTq=Q=C};a@pOfZ(Jv1J<_-MpFWEz-Sym-%X zYZh&mf<*_~7BpNHacvaYne-DjY)hNwb~(&4Fm5Jd@?H>}kNfnQ)}F9tajcyN4t)zZ lP8Fft5};_1KV!`&@fT9NhU=cixyt|m002ovPDHLkV1fsiai;(P literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/brown_television_particle.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/brown_television_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..a4ceab890f9e9fd421516cd913a6160ac99ae664 GIT binary patch literal 328 zcmV-O0k{5%P)Px$0!c(cR5*>DlR<03KoEsrix62%Ad7?)0s&icst5mo|G_`)wFfk@x#3P7H*^fX-O$B9Y9M0b~nMaHW@|4pMA@%hN+EjEJYt)s&a<%nH zdu8BWB2RgD2CiHJmtwivdZc#=n*0Bo;MNr^!Jh_}ps7v*WojyDQz2wSglyPqZho@e aN#Yly+D0000vb*8wxu3^*zSq?z2P8dKIw=ZbC0P8Q!KJt3`)ldLE4j~0_&Ks3VX63# zRq^#9cT=(gt0()3St24oK1BaynA-h_wQ1JI6^WG}9thuwT(9Sl5p&O>(C&&U1ItcV VBgteoHK5NJJYD@<);T3K0RW-9ZYKZ$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/red_television_particle.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/red_television_particle.png new file mode 100644 index 0000000000000000000000000000000000000000..94dd16d25aea1c530b8106cc1836bf16f04824c2 GIT binary patch literal 308 zcmV-40n7f0P)Px#?ny*JR5*>DlQ9dzFc5{GB5f_$($GOsbm`>Q#b4oncW`wPEDDyE8mNhj4szjA ztybT3gyY?J_egKOOzzWggn!isfQ!EUZ7`sMO!h^EqQ1T~7PUeWM-aYey$y<5VdS~y zQTQGfA_M>gu49>Gm9%;-0Px$07*naR5*>DlRpoFFc8I`#-tM{2@Epetd0!K?tUsim9rZIlhMRQV}~--1f)|Z z9V&2*|InMRm&@Jny-Rzm<@`2@Bm5hE0J!qv?*W54sfX~rK(3w}h1Q6D1~+h;S|t?* zl~fp!q8m7fX68MNJZs1~<5sUlKqF0s*}6Gd^~KbGFM&pqgiTH<&Kd7Epe8U60ipGG zf|7WVBq4^8hbu3-5tOpEy^;!tqiQyXtR;wj)+{NdGFQkI;07(lCl9vkokiNo1A2+r zXYW0rK?x|ucD=JmKN1-I?4kekJHe|f)C6A#q^TgPx$KuJVFR5*>DlD%$&FcgJ9td4{PVhmH*So6|d`UYKEsZys7m8wb|vXKd#1QL=t zbf9(&B1_L=?zPX4&Go+Dp1WPSCr%|{60!N(kgsz9nyO}3?#b6VzEpg^ypykU+mBO; z;16LE5hz8RN_?qIdr-%zBv6Vli7ZE$VhmSg3UMj{`UIvhm@hNy;9|;51gdumlwuZU z_D~S52BaWb(Ns0FFvH~tbI4z;2Fjl24H9{tXT@A2!9UP--R%nh5pW@(|KFG67V~{N z6a$yB>*ctmsp?*!)f#|SYtBtUm_*E%8Et(N1ZeA?bZ!b<&cirTQ`Pvg81znug84Gz zlIZCx+=Fp9B5pkp*p+)5$z7*l_6+B4g0aXwQSbHXaq!&Zu^z)XTY>G*M<+x-maW!y kOs8-xHH%c)G}kNq0^x~~l3tq-?f?J)07*qoM6N<$f(-Ag-T(jq literal 0 HcmV?d00001