Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/forge-1.20' into forge-1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
@NewJumper
NewJumper committed Jan 16, 2024
2 parents c636dda + de3ddbd commit 96f7ca9
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/main/java/com/kyanite/deeperdarker/datagen/data/DDRecipeProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,34 +133,34 @@ private void addCookingRecipes(Consumer<FinishedRecipe> writer) {
smelting(DDItems.GRIME_BALL.get(), RecipeCategory.MISC, DDItems.GRIME_BRICK.get(), 0.2f, writer);

oreSmelting(DDBlocks.SCULK_STONE_COAL_ORE.get(), RecipeCategory.MISC, Items.COAL, 0.1f, "coal", writer);
oreSmelting(DDBlocks.SCULK_STONE_IRON_ORE.get(), RecipeCategory.MISC, Items.RAW_IRON, 0.7f, "iron_ingot", writer);
oreSmelting(DDBlocks.SCULK_STONE_COPPER_ORE.get(), RecipeCategory.MISC, Items.RAW_COPPER, 0.7f, "copper_ingot", writer);
oreSmelting(DDBlocks.SCULK_STONE_GOLD_ORE.get(), RecipeCategory.MISC, Items.RAW_GOLD, 1, "gold_ingot", writer);
oreSmelting(DDBlocks.SCULK_STONE_IRON_ORE.get(), RecipeCategory.MISC, Items.IRON_INGOT, 0.7f, "iron_ingot", writer);
oreSmelting(DDBlocks.SCULK_STONE_COPPER_ORE.get(), RecipeCategory.MISC, Items.COPPER_INGOT, 0.7f, "copper_ingot", writer);
oreSmelting(DDBlocks.SCULK_STONE_GOLD_ORE.get(), RecipeCategory.MISC, Items.GOLD_INGOT, 1, "gold_ingot", writer);
oreSmelting(DDBlocks.SCULK_STONE_REDSTONE_ORE.get(), RecipeCategory.REDSTONE, Items.REDSTONE, 0.7f, "redstone", writer);
oreSmelting(DDBlocks.SCULK_STONE_EMERALD_ORE.get(), RecipeCategory.MISC, Items.EMERALD, 1, "emerald", writer);
oreSmelting(DDBlocks.SCULK_STONE_LAPIS_ORE.get(), RecipeCategory.MISC, Items.LAPIS_LAZULI, 0.2f, "lapis_lazuli", writer);
oreSmelting(DDBlocks.SCULK_STONE_DIAMOND_ORE.get(), RecipeCategory.MISC, Items.DIAMOND, 1, "diamond", writer);
oreSmelting(DDBlocks.GLOOMSLATE_COAL_ORE.get(), RecipeCategory.MISC, Items.COAL, 0.1f, "coal", writer);
oreSmelting(DDBlocks.GLOOMSLATE_IRON_ORE.get(), RecipeCategory.MISC, Items.RAW_IRON, 0.7f, "iron_ingot", writer);
oreSmelting(DDBlocks.GLOOMSLATE_COPPER_ORE.get(), RecipeCategory.MISC, Items.RAW_COPPER, 0.7f, "copper_ingot", writer);
oreSmelting(DDBlocks.GLOOMSLATE_GOLD_ORE.get(), RecipeCategory.MISC, Items.RAW_GOLD, 1, "gold_ingot", writer);
oreSmelting(DDBlocks.GLOOMSLATE_IRON_ORE.get(), RecipeCategory.MISC, Items.IRON_INGOT, 0.7f, "iron_ingot", writer);
oreSmelting(DDBlocks.GLOOMSLATE_COPPER_ORE.get(), RecipeCategory.MISC, Items.COPPER_INGOT, 0.7f, "copper_ingot", writer);
oreSmelting(DDBlocks.GLOOMSLATE_GOLD_ORE.get(), RecipeCategory.MISC, Items.GOLD_INGOT, 1, "gold_ingot", writer);
oreSmelting(DDBlocks.GLOOMSLATE_REDSTONE_ORE.get(), RecipeCategory.REDSTONE, Items.REDSTONE, 0.7f, "redstone", writer);
oreSmelting(DDBlocks.GLOOMSLATE_EMERALD_ORE.get(), RecipeCategory.MISC, Items.EMERALD, 1, "emerald", writer);
oreSmelting(DDBlocks.GLOOMSLATE_LAPIS_ORE.get(), RecipeCategory.MISC, Items.LAPIS_LAZULI, 0.2f, "lapis_lazuli", writer);
oreSmelting(DDBlocks.GLOOMSLATE_DIAMOND_ORE.get(), RecipeCategory.MISC, Items.DIAMOND, 1, "diamond", writer);

oreBlasting(DDBlocks.SCULK_STONE_COAL_ORE.get(), RecipeCategory.MISC, Items.COAL, 0.1f, "coal", writer);
oreBlasting(DDBlocks.SCULK_STONE_IRON_ORE.get(), RecipeCategory.MISC, Items.RAW_IRON, 0.7f, "iron_ingot", writer);
oreBlasting(DDBlocks.SCULK_STONE_COPPER_ORE.get(), RecipeCategory.MISC, Items.RAW_COPPER, 0.7f, "copper_ingot", writer);
oreBlasting(DDBlocks.SCULK_STONE_GOLD_ORE.get(), RecipeCategory.MISC, Items.RAW_GOLD, 1, "gold_ingot", writer);
oreBlasting(DDBlocks.SCULK_STONE_IRON_ORE.get(), RecipeCategory.MISC, Items.IRON_INGOT, 0.7f, "iron_ingot", writer);
oreBlasting(DDBlocks.SCULK_STONE_COPPER_ORE.get(), RecipeCategory.MISC, Items.COPPER_INGOT, 0.7f, "copper_ingot", writer);
oreBlasting(DDBlocks.SCULK_STONE_GOLD_ORE.get(), RecipeCategory.MISC, Items.GOLD_INGOT, 1, "gold_ingot", writer);
oreBlasting(DDBlocks.SCULK_STONE_REDSTONE_ORE.get(), RecipeCategory.REDSTONE, Items.REDSTONE, 0.7f, "redstone", writer);
oreBlasting(DDBlocks.SCULK_STONE_EMERALD_ORE.get(), RecipeCategory.MISC, Items.EMERALD, 1, "emerald", writer);
oreBlasting(DDBlocks.SCULK_STONE_LAPIS_ORE.get(), RecipeCategory.MISC, Items.LAPIS_LAZULI, 0.2f, "lapis_lazuli", writer);
oreBlasting(DDBlocks.SCULK_STONE_DIAMOND_ORE.get(), RecipeCategory.MISC, Items.DIAMOND, 1, "diamond", writer);
oreBlasting(DDBlocks.GLOOMSLATE_COAL_ORE.get(), RecipeCategory.MISC, Items.COAL, 0.1f, "coal", writer);
oreBlasting(DDBlocks.GLOOMSLATE_IRON_ORE.get(), RecipeCategory.MISC, Items.RAW_IRON, 0.7f, "iron_ingot", writer);
oreBlasting(DDBlocks.GLOOMSLATE_COPPER_ORE.get(), RecipeCategory.MISC, Items.RAW_COPPER, 0.7f, "copper_ingot", writer);
oreBlasting(DDBlocks.GLOOMSLATE_GOLD_ORE.get(), RecipeCategory.MISC, Items.RAW_GOLD, 1, "gold_ingot", writer);
oreBlasting(DDBlocks.GLOOMSLATE_IRON_ORE.get(), RecipeCategory.MISC, Items.IRON_INGOT, 0.7f, "iron_ingot", writer);
oreBlasting(DDBlocks.GLOOMSLATE_COPPER_ORE.get(), RecipeCategory.MISC, Items.COPPER_INGOT, 0.7f, "copper_ingot", writer);
oreBlasting(DDBlocks.GLOOMSLATE_GOLD_ORE.get(), RecipeCategory.MISC, Items.GOLD_INGOT, 1, "gold_ingot", writer);
oreBlasting(DDBlocks.GLOOMSLATE_REDSTONE_ORE.get(), RecipeCategory.REDSTONE, Items.REDSTONE, 0.7f, "redstone", writer);
oreBlasting(DDBlocks.GLOOMSLATE_EMERALD_ORE.get(), RecipeCategory.MISC, Items.EMERALD, 1, "emerald", writer);
oreBlasting(DDBlocks.GLOOMSLATE_LAPIS_ORE.get(), RecipeCategory.MISC, Items.LAPIS_LAZULI, 0.2f, "lapis_lazuli", writer);
Expand Down

0 comments on commit 96f7ca9

Please sign in to comment.