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

Add more of the missing recipes

Browse source
This commit is contained in:
Andrew-71 2023-10-26 00:00:57 +03:00
parent dfda65184c
commit 7204a7bfd8
24 changed files with 298 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
recipeTODO.txt
View file

@ -1,12 +1,10 @@
=== Add
* whitewash recipe
* linoleum recipe
* metal plating recipe
* crate recipe
* po-2 recipe
* wallpaper recipes
* cigarette recipe
* switch recipe
* checkers and chess recipe
* post lamps recipes
* various lamps recipes

6
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/beige_concrete_with_bars.json
View file

@ -1,7 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_beige_concrete": {
"has_beige_concrete_with_bars": {
"conditions": {
"items": [
{
@ -13,7 +13,7 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_beige_concrete_with_bars": {
"has_cracked_beige_concrete": {
"conditions": {
"items": [
{
@ -47,7 +47,7 @@
"requirements": [
[
"has_beige_concrete_with_bars",
"has_beige_concrete",
"has_cracked_beige_concrete",
"has_iron_bars",
"has_the_recipe"
]

6
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/blue_concrete_with_bars.json
View file

@ -1,7 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_blue_concrete": {
"has_blue_concrete_with_bars": {
"conditions": {
"items": [
{
@ -13,7 +13,7 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_blue_concrete_with_bars": {
"has_cracked_blue_concrete": {
"conditions": {
"items": [
{
@ -47,7 +47,7 @@
"requirements": [
[
"has_blue_concrete_with_bars",
"has_blue_concrete",
"has_cracked_blue_concrete",
"has_iron_bars",
"has_the_recipe"
]

4
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/green_concrete_with_bars.json
View file

@ -1,7 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_green_concrete": {
"has_cracked_green_concrete": {
"conditions": {
"items": [
{
@ -47,7 +47,7 @@
"requirements": [
[
"has_green_concrete_with_bars",
"has_green_concrete",
"has_cracked_green_concrete",
"has_iron_bars",
"has_the_recipe"
]

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

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

6
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/red_concrete_with_bars.json
View file

@ -1,7 +1,7 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_iron_bars": {
"has_cracked_red_concrete": {
"conditions": {
"items": [
{
@ -13,7 +13,7 @@
},
"trigger": "minecraft:inventory_changed"
},
"has_red_concrete": {
"has_iron_bars": {
"conditions": {
"items": [
{
@ -47,7 +47,7 @@
"requirements": [
[
"has_red_concrete_with_bars",
"has_red_concrete",
"has_cracked_red_concrete",
"has_iron_bars",
"has_the_recipe"
]

26
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/white_concrete_with_bars.json
View file

@ -1,6 +1,18 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_cracked_white_concrete": {
"conditions": {
"items": [
{
"items": [
"new_soviet:white_concrete_with_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_bars": {
"conditions": {
"items": [
@ -19,18 +31,6 @@
},
"trigger": "minecraft:recipe_unlocked"
},
"has_white_concrete": {
"conditions": {
"items": [
{
"items": [
"new_soviet:white_concrete_with_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_white_concrete_with_bars": {
"conditions": {
"items": [
@ -47,7 +47,7 @@
"requirements": [
[
"has_white_concrete_with_bars",
"has_white_concrete",
"has_cracked_white_concrete",
"has_iron_bars",
"has_the_recipe"
]

26
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/yellow_concrete_with_bars.json
View file

@ -1,6 +1,18 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_cracked_yellow_concrete": {
"conditions": {
"items": [
{
"items": [
"new_soviet:yellow_concrete_with_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_iron_bars": {
"conditions": {
"items": [
@ -19,18 +31,6 @@
},
"trigger": "minecraft:recipe_unlocked"
},
"has_yellow_concrete": {
"conditions": {
"items": [
{
"items": [
"new_soviet:yellow_concrete_with_bars"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_yellow_concrete_with_bars": {
"conditions": {
"items": [
@ -47,7 +47,7 @@
"requirements": [
[
"has_yellow_concrete_with_bars",
"has_yellow_concrete",
"has_cracked_yellow_concrete",
"has_iron_bars",
"has_the_recipe"
]

61
src/main/generated/data/new_soviet/advancements/recipes/decorations/dark_switch.json Normal file
View file

@ -0,0 +1,61 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_dark_oak_slab": {
"conditions": {
"items": [
{
"items": [
"minecraft:dark_oak_slab"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_redstone": {
"conditions": {
"items": [
{
"items": [
"minecraft:redstone"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_stone_button": {
"conditions": {
"items": [
{
"items": [
"minecraft:stone_button"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:dark_switch"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_dark_oak_slab",
"has_redstone",
"has_stone_button",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:dark_switch"
]
},
"sends_telemetry_event": false
}

61
src/main/generated/data/new_soviet/advancements/recipes/decorations/switch.json Normal file
View file

@ -0,0 +1,61 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_oak_slab": {
"conditions": {
"items": [
{
"items": [
"minecraft:oak_slab"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_redstone": {
"conditions": {
"items": [
{
"items": [
"minecraft:redstone"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_stone_button": {
"conditions": {
"items": [
{
"items": [
"minecraft:stone_button"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:switch"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_oak_slab",
"has_redstone",
"has_stone_button",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:switch"
]
},
"sends_telemetry_event": false
}

0
src/main/generated/data/new_soviet/advancements/recipes/decorations/rake.json → src/main/generated/data/new_soviet/advancements/recipes/tools/rake.json
View file

0
src/main/generated/data/new_soviet/advancements/recipes/decorations/sickle.json → src/main/generated/data/new_soviet/advancements/recipes/tools/sickle.json
View file

2
src/main/generated/data/new_soviet/recipes/beige_concrete_with_bars.json
View file

@ -3,7 +3,7 @@
"category": "building",
"ingredients": [
{
"item": "new_soviet:beige_concrete"
"item": "new_soviet:cracked_beige_concrete"
},
{
"item": "minecraft:iron_bars"

2
src/main/generated/data/new_soviet/recipes/blue_concrete_with_bars.json
View file

@ -3,7 +3,7 @@
"category": "building",
"ingredients": [
{
"item": "new_soviet:blue_concrete"
"item": "new_soviet:cracked_blue_concrete"
},
{
"item": "minecraft:iron_bars"

24
src/main/generated/data/new_soviet/recipes/dark_switch.json Normal file
View file

@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"B": {
"item": "minecraft:stone_button"
},
"R": {
"item": "minecraft:redstone"
},
"S": {
"item": "minecraft:dark_oak_slab"
}
},
"pattern": [
" B ",
" R ",
" S "
],
"result": {
"item": "new_soviet:dark_switch"
},
"show_notification": true
}

2
src/main/generated/data/new_soviet/recipes/green_concrete_with_bars.json
View file

@ -3,7 +3,7 @@
"category": "building",
"ingredients": [
{
"item": "new_soviet:green_concrete"
"item": "new_soviet:cracked_green_concrete"
},
{
"item": "minecraft:iron_bars"

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

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

2
src/main/generated/data/new_soviet/recipes/rake.json
View file

@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"category": "equipment",
"key": {
"I": {
"item": "minecraft:iron_ingot"

2
src/main/generated/data/new_soviet/recipes/red_concrete_with_bars.json
View file

@ -3,7 +3,7 @@
"category": "building",
"ingredients": [
{
"item": "new_soviet:red_concrete"
"item": "new_soviet:cracked_red_concrete"
},
{
"item": "minecraft:iron_bars"

2
src/main/generated/data/new_soviet/recipes/sickle.json
View file

@ -1,6 +1,6 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"category": "equipment",
"key": {
"I": {
"item": "minecraft:iron_ingot"

24
src/main/generated/data/new_soviet/recipes/switch.json Normal file
View file

@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"B": {
"item": "minecraft:stone_button"
},
"R": {
"item": "minecraft:redstone"
},
"S": {
"item": "minecraft:oak_slab"
}
},
"pattern": [
" B ",
" R ",
" S "
],
"result": {
"item": "new_soviet:switch"
},
"show_notification": true
}

2
src/main/generated/data/new_soviet/recipes/white_concrete_with_bars.json
View file

@ -3,7 +3,7 @@
"category": "building",
"ingredients": [
{
"item": "new_soviet:white_concrete"
"item": "new_soviet:cracked_white_concrete"
},
{
"item": "minecraft:iron_bars"

2
src/main/generated/data/new_soviet/recipes/yellow_concrete_with_bars.json
View file

@ -3,7 +3,7 @@
"category": "building",
"ingredients": [
{
"item": "new_soviet:yellow_concrete"
"item": "new_soviet:cracked_yellow_concrete"
},
{
"item": "minecraft:iron_bars"

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

@ -13,6 +13,7 @@ import net.minecraft.item.ItemConvertible;
import net.minecraft.item.Items;
import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.book.RecipeCategory;
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;
@ -411,6 +412,7 @@ public class RecipeGenerator extends FabricRecipeProvider {
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.NII_WALL_3, Blocks.STONE_BRICKS);
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.NII_WALL_2, Blocks.SMOOTH_STONE);
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.VINTAGE_IRON_BARS, Blocks.IRON_BARS);
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.METAL_PLATING, Blocks.IRON_BLOCK);
diceRecipe(exporter, NSE_Items.DICE_D4);
diceRecipe(exporter, NSE_Items.DICE_D6);
@ -478,7 +480,7 @@ public class RecipeGenerator extends FabricRecipeProvider {
RecipeProvider.conditionsFromItem(Items.GREEN_STAINED_GLASS))
.offerTo(exporter);
ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Items.SICKLE, 1)
ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, NSE_Items.SICKLE, 1)
.pattern(" I ")
.pattern(" I")
.pattern(" S ")
@ -490,7 +492,7 @@ public class RecipeGenerator extends FabricRecipeProvider {
RecipeProvider.conditionsFromItem(Items.IRON_INGOT))
.offerTo(exporter);
ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Items.RAKE, 1)
ShapedRecipeJsonBuilder.create(RecipeCategory.TOOLS, NSE_Items.RAKE, 1)
.pattern("III")
.pattern(" N ")
.pattern(" S ")
@ -574,6 +576,36 @@ public class RecipeGenerator extends FabricRecipeProvider {
.criterion(hasItem(Blocks.TNT), conditionsFromItem(Blocks.TNT))
.offerTo(exporter);
ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.SWITCH, 1)
.pattern(" B ")
.pattern(" R ")
.pattern(" S ")
.input('S', Blocks.OAK_SLAB)
.input('R', Items.REDSTONE)
.input('B', Blocks.STONE_BUTTON)
.criterion(RecipeProvider.hasItem(Blocks.OAK_SLAB),
RecipeProvider.conditionsFromItem(Blocks.OAK_SLAB))
.criterion(RecipeProvider.hasItem(Items.REDSTONE),
RecipeProvider.conditionsFromItem(Items.REDSTONE))
.criterion(RecipeProvider.hasItem(Blocks.STONE_BUTTON),
RecipeProvider.conditionsFromItem(Blocks.STONE_BUTTON))
.offerTo(exporter);
ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.DARK_SWITCH, 1)
.pattern(" B ")
.pattern(" R ")
.pattern(" S ")
.input('S', Blocks.DARK_OAK_SLAB)
.input('R', Items.REDSTONE)
.input('B', Blocks.STONE_BUTTON)
.criterion(RecipeProvider.hasItem(Blocks.DARK_OAK_SLAB),
RecipeProvider.conditionsFromItem(Blocks.DARK_OAK_SLAB))
.criterion(RecipeProvider.hasItem(Items.REDSTONE),
RecipeProvider.conditionsFromItem(Items.REDSTONE))
.criterion(RecipeProvider.hasItem(Blocks.STONE_BUTTON),
RecipeProvider.conditionsFromItem(Blocks.STONE_BUTTON))
.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),
@ -741,11 +773,11 @@ public class RecipeGenerator extends FabricRecipeProvider {
concreteRecipe(exporter, NSE_Blocks.RED_CONCRETE, Items.RED_DYE);
concreteRecipe(exporter, NSE_Blocks.WHITE_CONCRETE, Items.WHITE_DYE);
concreteRecipe(exporter, NSE_Blocks.BEIGE_CONCRETE, Items.LIGHT_GRAY_DYE);
concreteWithBarsRecipe(exporter, NSE_Blocks.GREEN_CONCRETE_WITH_BARS, NSE_Blocks.GREEN_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.YELLOW_CONCRETE_WITH_BARS, NSE_Blocks.YELLOW_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.BLUE_CONCRETE_WITH_BARS, NSE_Blocks.BLUE_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.RED_CONCRETE_WITH_BARS, NSE_Blocks.RED_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.WHITE_CONCRETE_WITH_BARS, NSE_Blocks.WHITE_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.BEIGE_CONCRETE_WITH_BARS, NSE_Blocks.BEIGE_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.GREEN_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_GREEN_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.YELLOW_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_YELLOW_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.BLUE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_BLUE_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.RED_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_RED_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.WHITE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_WHITE_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.BEIGE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_BEIGE_CONCRETE);
}
}