From ea9a5d1305b40b852feb8880e0645c093bd7573a Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 22 Jan 2020 20:31:09 +0100 Subject: [PATCH] recipeeeeees --- .../java/de/ellpeck/naturesaura/Helper.java | 39 +++++++ .../naturesaura/recipes/ModRecipes.java | 109 +++++++++++------- .../forge/{ => tags}/items/rods/wooden.json | 0 .../naturesaura/recipes/ancient_planks.json | 2 +- .../recipes/ancient_planks_from_bark.json | 2 +- .../naturesaura/recipes/ancient_slab.json | 2 +- .../naturesaura/recipes/ancient_stairs.json | 2 +- .../naturesaura/recipes/ancient_stick.json | 2 +- .../naturesaura/recipes/animal_generator.json | 2 +- .../naturesaura/recipes/animal_spawner.json | 2 +- .../data/naturesaura/recipes/aura_cache.json | 2 +- .../naturesaura/recipes/aura_detector.json | 2 +- .../data/naturesaura/recipes/aura_trove.json | 2 +- .../naturesaura/recipes/auto_crafter.json | 2 +- .../data/naturesaura/recipes/book.json | 5 +- .../recipes/bottle_two_the_rebottling.json | 5 +- .../naturesaura/recipes/calling_spirit.json | 6 +- .../data/naturesaura/recipes/cave_finder.json | 5 +- .../naturesaura/recipes/chunk_loader.json | 6 +- .../naturesaura/recipes/color_changer.json | 11 +- .../recipes/dimension_rail_end.json | 7 +- .../recipes/dimension_rail_nether.json | 7 +- .../recipes/dimension_rail_overworld.json | 7 +- .../naturesaura/recipes/ender_access.json | 4 +- .../data/naturesaura/recipes/ender_crate.json | 4 +- .../naturesaura/recipes/farming_stencil.json | 8 +- .../naturesaura/recipes/field_creator.json | 2 +- .../recipes/firework_generator.json | 4 +- .../naturesaura/recipes/flower_generator.json | 8 +- .../recipes/generator_limit_remover.json | 2 +- .../data/naturesaura/recipes/gold_brick.json | 3 +- .../data/naturesaura/recipes/gold_fiber.json | 11 +- .../data/naturesaura/recipes/gold_powder.json | 2 +- .../naturesaura/recipes/grated_chute.json | 5 +- .../naturesaura/recipes/hopper_upgrade.json | 5 +- .../data/naturesaura/recipes/infused_axe.json | 2 +- .../naturesaura/recipes/infused_brick.json | 2 +- .../recipes/infused_brick_slab.json | 2 +- .../recipes/infused_brick_stairs.json | 2 +- .../naturesaura/recipes/infused_chest.json | 2 +- .../naturesaura/recipes/infused_helmet.json | 2 +- .../data/naturesaura/recipes/infused_hoe.json | 2 +- .../naturesaura/recipes/infused_iron.json | 2 +- .../recipes/infused_iron_block.json | 2 +- .../naturesaura/recipes/infused_pants.json | 2 +- .../naturesaura/recipes/infused_pickaxe.json | 2 +- .../naturesaura/recipes/infused_shoes.json | 2 +- .../naturesaura/recipes/infused_shovel.json | 2 +- .../naturesaura/recipes/infused_slab.json | 2 +- .../naturesaura/recipes/infused_stairs.json | 2 +- .../naturesaura/recipes/infused_sword.json | 2 +- .../naturesaura/recipes/moss_generator.json | 2 +- .../data/naturesaura/recipes/mover_cart.json | 4 +- .../naturesaura/recipes/oak_generator.json | 13 +-- .../naturesaura/recipes/offering_table.json | 8 +- .../naturesaura/recipes/pickup_stopper.json | 2 +- .../data/naturesaura/recipes/placer.json | 2 +- .../naturesaura/recipes/potion_generator.json | 2 +- .../naturesaura/recipes/powder_placer.json | 2 +- .../recipes/projectile_generator.json | 2 +- .../naturesaura/recipes/range_visualizer.json | 2 +- .../naturesaura/recipes/rf_converter.json | 4 +- .../recipes/shockwave_creator.json | 2 +- .../data/naturesaura/recipes/spawn_lamp.json | 7 +- .../naturesaura/recipes/time_changer.json | 2 +- .../data/naturesaura/recipes/wood_stand.json | 5 +- 66 files changed, 208 insertions(+), 170 deletions(-) rename src/main/resources/data/forge/{ => tags}/items/rods/wooden.json (100%) diff --git a/src/main/java/de/ellpeck/naturesaura/Helper.java b/src/main/java/de/ellpeck/naturesaura/Helper.java index 558af4a4..20e74004 100644 --- a/src/main/java/de/ellpeck/naturesaura/Helper.java +++ b/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; + } + } } diff --git a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java b/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java index 04384d5a..48de8a35 100644 --- a/src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java +++ b/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.WeightedOre; +import de.ellpeck.naturesaura.api.recipes.*; 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"), - ing(new ItemStack(Blocks.SAPLING)), new ItemStack(ModItems.EYE), 250, + new TreeRitualRecipe(res("eye"), + ing(new ItemStack(Blocks.OAK_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.SAPLING), - ing(Blocks.YELLOW_FLOWER), - ing(Blocks.RED_FLOWER), + ing(Blocks.OAK_SAPLING), new ItemStack(ModBlocks.ANCIENT_SAPLING), 200, + ing(Blocks.OAK_SAPLING), + ing(Blocks.DANDELION), + 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("coal"), ing(new ItemStack(Items.COAL, 1, 1)), new ItemStack(Items.COAL), conversion, 30000, 250).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(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("sugar"), ing(Items.REEDS), new ItemStack(Items.SUGAR, 3), 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.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.STONEBRICK.getDefaultState().withProperty(BlockStoneBrick.VARIANT, BlockStoneBrick.EnumType.MOSSY)); + Blocks.STONE_BRICKS.getDefaultState(), + Blocks.MOSSY_STONE_BRICKS.getDefaultState()); NaturesAuraAPI.BOTANIST_PICKAXE_CONVERSIONS.put( - Blocks.COBBLESTONE_WALL.getDefaultState().withProperty(WallBlock.VARIANT, WallBlock.EnumType.NORMAL), - Blocks.COBBLESTONE_WALL.getDefaultState().withProperty(WallBlock.VARIANT, WallBlock.EnumType.MOSSY)); + Blocks.COBBLESTONE_WALL.getDefaultState(), + 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 tag) { + return Ingredient.fromTag(tag); + } + private static Ingredient nbtIng(ItemStack stack) { return new NBTIngredient(stack); } diff --git a/src/main/resources/data/forge/items/rods/wooden.json b/src/main/resources/data/forge/tags/items/rods/wooden.json similarity index 100% rename from src/main/resources/data/forge/items/rods/wooden.json rename to src/main/resources/data/forge/tags/items/rods/wooden.json diff --git a/src/main/resources/data/naturesaura/recipes/ancient_planks.json b/src/main/resources/data/naturesaura/recipes/ancient_planks.json index 8c7dc2b4..8ea3b785 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_planks.json +++ b/src/main/resources/data/naturesaura/recipes/ancient_planks.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "W" ], diff --git a/src/main/resources/data/naturesaura/recipes/ancient_planks_from_bark.json b/src/main/resources/data/naturesaura/recipes/ancient_planks_from_bark.json index b9c1e7a2..55f58bf3 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_planks_from_bark.json +++ b/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" ], diff --git a/src/main/resources/data/naturesaura/recipes/ancient_slab.json b/src/main/resources/data/naturesaura/recipes/ancient_slab.json index 7029d402..1e1c5a30 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_slab.json +++ b/src/main/resources/data/naturesaura/recipes/ancient_slab.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "WWW" ], diff --git a/src/main/resources/data/naturesaura/recipes/ancient_stairs.json b/src/main/resources/data/naturesaura/recipes/ancient_stairs.json index 16261921..0f993627 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_stairs.json +++ b/src/main/resources/data/naturesaura/recipes/ancient_stairs.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "W ", "WW ", diff --git a/src/main/resources/data/naturesaura/recipes/ancient_stick.json b/src/main/resources/data/naturesaura/recipes/ancient_stick.json index cfc8dd06..8f74b793 100644 --- a/src/main/resources/data/naturesaura/recipes/ancient_stick.json +++ b/src/main/resources/data/naturesaura/recipes/ancient_stick.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "W", "W" diff --git a/src/main/resources/data/naturesaura/recipes/animal_generator.json b/src/main/resources/data/naturesaura/recipes/animal_generator.json index 4f4d122b..c26284de 100644 --- a/src/main/resources/data/naturesaura/recipes/animal_generator.json +++ b/src/main/resources/data/naturesaura/recipes/animal_generator.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "BSB", "IAI", diff --git a/src/main/resources/data/naturesaura/recipes/animal_spawner.json b/src/main/resources/data/naturesaura/recipes/animal_spawner.json index 19d4471b..99269b3a 100644 --- a/src/main/resources/data/naturesaura/recipes/animal_spawner.json +++ b/src/main/resources/data/naturesaura/recipes/animal_spawner.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "SHS", "IWI", diff --git a/src/main/resources/data/naturesaura/recipes/aura_cache.json b/src/main/resources/data/naturesaura/recipes/aura_cache.json index f069a1ce..bea2fc78 100644 --- a/src/main/resources/data/naturesaura/recipes/aura_cache.json +++ b/src/main/resources/data/naturesaura/recipes/aura_cache.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "SIS", "IBI", diff --git a/src/main/resources/data/naturesaura/recipes/aura_detector.json b/src/main/resources/data/naturesaura/recipes/aura_detector.json index a43488dd..7e6ac334 100644 --- a/src/main/resources/data/naturesaura/recipes/aura_detector.json +++ b/src/main/resources/data/naturesaura/recipes/aura_detector.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "RSR", "SIS", diff --git a/src/main/resources/data/naturesaura/recipes/aura_trove.json b/src/main/resources/data/naturesaura/recipes/aura_trove.json index 84c3feb6..de297ff9 100644 --- a/src/main/resources/data/naturesaura/recipes/aura_trove.json +++ b/src/main/resources/data/naturesaura/recipes/aura_trove.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "SIS", "IBI", diff --git a/src/main/resources/data/naturesaura/recipes/auto_crafter.json b/src/main/resources/data/naturesaura/recipes/auto_crafter.json index 810478fd..15ce1b17 100644 --- a/src/main/resources/data/naturesaura/recipes/auto_crafter.json +++ b/src/main/resources/data/naturesaura/recipes/auto_crafter.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "AWA", "ACA", diff --git a/src/main/resources/data/naturesaura/recipes/book.json b/src/main/resources/data/naturesaura/recipes/book.json index a64c3624..bfadfab5 100644 --- a/src/main/resources/data/naturesaura/recipes/book.json +++ b/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", - "ore": "treeSapling" + "tag": "minecraft:saplings" } ], "result": { diff --git a/src/main/resources/data/naturesaura/recipes/bottle_two_the_rebottling.json b/src/main/resources/data/naturesaura/recipes/bottle_two_the_rebottling.json index 244cd842..d6c83d76 100644 --- a/src/main/resources/data/naturesaura/recipes/bottle_two_the_rebottling.json +++ b/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", - "ore": "plankWood" + "tag": "minecraft:planks" } ], "result": { diff --git a/src/main/resources/data/naturesaura/recipes/calling_spirit.json b/src/main/resources/data/naturesaura/recipes/calling_spirit.json index 5a712ecd..242ebd80 100644 --- a/src/main/resources/data/naturesaura/recipes/calling_spirit.json +++ b/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" diff --git a/src/main/resources/data/naturesaura/recipes/cave_finder.json b/src/main/resources/data/naturesaura/recipes/cave_finder.json index 00f5f65f..c37ea02f 100644 --- a/src/main/resources/data/naturesaura/recipes/cave_finder.json +++ b/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", - "ore": "stone" + "tag": "forge:stone" }, "T": { "item": "naturesaura:token_terror" diff --git a/src/main/resources/data/naturesaura/recipes/chunk_loader.json b/src/main/resources/data/naturesaura/recipes/chunk_loader.json index 3022b21f..6239fe0b 100644 --- a/src/main/resources/data/naturesaura/recipes/chunk_loader.json +++ b/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" } ] diff --git a/src/main/resources/data/naturesaura/recipes/color_changer.json b/src/main/resources/data/naturesaura/recipes/color_changer.json index 8ad328b5..b7e3d277 100644 --- a/src/main/resources/data/naturesaura/recipes/color_changer.json +++ b/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", - "ore": "dyeRed" + "tag": "forge:dyes/red" }, "Y": { - "type": "forge:ore_dict", - "ore": "dyeYellow" + "tag": "forge:dyes/yellow" }, "B": { - "type": "forge:ore_dict", - "ore": "dyeBlue" + "tag": "forge:dyes/blue" }, "T": { "item": "naturesaura:token_euphoria" diff --git a/src/main/resources/data/naturesaura/recipes/dimension_rail_end.json b/src/main/resources/data/naturesaura/recipes/dimension_rail_end.json index e421a4a7..9e86c744 100644 --- a/src/main/resources/data/naturesaura/recipes/dimension_rail_end.json +++ b/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", - "ore": "stickWood" + "tag": "forge:rods/wooden" }, "I": { "item": "naturesaura:sky_ingot" diff --git a/src/main/resources/data/naturesaura/recipes/dimension_rail_nether.json b/src/main/resources/data/naturesaura/recipes/dimension_rail_nether.json index 934d177f..ddbcc6f6 100644 --- a/src/main/resources/data/naturesaura/recipes/dimension_rail_nether.json +++ b/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", - "ore": "stickWood" + "tag": "forge:rods/wooden" }, "I": { "item": "naturesaura:sky_ingot" diff --git a/src/main/resources/data/naturesaura/recipes/dimension_rail_overworld.json b/src/main/resources/data/naturesaura/recipes/dimension_rail_overworld.json index 78008f9a..4bbc4a94 100644 --- a/src/main/resources/data/naturesaura/recipes/dimension_rail_overworld.json +++ b/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", - "ore": "stickWood" + "tag": "forge:rods/wooden" }, "I": { "item": "naturesaura:infused_iron" diff --git a/src/main/resources/data/naturesaura/recipes/ender_access.json b/src/main/resources/data/naturesaura/recipes/ender_access.json index 9d72f130..c6ed2101 100644 --- a/src/main/resources/data/naturesaura/recipes/ender_access.json +++ b/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" diff --git a/src/main/resources/data/naturesaura/recipes/ender_crate.json b/src/main/resources/data/naturesaura/recipes/ender_crate.json index 4cbc5ade..038342b9 100644 --- a/src/main/resources/data/naturesaura/recipes/ender_crate.json +++ b/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" diff --git a/src/main/resources/data/naturesaura/recipes/farming_stencil.json b/src/main/resources/data/naturesaura/recipes/farming_stencil.json index a50870f3..410e73df 100644 --- a/src/main/resources/data/naturesaura/recipes/farming_stencil.json +++ b/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", - "ore": "plankWood" + "tag": "minecraft:planks" }, "D": { - "item": "minecraft:dirt", - "data": 0 + "item": "minecraft:dirt" }, "H": { "item": "naturesaura:infused_iron_hoe" diff --git a/src/main/resources/data/naturesaura/recipes/field_creator.json b/src/main/resources/data/naturesaura/recipes/field_creator.json index 2bb8d64f..895c68f8 100644 --- a/src/main/resources/data/naturesaura/recipes/field_creator.json +++ b/src/main/resources/data/naturesaura/recipes/field_creator.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "GIG", "GPG", diff --git a/src/main/resources/data/naturesaura/recipes/firework_generator.json b/src/main/resources/data/naturesaura/recipes/firework_generator.json index dad3c121..6d8533db 100644 --- a/src/main/resources/data/naturesaura/recipes/firework_generator.json +++ b/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" diff --git a/src/main/resources/data/naturesaura/recipes/flower_generator.json b/src/main/resources/data/naturesaura/recipes/flower_generator.json index 140608b4..5de22b02 100644 --- a/src/main/resources/data/naturesaura/recipes/flower_generator.json +++ b/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", - "ore": "plankWood" + "tag": "minecraft:planks" }, "I": { "item": "naturesaura:infused_iron" }, "F": { - "item": "minecraft:double_plant", - "data": 5 + "item": "minecraft:peony" }, "B": { "item": "naturesaura:token_joy" diff --git a/src/main/resources/data/naturesaura/recipes/generator_limit_remover.json b/src/main/resources/data/naturesaura/recipes/generator_limit_remover.json index fd0bc9fa..cfe9b456 100644 --- a/src/main/resources/data/naturesaura/recipes/generator_limit_remover.json +++ b/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", diff --git a/src/main/resources/data/naturesaura/recipes/gold_brick.json b/src/main/resources/data/naturesaura/recipes/gold_brick.json index 8113a036..b0399c58 100644 --- a/src/main/resources/data/naturesaura/recipes/gold_brick.json +++ b/src/main/resources/data/naturesaura/recipes/gold_brick.json @@ -2,8 +2,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "minecraft:stonebrick", - "data": 0 + "item": "minecraft:stone_bricks" }, { "item": "naturesaura:gold_fiber" diff --git a/src/main/resources/data/naturesaura/recipes/gold_fiber.json b/src/main/resources/data/naturesaura/recipes/gold_fiber.json index 22ecd03d..6f5e62b9 100644 --- a/src/main/resources/data/naturesaura/recipes/gold_fiber.json +++ b/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", - "ore": "nuggetGold" + "tag": "forge:nuggets/gold" }, "G": { - "item": "minecraft:tallgrass", - "data": 1 + "item": "minecraft:tall_grass" }, "L": { - "type": "forge:ore_dict", - "ore": "treeLeaves" + "tag": "minecraft:leaves" } }, "result": { diff --git a/src/main/resources/data/naturesaura/recipes/gold_powder.json b/src/main/resources/data/naturesaura/recipes/gold_powder.json index f9a44729..82217dd5 100644 --- a/src/main/resources/data/naturesaura/recipes/gold_powder.json +++ b/src/main/resources/data/naturesaura/recipes/gold_powder.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "L" ], diff --git a/src/main/resources/data/naturesaura/recipes/grated_chute.json b/src/main/resources/data/naturesaura/recipes/grated_chute.json index 87a0c32e..04c26aa7 100644 --- a/src/main/resources/data/naturesaura/recipes/grated_chute.json +++ b/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", - "ore": "chestWood" + "tag": "forge:chests/wooden" }, "I": { "item": "naturesaura:infused_iron" diff --git a/src/main/resources/data/naturesaura/recipes/hopper_upgrade.json b/src/main/resources/data/naturesaura/recipes/hopper_upgrade.json index b338c3af..0421d5cf 100644 --- a/src/main/resources/data/naturesaura/recipes/hopper_upgrade.json +++ b/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", - "ore": "ingotIron" + "tag": "forge:ingots/iron" }, "E": { "item": "minecraft:ender_pearl" diff --git a/src/main/resources/data/naturesaura/recipes/infused_axe.json b/src/main/resources/data/naturesaura/recipes/infused_axe.json index c3b9d7ee..878a83ec 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_axe.json +++ b/src/main/resources/data/naturesaura/recipes/infused_axe.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "AA", "AS", diff --git a/src/main/resources/data/naturesaura/recipes/infused_brick.json b/src/main/resources/data/naturesaura/recipes/infused_brick.json index c5457cec..f84a6fe6 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_brick.json +++ b/src/main/resources/data/naturesaura/recipes/infused_brick.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "WW", "WW" diff --git a/src/main/resources/data/naturesaura/recipes/infused_brick_slab.json b/src/main/resources/data/naturesaura/recipes/infused_brick_slab.json index 8fbb8bfd..7ba4415b 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_brick_slab.json +++ b/src/main/resources/data/naturesaura/recipes/infused_brick_slab.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "WWW" ], diff --git a/src/main/resources/data/naturesaura/recipes/infused_brick_stairs.json b/src/main/resources/data/naturesaura/recipes/infused_brick_stairs.json index 65ba85c6..8c0f5ff0 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_brick_stairs.json +++ b/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 ", diff --git a/src/main/resources/data/naturesaura/recipes/infused_chest.json b/src/main/resources/data/naturesaura/recipes/infused_chest.json index 0141d18c..e520ca4f 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_chest.json +++ b/src/main/resources/data/naturesaura/recipes/infused_chest.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "ASA", "AAA", diff --git a/src/main/resources/data/naturesaura/recipes/infused_helmet.json b/src/main/resources/data/naturesaura/recipes/infused_helmet.json index f638d4e4..5b2d6125 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_helmet.json +++ b/src/main/resources/data/naturesaura/recipes/infused_helmet.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "AAA", "ASA" diff --git a/src/main/resources/data/naturesaura/recipes/infused_hoe.json b/src/main/resources/data/naturesaura/recipes/infused_hoe.json index 395ca4ff..f5fa0773 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_hoe.json +++ b/src/main/resources/data/naturesaura/recipes/infused_hoe.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "AA", " S", diff --git a/src/main/resources/data/naturesaura/recipes/infused_iron.json b/src/main/resources/data/naturesaura/recipes/infused_iron.json index f8805045..58fab6bf 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_iron.json +++ b/src/main/resources/data/naturesaura/recipes/infused_iron.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "I" ], diff --git a/src/main/resources/data/naturesaura/recipes/infused_iron_block.json b/src/main/resources/data/naturesaura/recipes/infused_iron_block.json index 0ec2a701..37523b33 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_iron_block.json +++ b/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", diff --git a/src/main/resources/data/naturesaura/recipes/infused_pants.json b/src/main/resources/data/naturesaura/recipes/infused_pants.json index b08e19f5..c13c5485 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_pants.json +++ b/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", diff --git a/src/main/resources/data/naturesaura/recipes/infused_pickaxe.json b/src/main/resources/data/naturesaura/recipes/infused_pickaxe.json index 82e05f8e..8f3daed1 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_pickaxe.json +++ b/src/main/resources/data/naturesaura/recipes/infused_pickaxe.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "AAA", " S ", diff --git a/src/main/resources/data/naturesaura/recipes/infused_shoes.json b/src/main/resources/data/naturesaura/recipes/infused_shoes.json index 0bc1c0ce..8b1480b4 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_shoes.json +++ b/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" diff --git a/src/main/resources/data/naturesaura/recipes/infused_shovel.json b/src/main/resources/data/naturesaura/recipes/infused_shovel.json index 2593d760..af8c042b 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_shovel.json +++ b/src/main/resources/data/naturesaura/recipes/infused_shovel.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "A", "S", diff --git a/src/main/resources/data/naturesaura/recipes/infused_slab.json b/src/main/resources/data/naturesaura/recipes/infused_slab.json index 59fb007b..6c413822 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_slab.json +++ b/src/main/resources/data/naturesaura/recipes/infused_slab.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "WWW" ], diff --git a/src/main/resources/data/naturesaura/recipes/infused_stairs.json b/src/main/resources/data/naturesaura/recipes/infused_stairs.json index 94de66e6..4382a1d3 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_stairs.json +++ b/src/main/resources/data/naturesaura/recipes/infused_stairs.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "W ", "WW ", diff --git a/src/main/resources/data/naturesaura/recipes/infused_sword.json b/src/main/resources/data/naturesaura/recipes/infused_sword.json index d425be44..1c893f0a 100644 --- a/src/main/resources/data/naturesaura/recipes/infused_sword.json +++ b/src/main/resources/data/naturesaura/recipes/infused_sword.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "A", "A", diff --git a/src/main/resources/data/naturesaura/recipes/moss_generator.json b/src/main/resources/data/naturesaura/recipes/moss_generator.json index 6931737e..e11b76e1 100644 --- a/src/main/resources/data/naturesaura/recipes/moss_generator.json +++ b/src/main/resources/data/naturesaura/recipes/moss_generator.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "ICI", "CWC", diff --git a/src/main/resources/data/naturesaura/recipes/mover_cart.json b/src/main/resources/data/naturesaura/recipes/mover_cart.json index e6b0fbb9..f34f8550 100644 --- a/src/main/resources/data/naturesaura/recipes/mover_cart.json +++ b/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" diff --git a/src/main/resources/data/naturesaura/recipes/oak_generator.json b/src/main/resources/data/naturesaura/recipes/oak_generator.json index f22c4ce6..7a3879f2 100644 --- a/src/main/resources/data/naturesaura/recipes/oak_generator.json +++ b/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", - "ore": "logWood" + "tag": "minecraft:logs" }, "S": { - "type": "forge:ore_dict", - "ore": "treeSapling" + "tag": "minecraft:saplings" }, "B": { - "type": "minecraft:item_nbt", + "type": "forge:nbt", "item": "naturesaura:aura_bottle", "nbt": { "stored_type": "naturesaura:overworld" } }, "M": { - "item": "minecraft:dye", - "data": 15 + "item": "minecraft:bone_meal" }, "I": { "item": "naturesaura:infused_iron" diff --git a/src/main/resources/data/naturesaura/recipes/offering_table.json b/src/main/resources/data/naturesaura/recipes/offering_table.json index 04ffc65f..33475073 100644 --- a/src/main/resources/data/naturesaura/recipes/offering_table.json +++ b/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", - "ore": "stone" + "tag": "forge:stone" }, "W": { - "type": "forge:ore_dict", - "ore": "logWood" + "tag": "minecraft:logs" }, "I": { "item": "naturesaura:infused_iron" diff --git a/src/main/resources/data/naturesaura/recipes/pickup_stopper.json b/src/main/resources/data/naturesaura/recipes/pickup_stopper.json index fe909f29..5c402f28 100644 --- a/src/main/resources/data/naturesaura/recipes/pickup_stopper.json +++ b/src/main/resources/data/naturesaura/recipes/pickup_stopper.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "CIC", "CDC", diff --git a/src/main/resources/data/naturesaura/recipes/placer.json b/src/main/resources/data/naturesaura/recipes/placer.json index bc005f14..93367d7a 100644 --- a/src/main/resources/data/naturesaura/recipes/placer.json +++ b/src/main/resources/data/naturesaura/recipes/placer.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "CHC", "CDC", diff --git a/src/main/resources/data/naturesaura/recipes/potion_generator.json b/src/main/resources/data/naturesaura/recipes/potion_generator.json index 211ebe22..d998c57b 100644 --- a/src/main/resources/data/naturesaura/recipes/potion_generator.json +++ b/src/main/resources/data/naturesaura/recipes/potion_generator.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "BRB", "IWI", diff --git a/src/main/resources/data/naturesaura/recipes/powder_placer.json b/src/main/resources/data/naturesaura/recipes/powder_placer.json index f070d49f..c1e016d1 100644 --- a/src/main/resources/data/naturesaura/recipes/powder_placer.json +++ b/src/main/resources/data/naturesaura/recipes/powder_placer.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ " A ", "PSP", diff --git a/src/main/resources/data/naturesaura/recipes/projectile_generator.json b/src/main/resources/data/naturesaura/recipes/projectile_generator.json index b3b62166..d94261f5 100644 --- a/src/main/resources/data/naturesaura/recipes/projectile_generator.json +++ b/src/main/resources/data/naturesaura/recipes/projectile_generator.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "SFI", "TXT", diff --git a/src/main/resources/data/naturesaura/recipes/range_visualizer.json b/src/main/resources/data/naturesaura/recipes/range_visualizer.json index fe372a3a..33433b52 100644 --- a/src/main/resources/data/naturesaura/recipes/range_visualizer.json +++ b/src/main/resources/data/naturesaura/recipes/range_visualizer.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ "IA ", "AGA", diff --git a/src/main/resources/data/naturesaura/recipes/rf_converter.json b/src/main/resources/data/naturesaura/recipes/rf_converter.json index d8859d8f..cbff19b6 100644 --- a/src/main/resources/data/naturesaura/recipes/rf_converter.json +++ b/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" } ] diff --git a/src/main/resources/data/naturesaura/recipes/shockwave_creator.json b/src/main/resources/data/naturesaura/recipes/shockwave_creator.json index d1821d13..1d3cb011 100644 --- a/src/main/resources/data/naturesaura/recipes/shockwave_creator.json +++ b/src/main/resources/data/naturesaura/recipes/shockwave_creator.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ " I ", "RTR", diff --git a/src/main/resources/data/naturesaura/recipes/spawn_lamp.json b/src/main/resources/data/naturesaura/recipes/spawn_lamp.json index ba974380..449d7fce 100644 --- a/src/main/resources/data/naturesaura/recipes/spawn_lamp.json +++ b/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", - "ore": "ingotIron" + "tag": "forge:ingots/iron" }, "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" diff --git a/src/main/resources/data/naturesaura/recipes/time_changer.json b/src/main/resources/data/naturesaura/recipes/time_changer.json index 0b2fd5b8..42e26a03 100644 --- a/src/main/resources/data/naturesaura/recipes/time_changer.json +++ b/src/main/resources/data/naturesaura/recipes/time_changer.json @@ -1,5 +1,5 @@ { - "type": "forge:ore_shaped", + "type": "minecraft:crafting_shaped", "pattern": [ " O ", "BCB", diff --git a/src/main/resources/data/naturesaura/recipes/wood_stand.json b/src/main/resources/data/naturesaura/recipes/wood_stand.json index 2af26d97..a3debbb2 100644 --- a/src/main/resources/data/naturesaura/recipes/wood_stand.json +++ b/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", - "ore": "logWood" + "tag": "minecraft:logs" }, "L": { "item": "naturesaura:gold_leaf"