recipeeeeees

src/main/java/de/ellpeck/naturesaura/Helper.java

@@ -7,6 +7,7 @@ import de.ellpeck.naturesaura.blocks.tiles.TileEntityImpl;
 import de.ellpeck.naturesaura.chunk.AuraChunk;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.model.ItemCameraTransforms;
@@ -14,6 +15,7 @@ import net.minecraft.entity.item.ItemEntity;
 import net.minecraft.entity.item.ItemFrameEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.item.DyeColor;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.Ingredient;
@@ -330,4 +332,41 @@ public final class Helper {
             }
         }
     }
+
+    public static Block getWool(DyeColor color) {
+        switch (color) {
+            case ORANGE:
+                return Blocks.ORANGE_WOOL;
+            case MAGENTA:
+                return Blocks.MAGENTA_WOOL;
+            case LIGHT_BLUE:
+                return Blocks.LIGHT_BLUE_WOOL;
+            case YELLOW:
+                return Blocks.YELLOW_WOOL;
+            case LIME:
+                return Blocks.LIME_WOOL;
+            case PINK:
+                return Blocks.PINK_WOOL;
+            case GRAY:
+                return Blocks.GRAY_WOOL;
+            case LIGHT_GRAY:
+                return Blocks.LIGHT_GRAY_WOOL;
+            case CYAN:
+                return Blocks.CYAN_WOOL;
+            case PURPLE:
+                return Blocks.PURPLE_WOOL;
+            case BLUE:
+                return Blocks.BLUE_WOOL;
+            case BROWN:
+                return Blocks.BROWN_WOOL;
+            case GREEN:
+                return Blocks.GREEN_WOOL;
+            case RED:
+                return Blocks.RED_WOOL;
+            case BLACK:
+                return Blocks.BLACK_WOOL;
+            default:
+                return Blocks.WHITE_WOOL;
+        }
+    }
 }

src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java

@@ -1,32 +1,50 @@
 package de.ellpeck.naturesaura.recipes;
 
+import de.ellpeck.naturesaura.Helper;
 import de.ellpeck.naturesaura.NaturesAura;
 import de.ellpeck.naturesaura.api.NaturesAuraAPI;
-import de.ellpeck.naturesaura.api.recipes.AnimalSpawnerRecipe;
+import de.ellpeck.naturesaura.api.recipes.*;
-import de.ellpeck.naturesaura.api.recipes.WeightedOre;
 import de.ellpeck.naturesaura.api.recipes.ing.AmountIngredient;
 import de.ellpeck.naturesaura.api.recipes.ing.NBTIngredient;
+import de.ellpeck.naturesaura.blocks.ModBlocks;
+import de.ellpeck.naturesaura.chunk.effect.AnimalEffect;
+import de.ellpeck.naturesaura.chunk.effect.CacheRechargeEffect;
+import de.ellpeck.naturesaura.chunk.effect.OreSpawnEffect;
+import de.ellpeck.naturesaura.chunk.effect.PlantBoostEffect;
+import de.ellpeck.naturesaura.items.AuraBottle;
+import de.ellpeck.naturesaura.items.EffectPowder;
 import de.ellpeck.naturesaura.items.ModItems;
 import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.FlowerBlock;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.passive.SheepEntity;
+import net.minecraft.item.DyeColor;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
 import net.minecraft.item.crafting.Ingredient;
+import net.minecraft.potion.PotionUtils;
+import net.minecraft.potion.Potions;
+import net.minecraft.tags.ItemTags;
+import net.minecraft.tags.Tag;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
+import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.Arrays;
 
 public final class ModRecipes {
 
     public static void init() {
-        // TODO recipes
+        new TreeRitualRecipe(res("eye"),
-/*        new TreeRitualRecipe(res("eye"),
+                ing(new ItemStack(Blocks.OAK_SAPLING)), new ItemStack(ModItems.EYE), 250,
-                ing(new ItemStack(Blocks.SAPLING)), new ItemStack(ModItems.EYE), 250,
                 ing(Items.SPIDER_EYE),
                 ing(Items.GOLD_INGOT),
                 ing(ModItems.GOLD_LEAF),
                 ing(ModItems.GOLD_LEAF)).register();
         new TreeRitualRecipe(res("eye_improved"),
-                ing(new ItemStack(Blocks.SAPLING)), new ItemStack(ModItems.EYE_IMPROVED), 500,
+                ing(new ItemStack(Blocks.OAK_SAPLING)), new ItemStack(ModItems.EYE_IMPROVED), 500,
                 ing(ModItems.EYE),
                 ing(ModItems.SKY_INGOT),
                 ing(ModItems.SKY_INGOT),
@@ -34,7 +52,7 @@ public final class ModRecipes {
                 ing(ModItems.GOLD_LEAF),
                 ing(ModItems.GOLD_LEAF)).register();
         new TreeRitualRecipe(res("nature_altar"),
-                ing(Blocks.SAPLING), new ItemStack(ModBlocks.NATURE_ALTAR), 500,
+                ing(Blocks.OAK_SAPLING), new ItemStack(ModBlocks.NATURE_ALTAR), 500,
                 ing(Blocks.STONE),
                 ing(Blocks.STONE),
                 ing(Blocks.STONE),
@@ -42,25 +60,25 @@ public final class ModRecipes {
                 ing(Items.GOLD_INGOT),
                 ing(ModItems.TOKEN_JOY)).register();
         new TreeRitualRecipe(res("ancient_sapling"),
-                ing(Blocks.SAPLING), new ItemStack(ModBlocks.ANCIENT_SAPLING), 200,
+                ing(Blocks.OAK_SAPLING), new ItemStack(ModBlocks.ANCIENT_SAPLING), 200,
-                ing(Blocks.SAPLING),
+                ing(Blocks.OAK_SAPLING),
-                ing(Blocks.YELLOW_FLOWER),
+                ing(Blocks.DANDELION),
-                ing(Blocks.RED_FLOWER),
+                ing(Blocks.POPPY),
                 ing(Items.WHEAT_SEEDS),
-                ing(Items.REEDS),
+                ing(Items.SUGAR_CANE),
                 ing(ModItems.GOLD_LEAF)).register();
         new TreeRitualRecipe(res("furnace_heater"),
-                ing(Blocks.SAPLING), new ItemStack(ModBlocks.FURNACE_HEATER), 600,
+                ing(Blocks.OAK_SAPLING), new ItemStack(ModBlocks.FURNACE_HEATER), 600,
                 ing(ModBlocks.INFUSED_STONE),
                 ing(ModBlocks.INFUSED_STONE),
                 ing(ModItems.INFUSED_IRON),
                 ing(ModItems.INFUSED_IRON),
                 ing(Items.FIRE_CHARGE),
                 ing(Items.FLINT),
-                ing(Blocks.MAGMA),
+                ing(Blocks.MAGMA_BLOCK),
                 ing(ModItems.TOKEN_FEAR)).register();
         new TreeRitualRecipe(res("conversion_catalyst"),
-                ing(new ItemStack(Blocks.SAPLING, 1, 3)), new ItemStack(ModBlocks.CONVERSION_CATALYST), 600,
+                ing(Blocks.JUNGLE_SAPLING), new ItemStack(ModBlocks.CONVERSION_CATALYST), 600,
                 ing(ModBlocks.GOLD_BRICK),
                 ing(ModBlocks.INFUSED_STONE),
                 ing(Items.BREWING_STAND),
@@ -68,66 +86,66 @@ public final class ModRecipes {
                 ing(ModItems.GOLD_LEAF),
                 ing(Blocks.GLOWSTONE)).register();
         new TreeRitualRecipe(res("crushing_catalyst"),
-                ing(Blocks.SAPLING), new ItemStack(ModBlocks.CRUSHING_CATALYST), 600,
+                ing(Blocks.OAK_SAPLING), new ItemStack(ModBlocks.CRUSHING_CATALYST), 600,
                 ing(ModBlocks.GOLD_BRICK),
                 ing(ModBlocks.INFUSED_STONE),
                 ing(Blocks.PISTON),
                 ing(Items.FLINT),
                 ing(ModItems.TOKEN_ANGER)).register();
         new TreeRitualRecipe(res("plant_powder"),
-                ing(new ItemStack(Blocks.SAPLING)),
+                ing(new ItemStack(Blocks.OAK_SAPLING)),
                 EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 24), PlantBoostEffect.NAME), 400,
                 ing(ModBlocks.GOLD_POWDER),
                 ing(ModBlocks.GOLD_POWDER),
                 ing(ModItems.SKY_INGOT),
                 ing(Items.WHEAT)).register();
         new TreeRitualRecipe(res("cache_powder"),
-                ing(new ItemStack(Blocks.SAPLING)),
+                ing(new ItemStack(Blocks.OAK_SAPLING)),
                 EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 32), CacheRechargeEffect.NAME), 400,
                 ing(ModBlocks.GOLD_POWDER),
                 ing(ModBlocks.GOLD_POWDER),
                 ing(ModItems.SKY_INGOT),
                 ing(ModItems.AURA_CACHE)).register();
         new TreeRitualRecipe(res("animal_powder"),
-                ing(new ItemStack(Blocks.SAPLING, 1, 3)),
+                ing(Blocks.JUNGLE_SAPLING),
                 EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 8), AnimalEffect.NAME), 400,
                 ing(ModBlocks.GOLD_POWDER),
                 ing(ModBlocks.GOLD_POWDER),
                 ing(ModItems.SKY_INGOT),
                 ing(Items.EGG)).register();
         new TreeRitualRecipe(res("ore_spawn_powder"),
-                ing(new ItemStack(Blocks.SAPLING)),
+                ing(Blocks.OAK_SAPLING),
                 EffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 4), OreSpawnEffect.NAME), 400,
                 ing(ModBlocks.GOLD_POWDER),
                 ing(ModBlocks.GOLD_POWDER),
                 ing(Blocks.DIAMOND_ORE),
                 ing(Blocks.REDSTONE_ORE)).register();
         new TreeRitualRecipe(res("token_joy"),
-                ing(Blocks.SAPLING), new ItemStack(ModItems.TOKEN_JOY, 2), 200,
+                ing(Blocks.OAK_SAPLING), new ItemStack(ModItems.TOKEN_JOY, 2), 200,
                 nbtIng(AuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_OVERWORLD)),
                 ing(ModItems.GOLD_LEAF),
-                ing(new ItemStack(Blocks.RED_FLOWER, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Blocks.YELLOW_FLOWER)),
+                ing(ItemTags.SMALL_FLOWERS),
                 ing(Items.APPLE),
                 ing(Blocks.TORCH),
                 ing(Items.IRON_INGOT)).register();
         new TreeRitualRecipe(res("token_anger"),
-                ing(Blocks.SAPLING), new ItemStack(ModItems.TOKEN_ANGER, 2), 200,
+                ing(Blocks.OAK_SAPLING), new ItemStack(ModItems.TOKEN_ANGER, 2), 200,
                 nbtIng(AuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER)),
                 ing(ModItems.GOLD_LEAF),
-                ing(Blocks.MAGMA),
+                ing(Blocks.MAGMA_BLOCK),
                 ing(Items.BLAZE_POWDER),
                 ing(Items.GUNPOWDER),
                 ing(Items.ENDER_PEARL)).register();
         new TreeRitualRecipe(res("token_sorrow"),
-                ing(Blocks.SAPLING), new ItemStack(ModItems.TOKEN_SORROW, 2), 200,
+                ing(Blocks.OAK_SAPLING), new ItemStack(ModItems.TOKEN_SORROW, 2), 200,
                 nbtIng(AuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_OVERWORLD)),
                 ing(ModItems.GOLD_LEAF),
                 ing(Items.GHAST_TEAR),
                 ing(Items.BEEF, Items.MUTTON, Items.CHICKEN, Items.PORKCHOP),
                 ing(Blocks.GLASS),
-                ing(new ItemStack(Items.FISH, 1, OreDictionary.WILDCARD_VALUE))).register();
+                ing(ItemTags.FISHES)).register();
         new TreeRitualRecipe(res("token_fear"),
-                ing(Blocks.SAPLING), new ItemStack(ModItems.TOKEN_FEAR, 2), 200,
+                ing(Blocks.OAK_SAPLING), new ItemStack(ModItems.TOKEN_FEAR, 2), 200,
                 nbtIng(AuraBottle.setType(new ItemStack(ModItems.AURA_BOTTLE), NaturesAuraAPI.TYPE_NETHER)),
                 ing(ModItems.GOLD_LEAF),
                 ing(Items.ROTTEN_FLESH),
@@ -151,12 +169,12 @@ public final class ModRecipes {
         new AltarRecipe(res("soul_sand"), ing(Blocks.SAND), new ItemStack(Blocks.SOUL_SAND), conversion, 5000, 100).register();
         new AltarRecipe(res("nether_wart"), ing(Blocks.RED_MUSHROOM), new ItemStack(Items.NETHER_WART), conversion, 30000, 250).register();
         new AltarRecipe(res("prismarine"), ing(Items.QUARTZ), new ItemStack(Items.PRISMARINE_SHARD), conversion, 55000, 200).register();
-        new AltarRecipe(res("water"), ing(Items.GLASS_BOTTLE), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTIONITEM), Potions.WATER), conversion, 25000, 200).register();
+        new AltarRecipe(res("water"), ing(Items.GLASS_BOTTLE), PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.WATER), conversion, 25000, 200).register();
-        new AltarRecipe(res("coal"), ing(new ItemStack(Items.COAL, 1, 1)), new ItemStack(Items.COAL), conversion, 30000, 250).register();
+        new AltarRecipe(res("coal"), ing(ItemTags.COALS), new ItemStack(Items.COAL), conversion, 30000, 250).register();
 
         Ingredient crushing = ing(ModBlocks.CRUSHING_CATALYST);
-        new AltarRecipe(res("bone"), ing(Items.BONE), new ItemStack(Items.DYE, 6, 15), crushing, 3000, 40).register();
+        new AltarRecipe(res("bone"), ing(Items.BONE), new ItemStack(Items.BONE_MEAL, 6), crushing, 3000, 40).register();
-        new AltarRecipe(res("sugar"), ing(Items.REEDS), new ItemStack(Items.SUGAR, 3), crushing, 3000, 40).register();
+        new AltarRecipe(res("sugar"), ing(Items.SUGAR_CANE), new ItemStack(Items.SUGAR, 3), crushing, 3000, 40).register();
         new AltarRecipe(res("blaze"), ing(Items.BLAZE_ROD), new ItemStack(Items.BLAZE_POWDER, 4), crushing, 5000, 60).register();
         new AltarRecipe(res("glowstone"), ing(Blocks.GLOWSTONE), new ItemStack(Items.GLOWSTONE_DUST, 4), crushing, 3000, 40).register();
         new AltarRecipe(res("sand"), ing(Blocks.COBBLESTONE), new ItemStack(Blocks.SAND), crushing, 3000, 40).register();
@@ -190,21 +208,24 @@ public final class ModRecipes {
                 Blocks.COBBLESTONE.getDefaultState(),
                 Blocks.MOSSY_COBBLESTONE.getDefaultState());
         NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.put(
-                Blocks.STONEBRICK.getDefaultState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.DEFAULT),
+                Blocks.STONE_BRICKS.getDefaultState(),
-                Blocks.STONEBRICK.getDefaultState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.MOSSY));
+                Blocks.MOSSY_STONE_BRICKS.getDefaultState());
         NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.put(
-                Blocks.COBBLESTONE_WALL.getDefaultState().withProperty(WallBlock.VARIANT, WallBlock.EnumType.NORMAL),
+                Blocks.COBBLESTONE_WALL.getDefaultState(),
-                Blocks.COBBLESTONE_WALL.getDefaultState().withProperty(WallBlock.VARIANT, WallBlock.EnumType.MOSSY));
+                Blocks.MOSSY_COBBLESTONE_WALL.getDefaultState());
+        NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.put(
+                Blocks.STONE_BRICK_WALL.getDefaultState(),
+                Blocks.MOSSY_STONE_BRICK_WALL.getDefaultState());
 
         for (Block block : ForgeRegistries.BLOCKS)
             if (block instanceof FlowerBlock)
-                NaturesAuraAPI.FLOWERS.addAll(block.getBlockState().getValidStates());
+                NaturesAuraAPI.FLOWERS.addAll(block.getStateContainer().getValidStates());
 
         spawner("cow", "minecraft:cow", 50000, 60, ing(Items.BEEF), ing(Items.LEATHER));
         for (DyeColor color : DyeColor.values())
             new AnimalSpawnerRecipe(res("sheep_" + color.getName()), new ResourceLocation("minecraft:sheep"),
                     500, 60, ing(ModItems.BIRTH_SPIRIT), ing(Items.MUTTON),
-                    ing(new ItemStack(Blocks.WOOL, 1, color.getMetadata()))) {
+                    ing(Helper.getWool(color))) {
                 @Override
                 public Entity makeEntity(World world, double x, double y, double z) {
                     SheepEntity sheep = (SheepEntity) super.makeEntity(world, x, y, z);
@@ -216,7 +237,7 @@ public final class ModRecipes {
         spawner("pig", "minecraft:pig", 50000, 60, ing(Items.PORKCHOP));
         spawner("blaze", "minecraft:blaze", 150000, 120, ing(Items.BLAZE_ROD), ing(Items.BLAZE_POWDER));
         spawner("ghast", "minecraft:ghast", 120000, 150, ing(Items.GUNPOWDER), ing(Items.GHAST_TEAR));
-        spawner("ocelot", "minecraft:ocelot", 80000, 60, ing(Items.FISH), ing(Blocks.WOOL));
+        spawner("ocelot", "minecraft:ocelot", 80000, 60, ing(Items.COD), ing(ItemTags.WOOL));
         spawner("mule", "minecraft:mule", 100000, 100, ing(Items.LEATHER), ing(Blocks.CHEST), ing(Items.APPLE));
         spawner("bat", "minecraft:bat", 30000, 40, ing(Items.FEATHER));
         spawner("endermite", "minecraft:endermite", 30000, 40, ing(Items.ENDER_PEARL), ing(Blocks.STONE));
@@ -226,15 +247,15 @@ public final class ModRecipes {
         spawner("skeleton", "minecraft:skeleton", 100000, 120, ing(Items.BONE), ing(Items.ARROW));
         spawner("enderman", "minecraft:enderman", 120000, 120, ing(Items.ENDER_PEARL));
         spawner("silverfish", "minecraft:silverfish", 30000, 40, ing(Blocks.STONE));
-        spawner("squid", "minecraft:squid", 50000, 40, ing(new ItemStack(Items.DYE, 1, DyeColor.BLACK.getDyeDamage())));
+        spawner("squid", "minecraft:squid", 50000, 40, ing(Items.INK_SAC));
         spawner("stray", "minecraft:stray", 100000, 120, ing(Items.BONE), ing(Blocks.ICE));
         spawner("shulker", "minecraft:shulker", 150000, 100, ing(Items.SHULKER_SHELL));
         spawner("husk", "minecraft:husk", 100000, 120, ing(Items.ROTTEN_FLESH), ing(Blocks.SAND));
-        spawner("llama", "minecraft:llama", 60000, 80, ing(new ItemStack(Blocks.WOOL, 1, OreDictionary.WILDCARD_VALUE)));
+        spawner("llama", "minecraft:llama", 60000, 80, ing(ItemTags.WOOL));
         spawner("rabbit", "minecraft:rabbit", 30000, 40, ing(Items.RABBIT_HIDE));
         spawner("magma_cube", "minecraft:magma_cube", 100000, 100, ing(Items.MAGMA_CREAM));
         spawner("zombie_pigman", "minecraft:zombie_pigman", 120000, 150, ing(Items.ROTTEN_FLESH), ing(Items.GOLD_NUGGET));
-        spawner("polar_bear", "minecraft:polar_bear", 50000, 60, ing(Items.FISH), ing(Blocks.ICE));
+        spawner("polar_bear", "minecraft:polar_bear", 50000, 60, ing(Items.COD), ing(Blocks.ICE));
         spawner("mooshroom", "minecraft:mooshroom", 40000, 60, ing(Items.LEATHER), ing(Blocks.RED_MUSHROOM));
         spawner("guardian", "minecraft:guardian", 150000, 150, ing(Items.PRISMARINE_SHARD), ing(Items.PRISMARINE_CRYSTALS));
         spawner("horse", "minecraft:horse", 100000, 100, ing(Items.LEATHER));
@@ -244,7 +265,7 @@ public final class ModRecipes {
         spawner("witch", "minecraft:witch", 150000, 150, ing(Items.GLASS_BOTTLE), ing(Items.GLOWSTONE_DUST));
         spawner("wither_skeleton", "minecraft:wither_skeleton", 150000, 150, ing(Items.BONE), ing(Blocks.OBSIDIAN));
         spawner("wolf", "minecraft:wolf", 50000, 60, ing(Items.LEATHER), ing(Items.BONE));
-        spawner("zombie", "minecraft:zombie", 100000, 100, ing(Items.ROTTEN_FLESH));*/
+        spawner("zombie", "minecraft:zombie", 100000, 100, ing(Items.ROTTEN_FLESH));
 
         NaturesAuraAPI.OVERWORLD_ORES.add(new WeightedOre("oreCoal", 5000));
         NaturesAuraAPI.NETHER_ORES.add(new WeightedOre("oreNetherCoal", 5000));
@@ -335,6 +356,10 @@ public final class ModRecipes {
         return Ingredient.fromStacks(stacks);
     }
 
+    private static Ingredient ing(Tag<Item> tag) {
+        return Ingredient.fromTag(tag);
+    }
+
     private static Ingredient nbtIng(ItemStack stack) {
         return new NBTIngredient(stack);
     }

src/main/resources/data/naturesaura/recipes/ancient_planks.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "W"
     ],

src/main/resources/data/naturesaura/recipes/ancient_planks_from_bark.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "W"
     ],

src/main/resources/data/naturesaura/recipes/ancient_slab.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "WWW"
     ],

src/main/resources/data/naturesaura/recipes/ancient_stairs.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "W  ",
         "WW ",

src/main/resources/data/naturesaura/recipes/ancient_stick.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "W",
         "W"

src/main/resources/data/naturesaura/recipes/animal_generator.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "BSB",
         "IAI",

src/main/resources/data/naturesaura/recipes/animal_spawner.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "SHS",
         "IWI",

src/main/resources/data/naturesaura/recipes/aura_cache.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "SIS",
         "IBI",

src/main/resources/data/naturesaura/recipes/aura_detector.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "RSR",
         "SIS",

src/main/resources/data/naturesaura/recipes/aura_trove.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "SIS",
         "IBI",

src/main/resources/data/naturesaura/recipes/auto_crafter.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "AWA",
         "ACA",

src/main/resources/data/naturesaura/recipes/book.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shapeless",
+    "type": "minecraft:crafting_shapeless",
     "ingredients": [
         {
             "item": "minecraft:paper"
@@ -11,8 +11,7 @@
             "item": "minecraft:leather"
         },
         {
-            "type": "forge:ore_dict",
+            "tag": "minecraft:saplings"
-            "ore": "treeSapling"
         }
     ],
     "result": {

src/main/resources/data/naturesaura/recipes/bottle_two_the_rebottling.json

@@ -1,12 +1,11 @@
 {
-    "type": "forge:ore_shapeless",
+    "type": "minecraft:crafting_shapeless",
     "ingredients": [
         {
             "item": "minecraft:glass_bottle"
         },
         {
-            "type": "forge:ore_dict",
+            "tag": "minecraft:planks"
-            "ore": "plankWood"
         }
     ],
     "result": {

src/main/resources/data/naturesaura/recipes/calling_spirit.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         " O ",
         "GDG",
@@ -10,14 +10,14 @@
             "item": "naturesaura:infused_iron"
         },
         "O": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:overworld"
             }
         },
         "N": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:nether"

src/main/resources/data/naturesaura/recipes/cave_finder.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         " ST",
         "SRS",
@@ -10,8 +10,7 @@
             "item": "naturesaura:ancient_stick"
         },
         "S": {
-            "type": "forge:ore_dict",
+            "tag": "forge:stone"
-            "ore": "stone"
         },
         "T": {
             "item": "naturesaura:token_terror"

src/main/resources/data/naturesaura/recipes/chunk_loader.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "ONO",
         "PEP",
@@ -16,7 +16,7 @@
             "item": "minecraft:obsidian"
         },
         "N": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:end"
@@ -28,7 +28,7 @@
     },
     "conditions": [
         {
-            "type": "minecraft:item_exists",
+            "type": "forge:item_exists",
             "item": "naturesaura:chunk_loader"
         }
     ]

src/main/resources/data/naturesaura/recipes/color_changer.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "RYB",
         "ITI",
@@ -10,16 +10,13 @@
             "item": "naturesaura:infused_iron"
         },
         "R": {
-            "type": "forge:ore_dict",
+            "tag": "forge:dyes/red"
-            "ore": "dyeRed"
         },
         "Y": {
-            "type": "forge:ore_dict",
+            "tag": "forge:dyes/yellow"
-            "ore": "dyeYellow"
         },
         "B": {
-            "type": "forge:ore_dict",
+            "tag": "forge:dyes/blue"
-            "ore": "dyeBlue"
         },
         "T": {
             "item": "naturesaura:token_euphoria"

src/main/resources/data/naturesaura/recipes/dimension_rail_end.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "IEI",
         "ISI",
@@ -10,15 +10,14 @@
             "item": "naturesaura:token_rage"
         },
         "O": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:end"
             }
         },
         "S": {
-            "type": "forge:ore_dict",
+            "tag": "forge:rods/wooden"
-            "ore": "stickWood"
         },
         "I": {
             "item": "naturesaura:sky_ingot"

src/main/resources/data/naturesaura/recipes/dimension_rail_nether.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "IEI",
         "ISI",
@@ -10,15 +10,14 @@
             "item": "naturesaura:token_terror"
         },
         "O": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:nether"
             }
         },
         "S": {
-            "type": "forge:ore_dict",
+            "tag": "forge:rods/wooden"
-            "ore": "stickWood"
         },
         "I": {
             "item": "naturesaura:sky_ingot"

src/main/resources/data/naturesaura/recipes/dimension_rail_overworld.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "IEI",
         "ISI",
@@ -10,15 +10,14 @@
             "item": "naturesaura:token_euphoria"
         },
         "O": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:overworld"
             }
         },
         "S": {
-            "type": "forge:ore_dict",
+            "tag": "forge:rods/wooden"
-            "ore": "stickWood"
         },
         "I": {
             "item": "naturesaura:infused_iron"

src/main/resources/data/naturesaura/recipes/ender_access.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         " Y ",
         "DED",
@@ -13,7 +13,7 @@
             "item": "minecraft:ender_eye"
         },
         "D": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:end"

src/main/resources/data/naturesaura/recipes/ender_crate.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "OYO",
         "DED",
@@ -13,7 +13,7 @@
             "item": "minecraft:ender_eye"
         },
         "D": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:end"

src/main/resources/data/naturesaura/recipes/farming_stencil.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "WHW",
         "WDW",
@@ -7,12 +7,10 @@
     ],
     "key": {
         "W": {
-            "type": "forge:ore_dict",
+            "tag": "minecraft:planks"
-            "ore": "plankWood"
         },
         "D": {
-            "item": "minecraft:dirt",
+            "item": "minecraft:dirt"
-            "data": 0
         },
         "H": {
             "item": "naturesaura:infused_iron_hoe"

src/main/resources/data/naturesaura/recipes/field_creator.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "GIG",
         "GPG",

src/main/resources/data/naturesaura/recipes/firework_generator.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "SFS",
         "GIG",
@@ -7,7 +7,7 @@
     ],
     "key": {
         "F": {
-            "item": "minecraft:fireworks"
+            "item": "minecraft:firework_rocket"
         },
         "G": {
             "item": "minecraft:gunpowder"

src/main/resources/data/naturesaura/recipes/flower_generator.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "PBP",
         "IFI",
@@ -7,15 +7,13 @@
     ],
     "key": {
         "P": {
-            "type": "forge:ore_dict",
+            "tag": "minecraft:planks"
-            "ore": "plankWood"
         },
         "I": {
             "item": "naturesaura:infused_iron"
         },
         "F": {
-            "item": "minecraft:double_plant",
+            "item": "minecraft:peony"
-            "data": 5
         },
         "B": {
             "item": "naturesaura:token_joy"

src/main/resources/data/naturesaura/recipes/generator_limit_remover.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "S1S",
         "2I3",

src/main/resources/data/naturesaura/recipes/gold_brick.json

@@ -2,8 +2,7 @@
     "type": "minecraft:crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:stonebrick",
+            "item": "minecraft:stone_bricks"
-            "data": 0
         },
         {
             "item": "naturesaura:gold_fiber"

src/main/resources/data/naturesaura/recipes/gold_fiber.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "LNL",
         "NGN",
@@ -7,16 +7,13 @@
     ],
     "key": {
         "N": {
-            "type": "forge:ore_dict",
+            "tag": "forge:nuggets/gold"
-            "ore": "nuggetGold"
         },
         "G": {
-            "item": "minecraft:tallgrass",
+            "item": "minecraft:tall_grass"
-            "data": 1
         },
         "L": {
-            "type": "forge:ore_dict",
+            "tag": "minecraft:leaves"
-            "ore": "treeLeaves"
         }
     },
     "result": {

src/main/resources/data/naturesaura/recipes/gold_powder.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "L"
     ],

src/main/resources/data/naturesaura/recipes/grated_chute.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "IHI",
         "ICI",
@@ -7,8 +7,7 @@
     ],
     "key": {
         "C": {
-            "type": "forge:ore_dict",
+            "tag": "forge:chests/wooden"
-            "ore": "chestWood"
         },
         "I": {
             "item": "naturesaura:infused_iron"

src/main/resources/data/naturesaura/recipes/hopper_upgrade.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "RIR",
         "IEI",
@@ -13,8 +13,7 @@
             "item": "naturesaura:infused_iron"
         },
         "R": {
-            "type": "forge:ore_dict",
+            "tag": "forge:ingots/iron"
-            "ore": "ingotIron"
         },
         "E": {
             "item": "minecraft:ender_pearl"

src/main/resources/data/naturesaura/recipes/infused_axe.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "AA",
         "AS",

src/main/resources/data/naturesaura/recipes/infused_brick.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "WW",
         "WW"

src/main/resources/data/naturesaura/recipes/infused_brick_slab.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "WWW"
     ],

src/main/resources/data/naturesaura/recipes/infused_brick_stairs.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "W  ",
         "WW ",

src/main/resources/data/naturesaura/recipes/infused_chest.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "ASA",
         "AAA",

src/main/resources/data/naturesaura/recipes/infused_helmet.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "AAA",
         "ASA"

src/main/resources/data/naturesaura/recipes/infused_hoe.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "AA",
         " S",

src/main/resources/data/naturesaura/recipes/infused_iron.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "I"
     ],

src/main/resources/data/naturesaura/recipes/infused_iron_block.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "III",
         "III",

src/main/resources/data/naturesaura/recipes/infused_pants.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "AAA",
         "A A",

src/main/resources/data/naturesaura/recipes/infused_pickaxe.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "AAA",
         " S ",

src/main/resources/data/naturesaura/recipes/infused_shoes.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "A A",
         "A A"

src/main/resources/data/naturesaura/recipes/infused_shovel.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "A",
         "S",

src/main/resources/data/naturesaura/recipes/infused_slab.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "WWW"
     ],

src/main/resources/data/naturesaura/recipes/infused_stairs.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "W  ",
         "WW ",

src/main/resources/data/naturesaura/recipes/infused_sword.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "A",
         "A",

src/main/resources/data/naturesaura/recipes/moss_generator.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "ICI",
         "CWC",

src/main/resources/data/naturesaura/recipes/mover_cart.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "EBE",
         "SIS",
@@ -7,7 +7,7 @@
     ],
     "key": {
         "B": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:end"

src/main/resources/data/naturesaura/recipes/oak_generator.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "MTI",
         "SOS",
@@ -7,23 +7,20 @@
     ],
     "key": {
         "O": {
-            "type": "forge:ore_dict",
+            "tag": "minecraft:logs"
-            "ore": "logWood"
         },
         "S": {
-            "type": "forge:ore_dict",
+            "tag": "minecraft:saplings"
-            "ore": "treeSapling"
         },
         "B": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:overworld"
             }
         },
         "M": {
-            "item": "minecraft:dye",
+            "item": "minecraft:bone_meal"
-            "data": 15
         },
         "I": {
             "item": "naturesaura:infused_iron"

src/main/resources/data/naturesaura/recipes/offering_table.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "SIS",
         "FST",
@@ -7,12 +7,10 @@
     ],
     "key": {
         "S": {
-            "type": "forge:ore_dict",
+            "tag": "forge:stone"
-            "ore": "stone"
         },
         "W": {
-            "type": "forge:ore_dict",
+            "tag": "minecraft:logs"
-            "ore": "logWood"
         },
         "I": {
             "item": "naturesaura:infused_iron"

src/main/resources/data/naturesaura/recipes/pickup_stopper.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "CIC",
         "CDC",

src/main/resources/data/naturesaura/recipes/placer.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "CHC",
         "CDC",

src/main/resources/data/naturesaura/recipes/potion_generator.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "BRB",
         "IWI",

src/main/resources/data/naturesaura/recipes/powder_placer.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         " A ",
         "PSP",

src/main/resources/data/naturesaura/recipes/projectile_generator.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "SFI",
         "TXT",

src/main/resources/data/naturesaura/recipes/range_visualizer.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "IA ",
         "AGA",

src/main/resources/data/naturesaura/recipes/rf_converter.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "RWR",
         "ITI",
@@ -27,7 +27,7 @@
     },
     "conditions": [
         {
-            "type": "minecraft:item_exists",
+            "type": "forge:item_exists",
             "item": "naturesaura:rf_converter"
         }
     ]

src/main/resources/data/naturesaura/recipes/shockwave_creator.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         " I ",
         "RTR",

src/main/resources/data/naturesaura/recipes/spawn_lamp.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "ILI",
         "SGE",
@@ -7,8 +7,7 @@
     ],
     "key": {
         "I": {
-            "type": "forge:ore_dict",
+            "tag": "forge:ingots/iron"
-            "ore": "ingotIron"
         },
         "L": {
             "item": "minecraft:glass"
@@ -20,7 +19,7 @@
             "item": "minecraft:glowstone"
         },
         "E": {
-            "type": "minecraft:item_nbt",
+            "type": "forge:nbt",
             "item": "naturesaura:aura_bottle",
             "nbt": {
                 "stored_type": "naturesaura:end"

src/main/resources/data/naturesaura/recipes/time_changer.json

@@ -1,5 +1,5 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         " O ",
         "BCB",

src/main/resources/data/naturesaura/recipes/wood_stand.json

@@ -1,13 +1,12 @@
 {
-    "type": "forge:ore_shaped",
+    "type": "minecraft:crafting_shaped",
     "pattern": [
         "L",
         "W"
     ],
     "key": {
         "W": {
-            "type": "forge:ore_dict",
+            "tag": "minecraft:logs"
-            "ore": "logWood"
         },
         "L": {
             "item": "naturesaura:gold_leaf"