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

Improve recipes, remove reverse stone cutting

Browse source
This commit is contained in:
Andrew-71 2023-10-25 22:39:33 +03:00
parent c428ce6c89
commit dfda65184c
380 changed files with 568 additions and 7658 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,14 +53,16 @@ public class RecipeGenerator extends FabricRecipeProvider {
FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter, path + "_lichen");
}
private void stoneCuttingCategory(Consumer<RecipeJsonProvider> exporter, List<ItemConvertible> category, RecipeCategory recipe_category) {
for (int i = 0; i < category.size(); i++) {
for (int j = 0; j < category.size(); j++) {
if (i != j) {
offerStonecuttingRecipe(exporter, recipe_category,
category.get(i), category.get(j));
}
}
private void concreteWithBarsRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output, ItemConvertible input) {
ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Blocks.IRON_BARS).criterion(FabricRecipeProvider.hasItem(output),
FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input),
FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Blocks.IRON_BARS),
FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter);
}
private void stoneCuttingCategory(Consumer<RecipeJsonProvider> exporter, ItemConvertible base, List<ItemConvertible> category, RecipeCategory recipe_category) {
for (ItemConvertible itemConvertible : category) {
offerStonecuttingRecipe(exporter, recipe_category, itemConvertible, base);
}
}
@ -298,8 +300,7 @@ public class RecipeGenerator extends FabricRecipeProvider {
warningStripeRecipe(exporter, NSE_Blocks.MAGENTA_WARNING, Items.MAGENTA_DYE);
warningStripeRecipe(exporter, NSE_Blocks.GRAY_WARNING, Items.GRAY_DYE);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.SAND_TILES);
stoneCuttingCategory(exporter, NSE_Blocks.SAND_TILES, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.SAND_BRICKS);
list.add(NSE_Blocks.SMALL_SAND_TILES);
list.add(NSE_Blocks.BIG_SAND_TILES);
@ -308,139 +309,109 @@ public class RecipeGenerator extends FabricRecipeProvider {
list.add(NSE_Blocks.HERRINGBONE_SAND_TILES);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.PRISMARINE_BRICKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.TEAL_TILES);
list.add(NSE_Blocks.SMALL_TEAL_TILES);
list.add(NSE_Blocks.GLAZED_TEAL_TILES);
list.add(NSE_Blocks.VARIATED_TEAL_TILES);
list.add(Blocks.PRISMARINE_BRICKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.DARK_PRISMARINE, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.AQUAMARINE_TILES);
list.add(NSE_Blocks.GLAZED_AQUAMARINE_TILES);
list.add(NSE_Blocks.SMALL_AQUAMARINE_TILES);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.POLISHED_DIORITE, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.DIORITE_BRICKS);
list.add(NSE_Blocks.BIG_DIORITE_TILES);
list.add(NSE_Blocks.SMALL_DIORITE_TILES);
list.add(NSE_Blocks.NII_WALL_1);
list.add(Blocks.POLISHED_DIORITE);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.CALCITE, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CALCITE_TILES);
list.add(NSE_Blocks.DIAGONAL_CALCITE_TILES);
list.add(Blocks.CALCITE);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.DRIPSTONE_BLOCK, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.DRIPSTONE_TILES);
list.add(NSE_Blocks.DRIPSTONE_BRICKS);
list.add(Blocks.DRIPSTONE_BLOCK);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.POLISHED_DEEPSLATE, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.DEEPSLATE_TILES);
list.add(NSE_Blocks.DIAGONAL_DEEPSLATE_TILES);
list.add(NSE_Blocks.SMALL_DEEPSLATE_TILES);
list.add(Blocks.POLISHED_DEEPSLATE);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.LIGHT_BLUE_TILES);
stoneCuttingCategory(exporter, NSE_Blocks.LIGHT_BLUE_TILES, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.LIGHT_BLUE_BRICKS);
list.add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES);
list.add(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES);
list.add(NSE_Blocks.SMALL_LIGHT_BLUE_TILES);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.POLISHED_GRANITE, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.BIG_GRANITE_TILES);
list.add(NSE_Blocks.SMALL_GRANITE_TILES);
list.add(Blocks.POLISHED_GRANITE);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.TUFF, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.TUFF_TILES);
list.add(NSE_Blocks.TUFF_BRICKS);
list.add(NSE_Blocks.BIG_TUFF_TILES);
list.add(Blocks.TUFF);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.SMALL_WHITE_TILES);
stoneCuttingCategory(exporter, NSE_Blocks.SMALL_WHITE_TILES, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.SMALL_CRACKED_WHITE_TILES);
list.add(NSE_Blocks.GLAZED_WHITE_TILES);
list.add(NSE_Blocks.CRACKED_GLAZED_WHITE_TILES);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.ACACIA_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_ACACIA_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS);
list.add(Blocks.ACACIA_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.OAK_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_OAK_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS);
list.add(Blocks.OAK_PLANKS);
list.add(NSE_Blocks.STRAIGHT_PARQUET);
list.add(NSE_Blocks.SEPARATED_PARQUET);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.BIRCH_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_BIRCH_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS);
list.add(Blocks.BIRCH_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.CRIMSON_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_CRIMSON_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS);
list.add(Blocks.CRIMSON_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.WARPED_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_WARPED_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS);
list.add(Blocks.WARPED_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.DARK_OAK_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS);
list.add(Blocks.DARK_OAK_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.JUNGLE_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_JUNGLE_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS);
list.add(Blocks.JUNGLE_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.MANGROVE_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_MANGROVE_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS);
list.add(Blocks.MANGROVE_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.SPRUCE_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_SPRUCE_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS);
list.add(Blocks.SPRUCE_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_PARQUET);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.CHERRY_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_CHERRY_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS);
list.add(Blocks.CHERRY_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS);
list.add(Blocks.BAMBOO_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
stoneCuttingCategory(exporter, Blocks.BRICKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.BRICK_TILES);
list.add(NSE_Blocks.GLAZED_BRICK_TILES);
list.add(Blocks.BRICKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.NII_WALL_3);
list.add(Blocks.STONE);
list.add(Blocks.STONE_BRICKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.NII_WALL_2);
list.add(Blocks.SMOOTH_STONE);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.VINTAGE_IRON_BARS);
list.add(Blocks.IRON_BARS);
}), RecipeCategory.BUILDING_BLOCKS);
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS, Blocks.BAMBOO_PLANKS);
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);
diceRecipe(exporter, NSE_Items.DICE_D4);
diceRecipe(exporter, NSE_Items.DICE_D6);
diceRecipe(exporter, NSE_Items.DICE_D20);
@ -770,5 +741,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);
}
}