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

Change some recipes

Browse source
This commit is contained in:
Andrew-71 2023-10-04 14:58:34 +03:00
parent b119ea2a4c
commit 588f7c0e2a
27 changed files with 275 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_blue.json Normal file
View file

@ -0,0 +1,61 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_blue_dye": {
"conditions": {
"items": [
{
"items": [
"new_soviet:blue_iron_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_blue_iron_bars": {
"conditions": {
"items": [
{
"items": [
"new_soviet:blue_iron_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_bars": {
"conditions": {
"items": [
{
"items": [
"new_soviet:blue_iron_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:blue_iron_bars_from_iron_bars_blue"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_blue_iron_bars",
"has_iron_bars",
"has_blue_dye",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:blue_iron_bars_from_iron_bars_blue"
]
},
"sends_telemetry_event": false
}

61
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_cyan.json Normal file
View file

@ -0,0 +1,61 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_blue_iron_bars": {
"conditions": {
"items": [
{
"items": [
"new_soviet:blue_iron_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_cyan_dye": {
"conditions": {
"items": [
{
"items": [
"new_soviet:blue_iron_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_bars": {
"conditions": {
"items": [
{
"items": [
"new_soviet:blue_iron_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:blue_iron_bars_from_iron_bars_cyan"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_blue_iron_bars",
"has_iron_bars",
"has_cyan_dye",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:blue_iron_bars_from_iron_bars_cyan"
]
},
"sends_telemetry_event": false
}

61
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_light_blue.json Normal file
View file

@ -0,0 +1,61 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_blue_iron_bars": {
"conditions": {
"items": [
{
"items": [
"new_soviet:blue_iron_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_bars": {
"conditions": {
"items": [
{
"items": [
"new_soviet:blue_iron_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_light_blue_dye": {
"conditions": {
"items": [
{
"items": [
"new_soviet:blue_iron_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:blue_iron_bars_from_iron_bars_light_blue"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_blue_iron_bars",
"has_iron_bars",
"has_light_blue_dye",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:blue_iron_bars_from_iron_bars_light_blue"
]
},
"sends_telemetry_event": false
}

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

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

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

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

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

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

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

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

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_iron_bars_from_iron_bars_stonecutting.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_boundary_marker_from_bone_block_stonecutting.json
View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_iron_bars": { "has_bone_block": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"minecraft:iron_bars" "minecraft:bone_block"
] ]
} }
] ]
@ -15,20 +15,20 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "conditions": {
"recipe": "minecraft:blue_iron_bars_from_iron_bars_stonecutting" "recipe": "minecraft:white_boundary_marker_from_bone_block_stonecutting"
}, },
"trigger": "minecraft:recipe_unlocked" "trigger": "minecraft:recipe_unlocked"
} }
}, },
"requirements": [ "requirements": [
[ [
"has_iron_bars", "has_bone_block",
"has_the_recipe" "has_the_recipe"
] ]
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"minecraft:blue_iron_bars_from_iron_bars_stonecutting" "minecraft:white_boundary_marker_from_bone_block_stonecutting"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/iron_bars_from_blue_iron_bars_stonecutting.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_boundary_marker_from_diorite_wall_stonecutting.json
View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_blue_iron_bars": { "has_diorite_wall": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"new_soviet:blue_iron_bars" "minecraft:diorite_wall"
] ]
} }
] ]
@ -15,20 +15,20 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "conditions": {
"recipe": "minecraft:iron_bars_from_blue_iron_bars_stonecutting" "recipe": "minecraft:white_boundary_marker_from_diorite_wall_stonecutting"
}, },
"trigger": "minecraft:recipe_unlocked" "trigger": "minecraft:recipe_unlocked"
} }
}, },
"requirements": [ "requirements": [
[ [
"has_blue_iron_bars", "has_diorite_wall",
"has_the_recipe" "has_the_recipe"
] ]
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"minecraft:iron_bars_from_blue_iron_bars_stonecutting" "minecraft:white_boundary_marker_from_diorite_wall_stonecutting"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

5
src/main/generated/data/new_soviet/recipes/beige_concrete.json
View file

@ -5,9 +5,6 @@
"B": { "B": {
"item": "minecraft:iron_bars" "item": "minecraft:iron_bars"
}, },
"C": {
"item": "new_soviet:beige_concrete"
},
"D": { "D": {
"item": "minecraft:light_gray_dye" "item": "minecraft:light_gray_dye"
}, },
@ -17,7 +14,7 @@
}, },
"pattern": [ "pattern": [
"SBS", "SBS",
"DC ", " D ",
"SBS" "SBS"
], ],
"result": { "result": {

5
src/main/generated/data/new_soviet/recipes/blue_concrete.json
View file

@ -5,9 +5,6 @@
"B": { "B": {
"item": "minecraft:iron_bars" "item": "minecraft:iron_bars"
}, },
"C": {
"item": "new_soviet:blue_concrete"
},
"D": { "D": {
"item": "minecraft:blue_dye" "item": "minecraft:blue_dye"
}, },
@ -17,7 +14,7 @@
}, },
"pattern": [ "pattern": [
"SBS", "SBS",
"DC ", " D ",
"SBS" "SBS"
], ],
"result": { "result": {

15
src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_blue.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "minecraft:iron_bars"
},
{
"item": "minecraft:blue_dye"
}
],
"result": {
"item": "new_soviet:blue_iron_bars"
}
}

15
src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_cyan.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "minecraft:iron_bars"
},
{
"item": "minecraft:cyan_dye"
}
],
"result": {
"item": "new_soviet:blue_iron_bars"
}
}

15
src/main/generated/data/new_soviet/recipes/blue_iron_bars_from_iron_bars_light_blue.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "minecraft:crafting_shapeless",
"category": "building",
"ingredients": [
{
"item": "minecraft:iron_bars"
},
{
"item": "minecraft:light_blue_dye"
}
],
"result": {
"item": "new_soviet:blue_iron_bars"
}
}

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

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

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

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

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

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

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

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

5
src/main/generated/data/new_soviet/recipes/green_concrete.json
View file

@ -5,9 +5,6 @@
"B": { "B": {
"item": "minecraft:iron_bars" "item": "minecraft:iron_bars"
}, },
"C": {
"item": "new_soviet:green_concrete"
},
"D": { "D": {
"item": "minecraft:green_dye" "item": "minecraft:green_dye"
}, },
@ -17,7 +14,7 @@
}, },
"pattern": [ "pattern": [
"SBS", "SBS",
"DC ", " D ",
"SBS" "SBS"
], ],
"result": { "result": {

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

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

5
src/main/generated/data/new_soviet/recipes/red_concrete.json
View file

@ -5,9 +5,6 @@
"B": { "B": {
"item": "minecraft:iron_bars" "item": "minecraft:iron_bars"
}, },
"C": {
"item": "new_soviet:red_concrete"
},
"D": { "D": {
"item": "minecraft:red_dye" "item": "minecraft:red_dye"
}, },
@ -17,7 +14,7 @@
}, },
"pattern": [ "pattern": [
"SBS", "SBS",
"DC ", " D ",
"SBS" "SBS"
], ],
"result": { "result": {

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

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

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

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

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

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

5
src/main/generated/data/new_soviet/recipes/white_concrete.json
View file

@ -5,9 +5,6 @@
"B": { "B": {
"item": "minecraft:iron_bars" "item": "minecraft:iron_bars"
}, },
"C": {
"item": "new_soviet:white_concrete"
},
"D": { "D": {
"item": "minecraft:white_dye" "item": "minecraft:white_dye"
}, },
@ -17,7 +14,7 @@
}, },
"pattern": [ "pattern": [
"SBS", "SBS",
"DC ", " D ",
"SBS" "SBS"
], ],
"result": { "result": {

5
src/main/generated/data/new_soviet/recipes/yellow_concrete.json
View file

@ -5,9 +5,6 @@
"B": { "B": {
"item": "minecraft:iron_bars" "item": "minecraft:iron_bars"
}, },
"C": {
"item": "new_soviet:yellow_concrete"
},
"D": { "D": {
"item": "minecraft:yellow_dye" "item": "minecraft:yellow_dye"
}, },
@ -17,7 +14,7 @@
}, },
"pattern": [ "pattern": [
"SBS", "SBS",
"DC ", " D ",
"SBS" "SBS"
], ],
"result": { "result": {

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

@ -529,7 +529,6 @@ public class RecipeGenerator extends FabricRecipeProvider {
list.add(Blocks.SMOOTH_STONE); list.add(Blocks.SMOOTH_STONE);
}), RecipeCategory.BUILDING_BLOCKS); }), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.BLUE_IRON_BARS);
list.add(NSE_Blocks.VINTAGE_IRON_BARS); list.add(NSE_Blocks.VINTAGE_IRON_BARS);
list.add(Blocks.IRON_BARS); list.add(Blocks.IRON_BARS);
}), RecipeCategory.BUILDING_BLOCKS); }), RecipeCategory.BUILDING_BLOCKS);
@ -556,6 +555,21 @@ public class RecipeGenerator extends FabricRecipeProvider {
.criterion(hasItem(Items.COBBLESTONE), conditionsFromItem(Items.COBBLESTONE)) .criterion(hasItem(Items.COBBLESTONE), conditionsFromItem(Items.COBBLESTONE))
.offerTo(exporter); .offerTo(exporter);
var path_blue_bars = convertBetween(NSE_Blocks.BLUE_IRON_BARS, Blocks.IRON_BARS);
ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, (NSE_Blocks.BLUE_IRON_BARS)).input(Blocks.IRON_BARS).input(Items.BLUE_DYE).criterion(FabricRecipeProvider.hasItem(NSE_Blocks.BLUE_IRON_BARS),
FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Blocks.IRON_BARS),
FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Items.BLUE_DYE),
FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).offerTo(exporter, path_blue_bars + "_blue");
ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, (NSE_Blocks.BLUE_IRON_BARS)).input(Blocks.IRON_BARS).input(Items.LIGHT_BLUE_DYE).criterion(FabricRecipeProvider.hasItem(NSE_Blocks.BLUE_IRON_BARS),
FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Blocks.IRON_BARS),
FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Items.LIGHT_BLUE_DYE),
FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).offerTo(exporter, path_blue_bars + "_light_blue");
ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, (NSE_Blocks.BLUE_IRON_BARS)).input(Blocks.IRON_BARS).input(Items.CYAN_DYE).criterion(FabricRecipeProvider.hasItem(NSE_Blocks.BLUE_IRON_BARS),
FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Blocks.IRON_BARS),
FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).criterion(FabricRecipeProvider.hasItem(Items.CYAN_DYE),
FabricRecipeProvider.conditionsFromItem(NSE_Blocks.BLUE_IRON_BARS)).offerTo(exporter, path_blue_bars + "_cyan");
centerRecipe(exporter, NSE_Blocks.BIG_GREEN_TILES, NSE_Blocks.BIG_DIORITE_TILES, Items.GREEN_DYE); centerRecipe(exporter, NSE_Blocks.BIG_GREEN_TILES, NSE_Blocks.BIG_DIORITE_TILES, Items.GREEN_DYE);
centerRecipe(exporter, NSE_Blocks.GREEN_BRICKS, Items.BRICKS, Items.GREEN_DYE); centerRecipe(exporter, NSE_Blocks.GREEN_BRICKS, Items.BRICKS, Items.GREEN_DYE);
centerRecipe(exporter, NSE_Blocks.SMALL_YELLOW_TILES, NSE_Blocks.SMALL_WHITE_TILES, Items.YELLOW_DYE); centerRecipe(exporter, NSE_Blocks.SMALL_YELLOW_TILES, NSE_Blocks.SMALL_WHITE_TILES, Items.YELLOW_DYE);