diff --git a/TODO b/TODO index eca9934..5f1cacd 100644 --- a/TODO +++ b/TODO @@ -1,19 +1,14 @@ -1. Add brown+white+yellow+red+green blocks, whitewash, concrete -2. Figure out what to do with "NII wall", nii floor, tilled block -6. Work on custom blocks and doors, etc. -9. Possibly make all NSE_ into a generic class with inheritance (for registration functions) - - === ADD BLOCKS/FEATURES === -* Add brown+white+yellow+red+green blocks, whitewash, concrete +* Add brown+white+yellow+red+green blocks +* Add slab and stair variations * Add doors and fences * Add windows * Add (with functionality) present appliance/furniture/electronics textures -* Fully make datagen for tags, recipes (with unlocks), drops, achievements * Figure out what to do with "NII wall", nii floor, tilled block === FIX STUFF === * PO2 wall +* Replace a ton of stuff with FabricBlockSettings.copy and resistance+hardness -> strength === NON-GAME CHANGES === * Minotaur publishing to modrinth and something similar for curse diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_beige_concrete.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_beige_concrete.json new file mode 100644 index 0000000..81e7b31 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_beige_concrete.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_beige_concrete": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:beige_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_beige_concrete" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_beige_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_beige_concrete" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_blue_concrete.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_blue_concrete.json new file mode 100644 index 0000000..bebb379 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_blue_concrete.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_concrete": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:blue_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_blue_concrete" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_blue_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_blue_concrete" + ] + }, + "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_concrete.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_concrete.json new file mode 100644 index 0000000..34244a5 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_green_concrete.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_concrete": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:green_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_green_concrete" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_green_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_green_concrete" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_red_concrete.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_red_concrete.json new file mode 100644 index 0000000..256eb0a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_red_concrete.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_red_concrete": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:red_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_red_concrete" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_red_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_red_concrete" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_white_concrete.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_white_concrete.json new file mode 100644 index 0000000..64e1aec --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_white_concrete.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_white_concrete" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_concrete": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:white_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_white_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_white_concrete" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_whitewash.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_whitewash.json new file mode 100644 index 0000000..8fc1aa4 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_whitewash.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_whitewash" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_whitewash": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:whitewash" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_whitewash", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_whitewash" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_yellow_concrete.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_yellow_concrete.json new file mode 100644 index 0000000..001f52c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cracked_yellow_concrete.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cracked_yellow_concrete" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_concrete": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:yellow_concrete" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_yellow_concrete", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cracked_yellow_concrete" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/very_cracked_whitewash.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/very_cracked_whitewash.json new file mode 100644 index 0000000..1172b61 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/very_cracked_whitewash.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_whitewash": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cracked_whitewash" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:very_cracked_whitewash" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_whitewash", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:very_cracked_whitewash" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/beige_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/beige_concrete.json new file mode 100644 index 0000000..2751ac0 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/beige_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:beige_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/blue_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/blue_concrete.json new file mode 100644 index 0000000..b79ff4f --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/blue_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:blue_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_beige_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_beige_concrete.json new file mode 100644 index 0000000..ca75e17 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_beige_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_beige_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_blue_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_blue_concrete.json new file mode 100644 index 0000000..d43a9ba --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_blue_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_blue_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_green_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_green_concrete.json new file mode 100644 index 0000000..716a658 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_green_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_green_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_red_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_red_concrete.json new file mode 100644 index 0000000..9df08c3 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_red_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_red_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_white_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_white_concrete.json new file mode 100644 index 0000000..81f7f8e --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_white_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_white_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_whitewash.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_whitewash.json new file mode 100644 index 0000000..1bbe730 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_whitewash.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_whitewash" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_yellow_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_yellow_concrete.json new file mode 100644 index 0000000..ff3884b --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_yellow_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_yellow_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/green_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/green_concrete.json new file mode 100644 index 0000000..2e6f844 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/green_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:green_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/red_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/red_concrete.json new file mode 100644 index 0000000..c3ff034 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/red_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:red_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/very_cracked_whitewash.json b/src/main/generated/data/new_soviet/loot_tables/blocks/very_cracked_whitewash.json new file mode 100644 index 0000000..665c486 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/very_cracked_whitewash.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:very_cracked_whitewash" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/white_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/white_concrete.json new file mode 100644 index 0000000..ab16e12 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/white_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:white_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/whitewash.json b/src/main/generated/data/new_soviet/loot_tables/blocks/whitewash.json new file mode 100644 index 0000000..0c2b70f --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/whitewash.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:whitewash" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/yellow_concrete.json b/src/main/generated/data/new_soviet/loot_tables/blocks/yellow_concrete.json new file mode 100644 index 0000000..b7c249a --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/yellow_concrete.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:yellow_concrete" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_beige_concrete.json b/src/main/generated/data/new_soviet/recipes/cracked_beige_concrete.json new file mode 100644 index 0000000..d5f6f79 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_beige_concrete.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:beige_concrete" + }, + "result": "new_soviet:cracked_beige_concrete" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_blue_concrete.json b/src/main/generated/data/new_soviet/recipes/cracked_blue_concrete.json new file mode 100644 index 0000000..a0a3330 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_blue_concrete.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:blue_concrete" + }, + "result": "new_soviet:cracked_blue_concrete" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_green_concrete.json b/src/main/generated/data/new_soviet/recipes/cracked_green_concrete.json new file mode 100644 index 0000000..903d653 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_green_concrete.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:green_concrete" + }, + "result": "new_soviet:cracked_green_concrete" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_red_concrete.json b/src/main/generated/data/new_soviet/recipes/cracked_red_concrete.json new file mode 100644 index 0000000..81fef84 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_red_concrete.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:red_concrete" + }, + "result": "new_soviet:cracked_red_concrete" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_white_concrete.json b/src/main/generated/data/new_soviet/recipes/cracked_white_concrete.json new file mode 100644 index 0000000..2b4198d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_white_concrete.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:white_concrete" + }, + "result": "new_soviet:cracked_white_concrete" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_whitewash.json b/src/main/generated/data/new_soviet/recipes/cracked_whitewash.json new file mode 100644 index 0000000..c453a03 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_whitewash.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:whitewash" + }, + "result": "new_soviet:cracked_whitewash" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_yellow_concrete.json b/src/main/generated/data/new_soviet/recipes/cracked_yellow_concrete.json new file mode 100644 index 0000000..b0bd4cd --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_yellow_concrete.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:yellow_concrete" + }, + "result": "new_soviet:cracked_yellow_concrete" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/very_cracked_whitewash.json b/src/main/generated/data/new_soviet/recipes/very_cracked_whitewash.json new file mode 100644 index 0000000..8d7d5cf --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/very_cracked_whitewash.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:cracked_whitewash" + }, + "result": "new_soviet:very_cracked_whitewash" +} \ 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 6958260..f2a0ba2 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -6,9 +6,12 @@ import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.minecraft.block.Blocks; +import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.RecipeProvider; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; @@ -148,6 +151,21 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Blocks.CYAN_LINOLEUM); addDrop(NSE_Blocks.CROSS_ORANGE_LINOLEUM); addDrop(NSE_Blocks.CROSS_BROWN_LINOLEUM); + addDrop(NSE_Blocks.WHITE_CONCRETE); + addDrop(NSE_Blocks.CRACKED_WHITE_CONCRETE); + addDrop(NSE_Blocks.BEIGE_CONCRETE); + addDrop(NSE_Blocks.CRACKED_BEIGE_CONCRETE); + addDrop(NSE_Blocks.BLUE_CONCRETE); + addDrop(NSE_Blocks.CRACKED_BLUE_CONCRETE); + addDrop(NSE_Blocks.RED_CONCRETE); + addDrop(NSE_Blocks.CRACKED_RED_CONCRETE); + addDrop(NSE_Blocks.YELLOW_CONCRETE); + addDrop(NSE_Blocks.CRACKED_YELLOW_CONCRETE); + addDrop(NSE_Blocks.GREEN_CONCRETE); + addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE); + addDrop(NSE_Blocks.WHITEWASH); + addDrop(NSE_Blocks.CRACKED_WHITEWASH); + addDrop(NSE_Blocks.VERY_CRACKED_WHITEWASH); // Drops for furniture/electronics/appliances addDrop(NSE_Custom.TV); @@ -465,6 +483,14 @@ public class DataGeneration implements DataGeneratorEntrypoint { offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_WHITE_TILES, NSE_Blocks.GREEN_WHITE_TILES); offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_TUFF_TILES, NSE_Blocks.TUFF_TILES); offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_TUFF_BRICKS, NSE_Blocks.TUFF_BRICKS); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_WHITEWASH, NSE_Blocks.WHITEWASH); + offerCrackingRecipe(exporter, NSE_Blocks.VERY_CRACKED_WHITEWASH, NSE_Blocks.CRACKED_WHITEWASH); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_WHITE_CONCRETE, NSE_Blocks.WHITE_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BEIGE_CONCRETE, NSE_Blocks.BEIGE_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BLUE_CONCRETE, NSE_Blocks.BLUE_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_RED_CONCRETE, NSE_Blocks.RED_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_YELLOW_CONCRETE, NSE_Blocks.YELLOW_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_CONCRETE, NSE_Blocks.GREEN_CONCRETE); mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES, NSE_Blocks.SAND_TILES); mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_BRICKS, NSE_Blocks.SAND_BRICKS); @@ -565,11 +591,27 @@ public class DataGeneration implements DataGeneratorEntrypoint { } } + // This is often used once to generate some model and then move it into "proper" assets folder + private static class ModelGenerator extends FabricModelProvider { + private ModelGenerator(FabricDataOutput generator) { + super(generator); + } + + @Override + public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { + } + + @Override + public void generateItemModels(ItemModelGenerator itemModelGenerator) { + } + } + @Override public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { - FabricDataGenerator.Pack myPack = fabricDataGenerator.createPack(); - myPack.addProvider(BlockLootTables::new); - myPack.addProvider(RecipeGenerator::new); - myPack.addProvider(BlockTagGenerator::new); + FabricDataGenerator.Pack NSEPack = fabricDataGenerator.createPack(); + NSEPack.addProvider(BlockLootTables::new); + NSEPack.addProvider(RecipeGenerator::new); + NSEPack.addProvider(BlockTagGenerator::new); + NSEPack.addProvider(ModelGenerator::new); } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/NSE_Blocks.java b/src/main/java/su/a71/new_soviet/NSE_Blocks.java index 3edd443..b57e84c 100644 --- a/src/main/java/su/a71/new_soviet/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/NSE_Blocks.java @@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.minecraft.block.Block; import net.minecraft.block.MapColor; +import net.minecraft.block.StairsBlock; import net.minecraft.block.WallBlock; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; @@ -106,23 +107,29 @@ public class NSE_Blocks { public static final Block CRACKED_TUFF_BRICKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.TUFF).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TERRACOTTA_GRAY)); public static final Block MOSSY_TUFF_BRICKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.TUFF).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TERRACOTTA_GRAY)); - // Industrial ===================================== - public static final Block INDUSTRIAL_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.BLACK)); - public static final Block RED_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.RED)); - public static final Block ORANGE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.ORANGE)); - public static final Block YELLOW_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.YELLOW)); - public static final Block CYAN_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.CYAN)); - public static final Block LIGHT_BLUE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.LIGHT_BLUE)); - public static final Block BLUE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.BLUE)); - public static final Block LIME_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.LIME)); - public static final Block GREEN_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.GREEN)); - public static final Block GRAY_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.GRAY)); - public static final Block PURPLE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.PURPLE)); - public static final Block MAGENTA_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.MAGENTA)); - public static final Block METAL_PLATING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(5f).requiresTool().mapColor(MapColor.IRON_GRAY)); - public static final Block CRATE = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).nonOpaque().mapColor(MapColor.OAK_TAN)); - public static final WallBlock CONCRETE_WALL = new WallBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).mapColor(MapColor.STONE_GRAY)); + public static final Block WHITEWASH = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.OFF_WHITE)); + public static final Block CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH)); + public static final Block VERY_CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH)); + + public static final Block WHITE_CONCRETE = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.OFF_WHITE)); + public static final Block CRACKED_WHITE_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE)); + public static final Block WHITE_CONCRETE_WITH_BARS = new Block(FabricBlockSettings.copy(WHITE_CONCRETE)); + public static final Block BEIGE_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.OAK_TAN)); + public static final Block CRACKED_BEIGE_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.OAK_TAN)); + public static final Block BEIGE_CONCRETE_WITH_BARS = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.OAK_TAN)); + public static final Block BLUE_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_BLUE)); + public static final Block CRACKED_BLUE_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_BLUE)); + public static final Block BLUE_CONCRETE_WITH_BARS = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_BLUE)); + public static final Block RED_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_RED)); + public static final Block CRACKED_RED_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_RED)); + public static final Block RED_CONCRETE_WITH_BARS = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_RED)); + public static final Block YELLOW_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_YELLOW)); + public static final Block CRACKED_YELLOW_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_YELLOW)); + public static final Block YELLOW_CONCRETE_WITH_BARS = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_YELLOW)); + public static final Block GREEN_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_GREEN)); + public static final Block CRACKED_GREEN_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_GREEN)); + public static final Block GREEN_CONCRETE_WITH_BARS = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_GREEN)); // WOOD/FLOOR ====== public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).hardness(2f).resistance(3f).mapColor(MapColor.ORANGE)); @@ -156,7 +163,23 @@ public class NSE_Blocks { public static final Block CROSS_ORANGE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).hardness(2f).resistance(3f)); public static final Block CROSS_BROWN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).hardness(2f).resistance(3f)); - // Concrete + // Industrial ===================================== + public static final Block INDUSTRIAL_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.BLACK)); + public static final Block RED_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.RED)); + public static final Block ORANGE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.ORANGE)); + public static final Block YELLOW_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.YELLOW)); + public static final Block CYAN_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.CYAN)); + public static final Block LIGHT_BLUE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.LIGHT_BLUE)); + public static final Block BLUE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.BLUE)); + public static final Block LIME_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.LIME)); + public static final Block GREEN_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.GREEN)); + public static final Block GRAY_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.GRAY)); + public static final Block PURPLE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.PURPLE)); + public static final Block MAGENTA_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.MAGENTA)); + + public static final Block METAL_PLATING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(5f).requiresTool().mapColor(MapColor.IRON_GRAY)); + public static final Block CRATE = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).nonOpaque().mapColor(MapColor.OAK_TAN)); + public static final WallBlock CONCRETE_WALL = new WallBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).mapColor(MapColor.STONE_GRAY)); private static final ItemGroup NSE_BUILDING_TAB = FabricItemGroup.builder() .icon(() -> new ItemStack(CALCITE_TILES)) @@ -249,22 +272,28 @@ public class NSE_Blocks { register("cracked_tuff_bricks", () -> CRACKED_TUFF_BRICKS, NSE_BUILDING_TAB); register("mossy_tuff_bricks", () -> MOSSY_TUFF_BRICKS, 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); + register("whitewash", () -> WHITEWASH, NSE_BUILDING_TAB); + register("cracked_whitewash", () -> CRACKED_WHITEWASH, NSE_BUILDING_TAB); + register("very_cracked_whitewash", () -> VERY_CRACKED_WHITEWASH, 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 + 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); register("herringbone_acacia_planks", () -> HERRINGBONE_ACACIA_PLANKS, NSE_BUILDING_TAB); register("cross_acacia_planks", () -> CROSS_ACACIA_PLANKS, NSE_BUILDING_TAB); @@ -296,6 +325,23 @@ public class NSE_Blocks { 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); + + 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); + + register("metal_plating", () -> METAL_PLATING, NSE_BUILDING_TAB); + register("crate", () -> CRATE, NSE_BUILDING_TAB); + register("concrete_wall", () -> CONCRETE_WALL, NSE_BUILDING_TAB); // TODO: Broken } public static void initFlame() { diff --git a/src/main/resources/assets/new_soviet/blockstates/beige_concrete.json b/src/main/resources/assets/new_soviet/blockstates/beige_concrete.json new file mode 100644 index 0000000..ff36dcc --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/beige_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/beige_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/blue_concrete.json b/src/main/resources/assets/new_soviet/blockstates/blue_concrete.json new file mode 100644 index 0000000..41d9c93 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/blue_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/blue_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_beige_concrete.json b/src/main/resources/assets/new_soviet/blockstates/cracked_beige_concrete.json new file mode 100644 index 0000000..439b302 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_beige_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_beige_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_blue_concrete.json b/src/main/resources/assets/new_soviet/blockstates/cracked_blue_concrete.json new file mode 100644 index 0000000..d643062 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_blue_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_blue_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_green_concrete.json b/src/main/resources/assets/new_soviet/blockstates/cracked_green_concrete.json new file mode 100644 index 0000000..abedb6e --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_green_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_green_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_red_concrete.json b/src/main/resources/assets/new_soviet/blockstates/cracked_red_concrete.json new file mode 100644 index 0000000..c4e3b7a --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_red_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_red_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_white_concrete.json b/src/main/resources/assets/new_soviet/blockstates/cracked_white_concrete.json new file mode 100644 index 0000000..e8df1a9 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_white_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_white_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_whitewash.json b/src/main/resources/assets/new_soviet/blockstates/cracked_whitewash.json new file mode 100644 index 0000000..eddd596 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_whitewash.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_whitewash" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_yellow_concrete.json b/src/main/resources/assets/new_soviet/blockstates/cracked_yellow_concrete.json new file mode 100644 index 0000000..27056f0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_yellow_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_yellow_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/green_concrete.json b/src/main/resources/assets/new_soviet/blockstates/green_concrete.json new file mode 100644 index 0000000..7b9d849 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/green_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/green_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/red_concrete.json b/src/main/resources/assets/new_soviet/blockstates/red_concrete.json new file mode 100644 index 0000000..79b6852 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/red_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/red_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/very_cracked_whitewash.json b/src/main/resources/assets/new_soviet/blockstates/very_cracked_whitewash.json new file mode 100644 index 0000000..2ff1d26 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/very_cracked_whitewash.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/very_cracked_whitewash" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/white_concrete.json b/src/main/resources/assets/new_soviet/blockstates/white_concrete.json new file mode 100644 index 0000000..529c4d0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/white_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/white_concrete" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/whitewash.json b/src/main/resources/assets/new_soviet/blockstates/whitewash.json new file mode 100644 index 0000000..c430339 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/whitewash.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/whitewash" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/yellow_concrete.json b/src/main/resources/assets/new_soviet/blockstates/yellow_concrete.json new file mode 100644 index 0000000..10df34f --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/yellow_concrete.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/yellow_concrete" + } + } +} \ No newline at end of file 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 d76d263..9834322 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -73,6 +73,9 @@ "block.new_soviet.tuff_bricks": "Tuff Bricks", "block.new_soviet.cracked_tuff_bricks": "Cracked Tuff Bricks", "block.new_soviet.mossy_tuff_bricks": "Mossy Tuff Bricks", + "block.new_soviet.whitewash": "Whitewash", + "block.new_soviet.cracked_whitewash": "Cracked Whitewash", + "block.new_soviet.very_cracked_whitewash": "Very Cracked Whitewash", "block.new_soviet.industrial_warning": "Industrial Warning Stripes", "block.new_soviet.gray_warning": "Gray Warning Stripes", "block.new_soviet.red_warning": "Red Warning Stripes", diff --git a/src/main/resources/assets/new_soviet/models/block/beige_concrete.json b/src/main/resources/assets/new_soviet/models/block/beige_concrete.json new file mode 100644 index 0000000..e77e494 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/beige_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/beige_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/blue_concrete.json b/src/main/resources/assets/new_soviet/models/block/blue_concrete.json new file mode 100644 index 0000000..47554d8 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/blue_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/blue_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_beige_concrete.json b/src/main/resources/assets/new_soviet/models/block/cracked_beige_concrete.json new file mode 100644 index 0000000..8ad188e --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_beige_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/cracked_beige_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_blue_concrete.json b/src/main/resources/assets/new_soviet/models/block/cracked_blue_concrete.json new file mode 100644 index 0000000..85af107 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_blue_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/cracked_blue_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_green_concrete.json b/src/main/resources/assets/new_soviet/models/block/cracked_green_concrete.json new file mode 100644 index 0000000..f94ef89 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_green_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/cracked_green_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_red_concrete.json b/src/main/resources/assets/new_soviet/models/block/cracked_red_concrete.json new file mode 100644 index 0000000..a488ba1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_red_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/cracked_red_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_white_concrete.json b/src/main/resources/assets/new_soviet/models/block/cracked_white_concrete.json new file mode 100644 index 0000000..a86dd88 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_white_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/cracked_white_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_whitewash.json b/src/main/resources/assets/new_soviet/models/block/cracked_whitewash.json new file mode 100644 index 0000000..0fa8c38 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_whitewash.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/whitewash/cracked_whitewash", + "particle": "new_soviet:block/whitewash/cracked_whitewash" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_yellow_concrete.json b/src/main/resources/assets/new_soviet/models/block/cracked_yellow_concrete.json new file mode 100644 index 0000000..e2b947c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_yellow_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/cracked_yellow_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/green_concrete.json b/src/main/resources/assets/new_soviet/models/block/green_concrete.json new file mode 100644 index 0000000..69f47ac --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/green_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/green_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/red_concrete.json b/src/main/resources/assets/new_soviet/models/block/red_concrete.json new file mode 100644 index 0000000..634b8d0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/red_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/red_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/very_cracked_whitewash.json b/src/main/resources/assets/new_soviet/models/block/very_cracked_whitewash.json new file mode 100644 index 0000000..f637daf --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/very_cracked_whitewash.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/whitewash/very_cracked_whitewash", + "particle": "new_soviet:block/whitewash/very_cracked_whitewash" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/white_concrete.json b/src/main/resources/assets/new_soviet/models/block/white_concrete.json new file mode 100644 index 0000000..7440edb --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/white_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/white_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/whitewash.json b/src/main/resources/assets/new_soviet/models/block/whitewash.json new file mode 100644 index 0000000..8afa0c4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/whitewash.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/whitewash/whitewash", + "particle": "new_soviet:block/whitewash/whitewash" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/yellow_concrete.json b/src/main/resources/assets/new_soviet/models/block/yellow_concrete.json new file mode 100644 index 0000000..d9668b0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/yellow_concrete.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/concrete/yellow_concrete" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/beige_concrete.json b/src/main/resources/assets/new_soviet/models/item/beige_concrete.json new file mode 100644 index 0000000..854ca01 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/beige_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/beige_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/blue_concrete.json b/src/main/resources/assets/new_soviet/models/item/blue_concrete.json new file mode 100644 index 0000000..24ebf66 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/blue_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/blue_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_beige_concrete.json b/src/main/resources/assets/new_soviet/models/item/cracked_beige_concrete.json new file mode 100644 index 0000000..19b67e7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_beige_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cracked_beige_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_blue_concrete.json b/src/main/resources/assets/new_soviet/models/item/cracked_blue_concrete.json new file mode 100644 index 0000000..3c57309 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_blue_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cracked_blue_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_green_concrete.json b/src/main/resources/assets/new_soviet/models/item/cracked_green_concrete.json new file mode 100644 index 0000000..9d82edb --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_green_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cracked_green_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_red_concrete.json b/src/main/resources/assets/new_soviet/models/item/cracked_red_concrete.json new file mode 100644 index 0000000..5b4d8c5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_red_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cracked_red_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_white_concrete.json b/src/main/resources/assets/new_soviet/models/item/cracked_white_concrete.json new file mode 100644 index 0000000..c8767a5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_white_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cracked_white_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_whitewash.json b/src/main/resources/assets/new_soviet/models/item/cracked_whitewash.json new file mode 100644 index 0000000..8826b0b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_whitewash.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_whitewash" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_yellow_concrete.json b/src/main/resources/assets/new_soviet/models/item/cracked_yellow_concrete.json new file mode 100644 index 0000000..90b07c4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_yellow_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cracked_yellow_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/green_concrete.json b/src/main/resources/assets/new_soviet/models/item/green_concrete.json new file mode 100644 index 0000000..7242998 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/green_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/green_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/red_concrete.json b/src/main/resources/assets/new_soviet/models/item/red_concrete.json new file mode 100644 index 0000000..83f8072 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/red_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/red_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/very_cracked_whitewash.json b/src/main/resources/assets/new_soviet/models/item/very_cracked_whitewash.json new file mode 100644 index 0000000..9573c60 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/very_cracked_whitewash.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/very_cracked_whitewash" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/white_concrete.json b/src/main/resources/assets/new_soviet/models/item/white_concrete.json new file mode 100644 index 0000000..300f1e1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/white_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/white_concrete" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/whitewash.json b/src/main/resources/assets/new_soviet/models/item/whitewash.json new file mode 100644 index 0000000..eed3180 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/whitewash.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/whitewash" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/yellow_concrete.json b/src/main/resources/assets/new_soviet/models/item/yellow_concrete.json new file mode 100644 index 0000000..479788b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/yellow_concrete.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/yellow_concrete" +} \ No newline at end of file