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

Fix linoleum crafting recipes

Browse source
This commit is contained in:
Andrew-71 2024-04-27 16:39:39 +03:00
parent 08548822d0
commit 919688f44f
7 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,24 +1,24 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_gray_dye_1": { "has_brown_dye_1": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"minecraft:gray_dye" "minecraft:brown_dye"
] ]
} }
] ]
}, },
"trigger": "minecraft:inventory_changed" "trigger": "minecraft:inventory_changed"
}, },
"has_gray_dye_2": { "has_brown_dye_2": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"minecraft:gray_dye" "minecraft:brown_dye"
] ]
} }
] ]
@ -70,8 +70,8 @@
}, },
"requirements": [ "requirements": [
[ [
"has_gray_dye_1", "has_brown_dye_1",
"has_gray_dye_2", "has_brown_dye_2",
"has_leather", "has_leather",
"has_oak_planks", "has_oak_planks",
"has_iron_nugget", "has_iron_nugget",

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

@ -1,24 +1,24 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_gray_dye_1": { "has_cyan_dye_1": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"minecraft:gray_dye" "minecraft:cyan_dye"
] ]
} }
] ]
}, },
"trigger": "minecraft:inventory_changed" "trigger": "minecraft:inventory_changed"
}, },
"has_gray_dye_2": { "has_cyan_dye_2": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"minecraft:gray_dye" "minecraft:cyan_dye"
] ]
} }
] ]
@ -70,8 +70,8 @@
}, },
"requirements": [ "requirements": [
[ [
"has_gray_dye_1", "has_cyan_dye_1",
"has_gray_dye_2", "has_cyan_dye_2",
"has_leather", "has_leather",
"has_oak_planks", "has_oak_planks",
"has_iron_nugget", "has_iron_nugget",

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

@ -1,30 +1,6 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_gray_dye_1": {
"conditions": {
"items": [
{
"items": [
"minecraft:gray_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_gray_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:gray_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_nugget": { "has_iron_nugget": {
"conditions": { "conditions": {
"items": [ "items": [
@ -61,6 +37,30 @@
}, },
"trigger": "minecraft:inventory_changed" "trigger": "minecraft:inventory_changed"
}, },
"has_orange_dye_1": {
"conditions": {
"items": [
{
"items": [
"minecraft:orange_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_orange_dye_2": {
"conditions": {
"items": [
{
"items": [
"minecraft:orange_dye"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": { "has_the_recipe": {
"conditions": { "conditions": {
"recipe": "new_soviet:orange_linoleum" "recipe": "new_soviet:orange_linoleum"
@ -70,8 +70,8 @@
}, },
"requirements": [ "requirements": [
[ [
"has_gray_dye_1", "has_orange_dye_1",
"has_gray_dye_2", "has_orange_dye_2",
"has_leather", "has_leather",
"has_oak_planks", "has_oak_planks",
"has_iron_nugget", "has_iron_nugget",

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

@ -3,7 +3,7 @@
"category": "building", "category": "building",
"key": { "key": {
"F": { "F": {
"item": "minecraft:gray_dye" "item": "minecraft:brown_dye"
}, },
"I": { "I": {
"item": "minecraft:iron_nugget" "item": "minecraft:iron_nugget"
@ -15,7 +15,7 @@
"item": "minecraft:oak_planks" "item": "minecraft:oak_planks"
}, },
"S": { "S": {
"item": "minecraft:gray_dye" "item": "minecraft:brown_dye"
} }
}, },
"pattern": [ "pattern": [

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

@ -3,7 +3,7 @@
"category": "building", "category": "building",
"key": { "key": {
"F": { "F": {
"item": "minecraft:gray_dye" "item": "minecraft:cyan_dye"
}, },
"I": { "I": {
"item": "minecraft:iron_nugget" "item": "minecraft:iron_nugget"
@ -15,7 +15,7 @@
"item": "minecraft:oak_planks" "item": "minecraft:oak_planks"
}, },
"S": { "S": {
"item": "minecraft:gray_dye" "item": "minecraft:cyan_dye"
} }
}, },
"pattern": [ "pattern": [

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

@ -3,7 +3,7 @@
"category": "building", "category": "building",
"key": { "key": {
"F": { "F": {
"item": "minecraft:gray_dye" "item": "minecraft:orange_dye"
}, },
"I": { "I": {
"item": "minecraft:iron_nugget" "item": "minecraft:iron_nugget"
@ -15,7 +15,7 @@
"item": "minecraft:oak_planks" "item": "minecraft:oak_planks"
}, },
"S": { "S": {
"item": "minecraft:gray_dye" "item": "minecraft:orange_dye"
} }
}, },
"pattern": [ "pattern": [

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

@ -1112,9 +1112,9 @@ public class RecipeGenerator extends FabricRecipeProvider {
linoleumRecipe(exporter, NSE_Blocks.BLUE_LINOLEUM, Items.BLUE_DYE); linoleumRecipe(exporter, NSE_Blocks.BLUE_LINOLEUM, Items.BLUE_DYE);
linoleumRecipe(exporter, NSE_Blocks.RED_LINOLEUM, Items.RED_DYE); linoleumRecipe(exporter, NSE_Blocks.RED_LINOLEUM, Items.RED_DYE);
linoleumRecipe(exporter, NSE_Blocks.GRAY_LINOLEUM, Items.GRAY_DYE); linoleumRecipe(exporter, NSE_Blocks.GRAY_LINOLEUM, Items.GRAY_DYE);
linoleumRecipe(exporter, NSE_Blocks.ORANGE_LINOLEUM, Items.GRAY_DYE); linoleumRecipe(exporter, NSE_Blocks.ORANGE_LINOLEUM, Items.ORANGE_DYE);
linoleumRecipe(exporter, NSE_Blocks.BROWN_LINOLEUM, Items.GRAY_DYE); linoleumRecipe(exporter, NSE_Blocks.BROWN_LINOLEUM, Items.BROWN_DYE);
linoleumRecipe(exporter, NSE_Blocks.CYAN_LINOLEUM, Items.GRAY_DYE); linoleumRecipe(exporter, NSE_Blocks.CYAN_LINOLEUM, Items.CYAN_DYE);
linoleumRecipe(exporter, NSE_Blocks.YELLOW_RED_LINOLEUM, Items.YELLOW_DYE, Items.RED_DYE); linoleumRecipe(exporter, NSE_Blocks.YELLOW_RED_LINOLEUM, Items.YELLOW_DYE, Items.RED_DYE);
linoleumRecipe(exporter, NSE_Blocks.BEIGE_LINOLEUM, Items.WHITE_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_ORANGE_LINOLEUM, NSE_Blocks.ORANGE_LINOLEUM);