Ethyl/New-Soviet-Era
Ethyl/New-Soviet-Era
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rework linoleum crafting recipe

Browse source
This commit is contained in:
Andrew-71 2024-04-26 22:25:13 +03:00
parent 267d6fe342
commit 0694e47660
46 changed files with 1042 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
TODO.md
View file

@ -3,11 +3,7 @@
* Ensure ru_ru and ru_rpr translations are up-to-date
### Missing recipes
* Aquamarine, teal - reliance on prismarine
* Long blue tiles - missing
* Concrete plate - missing
* Spruce and jungle carved - missing
* Yellow-red linoleum - missingл
* Beige linoleum - missing
* Po-2 wall and crate...? - missing
* Rusty blue iron bars - missing
* Most wallpaper - missing

87
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum.json Normal file
View file

@ -0,0 +1,87 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": [
"minecraft:iron_nugget"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_leather": {
"conditions": {
"items": [
{
"items": [
"minecraft:leather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_oak_planks": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_planks"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:beige_linoleum"
},
"trigger": "minecraft:recipe_unlocked"
},
"has_white_dye_1": {
"conditions": {
"items": [
{
"items": [
"minecraft:white_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_white_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:white_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"requirements": [
[
"has_white_dye_1",
"has_white_dye_2",
"has_leather",
"has_oak_planks",
"has_iron_nugget",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:beige_linoleum"
]
},
"sends_telemetry_event": false
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_slab.json Normal file
View file

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_beige_linoleum": {
"conditions": {
"items": [
{
"items": [
"new_soviet:beige_linoleum"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:beige_linoleum_slab"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_beige_linoleum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:beige_linoleum_slab"
]
},
"sends_telemetry_event": false
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_slab_from_beige_linoleum_stonecutting.json Normal file
View file

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_beige_linoleum": {
"conditions": {
"items": [
{
"items": [
"new_soviet:beige_linoleum"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:beige_linoleum_slab_from_beige_linoleum_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_beige_linoleum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:beige_linoleum_slab_from_beige_linoleum_stonecutting"
]
},
"sends_telemetry_event": false
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_stairs.json Normal file
View file

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_beige_linoleum": {
"conditions": {
"items": [
{
"items": [
"new_soviet:beige_linoleum"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:beige_linoleum_stairs"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_beige_linoleum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:beige_linoleum_stairs"
]
},
"sends_telemetry_event": false
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_linoleum_stairs_from_beige_linoleum_stonecutting.json Normal file
View file

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_beige_linoleum": {
"conditions": {
"items": [
{
"items": [
"new_soviet:beige_linoleum"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:beige_linoleum_stairs_from_beige_linoleum_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_beige_linoleum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:beige_linoleum_stairs_from_beige_linoleum_stonecutting"
]
},
"sends_telemetry_event": false
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_linoleum.json
View file

@ -1,7 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_blue_dye": {
"has_blue_dye_1": {
"conditions": {
"items": [
{
@ -13,36 +13,48 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_clay": {
"has_blue_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:clay"
"minecraft:blue_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_paper": {
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": [
"minecraft:paper"
"minecraft:iron_nugget"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_slime_ball": {
"has_leather": {
"conditions": {
"items": [
{
"items": [
"minecraft:slime_ball"
"minecraft:leather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_oak_planks": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_planks"
]
}
]
@ -58,10 +70,11 @@
},
"requirements": [
[
"has_blue_dye",
"has_paper",
"has_slime_ball",
"has_clay",
"has_blue_dye_1",
"has_blue_dye_2",
"has_leather",
"has_oak_planks",
"has_iron_nugget",
"has_the_recipe"
]
],

55
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/brown_linoleum.json
View file

@ -1,19 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_clay": {
"conditions": {
"items": [
{
"items": [
"minecraft:clay"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_gray_dye": {
"has_gray_dye_1": {
"conditions": {
"items": [
{
@ -25,24 +13,48 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_paper": {
"has_gray_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:paper"
"minecraft:gray_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_slime_ball": {
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": [
"minecraft:slime_ball"
"minecraft:iron_nugget"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_leather": {
"conditions": {
"items": [
{
"items": [
"minecraft:leather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_oak_planks": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_planks"
]
}
]
@ -58,10 +70,11 @@
},
"requirements": [
[
"has_gray_dye",
"has_paper",
"has_slime_ball",
"has_clay",
"has_gray_dye_1",
"has_gray_dye_2",
"has_leather",
"has_oak_planks",
"has_iron_nugget",
"has_the_recipe"
]
],

55
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cyan_linoleum.json
View file

@ -1,19 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_clay": {
"conditions": {
"items": [
{
"items": [
"minecraft:clay"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_gray_dye": {
"has_gray_dye_1": {
"conditions": {
"items": [
{
@ -25,24 +13,48 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_paper": {
"has_gray_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:paper"
"minecraft:gray_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_slime_ball": {
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": [
"minecraft:slime_ball"
"minecraft:iron_nugget"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_leather": {
"conditions": {
"items": [
{
"items": [
"minecraft:leather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_oak_planks": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_planks"
]
}
]
@ -58,10 +70,11 @@
},
"requirements": [
[
"has_gray_dye",
"has_paper",
"has_slime_ball",
"has_clay",
"has_gray_dye_1",
"has_gray_dye_2",
"has_leather",
"has_oak_planks",
"has_iron_nugget",
"has_the_recipe"
]
],

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/dye_beige_linoleum.json Normal file
View file

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_needed_dye": {
"conditions": {
"items": [
{
"items": [
"minecraft:white_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:dye_beige_linoleum"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_needed_dye",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:dye_beige_linoleum"
]
},
"sends_telemetry_event": false
}

55
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/gray_linoleum.json
View file

@ -1,19 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_clay": {
"conditions": {
"items": [
{
"items": [
"minecraft:clay"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_gray_dye": {
"has_gray_dye_1": {
"conditions": {
"items": [
{
@ -25,24 +13,48 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_paper": {
"has_gray_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:paper"
"minecraft:gray_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_slime_ball": {
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": [
"minecraft:slime_ball"
"minecraft:iron_nugget"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_leather": {
"conditions": {
"items": [
{
"items": [
"minecraft:leather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_oak_planks": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_planks"
]
}
]
@ -58,10 +70,11 @@
},
"requirements": [
[
"has_gray_dye",
"has_paper",
"has_slime_ball",
"has_clay",
"has_gray_dye_1",
"has_gray_dye_2",
"has_leather",
"has_oak_planks",
"has_iron_nugget",
"has_the_recipe"
]
],

55
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_linoleum.json
View file

@ -1,19 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_clay": {
"conditions": {
"items": [
{
"items": [
"minecraft:clay"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_green_dye": {
"has_green_dye_1": {
"conditions": {
"items": [
{
@ -25,24 +13,48 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_paper": {
"has_green_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:paper"
"minecraft:green_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_slime_ball": {
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": [
"minecraft:slime_ball"
"minecraft:iron_nugget"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_leather": {
"conditions": {
"items": [
{
"items": [
"minecraft:leather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_oak_planks": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_planks"
]
}
]
@ -58,10 +70,11 @@
},
"requirements": [
[
"has_green_dye",
"has_paper",
"has_slime_ball",
"has_clay",
"has_green_dye_1",
"has_green_dye_2",
"has_leather",
"has_oak_planks",
"has_iron_nugget",
"has_the_recipe"
]
],

55
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/orange_linoleum.json
View file

@ -1,19 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_clay": {
"conditions": {
"items": [
{
"items": [
"minecraft:clay"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_gray_dye": {
"has_gray_dye_1": {
"conditions": {
"items": [
{
@ -25,24 +13,48 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_paper": {
"has_gray_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:paper"
"minecraft:gray_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_slime_ball": {
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": [
"minecraft:slime_ball"
"minecraft:iron_nugget"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_leather": {
"conditions": {
"items": [
{
"items": [
"minecraft:leather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_oak_planks": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_planks"
]
}
]
@ -58,10 +70,11 @@
},
"requirements": [
[
"has_gray_dye",
"has_paper",
"has_slime_ball",
"has_clay",
"has_gray_dye_1",
"has_gray_dye_2",
"has_leather",
"has_oak_planks",
"has_iron_nugget",
"has_the_recipe"
]
],

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_linoleum.json
View file

@ -1,31 +1,43 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_clay": {
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": [
"minecraft:clay"
"minecraft:iron_nugget"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_paper": {
"has_leather": {
"conditions": {
"items": [
{
"items": [
"minecraft:paper"
"minecraft:leather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_red_dye": {
"has_oak_planks": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_planks"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_red_dye_1": {
"conditions": {
"items": [
{
@ -37,12 +49,12 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_slime_ball": {
"has_red_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:slime_ball"
"minecraft:red_dye"
]
}
]
@ -58,10 +70,11 @@
},
"requirements": [
[
"has_red_dye",
"has_paper",
"has_slime_ball",
"has_clay",
"has_red_dye_1",
"has_red_dye_2",
"has_leather",
"has_oak_planks",
"has_iron_nugget",
"has_the_recipe"
]
],

87
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum.json Normal file
View file

@ -0,0 +1,87 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_iron_nugget": {
"conditions": {
"items": [
{
"items": [
"minecraft:iron_nugget"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_leather": {
"conditions": {
"items": [
{
"items": [
"minecraft:leather"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_oak_planks": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_planks"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_red_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:red_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:yellow_red_linoleum"
},
"trigger": "minecraft:recipe_unlocked"
},
"has_yellow_dye_1": {
"conditions": {
"items": [
{
"items": [
"minecraft:yellow_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"requirements": [
[
"has_yellow_dye_1",
"has_red_dye_2",
"has_leather",
"has_oak_planks",
"has_iron_nugget",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:yellow_red_linoleum"
]
},
"sends_telemetry_event": false
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_slab.json Normal file
View file

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:yellow_red_linoleum_slab"
},
"trigger": "minecraft:recipe_unlocked"
},
"has_yellow_red_linoleum": {
"conditions": {
"items": [
{
"items": [
"new_soviet:yellow_red_linoleum"
]
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"requirements": [
[
"has_yellow_red_linoleum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:yellow_red_linoleum_slab"
]
},
"sends_telemetry_event": false
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting.json Normal file
View file

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
},
"has_yellow_red_linoleum": {
"conditions": {
"items": [
{
"items": [
"new_soviet:yellow_red_linoleum"
]
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"requirements": [
[
"has_yellow_red_linoleum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting"
]
},
"sends_telemetry_event": false
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_stairs.json Normal file
View file

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:yellow_red_linoleum_stairs"
},
"trigger": "minecraft:recipe_unlocked"
},
"has_yellow_red_linoleum": {
"conditions": {
"items": [
{
"items": [
"new_soviet:yellow_red_linoleum"
]
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"requirements": [
[
"has_yellow_red_linoleum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:yellow_red_linoleum_stairs"
]
},
"sends_telemetry_event": false
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting.json Normal file
View file

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
},
"has_yellow_red_linoleum": {
"conditions": {
"items": [
{
"items": [
"new_soviet:yellow_red_linoleum"
]
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"requirements": [
[
"has_yellow_red_linoleum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting"
]
},
"sends_telemetry_event": false
}

31
src/main/generated/data/new_soviet/recipes/beige_linoleum.json Normal file
View file

@ -0,0 +1,31 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"F": {
"item": "minecraft:white_dye"
},
"I": {
"item": "minecraft:iron_nugget"
},
"L": {
"item": "minecraft:leather"
},
"P": {
"item": "minecraft:oak_planks"
},
"S": {
"item": "minecraft:white_dye"
}
},
"pattern": [
"LLL",
"PPP",
"FIS"
],
"result": {
"count": 3,
"item": "new_soviet:beige_linoleum"
},
"show_notification": true
}

17
src/main/generated/data/new_soviet/recipes/beige_linoleum_slab.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "new_soviet:beige_linoleum"
}
},
"pattern": [
"###"
],
"result": {
"count": 6,
"item": "new_soviet:beige_linoleum_slab"
},
"show_notification": true
}

8
src/main/generated/data/new_soviet/recipes/beige_linoleum_slab_from_beige_linoleum_stonecutting.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:stonecutting",
"count": 2,
"ingredient": {
"item": "new_soviet:beige_linoleum"
},
"result": "new_soviet:beige_linoleum_slab"
}

19
src/main/generated/data/new_soviet/recipes/beige_linoleum_stairs.json Normal file
View file

@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "new_soviet:beige_linoleum"
}
},
"pattern": [
"# ",
"## ",
"###"
],
"result": {
"count": 4,
"item": "new_soviet:beige_linoleum_stairs"
},
"show_notification": true
}

8
src/main/generated/data/new_soviet/recipes/beige_linoleum_stairs_from_beige_linoleum_stonecutting.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:beige_linoleum"
},
"result": "new_soviet:beige_linoleum_stairs"
}

23
src/main/generated/data/new_soviet/recipes/blue_linoleum.json
View file

@ -2,26 +2,29 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"C": {
"item": "minecraft:clay"
},
"D": {
"F": {
"item": "minecraft:blue_dye"
},
"I": {
"item": "minecraft:iron_nugget"
},
"L": {
"item": "minecraft:leather"
},
"P": {
"item": "minecraft:paper"
"item": "minecraft:oak_planks"
},
"S": {
"item": "minecraft:slime_ball"
"item": "minecraft:blue_dye"
}
},
"pattern": [
" D ",
"CPC",
"SPS"
"LLL",
"PPP",
"FIS"
],
"result": {
"count": 2,
"count": 3,
"item": "new_soviet:blue_linoleum"
},
"show_notification": true

23
src/main/generated/data/new_soviet/recipes/brown_linoleum.json
View file

@ -2,26 +2,29 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"C": {
"item": "minecraft:clay"
},
"D": {
"F": {
"item": "minecraft:gray_dye"
},
"I": {
"item": "minecraft:iron_nugget"
},
"L": {
"item": "minecraft:leather"
},
"P": {
"item": "minecraft:paper"
"item": "minecraft:oak_planks"
},
"S": {
"item": "minecraft:slime_ball"
"item": "minecraft:gray_dye"
}
},
"pattern": [
" D ",
"CPC",
"SPS"
"LLL",
"PPP",
"FIS"
],
"result": {
"count": 2,
"count": 3,
"item": "new_soviet:brown_linoleum"
},
"show_notification": true

23
src/main/generated/data/new_soviet/recipes/cyan_linoleum.json
View file

@ -2,26 +2,29 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"C": {
"item": "minecraft:clay"
},
"D": {
"F": {
"item": "minecraft:gray_dye"
},
"I": {
"item": "minecraft:iron_nugget"
},
"L": {
"item": "minecraft:leather"
},
"P": {
"item": "minecraft:paper"
"item": "minecraft:oak_planks"
},
"S": {
"item": "minecraft:slime_ball"
"item": "minecraft:gray_dye"
}
},
"pattern": [
" D ",
"CPC",
"SPS"
"LLL",
"PPP",
"FIS"
],
"result": {
"count": 2,
"count": 3,
"item": "new_soviet:cyan_linoleum"
},
"show_notification": true

36
src/main/generated/data/new_soviet/recipes/dye_beige_linoleum.json Normal file
View file

@ -0,0 +1,36 @@
{
"type": "minecraft:crafting_shapeless",
"category": "building",
"group": "linoleum",
"ingredients": [
{
"item": "minecraft:white_dye"
},
[
{
"item": "new_soviet:green_linoleum"
},
{
"item": "new_soviet:orange_linoleum"
},
{
"item": "new_soviet:blue_linoleum"
},
{
"item": "new_soviet:red_linoleum"
},
{
"item": "new_soviet:gray_linoleum"
},
{
"item": "new_soviet:brown_linoleum"
},
{
"item": "new_soviet:cyan_linoleum"
}
]
],
"result": {
"item": "new_soviet:beige_linoleum"
}
}

3
src/main/generated/data/new_soviet/recipes/dye_blue_linoleum.json
View file

@ -7,6 +7,9 @@
"item": "minecraft:blue_dye"
},
[
{
"item": "new_soviet:beige_linoleum"
},
{
"item": "new_soviet:green_linoleum"
},

3
src/main/generated/data/new_soviet/recipes/dye_brown_linoleum.json
View file

@ -7,6 +7,9 @@
"item": "minecraft:brown_dye"
},
[
{
"item": "new_soviet:beige_linoleum"
},
{
"item": "new_soviet:green_linoleum"
},

3
src/main/generated/data/new_soviet/recipes/dye_cyan_linoleum.json
View file

@ -7,6 +7,9 @@
"item": "minecraft:cyan_dye"
},
[
{
"item": "new_soviet:beige_linoleum"
},
{
"item": "new_soviet:green_linoleum"
},

3
src/main/generated/data/new_soviet/recipes/dye_gray_linoleum.json
View file

@ -7,6 +7,9 @@
"item": "minecraft:gray_dye"
},
[
{
"item": "new_soviet:beige_linoleum"
},
{
"item": "new_soviet:green_linoleum"
},

3
src/main/generated/data/new_soviet/recipes/dye_green_linoleum.json
View file

@ -7,6 +7,9 @@
"item": "minecraft:green_dye"
},
[
{
"item": "new_soviet:beige_linoleum"
},
{
"item": "new_soviet:orange_linoleum"
},

3
src/main/generated/data/new_soviet/recipes/dye_orange_linoleum.json
View file

@ -7,6 +7,9 @@
"item": "minecraft:orange_dye"
},
[
{
"item": "new_soviet:beige_linoleum"
},
{
"item": "new_soviet:green_linoleum"
},

3
src/main/generated/data/new_soviet/recipes/dye_red_linoleum.json
View file

@ -7,6 +7,9 @@
"item": "minecraft:red_dye"
},
[
{
"item": "new_soviet:beige_linoleum"
},
{
"item": "new_soviet:green_linoleum"
},

23
src/main/generated/data/new_soviet/recipes/gray_linoleum.json
View file

@ -2,26 +2,29 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"C": {
"item": "minecraft:clay"
},
"D": {
"F": {
"item": "minecraft:gray_dye"
},
"I": {
"item": "minecraft:iron_nugget"
},
"L": {
"item": "minecraft:leather"
},
"P": {
"item": "minecraft:paper"
"item": "minecraft:oak_planks"
},
"S": {
"item": "minecraft:slime_ball"
"item": "minecraft:gray_dye"
}
},
"pattern": [
" D ",
"CPC",
"SPS"
"LLL",
"PPP",
"FIS"
],
"result": {
"count": 2,
"count": 3,
"item": "new_soviet:gray_linoleum"
},
"show_notification": true

23
src/main/generated/data/new_soviet/recipes/green_linoleum.json
View file

@ -2,26 +2,29 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"C": {
"item": "minecraft:clay"
},
"D": {
"F": {
"item": "minecraft:green_dye"
},
"I": {
"item": "minecraft:iron_nugget"
},
"L": {
"item": "minecraft:leather"
},
"P": {
"item": "minecraft:paper"
"item": "minecraft:oak_planks"
},
"S": {
"item": "minecraft:slime_ball"
"item": "minecraft:green_dye"
}
},
"pattern": [
" D ",
"CPC",
"SPS"
"LLL",
"PPP",
"FIS"
],
"result": {
"count": 2,
"count": 3,
"item": "new_soviet:green_linoleum"
},
"show_notification": true

23
src/main/generated/data/new_soviet/recipes/orange_linoleum.json
View file

@ -2,26 +2,29 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"C": {
"item": "minecraft:clay"
},
"D": {
"F": {
"item": "minecraft:gray_dye"
},
"I": {
"item": "minecraft:iron_nugget"
},
"L": {
"item": "minecraft:leather"
},
"P": {
"item": "minecraft:paper"
"item": "minecraft:oak_planks"
},
"S": {
"item": "minecraft:slime_ball"
"item": "minecraft:gray_dye"
}
},
"pattern": [
" D ",
"CPC",
"SPS"
"LLL",
"PPP",
"FIS"
],
"result": {
"count": 2,
"count": 3,
"item": "new_soviet:orange_linoleum"
},
"show_notification": true

23
src/main/generated/data/new_soviet/recipes/red_linoleum.json
View file

@ -2,26 +2,29 @@
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"C": {
"item": "minecraft:clay"
},
"D": {
"F": {
"item": "minecraft:red_dye"
},
"I": {
"item": "minecraft:iron_nugget"
},
"L": {
"item": "minecraft:leather"
},
"P": {
"item": "minecraft:paper"
"item": "minecraft:oak_planks"
},
"S": {
"item": "minecraft:slime_ball"
"item": "minecraft:red_dye"
}
},
"pattern": [
" D ",
"CPC",
"SPS"
"LLL",
"PPP",
"FIS"
],
"result": {
"count": 2,
"count": 3,
"item": "new_soviet:red_linoleum"
},
"show_notification": true

31
src/main/generated/data/new_soviet/recipes/yellow_red_linoleum.json Normal file
View file

@ -0,0 +1,31 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"F": {
"item": "minecraft:yellow_dye"
},
"I": {
"item": "minecraft:iron_nugget"
},
"L": {
"item": "minecraft:leather"
},
"P": {
"item": "minecraft:oak_planks"
},
"S": {
"item": "minecraft:red_dye"
}
},
"pattern": [
"LLL",
"PPP",
"FIS"
],
"result": {
"count": 3,
"item": "new_soviet:yellow_red_linoleum"
},
"show_notification": true
}

17
src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_slab.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "new_soviet:yellow_red_linoleum"
}
},
"pattern": [
"###"
],
"result": {
"count": 6,
"item": "new_soviet:yellow_red_linoleum_slab"
},
"show_notification": true
}

8
src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_slab_from_yellow_red_linoleum_stonecutting.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:stonecutting",
"count": 2,
"ingredient": {
"item": "new_soviet:yellow_red_linoleum"
},
"result": "new_soviet:yellow_red_linoleum_slab"
}

19
src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_stairs.json Normal file
View file

@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"category": "building",
"key": {
"#": {
"item": "new_soviet:yellow_red_linoleum"
}
},
"pattern": [
"# ",
"## ",
"###"
],
"result": {
"count": 4,
"item": "new_soviet:yellow_red_linoleum_stairs"
},
"show_notification": true
}

8
src/main/generated/data/new_soviet/recipes/yellow_red_linoleum_stairs_from_yellow_red_linoleum_stonecutting.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:yellow_red_linoleum"
},
"result": "new_soviet:yellow_red_linoleum_stairs"
}

32
src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java
View file

@ -11,6 +11,7 @@ import net.minecraft.item.Items;
import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.book.RecipeCategory;
import net.minecraft.registry.Registries;
import net.minecraft.registry.tag.BlockTags;
import net.minecraft.registry.tag.ItemTags;
import net.minecraft.util.Util;
import su.a71.new_soviet.registration.NSE_Blocks;
@ -162,15 +163,20 @@ public class RecipeGenerator extends FabricRecipeProvider {
}
private void linoleumRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output, ItemConvertible dye) {
ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 2)
.input('D', dye).input('P', Items.PAPER).input('C', Items.CLAY).input('S', Items.SLIME_BALL)
.pattern(" D ")
.pattern("CPC")
.pattern("SPS")
.criterion(hasItem(dye), conditionsFromItem(dye))
.criterion(hasItem(Items.PAPER), conditionsFromItem(Items.PAPER))
.criterion(hasItem(Items.SLIME_BALL), conditionsFromItem(Items.SLIME_BALL))
.criterion(hasItem(Items.CLAY), conditionsFromItem(Items.CLAY))
linoleumRecipe(exporter, output, dye, dye);
}
private void linoleumRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output, ItemConvertible dye1, ItemConvertible dye2) {
ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 3)
.input('F', dye1).input('S', dye2).input('L', Items.LEATHER).input('P', Items.OAK_PLANKS).input('I', Items.IRON_NUGGET)
.pattern("LLL")
.pattern("PPP")
.pattern("FIS")
.criterion(hasItem(dye1) + "_1", conditionsFromItem(dye1))
.criterion(hasItem(dye2) + "_2", conditionsFromItem(dye2))
.criterion(hasItem(Items.LEATHER), conditionsFromItem(Items.LEATHER))
.criterion(hasItem(Items.OAK_PLANKS), conditionsFromItem(Items.OAK_PLANKS))
.criterion(hasItem(Items.IRON_NUGGET), conditionsFromItem(Items.IRON_NUGGET))
.offerTo(exporter);
}
@ -997,6 +1003,8 @@ public class RecipeGenerator extends FabricRecipeProvider {
offerStairsAndSlab(exporter, NSE_Blocks.ORANGE_LINOLEUM_STAIRS, NSE_Blocks.ORANGE_LINOLEUM_SLAB, NSE_Blocks.ORANGE_LINOLEUM);
offerStairsAndSlab(exporter, NSE_Blocks.BROWN_LINOLEUM_STAIRS, NSE_Blocks.BROWN_LINOLEUM_SLAB, NSE_Blocks.BROWN_LINOLEUM);
offerStairsAndSlab(exporter, NSE_Blocks.CYAN_LINOLEUM_STAIRS, NSE_Blocks.CYAN_LINOLEUM_SLAB, NSE_Blocks.CYAN_LINOLEUM);
offerStairsAndSlab(exporter, NSE_Blocks.BEIGE_LINOLEUM_STAIRS, NSE_Blocks.BEIGE_LINOLEUM_SLAB, NSE_Blocks.BEIGE_LINOLEUM);
offerStairsAndSlab(exporter, NSE_Blocks.YELLOW_RED_LINOLEUM_STAIRS, NSE_Blocks.YELLOW_RED_LINOLEUM_SLAB, NSE_Blocks.YELLOW_RED_LINOLEUM);
offerStairsAndSlab(exporter, NSE_Blocks.METAL_PLATING_STAIRS, NSE_Blocks.METAL_PLATING_SLAB, NSE_Blocks.METAL_PLATING);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS, NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB, NSE_Blocks.CROSS_CHERRY_PLANKS);
@ -1088,11 +1096,13 @@ public class RecipeGenerator extends FabricRecipeProvider {
linoleumRecipe(exporter, NSE_Blocks.ORANGE_LINOLEUM, Items.GRAY_DYE);
linoleumRecipe(exporter, NSE_Blocks.BROWN_LINOLEUM, Items.GRAY_DYE);
linoleumRecipe(exporter, NSE_Blocks.CYAN_LINOLEUM, Items.GRAY_DYE);
linoleumRecipe(exporter, NSE_Blocks.YELLOW_RED_LINOLEUM, Items.YELLOW_DYE, Items.RED_DYE);
linoleumRecipe(exporter, NSE_Blocks.BEIGE_LINOLEUM, Items.WHITE_DYE);
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CROSS_ORANGE_LINOLEUM, NSE_Blocks.ORANGE_LINOLEUM);
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CROSS_BROWN_LINOLEUM, NSE_Blocks.ORANGE_LINOLEUM);
offerDyeableRecipes(exporter,
List.of(Items.GREEN_DYE, Items.ORANGE_DYE, Items.BLUE_DYE, Items.RED_DYE, Items.GRAY_DYE, Items.BROWN_DYE, Items.CYAN_DYE),
List.of(NSE_Blocks.GREEN_LINOLEUM.asItem(), NSE_Blocks.ORANGE_LINOLEUM.asItem(), NSE_Blocks.BLUE_LINOLEUM.asItem(),
List.of(Items.WHITE_DYE, Items.GREEN_DYE, Items.ORANGE_DYE, Items.BLUE_DYE, Items.RED_DYE, Items.GRAY_DYE, Items.BROWN_DYE, Items.CYAN_DYE),
List.of(NSE_Blocks.BEIGE_LINOLEUM.asItem(), NSE_Blocks.GREEN_LINOLEUM.asItem(), NSE_Blocks.ORANGE_LINOLEUM.asItem(), NSE_Blocks.BLUE_LINOLEUM.asItem(),
NSE_Blocks.RED_LINOLEUM.asItem(), NSE_Blocks.GRAY_LINOLEUM.asItem(), NSE_Blocks.BROWN_LINOLEUM.asItem(), NSE_Blocks.CYAN_LINOLEUM.asItem()),
"linoleum");

0
src/main/resources/assets/new_soviet/textures/block/blue/cracked_tile_rest_blue.png → src/main/resources/assets/new_soviet/textures/block/blue/cracked_long_blue_tiles.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3 KiB