From ea5af6ca06c2d859efaad599afa41a76574adea2 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sun, 6 Aug 2023 15:30:30 +0300 Subject: [PATCH] Make siren sound dynamic and add white recipes --- ...rch_door_from_birch_door_stonecutting.json | 35 ++++++++++++++ ..._from_glazed_white_tiles_stonecutting.json | 35 ++++++++++++++ ...mall_cracked_white_tiles_stonecutting.json | 35 ++++++++++++++ ...s_from_small_white_tiles_stonecutting.json | 35 ++++++++++++++ ...acked_glazed_white_tiles_stonecutting.json | 35 ++++++++++++++ ...mall_cracked_white_tiles_stonecutting.json | 35 ++++++++++++++ ...s_from_small_white_tiles_stonecutting.json | 35 ++++++++++++++ ...acked_glazed_white_tiles_stonecutting.json | 35 ++++++++++++++ ..._from_glazed_white_tiles_stonecutting.json | 35 ++++++++++++++ ...s_from_small_white_tiles_stonecutting.json | 35 ++++++++++++++ .../building_blocks/small_white_tiles.json | 48 +++++++++++++++++++ ...acked_glazed_white_tiles_stonecutting.json | 35 ++++++++++++++ ..._from_glazed_white_tiles_stonecutting.json | 35 ++++++++++++++ ...mall_cracked_white_tiles_stonecutting.json | 35 ++++++++++++++ ...rch_door_from_birch_door_stonecutting.json | 8 ++++ ..._from_glazed_white_tiles_stonecutting.json | 8 ++++ ...mall_cracked_white_tiles_stonecutting.json | 8 ++++ ...s_from_small_white_tiles_stonecutting.json | 8 ++++ ...acked_glazed_white_tiles_stonecutting.json | 8 ++++ ...mall_cracked_white_tiles_stonecutting.json | 8 ++++ ...s_from_small_white_tiles_stonecutting.json | 8 ++++ ...acked_glazed_white_tiles_stonecutting.json | 8 ++++ ..._from_glazed_white_tiles_stonecutting.json | 8 ++++ ...s_from_small_white_tiles_stonecutting.json | 8 ++++ .../new_soviet/recipes/small_white_tiles.json | 21 ++++++++ ...acked_glazed_white_tiles_stonecutting.json | 8 ++++ ..._from_glazed_white_tiles_stonecutting.json | 8 ++++ ...mall_cracked_white_tiles_stonecutting.json | 8 ++++ .../su/a71/new_soviet/DataGeneration.java | 10 +++- .../su/a71/new_soviet/blocks/SirenBlock.java | 15 +++++- .../models/item/glazed_white_tiles.json | 4 ++ 31 files changed, 654 insertions(+), 3 deletions(-) create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/chiseled_birch_door_from_birch_door_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles_from_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles_from_small_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_small_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles_from_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles_from_small_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_small_cracked_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/chiseled_birch_door_from_birch_door_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_small_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_small_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_small_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/small_white_tiles.json create mode 100644 src/main/generated/data/new_soviet/recipes/small_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/small_white_tiles_from_glazed_white_tiles_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/small_white_tiles_from_small_cracked_white_tiles_stonecutting.json create mode 100644 src/main/resources/assets/new_soviet/models/item/glazed_white_tiles.json diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/chiseled_birch_door_from_birch_door_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/chiseled_birch_door_from_birch_door_stonecutting.json new file mode 100644 index 0000000..facf1d2 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/chiseled_birch_door_from_birch_door_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_birch_door": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:birch_door" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:chiseled_birch_door_from_birch_door_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_birch_door", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:chiseled_birch_door_from_birch_door_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_glazed_white_tiles_from_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles_from_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..c3c6348 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles_from_glazed_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glazed_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:glazed_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_glazed_white_tiles_from_glazed_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_glazed_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_glazed_white_tiles_from_glazed_white_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_glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json new file mode 100644 index 0000000..f4966be --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_cracked_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:small_cracked_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_glazed_white_tiles_from_small_cracked_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_cracked_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_glazed_white_tiles_from_small_cracked_white_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_glazed_white_tiles_from_small_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles_from_small_white_tiles_stonecutting.json new file mode 100644 index 0000000..22a6449 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_glazed_white_tiles_from_small_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "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": "minecraft:cracked_glazed_white_tiles_from_small_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_glazed_white_tiles_from_small_white_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_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..9ed7227 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_glazed_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cracked_glazed_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:glazed_white_tiles_from_cracked_glazed_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_glazed_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:glazed_white_tiles_from_cracked_glazed_white_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_white_tiles_from_small_cracked_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json new file mode 100644 index 0000000..180ec58 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_cracked_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:small_cracked_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:glazed_white_tiles_from_small_cracked_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_cracked_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:glazed_white_tiles_from_small_cracked_white_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_white_tiles_from_small_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_small_white_tiles_stonecutting.json new file mode 100644 index 0000000..673d5bc --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/glazed_white_tiles_from_small_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "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": "minecraft:glazed_white_tiles_from_small_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:glazed_white_tiles_from_small_white_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_cracked_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..41456fe --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_glazed_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cracked_glazed_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:small_cracked_white_tiles_from_cracked_glazed_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_glazed_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:small_cracked_white_tiles_from_cracked_glazed_white_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_cracked_white_tiles_from_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles_from_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..b95ff53 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles_from_glazed_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glazed_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:glazed_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:small_cracked_white_tiles_from_glazed_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_glazed_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:small_cracked_white_tiles_from_glazed_white_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_cracked_white_tiles_from_small_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles_from_small_white_tiles_stonecutting.json new file mode 100644 index 0000000..3148366 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_cracked_white_tiles_from_small_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "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": "minecraft:small_cracked_white_tiles_from_small_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:small_cracked_white_tiles_from_small_white_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_white_tiles.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles.json new file mode 100644 index 0000000..3fb6ff3 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:small_white_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:white_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_stone", + "has_white_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:small_white_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_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..0875998 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_glazed_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cracked_glazed_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:small_white_tiles_from_cracked_glazed_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_glazed_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:small_white_tiles_from_cracked_glazed_white_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_white_tiles_from_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..4f4a4a4 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_glazed_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glazed_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:glazed_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:small_white_tiles_from_glazed_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_glazed_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:small_white_tiles_from_glazed_white_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_white_tiles_from_small_cracked_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_small_cracked_white_tiles_stonecutting.json new file mode 100644 index 0000000..ddabb0f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/small_white_tiles_from_small_cracked_white_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_cracked_white_tiles": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:small_cracked_white_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:small_white_tiles_from_small_cracked_white_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_cracked_white_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:small_white_tiles_from_small_cracked_white_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/chiseled_birch_door_from_birch_door_stonecutting.json b/src/main/generated/data/new_soviet/recipes/chiseled_birch_door_from_birch_door_stonecutting.json new file mode 100644 index 0000000..71f6433 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/chiseled_birch_door_from_birch_door_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:birch_door" + }, + "result": "new_soviet:chiseled_birch_door" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..525da7f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_glazed_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:glazed_white_tiles" + }, + "result": "new_soviet:cracked_glazed_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json new file mode 100644 index 0000000..796a935 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:small_cracked_white_tiles" + }, + "result": "new_soviet:cracked_glazed_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_small_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_small_white_tiles_stonecutting.json new file mode 100644 index 0000000..d5c65b9 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_glazed_white_tiles_from_small_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:small_white_tiles" + }, + "result": "new_soviet:cracked_glazed_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..ffd8c8e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:cracked_glazed_white_tiles" + }, + "result": "new_soviet:glazed_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json new file mode 100644 index 0000000..0566db6 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_small_cracked_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:small_cracked_white_tiles" + }, + "result": "new_soviet:glazed_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_small_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_small_white_tiles_stonecutting.json new file mode 100644 index 0000000..f8e5a83 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/glazed_white_tiles_from_small_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:small_white_tiles" + }, + "result": "new_soviet:glazed_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..09e5b8c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:cracked_glazed_white_tiles" + }, + "result": "new_soviet:small_cracked_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..a087a0c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_glazed_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:glazed_white_tiles" + }, + "result": "new_soviet:small_cracked_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_small_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_small_white_tiles_stonecutting.json new file mode 100644 index 0000000..aa6f645 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_cracked_white_tiles_from_small_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:small_white_tiles" + }, + "result": "new_soviet:small_cracked_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_white_tiles.json b/src/main/generated/data/new_soviet/recipes/small_white_tiles.json new file mode 100644 index 0000000..cf2e817 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_white_tiles.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "X": { + "item": "minecraft:stone" + }, + "Y": { + "item": "minecraft:white_dye" + } + }, + "pattern": [ + "XY", + "YX" + ], + "result": { + "count": 4, + "item": "new_soviet:small_white_tiles" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..88bb7c2 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_cracked_glazed_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:cracked_glazed_white_tiles" + }, + "result": "new_soviet:small_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_glazed_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_glazed_white_tiles_stonecutting.json new file mode 100644 index 0000000..9cae518 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_glazed_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:glazed_white_tiles" + }, + "result": "new_soviet:small_white_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_small_cracked_white_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_small_cracked_white_tiles_stonecutting.json new file mode 100644 index 0000000..8cc6935 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_white_tiles_from_small_cracked_white_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:small_cracked_white_tiles" + }, + "result": "new_soviet:small_white_tiles" +} \ 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 5b289ac..27d1912 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -473,6 +473,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { public void generate(Consumer exporter) { crissCrossRecipe(exporter, NSE_Blocks.SAND_TILES, Blocks.SMOOTH_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE); crissCrossRecipe(exporter, NSE_Blocks.LIGHT_BLUE_TILES, Blocks.STONE, Items.LIGHT_BLUE_DYE); + crissCrossRecipe(exporter, NSE_Blocks.SMALL_WHITE_TILES, Blocks.STONE, Items.WHITE_DYE); crissCrossRecipe(exporter, NSE_Blocks.GREEN_WHITE_TILES, Blocks.POLISHED_DIORITE, Items.GREEN_DYE); tvRecipe(exporter, NSE_Custom.TV, Items.ORANGE_DYE); @@ -613,6 +614,13 @@ public class DataGeneration implements DataGeneratorEntrypoint { list.add(Blocks.TUFF); }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.SMALL_WHITE_TILES); + list.add(NSE_Blocks.SMALL_CRACKED_WHITE_TILES); + list.add(NSE_Blocks.GLAZED_WHITE_TILES); + list.add(NSE_Blocks.CRACKED_GLAZED_WHITE_TILES); + }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { list.add(NSE_Blocks.CROSS_ACACIA_PLANKS); list.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS); @@ -661,7 +669,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_MANGROVE_DOOR, Blocks.MANGROVE_DOOR); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_OAK_DOOR, Blocks.OAK_DOOR); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_SPRUCE_DOOR, Blocks.SPRUCE_DOOR); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_BIRCH_DOOR, Blocks.BIRCH_BUTTON); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_BIRCH_DOOR, Blocks.BIRCH_DOOR); createStairsRecipe(NSE_Blocks.SAND_TILES_STAIRS, Ingredient.ofItems(NSE_Blocks.SAND_TILES)); } diff --git a/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java b/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java index 4db208d..3aefb24 100644 --- a/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java @@ -43,7 +43,7 @@ public class SirenBlock extends HorizontalFacingBlock { if (bl) { world.scheduleBlockTick(pos, this, 4); } else { - world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Custom.SIREN_SOUND, SoundCategory.NEUTRAL, 5F, 1f); + world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Custom.SIREN_SOUND, SoundCategory.NEUTRAL, getSirenVolume(world, pos), 1f); world.setBlockState(pos, (BlockState)state.cycle(ON), 2); world.scheduleBlockTick(pos, this, 140); } @@ -88,10 +88,21 @@ public class SirenBlock extends HorizontalFacingBlock { } else { NewSoviet.LOG.info("Playing!"); - world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Custom.SIREN_SOUND, SoundCategory.NEUTRAL, 5F, 1f); + world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Custom.SIREN_SOUND, SoundCategory.NEUTRAL, getSirenVolume(world, pos), 1f); world.scheduleBlockTick(pos, this, 140); } } + + public float getSirenVolume(World world, BlockPos pos) { + return switch (world.getReceivedRedstonePower(pos)) { + case 1, 2, 3 -> 2f; + case 4, 5, 6 -> 3f; + case 7, 8, 9 -> 4f; + case 10, 11, 12 -> 5f; + case 13, 14, 15, 16 -> 6f; + default -> 1f; + }; + } static { ON = RedstoneTorchBlock.LIT; diff --git a/src/main/resources/assets/new_soviet/models/item/glazed_white_tiles.json b/src/main/resources/assets/new_soviet/models/item/glazed_white_tiles.json new file mode 100644 index 0000000..a765760 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/glazed_white_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/glazed_white_tiles" +} +