diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 086d1e44b..0e9f5ee0f 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -495,7 +495,7 @@ public final class BotaniaAPI { * The fact I have to write that means some moron already tried, don't be that moron. * @see IInternalMethodHandler */ - public static IInternalMethodHandler internalHandler = new DummyMethodHandler(); + public static volatile IInternalMethodHandler internalHandler = new DummyMethodHandler(); /** * Registers a new Knowledge Type. @@ -625,7 +625,7 @@ public final class BotaniaAPI { */ public static RecipeManaInfusion registerManaAlchemyRecipe(ItemStack output, Ingredient input, int mana) { RecipeManaInfusion recipe = registerManaInfusionRecipe(output, input, mana); - recipe.setCatalyst(RecipeManaInfusion.alchemyState); + recipe.setCatalyst(RecipeManaInfusion.alchemy.getDefaultState()); return recipe; } @@ -636,7 +636,7 @@ public final class BotaniaAPI { */ public static RecipeManaInfusion registerManaConjurationRecipe(ItemStack output, Ingredient input, int mana) { RecipeManaInfusion recipe = registerManaInfusionRecipe(output, input, mana); - recipe.setCatalyst(RecipeManaInfusion.conjurationState); + recipe.setCatalyst(RecipeManaInfusion.conjuration.getDefaultState()); return recipe; } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index 3e20bf558..b77f8ea78 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -10,22 +10,26 @@ */ package vazkii.botania.api.recipe; +import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; +import net.minecraftforge.registries.ObjectHolder; import javax.annotation.Nullable; public class RecipeManaInfusion { + @ObjectHolder("botania:alchemy_catalyst") + public static Block alchemy; + + @ObjectHolder("botania:conjuration_catalyst") + public static Block conjuration; private final ItemStack output; private final Ingredient input; private final int mana; private @Nullable IBlockState catalystState; - public static IBlockState alchemyState; - public static IBlockState conjurationState; - public RecipeManaInfusion(ItemStack output, Ingredient input, int mana) { this.output = output; this.input = input; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java index 5541f1397..550d583f3 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeMiniFlower.java @@ -19,7 +19,7 @@ public class RecipeMiniFlower extends RecipeManaInfusion { public RecipeMiniFlower(ResourceLocation mini, ResourceLocation flower, int mana) { super(BotaniaAPI.internalHandler.getSubTileAsStack(flower), Ingredient.fromStacks(BotaniaAPI.internalHandler.getSubTileAsStack(mini)), mana); - setCatalyst(RecipeManaInfusion.alchemyState); + setCatalyst(RecipeManaInfusion.alchemy.getDefaultState()); } @Override diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 1e30762f8..4fb663182 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -15,6 +15,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; import net.minecraft.util.Util; +import net.minecraft.world.FoliageColors; +import net.minecraft.world.biome.BiomeColors; import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; @@ -48,17 +50,10 @@ public final class ColorHandler { public static void init() { BlockColors blocks = Minecraft.getInstance().getBlockColors(); - Map, IBlockColor> map; - try { - Field f = BlockColors.class.getField("colors"); - f.setAccessible(true); - map = (Map, IBlockColor>) f.get(blocks); - } catch (ReflectiveOperationException ex) { - throw new RuntimeException(ex); - } - // Steal vine colorer - blocks.register(map.get(Blocks.VINE.delegate), ModBlocks.solidVines); + // [VanillaCopy] BlockColors for vine + IBlockColor vineColor = (state, world, pos, tint) -> world != null && pos != null ? BiomeColors.getFoliageColor(world, pos) : FoliageColors.getDefault(); + blocks.register(vineColor, ModBlocks.solidVines); // Pool blocks.register( @@ -119,10 +114,10 @@ public final class ColorHandler { ModItems.twigWand); IItemColor handler = (s, t) -> ((Item16Colors) s.getItem()).color.colorValue; - Item[] dyes = ModItems.dyes.values().toArray(new Item[0]); - Item[] petals = ModItems.petals.values().toArray(new Item[0]); - items.register(handler, dyes); - items.register(handler, petals); + for(EnumDyeColor color : EnumDyeColor.values()) { + items.register(handler, ModItems.getPetal(color)); + items.register(handler, ModItems.getDye(color)); + } items.register((s, t) -> Minecraft.getInstance().getBlockColors().getColor(((ItemBlock)s.getItem()).getBlock().getDefaultState(), null, null, t), ModBlocks.petalBlockWhite, ModBlocks.petalBlockOrange, ModBlocks.petalBlockMagenta, ModBlocks.petalBlockLightBlue, diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index e6aaeb1ba..17a64aa33 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -81,10 +81,10 @@ public class MiscellaneousIcons { public void onModelBake(ModelBakeEvent evt) { // Floating flowers FloatingFlowerModel model = new FloatingFlowerModel(); - evt.getModelRegistry().put(new ModelResourceLocation("botania:miniIsland", "normal"), model); - evt.getModelRegistry().put(new ModelResourceLocation("botania:miniIsland", "inventory"), model); - evt.getModelRegistry().put(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), model); - evt.getModelRegistry().put(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), model); + evt.getModelRegistry().put(new ModelResourceLocation("botania:mini_island", "normal"), model); + evt.getModelRegistry().put(new ModelResourceLocation("botania:mini_island", "inventory"), model); + evt.getModelRegistry().put(new ModelResourceLocation("botania:floating_special_flower", "normal"), model); + evt.getModelRegistry().put(new ModelResourceLocation("botania:floating_special_flower", "inventory"), model); // Platforms ModelResourceLocation abstruseName = new ModelResourceLocation("botania:abstruse_platform", "normal"); @@ -102,18 +102,22 @@ public class MiscellaneousIcons { IBakedModel original = evt.getModelRegistry().get(new ModelResourceLocation("botania:lexicon", "inventory")); evt.getModelRegistry().put(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel(original)); + /* todo 1.13 models referenced using overrides aren't put in the model registry? original = evt.getModelRegistry().get(new ModelResourceLocation("botania:lexicon_elven", "inventory")); evt.getModelRegistry().put(new ModelResourceLocation("botania:lexicon_elven", "inventory"), new LexiconModel(original)); + */ // Mana Blaster - ModelResourceLocation key = new ModelResourceLocation("botania:managun", "inventory"); + ModelResourceLocation key = new ModelResourceLocation("botania:mana_gun", "inventory"); IBakedModel originalModel = evt.getModelRegistry().get(key); evt.getModelRegistry().put(key, new GunModel(originalModel)); - key = new ModelResourceLocation("botania:managunclip", "inventory"); + /* todo 1.13 models referenced using overrides aren't put in the model registry? + key = new ModelResourceLocation("botania:mana_gun_clip", "inventory"); originalModel = evt.getModelRegistry().get(key); evt.getModelRegistry().put(key, new GunModel(originalModel)); + */ } @SubscribeEvent @@ -150,8 +154,8 @@ public class MiscellaneousIcons { for(int i = 0; i < 3; i++) register(evt.getMap(), "items/third_eye_" + i); - register(evt.getMap(), "items/triggers/manaDetector"); - register(evt.getMap(), "items/triggers/runeAltarCanCraft"); + register(evt.getMap(), "items/triggers/mana_detector"); + register(evt.getMap(), "items/triggers/rune_altar_can_craft"); /* for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { @@ -163,7 +167,7 @@ public class MiscellaneousIcons { register(evt.getMap(), "items/headpiece_tiara_wing_" + (i + 1)); } - register(evt.getMap(), "items/willFlame"); + register(evt.getMap(), "items/will_flame"); register(evt.getMap(), "items/pendant_blood_chain"); register(evt.getMap(), "items/pendant_blood_gem"); @@ -208,8 +212,8 @@ public class MiscellaneousIcons { for(int i = 0; i < 3; i++) thirdEyeLayers[i] = get(evt.getMap(), "items/third_eye_" + i); - manaDetectorIcon = get(evt.getMap(), "items/triggers/manaDetector"); - runeAltarTriggerIcon = get(evt.getMap(), "items/triggers/runeAltarCanCraft"); + manaDetectorIcon = get(evt.getMap(), "items/triggers/mana_detector"); + runeAltarTriggerIcon = get(evt.getMap(), "items/triggers/rune_altar_can_craft"); /* for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { @@ -221,7 +225,7 @@ public class MiscellaneousIcons { tiaraWingIcons[i] = get(evt.getMap(), "items/headpiece_tiara_wing_" + (i + 1)); } - terrasteelHelmWillIcon = get(evt.getMap(), "items/willFlame"); + terrasteelHelmWillIcon = get(evt.getMap(), "items/will_flame"); bloodPendantChain = get(evt.getMap(), "items/pendant_blood_chain"); bloodPendantGem = get(evt.getMap(), "items/pendant_blood_gem"); diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index e7ac665d5..8aaf1fbba 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -143,16 +143,16 @@ public final class ModelHandler { } private static void registerSubtiles() { - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GRASS, new ModelResourceLocation("botania:miniIsland", "variant=grass")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.PODZOL, new ModelResourceLocation("botania:miniIsland", "variant=podzol")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MYCEL, new ModelResourceLocation("botania:miniIsland", "variant=mycel")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SNOW, new ModelResourceLocation("botania:miniIsland", "variant=snow")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.DRY, new ModelResourceLocation("botania:miniIsland", "variant=dry")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GOLDEN, new ModelResourceLocation("botania:miniIsland", "variant=golden")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.VIVID, new ModelResourceLocation("botania:miniIsland", "variant=vivid")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SCORCHED, new ModelResourceLocation("botania:miniIsland", "variant=scorched")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.INFUSED, new ModelResourceLocation("botania:miniIsland", "variant=infused")); - BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MUTATED, new ModelResourceLocation("botania:miniIsland", "variant=mutated")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GRASS, new ModelResourceLocation("botania:mini_island", "variant=grass")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.PODZOL, new ModelResourceLocation("botania:mini_island", "variant=podzol")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MYCEL, new ModelResourceLocation("botania:mini_island", "variant=mycel")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SNOW, new ModelResourceLocation("botania:mini_island", "variant=snow")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.DRY, new ModelResourceLocation("botania:mini_island", "variant=dry")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.GOLDEN, new ModelResourceLocation("botania:mini_island", "variant=golden")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.VIVID, new ModelResourceLocation("botania:mini_island", "variant=vivid")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.SCORCHED, new ModelResourceLocation("botania:mini_island", "variant=scorched")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.INFUSED, new ModelResourceLocation("botania:mini_island", "variant=infused")); + BotaniaAPIClient.registerIslandTypeModel(IFloatingFlower.IslandType.MUTATED, new ModelResourceLocation("botania:mini_island", "variant=mutated")); BotaniaAPIClient.registerSubtileModel(SubTileManastar.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MANASTAR.toString())); BotaniaAPIClient.registerSubtileModel(SubTilePureDaisy.class, new ModelResourceLocation(LibBlockNames.SUBTILE_PUREDAISY.toString())); @@ -172,7 +172,7 @@ public final class ModelHandler { BotaniaAPIClient.registerSubtileModel(SubTileShulkMeNot.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SHULK_ME_NOT.toString())); BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BELLETHORN.toString())); - BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BELLETHORN + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BELLETHORN + "_chibi")); BotaniaAPIClient.registerSubtileModel(SubTileDreadthorn.class, new ModelResourceLocation(LibBlockNames.SUBTILE_DREADTHORN.toString())); BotaniaAPIClient.registerSubtileModel(SubTileHeiseiDream.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HEISEI_DREAM.toString())); BotaniaAPIClient.registerSubtileModel(SubTileTigerseye.class, new ModelResourceLocation(LibBlockNames.SUBTILE_TIGERSEYE.toString())); @@ -182,28 +182,28 @@ public final class ModelHandler { BotaniaAPIClient.registerSubtileModel(SubTileFallenKanade.class, new ModelResourceLocation(LibBlockNames.SUBTILE_FALLEN_KANADE.toString())); BotaniaAPIClient.registerSubtileModel(SubTileExoflame.class, new ModelResourceLocation(LibBlockNames.SUBTILE_EXOFLAME.toString())); BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.class, new ModelResourceLocation(LibBlockNames.SUBTILE_AGRICARNATION.toString())); - BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_AGRICARNATION + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_AGRICARNATION + "_chibi")); BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HOPPERHOCK.toString())); - BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HOPPERHOCK + "_chibi")); BotaniaAPIClient.registerSubtileModel(SubTileTangleberrie.class, new ModelResourceLocation(LibBlockNames.SUBTILE_TANGLEBERRIE.toString())); BotaniaAPIClient.registerSubtileModel(SubTileJiyuulia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_JIYUULIA.toString())); BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_RANNUNCARPUS.toString())); - BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_RANNUNCARPUS + "_chibi")); BotaniaAPIClient.registerSubtileModel(SubTileHyacidus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_HYACIDUS.toString())); BotaniaAPIClient.registerSubtileModel(SubTilePollidisiac.class, new ModelResourceLocation(LibBlockNames.SUBTILE_POLLIDISIAC.toString())); BotaniaAPIClient.registerSubtileModel(SubTileClayconia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_CLAYCONIA.toString())); - BotaniaAPIClient.registerSubtileModel(SubTileClayconia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_CLAYCONIA + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileClayconia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_CLAYCONIA + "_chibi")); BotaniaAPIClient.registerSubtileModel(SubTileLoonuim.class, new ModelResourceLocation(LibBlockNames.SUBTILE_LOONIUM.toString())); BotaniaAPIClient.registerSubtileModel(SubTileDaffomill.class, new ModelResourceLocation(LibBlockNames.SUBTILE_DAFFOMILL.toString())); BotaniaAPIClient.registerSubtileModel(SubTileVinculotus.class, new ModelResourceLocation(LibBlockNames.SUBTILE_VINCULOTUS.toString())); BotaniaAPIClient.registerSubtileModel(SubTileSpectranthemum.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SPECTRANTHEMUM.toString())); BotaniaAPIClient.registerSubtileModel(SubTileMedumone.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MEDUMONE.toString())); BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MARIMORPHOSIS.toString())); - BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_MARIMORPHOSIS + "_chibi")); BotaniaAPIClient.registerSubtileModel(SubTileBubbell.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BUBBELL.toString())); - BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BUBBELL + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BUBBELL + "_chibi")); BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SOLEGNOLIA.toString())); - BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); + BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation(LibBlockNames.SUBTILE_SOLEGNOLIA + "_chibi")); BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation(LibBlockNames.SUBTILE_BERGAMUTE.toString())); } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 73ab952cd..75a241760 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -154,9 +154,6 @@ public class ClientProxy implements IProxy { MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); - ColorHandler.init(); - initAuxiliaryRender(); - ModChallenges.init(); if(ConfigHandler.CLIENT.boundBlockWireframe.get()) @@ -179,6 +176,10 @@ public class ClientProxy implements IProxy { } private void loadComplete(FMLLoadCompleteEvent event) { + DeferredWorkQueue.runLater(() -> { + initAuxiliaryRender(); + ColorHandler.init(); + }); CorporeaAutoCompleteHandler.updateItemList(); } diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 5aafacb2d..cb0e70d97 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -26,43 +26,43 @@ public final class LibResources { public static final String PREFIX_OBJ_MODEL = PREFIX_MOD + "model/"; public static final String PREFIX_CATEGORIES = PREFIX_GUI + "categories/"; - public static final String EMTPY_TEXTURE = "emptyTexture"; + public static final String EMTPY_TEXTURE = "empty_texture"; - public static final String GUI_MANA_HUD = PREFIX_GUI + "manaHud.png"; + public static final String GUI_MANA_HUD = PREFIX_GUI + "mana_hud.png"; public static final String GUI_LEXICON = PREFIX_GUI + "lexicon.png"; public static final String GUI_PAPER = PREFIX_GUI + "paper.png"; - public static final String GUI_CRAFTING_OVERLAY = PREFIX_GUI + "craftingOverlay.png"; - public static final String GUI_MANA_INFUSION_OVERLAY = PREFIX_GUI + "manaInfusionOverlay.png"; - public static final String GUI_PURE_DAISY_OVERLAY = PREFIX_GUI + "pureDaisyOverlay.png"; - public static final String GUI_PETAL_OVERLAY = PREFIX_GUI + "petalOverlay.png"; - public static final String GUI_TERRASTEEL_OVERLAY = PREFIX_GUI + "terrasteelOverlay.png"; - public static final String GUI_ELVEN_TRADE_OVERLAY = PREFIX_GUI + "elvenTradeOverlay.png"; - public static final String GUI_SHEDDING_OVERLAY = PREFIX_GUI + "sheddingOverlay.png"; - public static final String GUI_MULTIBLOCK_OVERLAY = PREFIX_GUI + "multiblockOverlay.png"; + public static final String GUI_CRAFTING_OVERLAY = PREFIX_GUI + "crafting_overlay.png"; + public static final String GUI_MANA_INFUSION_OVERLAY = PREFIX_GUI + "mana_infusion_overlay.png"; + public static final String GUI_PURE_DAISY_OVERLAY = PREFIX_GUI + "pure_daisy_overlay.png"; + public static final String GUI_PETAL_OVERLAY = PREFIX_GUI + "petal_overlay.png"; + public static final String GUI_TERRASTEEL_OVERLAY = PREFIX_GUI + "terrasteel_overlay.png"; + public static final String GUI_ELVEN_TRADE_OVERLAY = PREFIX_GUI + "elven_trade_overlay.png"; + public static final String GUI_SHEDDING_OVERLAY = PREFIX_GUI + "shedding_overlay.png"; + public static final String GUI_MULTIBLOCK_OVERLAY = PREFIX_GUI + "multiblock_overlay.png"; public static final String GUI_CREATIVE = "botania.png"; public static final String GUI_TOFF = PREFIX_GUI + "toff.png"; - public static final String GUI_BOSS_BAR = PREFIX_GUI + "bossBar.png"; + public static final String GUI_BOSS_BAR = PREFIX_GUI + "boss_bar.png"; public static final String GUI_POTIONS = PREFIX_GUI + "potions.png"; - public static final String GUI_NEI_BLANK = PREFIX_GUI + "neiBlank.png"; - public static final String GUI_NEI_BREWERY = PREFIX_GUI + "neiBrewery.png"; - public static final String GUI_FLOWER_BAG = PREFIX_GUI + "flowerBag.png"; - public static final String GUI_BAUBLE_BOX = PREFIX_GUI + "baubleBox.png"; - public static final String GUI_HUD_ICONS = PREFIX_GUI + "hudIcons.png"; + public static final String GUI_NEI_BLANK = PREFIX_GUI + "nei_blank.png"; + public static final String GUI_NEI_BREWERY = PREFIX_GUI + "nei_brewery.png"; + public static final String GUI_FLOWER_BAG = PREFIX_GUI + "flower_bag.png"; + public static final String GUI_BAUBLE_BOX = PREFIX_GUI + "bauble_box.png"; + public static final String GUI_HUD_ICONS = PREFIX_GUI + "hud_icons.png"; public static final String GUI_STENCIL = PREFIX_GUI + "stencil.png"; public static final String GUI_DOG = PREFIX_GUI + "dog.png"; public static final String GUI_FLOWEY = PREFIX_GUI + "flowey.png"; public static final String ENTRY_FLOWERS = PREFIX_ENTRIES + "flowers.png"; public static final String ENTRY_APOTHECARY = PREFIX_ENTRIES + "apothecary.png"; - public static final String ENTRY_PURE_DAISY = PREFIX_ENTRIES + "pureDaisy.png"; + public static final String ENTRY_PURE_DAISY = PREFIX_ENTRIES + "pure_daisy.png"; public static final String ENTRY_SPREADER = PREFIX_ENTRIES + "spreader.png"; public static final String ENTRY_BAUBLES = PREFIX_ENTRIES + "baubles.png"; - public static final String ENTRY_ELVEN_GARDE = PREFIX_ENTRIES + "elvenGarde.png"; - public static final String ENTRY_DIMINISHING_RETURNS = PREFIX_ENTRIES + "diminishingReturns.png"; + public static final String ENTRY_ELVEN_GARDE = PREFIX_ENTRIES + "elven_garde.png"; + public static final String ENTRY_DIMINISHING_RETURNS = PREFIX_ENTRIES + "diminishing_returns.png"; public static final String ENTRY_HYDROANGEAS = PREFIX_ENTRIES + "hydroangeas.png"; - public static final String ENTRY_CRAFT_CRATE = PREFIX_ENTRIES + "craftCrate.png"; + public static final String ENTRY_CRAFT_CRATE = PREFIX_ENTRIES + "craft_crate.png"; public static final String ENTRY_AZULEJOS = PREFIX_ENTRIES + "azulejos.png"; - public static final String ENTRY_METAMORPHIC_STONES = PREFIX_ENTRIES + "metamorphicStones.png"; + public static final String ENTRY_METAMORPHIC_STONES = PREFIX_ENTRIES + "metamorphic_stones.png"; public static final String ENTRY_BANNERS = PREFIX_ENTRIES + "banners.png"; public static final String MODEL_SPREADER = PREFIX_MODEL + "spreader_mana.png"; @@ -115,8 +115,8 @@ public final class LibResources { public static final String MODEL_BREWERY = PREFIX_MODEL + "brewery.png"; public static final String MODEL_HOURGLASS = PREFIX_MODEL + "hourglass.png"; public static final String MODEL_BELLOWS = PREFIX_MODEL + "bellows.png"; - public static final String MODEL_TERU_TERU_BOZU = PREFIX_MODEL + "teruTeruBozu.png"; - public static final String MODEL_TERU_TERU_BOZU_HALLOWEEN = PREFIX_MODEL + "teruTeruBozu_halloween.png"; + public static final String MODEL_TERU_TERU_BOZU = PREFIX_MODEL + "teru_teru_bozu.png"; + public static final String MODEL_TERU_TERU_BOZU_HALLOWEEN = PREFIX_MODEL + "teru_teru_bozu_halloween.png"; public static final String MODEL_AVATAR = PREFIX_MODEL + "avatar.png"; public static final String MODEL_AVATAR_DIVINING = PREFIX_MODEL + "avatar_divining.png"; public static final String MODEL_AVATAR_FIRE = PREFIX_MODEL + "avatar_fire.png"; diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 3bf2c7dac..0be76e2ad 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -154,7 +154,7 @@ public class Botania { ModElvenTradeRecipes.init(); ModBrewRecipes.init(); ModCraftingRecipes.init(); - LexiconData.init(); + // todo 1.13 LexiconData.init(); if(Botania.thaumcraftLoaded) { if(ConfigHandler.COMMON.enableThaumcraftAspects.get()) { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 77a207019..1d25be9e8 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -329,7 +329,7 @@ public final class ModBlocks { @ObjectHolder("red" + LibBlockNames.MUSHROOM_SUFFIX) public static Block redMushroom; @ObjectHolder("black" + LibBlockNames.MUSHROOM_SUFFIX) public static Block blackMushroom; @ObjectHolder(LibBlockNames.PUMP) public static Block pump; - @ObjectHolder("white" + LibBlockNames.MUSHROOM_SUFFIX) public static Block doubleFlowerWhite; + @ObjectHolder("white" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerWhite; @ObjectHolder("orange" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerOrange; @ObjectHolder("magenta" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerMagenta; @ObjectHolder("light_blue" + LibBlockNames.DOUBLE_FLOWER_SUFFIX) public static Block doubleFlowerLightBlue; @@ -511,7 +511,7 @@ public final class ModBlocks { builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 5).sound(SoundType.STONE); ILexiconable azulejo = (w, po ,pl, st) -> LexiconData.azulejo; - for (int i = 0; i < 15; i++) { + for (int i = 0; i < 16; i++) { register(r, new BlockModLexiconable(builder, azulejo), LibBlockNames.AZULEJO_PREFIX + i); } @@ -593,9 +593,6 @@ public final class ModBlocks { } register(r, new BlockAnimatedTorch(Block.Properties.create(Material.CIRCUITS).lightValue(7)), LibBlockNames.ANIMATED_TORCH); - - RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState(); - RecipeManaInfusion.conjurationState = conjurationCatalyst.getDefaultState(); } @SubscribeEvent @@ -949,7 +946,7 @@ public final class ModBlocks { for(Class innerClazz : clazz.getDeclaredClasses()) if(innerClazz.getSimpleName().equals("Mini")) - BotaniaAPI.registerMiniSubTile(new ResourceLocation(key.getNamespace(), key.getPath() + "Chibi"), innerClazz, key); + BotaniaAPI.registerMiniSubTile(new ResourceLocation(key.getNamespace(), key.getPath() + "_chibi"), innerClazz, key); } public static Block getFlower(EnumDyeColor color) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 2ce648056..0db2c97c0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -70,7 +70,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Nonnull @Override public Item getItemDropped(IBlockState state, World world, BlockPos pos, int fortune) { - return ModItems.petals.get(color); + return ModItems.getPetal(color); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index ed9f3854a..35006832f 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -58,9 +58,11 @@ public final class BotaniaCreativeTab extends ItemGroup { for(EnumDyeColor color : EnumDyeColor.values()) addItem(ModBlocks.getFlower(color)); addItem(ModBlocks.specialFlower); - ModItems.petals.values().forEach(this::addItem); + for(EnumDyeColor color : EnumDyeColor.values()) + this.addItem(ModItems.getPetal(color)); addItem(ModItems.pestleAndMortar); - ModItems.dyes.values().forEach(this::addItem); + for(EnumDyeColor color : EnumDyeColor.values()) + this.addItem(ModItems.getDye(color)); addItem(ModItems.fertilizer); addItem(ModItems.flowerBag); addItem(ModItems.blackLotus); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 24a497327..661d22fe6 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -12,6 +12,7 @@ package vazkii.botania.common.crafting; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; @@ -26,7 +27,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public final class ModManaInfusionRecipes { @@ -63,8 +66,9 @@ public final class ModManaInfusionRecipes { manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), Ingredient.fromItems(Items.REDSTONE), 500)); manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), Ingredient.fromItems(Items.GLOWSTONE_DUST), 500)); manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), Ingredient.fromItems(Items.SUGAR), 500)); - for(Item dye : ModItems.dyes.values()) - manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), Ingredient.fromItems(dye), 400)); + List dyes = Arrays.stream(EnumDyeColor.values()).map(ModItems::getDye).collect(Collectors.toList()); + Ingredient dyeIngredient = Ingredient.fromItems(dyes.toArray(new Item[0])); + manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPowder), dyeIngredient, 400)); pistonRelayRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pistonRelay), Ingredient.fromItems(Blocks.PISTON), 15000); manaCookieRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaCookie), Ingredient.fromItems(Items.COOKIE), 20000); diff --git a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java index d32fdad19..5bb68d8ec 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPureDaisyRecipes.java @@ -11,6 +11,8 @@ package vazkii.botania.common.crafting; import net.minecraft.init.Blocks; +import net.minecraft.tags.BlockTags; +import net.minecraftforge.common.Tags; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibOreDict; @@ -18,13 +20,14 @@ import vazkii.botania.common.lib.LibOreDict; public final class ModPureDaisyRecipes { public static void init() { - BotaniaAPI.registerPureDaisyRecipe("stone", ModBlocks.livingrock.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe("logWood", ModBlocks.livingwood.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe(Tags.Blocks.STONE, ModBlocks.livingrock.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe(BlockTags.LOGS, ModBlocks.livingwood.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe("netherrack", Blocks.COBBLESTONE.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe("soulSand", Blocks.SAND.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe("ice", Blocks.PACKED_ICE.getDefaultState()); - BotaniaAPI.registerPureDaisyRecipe(LibOreDict.BLAZE_BLOCK, Blocks.OBSIDIAN.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe(Blocks.NETHERRACK, Blocks.COBBLESTONE.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe(Blocks.SOUL_SAND, Blocks.SAND.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe(Blocks.ICE, Blocks.PACKED_ICE.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe(Blocks.PACKED_ICE, Blocks.BLUE_ICE.getDefaultState()); + BotaniaAPI.registerPureDaisyRecipe(ModBlocks.blazeBlock, Blocks.OBSIDIAN.getDefaultState()); BotaniaAPI.registerPureDaisyRecipe(Blocks.WATER, Blocks.SNOW.getDefaultState()); } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index a046cc9d4..1de0e749a 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -19,6 +19,7 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.api.item.IAncientWillContainer; @@ -90,23 +91,52 @@ import vazkii.botania.common.item.rod.ItemSmeltRod; import vazkii.botania.common.item.rod.ItemTerraformRod; import vazkii.botania.common.item.rod.ItemTornadoRod; import vazkii.botania.common.item.rod.ItemWaterRod; +import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; import java.util.*; +import static vazkii.botania.common.block.ModBlocks.register; + +// todo 1.13 objectholder ify everything @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModItems { - public static final Item lexicon = new ItemLexicon(unstackable()); - public static final Map petals = new EnumMap<>(EnumDyeColor.class); - public static final Map dyes = new EnumMap<>(EnumDyeColor.class); - static { - for(EnumDyeColor color : EnumDyeColor.values()) { - petals.put(color, new ItemPetal(ModBlocks.getBuriedPetal(color), color, defaultBuilder())); - dyes.put(color, new ItemDye(color, defaultBuilder())); - } - } + @ObjectHolder("botania:" + LibItemNames.LEXICON) public static Item lexicon; + @ObjectHolder("botania:" + "white" + LibItemNames.PETAL_SUFFIX) public static Item whitePetal; + @ObjectHolder("botania:" + "orange" + LibItemNames.PETAL_SUFFIX) public static Item orangePetal; + @ObjectHolder("botania:" + "magenta" + LibItemNames.PETAL_SUFFIX) public static Item magentaPetal; + @ObjectHolder("botania:" + "light_blue" + LibItemNames.PETAL_SUFFIX) public static Item lightBluePetal; + @ObjectHolder("botania:" + "yellow" + LibItemNames.PETAL_SUFFIX) public static Item yellowPetal; + @ObjectHolder("botania:" + "lime" + LibItemNames.PETAL_SUFFIX) public static Item limePetal; + @ObjectHolder("botania:" + "pink" + LibItemNames.PETAL_SUFFIX) public static Item pinkPetal; + @ObjectHolder("botania:" + "gray" + LibItemNames.PETAL_SUFFIX) public static Item grayPetal; + @ObjectHolder("botania:" + "light_gray" + LibItemNames.PETAL_SUFFIX) public static Item lightGrayPetal; + @ObjectHolder("botania:" + "cyan" + LibItemNames.PETAL_SUFFIX) public static Item cyanPetal; + @ObjectHolder("botania:" + "purple" + LibItemNames.PETAL_SUFFIX) public static Item purplePetal; + @ObjectHolder("botania:" + "blue" + LibItemNames.PETAL_SUFFIX) public static Item bluePetal; + @ObjectHolder("botania:" + "brown" + LibItemNames.PETAL_SUFFIX) public static Item brownPetal; + @ObjectHolder("botania:" + "green" + LibItemNames.PETAL_SUFFIX) public static Item greenPetal; + @ObjectHolder("botania:" + "red" + LibItemNames.PETAL_SUFFIX) public static Item redPetal; + @ObjectHolder("botania:" + "black" + LibItemNames.PETAL_SUFFIX) public static Item blackPetal; + + @ObjectHolder("botania:" + "white" + LibItemNames.DYE_SUFFIX) public static Item whiteDye; + @ObjectHolder("botania:" + "orange" + LibItemNames.DYE_SUFFIX) public static Item orangeDye; + @ObjectHolder("botania:" + "magenta" + LibItemNames.DYE_SUFFIX) public static Item magentaDye; + @ObjectHolder("botania:" + "light_blue" + LibItemNames.DYE_SUFFIX) public static Item lightBlueDye; + @ObjectHolder("botania:" + "yellow" + LibItemNames.DYE_SUFFIX) public static Item yellowDye; + @ObjectHolder("botania:" + "lime" + LibItemNames.DYE_SUFFIX) public static Item limeDye; + @ObjectHolder("botania:" + "pink" + LibItemNames.DYE_SUFFIX) public static Item pinkDye; + @ObjectHolder("botania:" + "gray" + LibItemNames.DYE_SUFFIX) public static Item grayDye; + @ObjectHolder("botania:" + "light_gray" + LibItemNames.DYE_SUFFIX) public static Item lightGrayDye; + @ObjectHolder("botania:" + "cyan" + LibItemNames.DYE_SUFFIX) public static Item cyanDye; + @ObjectHolder("botania:" + "purple" + LibItemNames.DYE_SUFFIX) public static Item purpleDye; + @ObjectHolder("botania:" + "blue" + LibItemNames.DYE_SUFFIX) public static Item blueDye; + @ObjectHolder("botania:" + "brown" + LibItemNames.DYE_SUFFIX) public static Item brownDye; + @ObjectHolder("botania:" + "green" + LibItemNames.DYE_SUFFIX) public static Item greenDye; + @ObjectHolder("botania:" + "red" + LibItemNames.DYE_SUFFIX) public static Item redDye; + @ObjectHolder("botania:" + "black" + LibItemNames.DYE_SUFFIX) public static Item blackDye; public static final Item pestleAndMortar = new ItemSelfReturning(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PESTLE_AND_MORTAR); public static final Item twigWand = new ItemTwigWand(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TWIG_WAND); @@ -183,15 +213,15 @@ public final class ModItems { public static final Item manaCookie = new ItemManaCookie(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANA_COOKIE); public static final Item fertilizer = new ItemFertilizer(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FERTILIZER); - public static final Item grassSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GRASS, defaultBuilder()); - public static final Item podzolSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.PODZOL, defaultBuilder()); - public static final Item mycelSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MYCEL, defaultBuilder()); - public static final Item drySeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.DRY, defaultBuilder()); - public static final Item goldenSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GOLDEN, defaultBuilder()); - public static final Item vividSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.VIVID, defaultBuilder()); - public static final Item scorchedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.SCORCHED, defaultBuilder()); - public static final Item infusedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.INFUSED, defaultBuilder()); - public static final Item mutatedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MUTATED, defaultBuilder()); + public static final Item grassSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GRASS, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GRASS_SEEDS); + public static final Item podzolSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.PODZOL, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.PODZOL_SEEDS); + public static final Item mycelSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MYCEL, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MYCEL_SEEDS); + public static final Item drySeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.DRY, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DRY_SEEDS); + public static final Item goldenSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.GOLDEN, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GOLDEN_SEEDS); + public static final Item vividSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.VIVID, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.VIVID_SEEDS); + public static final Item scorchedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.SCORCHED, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SCORCHED_SEEDS); + public static final Item infusedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.INFUSED, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.INFUSED_SEEDS); + public static final Item mutatedSeeds = new ItemGrassSeeds(IFloatingFlower.IslandType.MUTATED, defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MUTATED_SEEDS); public static final Item dirtRod = new ItemDirtRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DIRT_ROD); public static final Item terraformRod = new ItemTerraformRod(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRAFORM_ROD); @@ -230,7 +260,7 @@ public final class ModItems { public static final Item terraPick = new ItemTerraPick(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.TERRA_PICK); public static final Item divaCharm = new ItemDivaCharm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.DIVA_CHARM); public static final Item flightTiara = new ItemFlightTiara(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.FLIGHT_TIARA); - public static final Item enderDagger = new ItemEnderDagger(unstackable().defaultMaxDamage(69).setNoRepair()); // What you looking at? + public static final Item enderDagger = new ItemEnderDagger(unstackable().defaultMaxDamage(69).setNoRepair()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ENDER_DAGGER); // What you looking at? public static final Item darkQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[0]); public static final Item manaQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[1]); public static final Item blazeQuartz = new ItemMod(defaultBuilder()).setRegistryName(LibMisc.MOD_ID, LibItemNames.QUARTZ_NAMES[2]); @@ -354,7 +384,7 @@ public final class ModItems { public static final Item manaweaveLegs = new ItemManaweaveArmor(EntityEquipmentSlot.LEGS, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_LEGS); public static final Item manaweaveBoots = new ItemManaweaveArmor(EntityEquipmentSlot.FEET, unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.MANAWEAVE_BOOTS); public static final Item autocraftingHalo = new ItemAutocraftingHalo(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.AUTOCRAFTING_HALO); - public static final Item gaiaHead = new ItemGaiaHead(ModBlocks.gaiaHead, ModBlocks.gaiaHeadWall, defaultBuilder().setTEISR(() -> RenderTileGaiaHead.TEISR::new)); + @ObjectHolder("botania:" + LibBlockNames.GAIA_HEAD) public static Item gaiaHead; public static final Item sextant = new ItemSextant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SEXTANT); public static final Item speedUpBelt = new ItemSpeedUpBelt(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SPEED_UP_BELT); public static final Item baubleBox = new ItemBaubleBox(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.BAUBLE_BOX); @@ -363,8 +393,8 @@ public final class ModItems { public static final Item cloudPendant = new ItemCloudPendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.CLOUD_PENDANT); public static final Item superCloudPendant = new ItemSuperCloudPendant(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.SUPER_CLOUD_PENDANT); public static final Item thirdEye = new ItemThirdEye(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.THIRD_EYE); - public static final Item astrolabe = new ItemAstrolabe(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.ASTROLABE); - public static final Item goddessCharm = new ItemGoddessCharm(unstackable()).setRegistryName(LibMisc.MOD_ID, LibItemNames.GODDESS_CHARM); + @ObjectHolder("botania:" + LibItemNames.ASTROLABE) public static Item astrolabe; + @ObjectHolder("botania:" + LibItemNames.GODDESS_CHARM) public static Item goddessCharm; public static Item.Properties defaultBuilder() { return new Item.Properties().group(BotaniaCreativeTab.INSTANCE); @@ -378,9 +408,11 @@ public final class ModItems { public static void registerItems(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); - r.register(lexicon); - petals.values().forEach(r::register); - dyes.values().forEach(r::register); + register(r, new ItemLexicon(unstackable()), LibItemNames.LEXICON); + for(EnumDyeColor color : EnumDyeColor.values()) { + register(r, new ItemPetal(ModBlocks.getBuriedPetal(color), color, defaultBuilder()), color.getName() + LibItemNames.PETAL_SUFFIX); + register(r, new ItemDye(color, defaultBuilder()), color.getName() + LibItemNames.DYE_SUFFIX); + } r.register(pestleAndMortar); r.register(twigWand); r.register(manaSteel); @@ -616,7 +648,8 @@ public final class ModItems { r.register(manaweaveLegs); r.register(manaweaveBoots); r.register(autocraftingHalo); - r.register(gaiaHead); + Item head = new ItemGaiaHead(ModBlocks.gaiaHead, ModBlocks.gaiaHeadWall, defaultBuilder().setTEISR(() -> RenderTileGaiaHead.TEISR::new)); + r.register(head.setRegistryName(ModBlocks.gaiaHead.getRegistryName())); r.register(sextant); r.register(speedUpBelt); r.register(baubleBox); @@ -625,8 +658,8 @@ public final class ModItems { r.register(cloudPendant); r.register(superCloudPendant); r.register(thirdEye); - r.register(astrolabe); - r.register(goddessCharm); + register(r, new ItemAstrolabe(unstackable()), LibItemNames.ASTROLABE); + register(r, new ItemGoddessCharm(unstackable()), LibItemNames.GODDESS_CHARM); registerOreDictionary(); } @@ -654,4 +687,48 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock); */ } + + public static Item getPetal(EnumDyeColor color) { + switch (color) { + default: + case WHITE: return whitePetal; + case ORANGE: return orangePetal; + case MAGENTA: return magentaPetal; + case LIGHT_BLUE: return lightBluePetal; + case YELLOW: return yellowPetal; + case LIME: return limePetal; + case PINK: return pinkPetal; + case GRAY: return grayPetal; + case LIGHT_GRAY: return lightGrayPetal; + case CYAN: return cyanPetal; + case PURPLE: return purplePetal; + case BLUE: return bluePetal; + case BROWN: return brownPetal; + case GREEN: return greenPetal; + case RED: return redPetal; + case BLACK: return blackPetal; + } + } + + public static Item getDye(EnumDyeColor color) { + switch (color) { + default: + case WHITE: return whiteDye; + case ORANGE: return orangeDye; + case MAGENTA: return magentaDye; + case LIGHT_BLUE: return lightBlueDye; + case YELLOW: return yellowDye; + case LIME: return limeDye; + case PINK: return pinkDye; + case GRAY: return grayDye; + case LIGHT_GRAY: return lightGrayDye; + case CYAN: return cyanDye; + case PURPLE: return purpleDye; + case BLUE: return blueDye; + case BROWN: return brownDye; + case GREEN: return greenDye; + case RED: return redDye; + case BLACK: return blackDye; + } + } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java index 79a935ab6..96a1935a8 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java @@ -26,7 +26,7 @@ public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower { @Nonnull @Override public ITextComponent getDisplayName(@Nonnull ItemStack stack) { - ITextComponent flowerName = stack.getDisplayName(); + ITextComponent flowerName = super.getDisplayName(stack); return new TextComponentTranslation("botaniamisc.floatingPrefix").appendSibling(flowerName); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 133916f2c..826cc5aba 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -30,12 +30,15 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID) public class ItemOdinRing extends ItemRelicBauble { - private static final List damageNegations = new ArrayList<>(); + private static final Set damageNegations = new HashSet<>(); + private static final Set fireNegations = new HashSet<>(); public ItemOdinRing(Properties props) { super(props); @@ -43,13 +46,10 @@ public class ItemOdinRing extends ItemRelicBauble { damageNegations.add(DamageSource.DROWN.damageType); damageNegations.add(DamageSource.FALL.damageType); damageNegations.add(DamageSource.LAVA.damageType); - if(ConfigHandler.COMMON.ringOfOdinFireResist.get()) { - damageNegations.add(DamageSource.IN_FIRE.damageType); - damageNegations.add(DamageSource.ON_FIRE.damageType); - } - damageNegations.add(DamageSource.IN_WALL.damageType); damageNegations.add(DamageSource.STARVE.damageType); + fireNegations.add(DamageSource.IN_FIRE.damageType); + fireNegations.add(DamageSource.ON_FIRE.damageType); } @Override @@ -62,7 +62,9 @@ public class ItemOdinRing extends ItemRelicBauble { public static void onPlayerAttacked(LivingAttackEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - if(!getOdinRing(player).isEmpty() && damageNegations.contains(event.getSource().damageType)) + boolean negate = damageNegations.contains(event.getSource().damageType) + || (ConfigHandler.COMMON.ringOfOdinFireResist.get() && fireNegations.contains(event.getSource().damageType)); + if(!getOdinRing(player).isEmpty() && negate) event.setCanceled(true); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 98928dbfe..78c3db85b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -537,7 +537,7 @@ public final class LexiconData { flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); flowerShrinking.setPriority() .setLexiconPages(new PageText("0"), new PageManaInfusionRecipe("1", BotaniaAPI.miniFlowerRecipes)) - .setIcon(ItemBlockSpecialFlower.ofType(new ResourceLocation(LibBlockNames.SUBTILE_BELLETHORN.getNamespace(), LibBlockNames.SUBTILE_BELLETHORN.getPath() + "Chibi"))); + .setIcon(ItemBlockSpecialFlower.ofType(new ResourceLocation(LibBlockNames.SUBTILE_BELLETHORN.getNamespace(), LibBlockNames.SUBTILE_BELLETHORN.getPath() + "_chibi"))); flowerSpeed = new BasicLexiconEntry(LibLexicon.FFLOWER_SPEED, categoryFunctionalFlowers); flowerSpeed.setPriority().setLexiconPages(new PageText("0"), new PageText("1")); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index f018985de..d223db6da 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -146,7 +146,6 @@ public final class LibBlockNames { public static final ResourceLocation SUBTILE_ENDOFLAME = prefix("endoflame"); public static final ResourceLocation SUBTILE_HYDROANGEAS = prefix("hydroangeas"); public static final ResourceLocation SUBTILE_THERMALILY = prefix("thermalily"); - public static final ResourceLocation SUBTILE_NIGHTSHADE_PRIME = prefix("nightshadePrime"); public static final ResourceLocation SUBTILE_ARCANE_ROSE = prefix("arcanerose"); public static final ResourceLocation SUBTILE_MUNCHDEW = prefix("munchdew"); public static final ResourceLocation SUBTILE_ENTROPINNYUM = prefix("entropinnyum"); @@ -161,11 +160,11 @@ public final class LibBlockNames { public static final ResourceLocation SUBTILE_BELLETHORN = prefix("bellethorn"); public static final ResourceLocation SUBTILE_BERGAMUTE = prefix("bergamute"); public static final ResourceLocation SUBTILE_DREADTHORN = prefix("dreadthorn"); - public static final ResourceLocation SUBTILE_HEISEI_DREAM = prefix("heiseiDream"); + public static final ResourceLocation SUBTILE_HEISEI_DREAM = prefix("heisei_dream"); public static final ResourceLocation SUBTILE_TIGERSEYE = prefix("tigerseye"); - public static final ResourceLocation SUBTILE_JADED_AMARANTHUS = prefix("jadedAmaranthus"); + public static final ResourceLocation SUBTILE_JADED_AMARANTHUS = prefix("jaded_amaranthus"); public static final ResourceLocation SUBTILE_ORECHID = prefix("orechid"); - public static final ResourceLocation SUBTILE_FALLEN_KANADE = prefix("fallenKanade"); + public static final ResourceLocation SUBTILE_FALLEN_KANADE = prefix("fallen_kanade"); public static final ResourceLocation SUBTILE_EXOFLAME = prefix("exoflame"); public static final ResourceLocation SUBTILE_AGRICARNATION = prefix("agricarnation"); public static final ResourceLocation SUBTILE_HOPPERHOCK = prefix("hopperhock"); @@ -183,7 +182,7 @@ public final class LibBlockNames { public static final ResourceLocation SUBTILE_MARIMORPHOSIS = prefix("marimorphosis"); public static final ResourceLocation SUBTILE_BUBBELL = prefix("bubbell"); public static final ResourceLocation SUBTILE_SOLEGNOLIA = prefix("solegnolia"); - public static final ResourceLocation SUBTILE_ORECHID_IGNEM = prefix("orechidIgnem"); + public static final ResourceLocation SUBTILE_ORECHID_IGNEM = prefix("orechid_ignem"); public static final String QUARTZ_DARK = "dark_quartz"; public static final String QUARTZ_MANA = "mana_quartz"; diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index d59f0ccfe..35695a5e4 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -30,6 +30,14 @@ public final class LibItemNames { public static final String MANA_COOKIE = "mana_cookie"; public static final String FERTILIZER = "fertilizer"; public static final String GRASS_SEEDS = "seeds"; + public static final String PODZOL_SEEDS = "podzol_seeds"; + public static final String MYCEL_SEEDS = "mycelium_seeds"; + public static final String DRY_SEEDS = "dry_seeds"; + public static final String GOLDEN_SEEDS = "golden_seeds"; + public static final String VIVID_SEEDS = "vivid_seeds"; + public static final String SCORCHED_SEEDS = "scorched_seeds"; + public static final String INFUSED_SEEDS = "infused_seeds"; + public static final String MUTATED_SEEDS = "mutated_seeds"; public static final String DIRT_ROD = "dirt_rod"; public static final String TERRAFORM_ROD = "terraform_rod"; public static final String MANA_MIRROR = "mana_mirror"; diff --git a/src/main/resources/assets/botania/models/item/desugun.json b/src/main/resources/assets/botania/models/item/desugun.json deleted file mode 100644 index cd2620978..000000000 --- a/src/main/resources/assets/botania/models/item/desugun.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/desugun0", - "layer1": "botania:items/desugun1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/desugunclip.json b/src/main/resources/assets/botania/models/item/desugunclip.json deleted file mode 100644 index c0f65ca23..000000000 --- a/src/main/resources/assets/botania/models/item/desugunclip.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/desugun2", - "layer1": "botania:items/desugun1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lexicon_default.json b/src/main/resources/assets/botania/models/item/lexicon_default.json deleted file mode 100644 index f938313af..000000000 --- a/src/main/resources/assets/botania/models/item/lexicon_default.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lexicon_default" - }, - "overrides": [ - { - "predicate": { - "botania:elven": 1 - }, - "model": "botania:item/lexicon_elven" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/managun.json b/src/main/resources/assets/botania/models/item/managun.json deleted file mode 100644 index b9bc2b402..000000000 --- a/src/main/resources/assets/botania/models/item/managun.json +++ /dev/null @@ -1,188 +0,0 @@ -{ - "__comment": "Author: wiiv", - "textures": { - "layer0": "botania:items/manablaster", - "layer1": "botania:items/manablastercolor", - "layer2": "botania:items/manablasterglass" - }, - "elements": [ - { - "name": "Barrel1", - "from": [ -10.0, 5.0, 5.5 ], - "to": [ -3.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 7.01, 3.5, 11.49 ] }, - "east": { "texture": "layer0", "uv": [ 6.0, 7.0, 8.5, 11.5 ] }, - "south": { "texture": "layer0", "uv": [ 3.5, 7.01, 0.0, 11.49 ] }, - "west": { "texture": "layer0", "uv": [ 3.5, 7.01, 6.0, 11.49 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 10.5, 13.49, 13.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.5, 10.5, 16.0, 14.0 ], "rotation": 90 } - } - }, - { - "name": "Barrel2", - "from": [ -3.0, 5.0, 5.5 ], - "to": [ 7.0, 9.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 11.01, 14.0, 15.99, 15.99 ] }, - "south": { "texture": "layer0", "uv": [ 16.0, 14.0, 11.0, 16.0 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 5.0, 13.49, 10.0 ], "rotation": 270 }, - "down": { "texture": "layer0", "uv": [ 13.5, 5.0, 15.99, 10.0 ], "rotation": 270 } - } - }, - { - "name": "Barrel3", - "from": [ 7.0, 5.0, 5.5 ], - "to": [ 10.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, - "east": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, - "south": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, - "west": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, - "up": { "texture": "layer0", "uv": [ 11.0, 4.0, 13.5, 5.5 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.5, 4.0, 16.0, 5.5 ], "rotation": 90 } - } - }, - { - "name": "Barrel4", - "from": [ 10.0, 12.0, 5.5 ], - "to": [ 18.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 4.01, 14.5, 8.0, 15.5 ] }, - "east": { "texture": "layer0", "uv": [ 4.0, 14.5, 6.5, 15.5 ] }, - "south": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 0.01, 13.49, 3.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 11.0, 0.01, 13.5, 4.0 ], "rotation": 90 } - } - }, - { - "name": "Barrel5", - "from": [ 10.0, 9.0, 5.5 ], - "to": [ 18.0, 11.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, - "east": { "texture": "layer0", "uv": [ 6.5, 14.5, 4.0, 15.5 ] }, - "south": { "texture": "layer0", "uv": [ 4.0, 14.5, 8.0, 15.5 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 0.0, 13.49, 3.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.51, 0.01, 15.99, 3.99 ], "rotation": 90 } - } - }, - { - "name": "Strap", - "from": [ 14.0, -5.0, 6.5 ], - "to": [ 19.0, 9.0, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 0.01, 2.5, 6.99 ] }, - "east": { "texture": "layer0", "uv": [ 4.0, 0.01, 5.5, 6.99 ] }, - "south": { "texture": "layer0", "uv": [ 2.5, 0.01, 0.0, 6.99 ] }, - "west": { "texture": "layer0", "uv": [ 2.5, 0.01, 4.0, 6.99 ] }, - "down": { "texture": "layer0", "uv": [ 5.5, 0.0, 7.0, 2.5 ], "rotation": 90 } - } - }, - { - "name": "Magazine", - "from": [ 12.5, -6.0, 7.0 ], - "to": [ 18.5, -5.0, 9.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, - "faces": { - "north": { "texture": "layer0", "uv": [ 7.5, 0.0, 8.0, 3.0 ], "rotation": 90 }, - "east": { "texture": "layer0", "uv": [ 8.0, 0.0, 7.0, 0.5 ] }, - "south": { "texture": "layer0", "uv": [ 8.0, 0.01, 7.5, 3.0 ], "rotation": 90 }, - "west": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 0.5 ] }, - "up": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 3.0 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 7.01, 0.0, 7.99, 3.0 ], "rotation": 90 } - } - }, - { - "name": "Trigger Guard1", - "from": [ 10.0, 6.0, 7.0 ], - "to": [ 16.0, 7.0, 9.0 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.5 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.49 ] }, - "up": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] }, - "down": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] } - } - }, - { - "name": "Trigger", - "from": [ 13.0, 7.0, 7.5 ], - "to": [ 16.0, 9.0, 8.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, - "west": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 5.5 ] } - } - }, - { - "name": "Trigger Guard2", - "from": [ 10.0, 7.0, 7.0 ], - "to": [ 11.0, 9.0, 9.0 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] }, - "east": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.5, 5.0 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] } - } - }, - { - "name": "Colorizer", - "from": [ 9.5, 11.0, 6.0 ], - "to": [ 17.5, 12.0, 10.0 ], - "faces": { - "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 }, - "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 2 }, - "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 } - } - }, - { - "name": "Glass", - "from": [ -3.5, 9.5, 6.0 ], - "to": [ 7.5, 13.5, 10.0 ], - "faces": { - "north": { "texture": "layer2", "uv": [ 0.01, 7.01, 6.99, 7.99 ] }, - "east": { "texture": "layer2", "uv": [ 7.01, 7.01, 9.49, 7.99 ] }, - "south": { "texture": "layer2", "uv": [ 6.99, 7.01, 0.01, 7.99 ] }, - "up": { "texture": "layer2", "uv": [ 11.01, 0.01, 13.49, 6.99 ] }, - "down": { "texture": "layer2", "uv": [ 8.51, 0.01, 6.99, 9.99 ] } - } - } - ], - "display": { - "gui": { - "rotation": [ 0, -20, -40 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 0, 2.45, -1.5 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 0, -90, 0 ], - "translation": [ 0, 2.45, -1.5 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_lefthand": { - "rotation": [ 10, 80, -5 ], - "translation": [ 0.8, 2.5, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - }, - "firstperson_righthand": { - "rotation": [ 10, -80, 5 ], - "translation": [ -1.8, 2.5, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/managunclip.json b/src/main/resources/assets/botania/models/item/managunclip.json deleted file mode 100644 index 6153c87d0..000000000 --- a/src/main/resources/assets/botania/models/item/managunclip.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "__comment": "Author: wiiv", - "textures": { - "layer0": "botania:items/manablaster", - "layer1": "botania:items/manablastercolor", - "layer2": "botania:items/manablasterglass", - "layer3": "botania:items/manablasterlensclip" - }, - "elements": [ - { - "name": "Barrel1", - "from": [ -10.0, 5.0, 5.5 ], - "to": [ -3.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 7.01, 3.5, 11.49 ] }, - "east": { "texture": "layer0", "uv": [ 6.0, 7.0, 8.5, 11.5 ] }, - "south": { "texture": "layer0", "uv": [ 3.5, 7.01, 0.0, 11.49 ] }, - "west": { "texture": "layer0", "uv": [ 3.5, 7.01, 6.0, 11.49 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 10.5, 13.49, 13.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.5, 10.5, 16.0, 14.0 ], "rotation": 90 } - } - }, - { - "name": "Barrel2", - "from": [ -3.0, 5.0, 5.5 ], - "to": [ 7.0, 9.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 11.01, 14.0, 15.99, 15.99 ] }, - "south": { "texture": "layer0", "uv": [ 16.0, 14.0, 11.0, 16.0 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 5.0, 13.49, 10.0 ], "rotation": 270 }, - "down": { "texture": "layer0", "uv": [ 13.5, 5.0, 15.99, 10.0 ], "rotation": 270 } - } - }, - { - "name": "Barrel3", - "from": [ 7.0, 5.0, 5.5 ], - "to": [ 10.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, - "east": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, - "south": { "texture": "layer0", "uv": [ 0.0, 11.5, 1.5, 16.0 ] }, - "west": { "texture": "layer0", "uv": [ 1.5, 11.5, 4.0, 16.0 ] }, - "up": { "texture": "layer0", "uv": [ 11.0, 4.0, 13.5, 5.5 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.5, 4.0, 16.0, 5.5 ], "rotation": 90 } - } - }, - { - "name": "Barrel4", - "from": [ 10.0, 12.0, 5.5 ], - "to": [ 18.0, 14.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 4.01, 14.5, 8.0, 15.5 ] }, - "east": { "texture": "layer0", "uv": [ 4.0, 14.5, 6.5, 15.5 ] }, - "south": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 0.01, 13.49, 3.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 11.0, 0.01, 13.5, 4.0 ], "rotation": 90 } - } - }, - { - "name": "Barrel5", - "from": [ 10.0, 9.0, 5.5 ], - "to": [ 18.0, 11.0, 10.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 8.0, 14.5, 4.0, 15.5 ] }, - "east": { "texture": "layer0", "uv": [ 6.5, 14.5, 4.0, 15.5 ] }, - "south": { "texture": "layer0", "uv": [ 4.0, 14.5, 8.0, 15.5 ] }, - "up": { "texture": "layer0", "uv": [ 11.01, 0.0, 13.49, 3.99 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 13.51, 0.01, 15.99, 3.99 ], "rotation": 90 } - } - }, - { - "name": "Strap", - "from": [ 14.0, -5.0, 6.5 ], - "to": [ 19.0, 9.0, 9.5 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, - "faces": { - "north": { "texture": "layer0", "uv": [ 0.0, 0.01, 2.5, 6.99 ] }, - "east": { "texture": "layer0", "uv": [ 4.0, 0.01, 5.5, 6.99 ] }, - "south": { "texture": "layer0", "uv": [ 2.5, 0.01, 0.0, 6.99 ] }, - "west": { "texture": "layer0", "uv": [ 2.5, 0.01, 4.0, 6.99 ] }, - "down": { "texture": "layer0", "uv": [ 5.5, 0.0, 7.0, 2.5 ], "rotation": 90 } - } - }, - { - "name": "Magazine", - "from": [ 12.5, -6.0, 7.0 ], - "to": [ 18.5, -5.0, 9.0 ], - "rotation": { "origin": [ 8.0, 8.0, 8.0 ], "axis": "z", "angle": 22.5 }, - "faces": { - "north": { "texture": "layer0", "uv": [ 7.5, 0.0, 8.0, 3.0 ], "rotation": 90 }, - "east": { "texture": "layer0", "uv": [ 8.0, 0.0, 7.0, 0.5 ] }, - "south": { "texture": "layer0", "uv": [ 8.0, 0.01, 7.5, 3.0 ], "rotation": 90 }, - "west": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 0.5 ] }, - "up": { "texture": "layer0", "uv": [ 7.0, 0.01, 8.0, 3.0 ], "rotation": 90 }, - "down": { "texture": "layer0", "uv": [ 7.01, 0.0, 7.99, 3.0 ], "rotation": 90 } - } - }, - { - "name": "Trigger Guard1", - "from": [ 10.0, 6.0, 7.0 ], - "to": [ 16.0, 7.0, 9.0 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.5 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 3.01, 8.5, 3.49 ] }, - "up": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] }, - "down": { "texture": "layer0", "uv": [ 5.5, 3.0, 8.5, 4.0 ] } - } - }, - { - "name": "Trigger", - "from": [ 13.0, 7.0, 7.5 ], - "to": [ 16.0, 9.0, 8.5 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 6.0 ] }, - "west": { "texture": "layer0", "uv": [ 5.5, 5.0, 6.5, 5.5 ] } - } - }, - { - "name": "Trigger Guard2", - "from": [ 10.0, 7.0, 7.0 ], - "to": [ 11.0, 9.0, 9.0 ], - "faces": { - "north": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] }, - "east": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.5, 5.0 ] }, - "south": { "texture": "layer0", "uv": [ 5.5, 4.0, 6.0, 5.0 ] } - } - }, - { - "name": "Colorizer", - "from": [ 9.5, 11.0, 6.0 ], - "to": [ 17.5, 12.0, 10.0 ], - "faces": { - "north": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 }, - "east": { "texture": "layer1", "uv": [ 0.0, 0.0, 5.0, 5.0 ], "tintindex": 2 }, - "south": { "texture": "layer1", "uv": [ 0.0, 0.0, 8.0, 5.0 ], "tintindex": 2 } - } - }, - { - "name": "Glass", - "from": [ -3.5, 9.5, 6.0 ], - "to": [ 7.5, 13.5, 10.0 ], - "faces": { - "north": { "texture": "layer2", "uv": [ 0.01, 7.01, 6.99, 7.99 ] }, - "east": { "texture": "layer2", "uv": [ 7.01, 7.01, 9.49, 7.99 ] }, - "south": { "texture": "layer2", "uv": [ 6.99, 7.01, 0.01, 7.99 ] }, - "up": { "texture": "layer2", "uv": [ 11.01, 0.01, 13.49, 6.99 ] }, - "down": { "texture": "layer2", "uv": [ 8.51, 0.01, 6.99, 9.99 ] } - } - }, - { - "name": "Clip", - "from": [ -4.5, 2.0, 5.0 ], - "to": [ 8.5, 8.0, 11.0 ], - "faces": { - "north": { "texture": "layer3", "uv": [ 0.01, 6.51, 6.5, 9.49 ] }, - "east": { "texture": "layer3", "uv": [ 6.01, 0.0, 9.0, 3.0 ] }, - "south": { "texture": "layer3", "uv": [ 6.5, 6.5, 0.01, 9.5 ] }, - "west": { "texture": "layer3", "uv": [ 6.0, 3.0, 9.0, 6.0 ] }, - "up": { "texture": "layer3", "uv": [ 0.0, 0.01, 3.0, 6.5 ], "rotation": 90 }, - "down": { "texture": "layer3", "uv": [ 3.0, 0.01, 6.0, 6.5 ], "rotation": 90 } - } - } - ], - "display": { - "gui": { - "rotation": [ 0, -20, -40 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "ground": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "fixed": { - "rotation": [ 0, 0, 0 ], - "translation": [ 0, 0, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - }, - "thirdperson_lefthand": { - "rotation": [ 0, 90, 0 ], - "translation": [ 0, 2.45, -1.5 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "thirdperson_righthand": { - "rotation": [ 0, -90, 0 ], - "translation": [ 0, 2.45, -1.5 ], - "scale": [ 0.4, 0.4, 0.4 ] - }, - "firstperson_lefthand": { - "rotation": [ 10, 80, -5 ], - "translation": [ 0.8, 2.5, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - }, - "firstperson_righthand": { - "rotation": [ 10, -80, 5 ], - "translation": [ -1.8, 2.5, 0 ], - "scale": [ 0.45, 0.45, 0.45 ] - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/_constants.json b/src/main/resources/data/botania/recipes/_constants.json index e7feeef65..f55b8f183 100644 --- a/src/main/resources/data/botania/recipes/_constants.json +++ b/src/main/resources/data/botania/recipes/_constants.json @@ -18,944 +18,28 @@ { "item": "botania:dye_red" }, { "item": "botania:dye_black" } ], - "name": "ALL_DYES" + "name": "all_dyes" }, - { +{ "ingredient": [ - { "item": "botania:petal_white" }, - { "item": "botania:petal_orange" }, - { "item": "botania:petal_magenta" }, - { "item": "botania:petal_light_blue" }, - { "item": "botania:petal_yellow" }, - { "item": "botania:petal_lime" }, - { "item": "botania:petal_pink" }, - { "item": "botania:petal_gray" }, - { "item": "botania:petal_silver" }, - { "item": "botania:petal_cyan" }, - { "item": "botania:petal_purple" }, - { "item": "botania:petal_blue" }, - { "item": "botania:petal_brown" }, - { "item": "botania:petal_green" }, - { "item": "botania:petal_red" }, - { "item": "botania:petal_black" } + { "item": "minecraft:glass" }, + { "item": "minecraft:white_stained_glass" }, + { "item": "minecraft:orange_stained_glass" }, + { "item": "minecraft:magenta_stained_glass" }, + { "item": "minecraft:light_blue_stained_glass" }, + { "item": "minecraft:yellow_stained_glass" }, + { "item": "minecraft:lime_stained_glass" }, + { "item": "minecraft:pink_stained_glass" }, + { "item": "minecraft:gray_stained_glass" }, + { "item": "minecraft:silver_stained_glass" }, + { "item": "minecraft:cyan_stained_glass" }, + { "item": "minecraft:purple_stained_glass" }, + { "item": "minecraft:blue_stained_glass" }, + { "item": "minecraft:brown_stained_glass" }, + { "item": "minecraft:green_stained_glass" }, + { "item": "minecraft:red_stained_glass" }, + { "item": "minecraft:black_stained_glass" } ], - "name": "ALL_PETALS" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "bEnderAirBottle" - }, - "name": "BENDERAIRBOTTLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "bPlaceholder" - }, - "name": "BPLACEHOLDER" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "bRedString" - }, - "name": "BREDSTRING" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockBlaze" - }, - "name": "BLOCKBLAZE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockGlass" - }, - "name": "BLOCKGLASS" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockGlassColorless" - }, - "name": "BLOCKGLASSCOLORLESS" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockLapis" - }, - "name": "BLOCKLAPIS" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockQuartz" - }, - "name": "BLOCKQUARTZ" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockRedstone" - }, - "name": "BLOCKREDSTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "chestWood" - }, - "name": "CHESTWOOD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "clothManaweave" - }, - "name": "CLOTHMANAWEAVE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "cobblestone" - }, - "name": "COBBLESTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "cropWheat" - }, - "name": "CROPWHEAT" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dreamwood" - }, - "name": "DREAMWOOD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dreamwoodTwig" - }, - "name": "DREAMWOODTWIG" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - }, - "name": "DUSTGLOWSTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dustRedstone" - }, - "name": "DUSTREDSTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dye" - }, - "name": "DYE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "elvenDragonstone" - }, - "name": "ELVENDRAGONSTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "elvenPixieDust" - }, - "name": "ELVENPIXIEDUST" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "eternalLifeEssence" - }, - "name": "ETERNALLIFEESSENCE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "feather" - }, - "name": "FEATHER" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "gemEmerald" - }, - "name": "GEMEMERALD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "gemLapis" - }, - "name": "GEMLAPIS" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "gemPrismarine" - }, - "name": "GEMPRISMARINE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "gemQuartz" - }, - "name": "GEMQUARTZ" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "glowstone" - }, - "name": "GLOWSTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "gravel" - }, - "name": "GRAVEL" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotBrass" - }, - "name": "INGOTBRASS" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotElvenElementium" - }, - "name": "INGOTELVENELEMENTIUM" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotGold" - }, - "name": "INGOTGOLD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotIron" - }, - "name": "INGOTIRON" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotManasteel" - }, - "name": "INGOTMANASTEEL" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotTerrasteel" - }, - "name": "INGOTTERRASTEEL" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "leather" - }, - "name": "LEATHER" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "livingRoot" - }, - "name": "LIVINGROOT" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "livingrock" - }, - "name": "LIVINGROCK" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "livingwood" - }, - "name": "LIVINGWOOD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "livingwoodTwig" - }, - "name": "LIVINGWOODTWIG" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "manaDiamond" - }, - "name": "MANADIAMOND" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "manaPearl" - }, - "name": "MANAPEARL" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "manaString" - }, - "name": "MANASTRING" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerBlack" - }, - "name": "MYSTICFLOWERBLACK" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerBlackDouble" - }, - "name": "MYSTICFLOWERBLACKDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerBlue" - }, - "name": "MYSTICFLOWERBLUE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerBlueDouble" - }, - "name": "MYSTICFLOWERBLUEDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerBrown" - }, - "name": "MYSTICFLOWERBROWN" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerBrownDouble" - }, - "name": "MYSTICFLOWERBROWNDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerCyan" - }, - "name": "MYSTICFLOWERCYAN" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerCyanDouble" - }, - "name": "MYSTICFLOWERCYANDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerGray" - }, - "name": "MYSTICFLOWERGRAY" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerGrayDouble" - }, - "name": "MYSTICFLOWERGRAYDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerGreen" - }, - "name": "MYSTICFLOWERGREEN" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerGreenDouble" - }, - "name": "MYSTICFLOWERGREENDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerLightBlue" - }, - "name": "MYSTICFLOWERLIGHTBLUE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerLightBlueDouble" - }, - "name": "MYSTICFLOWERLIGHTBLUEDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerLightGray" - }, - "name": "MYSTICFLOWERLIGHTGRAY" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerLightGrayDouble" - }, - "name": "MYSTICFLOWERLIGHTGRAYDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerLime" - }, - "name": "MYSTICFLOWERLIME" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerLimeDouble" - }, - "name": "MYSTICFLOWERLIMEDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerMagenta" - }, - "name": "MYSTICFLOWERMAGENTA" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerMagentaDouble" - }, - "name": "MYSTICFLOWERMAGENTADOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerOrange" - }, - "name": "MYSTICFLOWERORANGE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerOrangeDouble" - }, - "name": "MYSTICFLOWERORANGEDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerPink" - }, - "name": "MYSTICFLOWERPINK" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerPinkDouble" - }, - "name": "MYSTICFLOWERPINKDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerPurple" - }, - "name": "MYSTICFLOWERPURPLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerPurpleDouble" - }, - "name": "MYSTICFLOWERPURPLEDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerRed" - }, - "name": "MYSTICFLOWERRED" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerRedDouble" - }, - "name": "MYSTICFLOWERREDDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerWhite" - }, - "name": "MYSTICFLOWERWHITE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerWhiteDouble" - }, - "name": "MYSTICFLOWERWHITEDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerYellow" - }, - "name": "MYSTICFLOWERYELLOW" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "mysticFlowerYellowDouble" - }, - "name": "MYSTICFLOWERYELLOWDOUBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "nuggetElvenElementium" - }, - "name": "NUGGETELVENELEMENTIUM" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "nuggetGold" - }, - "name": "NUGGETGOLD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "nuggetManasteel" - }, - "name": "NUGGETMANASTEEL" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "nuggetTerrasteel" - }, - "name": "NUGGETTERRASTEEL" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "obsidian" - }, - "name": "OBSIDIAN" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "paneGlassColorless" - }, - "name": "PANEGLASSCOLORLESS" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "paper" - }, - "name": "PAPER" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "pebble" - }, - "name": "PEBBLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "pestleAndMortar" - }, - "name": "PESTLEANDMORTAR" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalBlack" - }, - "name": "PETALBLACK" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalBlue" - }, - "name": "PETALBLUE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalBrown" - }, - "name": "PETALBROWN" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalCyan" - }, - "name": "PETALCYAN" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalGray" - }, - "name": "PETALGRAY" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalGreen" - }, - "name": "PETALGREEN" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalLightBlue" - }, - "name": "PETALLIGHTBLUE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalLightGray" - }, - "name": "PETALLIGHTGRAY" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalLime" - }, - "name": "PETALLIME" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalMagenta" - }, - "name": "PETALMAGENTA" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalOrange" - }, - "name": "PETALORANGE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalPink" - }, - "name": "PETALPINK" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalPurple" - }, - "name": "PETALPURPLE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalRed" - }, - "name": "PETALRED" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalWhite" - }, - "name": "PETALWHITE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "petalYellow" - }, - "name": "PETALYELLOW" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plankWood" - }, - "name": "PLANKWOOD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "powderBlaze" - }, - "name": "POWDERBLAZE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "powderMana" - }, - "name": "POWDERMANA" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "quartzBlaze" - }, - "name": "QUARTZBLAZE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "quartzDark" - }, - "name": "QUARTZDARK" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "quartzElven" - }, - "name": "QUARTZELVEN" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "quartzLavender" - }, - "name": "QUARTZLAVENDER" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "quartzMana" - }, - "name": "QUARTZMANA" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "quartzRed" - }, - "name": "QUARTZRED" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "quartzSunny" - }, - "name": "QUARTZSUNNY" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "rodBlaze" - }, - "name": "RODBLAZE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeAirB" - }, - "name": "RUNEAIRB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeAutumnB" - }, - "name": "RUNEAUTUMNB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeEarthB" - }, - "name": "RUNEEARTHB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeEnvyB" - }, - "name": "RUNEENVYB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeFireB" - }, - "name": "RUNEFIREB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeManaB" - }, - "name": "RUNEMANAB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runePrideB" - }, - "name": "RUNEPRIDEB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeSlothB" - }, - "name": "RUNESLOTHB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeSpringB" - }, - "name": "RUNESPRINGB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeSummerB" - }, - "name": "RUNESUMMERB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeWaterB" - }, - "name": "RUNEWATERB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeWinterB" - }, - "name": "RUNEWINTERB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "runeWrathB" - }, - "name": "RUNEWRATHB" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slabCobblestone" - }, - "name": "SLABCOBBLESTONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slimeball" - }, - "name": "SLIMEBALL" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickWood" - }, - "name": "STICKWOOD" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stone" - }, - "name": "STONE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "treeLeaves" - }, - "name": "TREELEAVES" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "treeSapling" - }, - "name": "TREESAPLING" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "vine" - }, - "name": "VINE" - }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "workbench" - }, - "name": "WORKBENCH" + "name": "glass" } ] \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/_factories.json b/src/main/resources/data/botania/recipes/_factories.json deleted file mode 100644 index 6448508e9..000000000 --- a/src/main/resources/data/botania/recipes/_factories.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "conditions": { - "fluxfield_enabled": "vazkii.botania.common.crafting.FluxfieldConditionFactory" - } -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/abstruse_platform.json b/src/main/resources/data/botania/recipes/abstruse_platform.json index 380b52e2e..752bc76f7 100644 --- a/src/main/resources/data/botania/recipes/abstruse_platform.json +++ b/src/main/resources/data/botania/recipes/abstruse_platform.json @@ -14,7 +14,7 @@ "data": 0 }, "P": { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, "3": { "item": "botania:livingwood", diff --git a/src/main/resources/data/botania/recipes/alchemycatalyst.json b/src/main/resources/data/botania/recipes/alchemycatalyst.json index 614428ffc..135ff815a 100644 --- a/src/main/resources/data/botania/recipes/alchemycatalyst.json +++ b/src/main/resources/data/botania/recipes/alchemycatalyst.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, "B": { "item": "minecraft:brewing_stand" }, "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "G": { - "item": "#INGOTGOLD" + "tag": "forge:ingots/gold" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/alfheimportal.json b/src/main/resources/data/botania/recipes/alfheimportal.json index 15f3f1987..d9dc71105 100644 --- a/src/main/resources/data/botania/recipes/alfheimportal.json +++ b/src/main/resources/data/botania/recipes/alfheimportal.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "T": { - "item": "#NUGGETTERRASTEEL" + "tag": "forge:nuggets/terrasteel" }, "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/animatedtorch.json b/src/main/resources/data/botania/recipes/animatedtorch.json index d0c28af97..c4f3273cc 100644 --- a/src/main/resources/data/botania/recipes/animatedtorch.json +++ b/src/main/resources/data/botania/recipes/animatedtorch.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "D": { - "item": "#POWDERMANA" + "tag": "forge:dusts/mana" }, "T": { "item": "minecraft:redstone_torch" diff --git a/src/main/resources/data/botania/recipes/apothecary_default.json b/src/main/resources/data/botania/recipes/apothecary_default.json index 5531c5f04..30dcbb808 100644 --- a/src/main/resources/data/botania/recipes/apothecary_default.json +++ b/src/main/resources/data/botania/recipes/apothecary_default.json @@ -11,59 +11,59 @@ "key": { "P": [ { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, { - "item": "#PETALLIGHTBLUE" + "tag": "botania:petals/lightblue" }, { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, { - "item": "#PETALRED" + "tag": "botania:petals/red" }, { - "item": "#PETALBLACK" + "tag": "botania:petals/black" } ], "S": { - "item": "#SLABCOBBLESTONE" + "item": "minecraft:cobblestone_slab" }, "C": { - "item": "#COBBLESTONE" + "tag": "forge:cobblestone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/astrolabe.json b/src/main/resources/data/botania/recipes/astrolabe.json index 50b784e28..c76a28e11 100644 --- a/src/main/resources/data/botania/recipes/astrolabe.json +++ b/src/main/resources/data/botania/recipes/astrolabe.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "D": { - "item": "#DREAMWOOD" + "item": "botania:dreamwood" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "G": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/auraring.json b/src/main/resources/data/botania/recipes/auraring.json index 7d1ec1283..0f1fcf685 100644 --- a/src/main/resources/data/botania/recipes/auraring.json +++ b/src/main/resources/data/botania/recipes/auraring.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#RUNEMANAB" + "tag": "botania:runes/mana" }, "I": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/auraringgreater.json b/src/main/resources/data/botania/recipes/auraringgreater.json index 435139d5f..f68dd4ef3 100644 --- a/src/main/resources/data/botania/recipes/auraringgreater.json +++ b/src/main/resources/data/botania/recipes/auraringgreater.json @@ -4,7 +4,7 @@ }, "ingredients": [ { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" }, { "item": "botania:auraring" diff --git a/src/main/resources/data/botania/recipes/autocraftinghalo.json b/src/main/resources/data/botania/recipes/autocraftinghalo.json index d90ba6bfb..562d45f36 100644 --- a/src/main/resources/data/botania/recipes/autocraftinghalo.json +++ b/src/main/resources/data/botania/recipes/autocraftinghalo.json @@ -7,7 +7,7 @@ "item": "botania:craftinghalo" }, { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/avatar.json b/src/main/resources/data/botania/recipes/avatar.json index fdf7d0fd8..e43488470 100644 --- a/src/main/resources/data/botania/recipes/avatar.json +++ b/src/main/resources/data/botania/recipes/avatar.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "D": { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" }, "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/azulejo_0.json b/src/main/resources/data/botania/recipes/azulejo_0.json index ad9b6d526..62b7d59cd 100644 --- a/src/main/resources/data/botania/recipes/azulejo_0.json +++ b/src/main/resources/data/botania/recipes/azulejo_0.json @@ -4,10 +4,10 @@ }, "ingredients": [ { - "item": "#GEMLAPIS" + "tag": "forge:gems/lapis" }, { - "item": "#BLOCKQUARTZ" + "tag": "forge:storage_blocks/quartz" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/balancecloak.json b/src/main/resources/data/botania/recipes/balancecloak.json index 51984dcd7..e4d262865 100644 --- a/src/main/resources/data/botania/recipes/balancecloak.json +++ b/src/main/resources/data/botania/recipes/balancecloak.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#GEMEMERALD" + "tag": "forge:gems/emerald" }, "S": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "W": { "item": "minecraft:wool", diff --git a/src/main/resources/data/botania/recipes/baublebox.json b/src/main/resources/data/botania/recipes/baublebox.json index b8f398e1d..432a33d9a 100644 --- a/src/main/resources/data/botania/recipes/baublebox.json +++ b/src/main/resources/data/botania/recipes/baublebox.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "C": { - "item": "#CHESTWOOD" + "tag": "forge:chests/wooden" }, "G": { - "item": "#INGOTGOLD" + "tag": "forge:ingots/gold" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/bellows.json b/src/main/resources/data/botania/recipes/bellows.json index 66883ddba..ee108aa4a 100644 --- a/src/main/resources/data/botania/recipes/bellows.json +++ b/src/main/resources/data/botania/recipes/bellows.json @@ -10,14 +10,14 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" }, "S": { "item": "botania:livingwood0slab", "data": 0 }, "L": { - "item": "#LEATHER" + "item": "minecraft:leather" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/blackholetalisman_0.json b/src/main/resources/data/botania/recipes/blackholetalisman_0.json index 9f6277cda..16d4a54be 100644 --- a/src/main/resources/data/botania/recipes/blackholetalisman_0.json +++ b/src/main/resources/data/botania/recipes/blackholetalisman_0.json @@ -11,13 +11,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "G": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/blazeblock.json b/src/main/resources/data/botania/recipes/blazeblock.json index a4f006027..3bc317ff6 100644 --- a/src/main/resources/data/botania/recipes/blazeblock.json +++ b/src/main/resources/data/botania/recipes/blazeblock.json @@ -19,7 +19,7 @@ "type": "forge:ore_shaped", "key": { "B": { - "item": "#RODBLAZE" + "tag": "forge:rods/blaze" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/bloodpendant.json b/src/main/resources/data/botania/recipes/bloodpendant.json index bd725a579..d85000ce8 100644 --- a/src/main/resources/data/botania/recipes/bloodpendant.json +++ b/src/main/resources/data/botania/recipes/bloodpendant.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#GEMPRISMARINE" + "tag": "forge:gems/prismarine" }, "D": { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" }, "G": { "item": "minecraft:ghast_tear" diff --git a/src/main/resources/data/botania/recipes/brewery.json b/src/main/resources/data/botania/recipes/brewery.json index 8a6c236f7..a5a1c14a3 100644 --- a/src/main/resources/data/botania/recipes/brewery.json +++ b/src/main/resources/data/botania/recipes/brewery.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#RUNEMANAB" + "tag": "botania:runes/mana" }, "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "S": { "item": "minecraft:brewing_stand" diff --git a/src/main/resources/data/botania/recipes/cacophonium.json b/src/main/resources/data/botania/recipes/cacophonium.json index 0d2e658b3..3a616cf76 100644 --- a/src/main/resources/data/botania/recipes/cacophonium.json +++ b/src/main/resources/data/botania/recipes/cacophonium.json @@ -11,10 +11,10 @@ "key": { "G": [ { - "item": "#INGOTGOLD" + "tag": "forge:ingots/gold" }, { - "item": "#INGOTBRASS" + "tag": "forge:ingots/brass" } ], "N": { diff --git a/src/main/resources/data/botania/recipes/clip.json b/src/main/resources/data/botania/recipes/clip.json index f794b2dfb..5a70d0b13 100644 --- a/src/main/resources/data/botania/recipes/clip.json +++ b/src/main/resources/data/botania/recipes/clip.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "D": { - "item": "#DREAMWOOD" + "item": "botania:dreamwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cloudpendant.json b/src/main/resources/data/botania/recipes/cloudpendant.json index eb7605f47..78fa88e14 100644 --- a/src/main/resources/data/botania/recipes/cloudpendant.json +++ b/src/main/resources/data/botania/recipes/cloudpendant.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" }, "D": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "F": { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" }, "M": { - "item": "#RUNEAUTUMNB" + "tag": "botania:runes/autumn" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cobblerod.json b/src/main/resources/data/botania/recipes/cobblerod.json index 65ddb53ed..a5592bb9c 100644 --- a/src/main/resources/data/botania/recipes/cobblerod.json +++ b/src/main/resources/data/botania/recipes/cobblerod.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "C": { - "item": "#COBBLESTONE" + "tag": "forge:cobblestone" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "F": { - "item": "#RUNEFIREB" + "tag": "botania:runes/fire" }, "W": { - "item": "#RUNEWATERB" + "tag": "botania:runes/water" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cocoon.json b/src/main/resources/data/botania/recipes/cocoon.json index 201ae0188..fd123186d 100644 --- a/src/main/resources/data/botania/recipes/cocoon.json +++ b/src/main/resources/data/botania/recipes/cocoon.json @@ -22,13 +22,13 @@ "item": "minecraft:string" }, "C": { - "item": "#CLOTHMANAWEAVE" + "item": "botania:manaweave_cloth" }, "P": { "item": "botania:felpumpkin" }, "D": { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conjurationcatalyst.json b/src/main/resources/data/botania/recipes/conjurationcatalyst.json index 84bc45d0a..46a8f2784 100644 --- a/src/main/resources/data/botania/recipes/conjurationcatalyst.json +++ b/src/main/resources/data/botania/recipes/conjurationcatalyst.json @@ -13,13 +13,13 @@ "item": "botania:alchemycatalyst" }, "B": { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "G": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json b/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json index 25e340147..bb6b5e295 100644 --- a/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json +++ b/src/main/resources/data/botania/recipes/conversions/blazeblock_deconstruct.json @@ -14,7 +14,7 @@ }, "ingredients": [ { - "item": "#BLOCKBLAZE" + "item": "botania:blaze_block" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/conversions/elementium_from_nuggets.json b/src/main/resources/data/botania/recipes/conversions/elementium_from_nuggets.json index 82967b865..19416d2f2 100644 --- a/src/main/resources/data/botania/recipes/conversions/elementium_from_nuggets.json +++ b/src/main/resources/data/botania/recipes/conversions/elementium_from_nuggets.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "I": { - "item": "#NUGGETELVENELEMENTIUM" + "tag": "forge:nuggets/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/elementium_to_nuggets.json b/src/main/resources/data/botania/recipes/conversions/elementium_to_nuggets.json index d689f9fca..04b482d10 100644 --- a/src/main/resources/data/botania/recipes/conversions/elementium_to_nuggets.json +++ b/src/main/resources/data/botania/recipes/conversions/elementium_to_nuggets.json @@ -5,7 +5,7 @@ }, "ingredients": [ { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/conversions/manasteel_from_nuggets.json b/src/main/resources/data/botania/recipes/conversions/manasteel_from_nuggets.json index 2320921af..80f4045c1 100644 --- a/src/main/resources/data/botania/recipes/conversions/manasteel_from_nuggets.json +++ b/src/main/resources/data/botania/recipes/conversions/manasteel_from_nuggets.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "I": { - "item": "#NUGGETMANASTEEL" + "tag": "forge:nuggets/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/manasteel_to_nuggets.json b/src/main/resources/data/botania/recipes/conversions/manasteel_to_nuggets.json index a17359614..4d663a047 100644 --- a/src/main/resources/data/botania/recipes/conversions/manasteel_to_nuggets.json +++ b/src/main/resources/data/botania/recipes/conversions/manasteel_to_nuggets.json @@ -5,7 +5,7 @@ }, "ingredients": [ { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/conversions/terrasteel_from_nugget.json b/src/main/resources/data/botania/recipes/conversions/terrasteel_from_nugget.json index 9b28e58d3..7f9029323 100644 --- a/src/main/resources/data/botania/recipes/conversions/terrasteel_from_nugget.json +++ b/src/main/resources/data/botania/recipes/conversions/terrasteel_from_nugget.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "I": { - "item": "#NUGGETTERRASTEEL" + "tag": "forge:nuggets/terrasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/conversions/terrasteel_to_nugget.json b/src/main/resources/data/botania/recipes/conversions/terrasteel_to_nugget.json index 668ba0a54..2b4c00b33 100644 --- a/src/main/resources/data/botania/recipes/conversions/terrasteel_to_nugget.json +++ b/src/main/resources/data/botania/recipes/conversions/terrasteel_to_nugget.json @@ -5,7 +5,7 @@ }, "ingredients": [ { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/corporea_spark.json b/src/main/resources/data/botania/recipes/corporea_spark.json index eacaf957e..296bf9485 100644 --- a/src/main/resources/data/botania/recipes/corporea_spark.json +++ b/src/main/resources/data/botania/recipes/corporea_spark.json @@ -7,10 +7,10 @@ "item": "botania:spark" }, { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/corporea_spark_master.json b/src/main/resources/data/botania/recipes/corporea_spark_master.json index c795d6c4e..b5f014b6a 100644 --- a/src/main/resources/data/botania/recipes/corporea_spark_master.json +++ b/src/main/resources/data/botania/recipes/corporea_spark_master.json @@ -7,7 +7,7 @@ "item": "botania:corporea_spark" }, { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/corporeacrystalcube.json b/src/main/resources/data/botania/recipes/corporeacrystalcube.json index a060dd39a..ea2ef2e4a 100644 --- a/src/main/resources/data/botania/recipes/corporeacrystalcube.json +++ b/src/main/resources/data/botania/recipes/corporeacrystalcube.json @@ -16,7 +16,7 @@ "item": "botania:elfglass" }, "W": { - "item": "#DREAMWOOD" + "item": "botania:dreamwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/corporeaindex.json b/src/main/resources/data/botania/recipes/corporeaindex.json index 6dfedc431..0d05f83e4 100644 --- a/src/main/resources/data/botania/recipes/corporeaindex.json +++ b/src/main/resources/data/botania/recipes/corporeaindex.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" }, "S": { "item": "botania:corporea_spark" }, "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, "O": { - "item": "#OBSIDIAN" + "item": "minecraft:obsidian" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/corporeainterceptor.json b/src/main/resources/data/botania/recipes/corporeainterceptor.json index 641a55ddc..92845a522 100644 --- a/src/main/resources/data/botania/recipes/corporeainterceptor.json +++ b/src/main/resources/data/botania/recipes/corporeainterceptor.json @@ -4,7 +4,7 @@ }, "ingredients": [ { - "item": "#BLOCKREDSTONE" + "tag": "forge:storage_blocks/redstone" }, { "item": "botania:corporea_spark" diff --git a/src/main/resources/data/botania/recipes/corporearetainer.json b/src/main/resources/data/botania/recipes/corporearetainer.json index 672279c55..345709d68 100644 --- a/src/main/resources/data/botania/recipes/corporearetainer.json +++ b/src/main/resources/data/botania/recipes/corporearetainer.json @@ -4,7 +4,7 @@ }, "ingredients": [ { - "item": "#CHESTWOOD" + "tag": "forge:chests/wooden" }, { "item": "botania:corporea_spark" diff --git a/src/main/resources/data/botania/recipes/cosmetic_32.json b/src/main/resources/data/botania/recipes/cosmetic_32.json index 9302c575f..e5d93e7db 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_32.json +++ b/src/main/resources/data/botania/recipes/cosmetic_32.json @@ -14,7 +14,7 @@ "item": "botania:tinypotato" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json b/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json index c0cb99084..dc9026fa2 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json +++ b/src/main/resources/data/botania/recipes/cosmetic_alien_antenna.json @@ -13,7 +13,7 @@ "item": "botania:dye_silver" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json b/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json index 978e2cdf9..a64151c08 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json +++ b/src/main/resources/data/botania/recipes/cosmetic_anaglyph_glasses.json @@ -13,7 +13,7 @@ "item": "botania:dye_cyan" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json b/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json index f21fa32db..b89dd51ac 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json +++ b/src/main/resources/data/botania/recipes/cosmetic_ancient_mask.json @@ -13,7 +13,7 @@ "item": "botania:dye_pink" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_black_bowtie.json b/src/main/resources/data/botania/recipes/cosmetic_black_bowtie.json index 87b15ce16..9cdb421c7 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_black_bowtie.json +++ b/src/main/resources/data/botania/recipes/cosmetic_black_bowtie.json @@ -13,7 +13,7 @@ "item": "botania:petal_white" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_black_tie.json b/src/main/resources/data/botania/recipes/cosmetic_black_tie.json index a43729627..8fc677624 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_black_tie.json +++ b/src/main/resources/data/botania/recipes/cosmetic_black_tie.json @@ -13,7 +13,7 @@ "item": "botania:petal_orange" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_blue_butterfly.json b/src/main/resources/data/botania/recipes/cosmetic_blue_butterfly.json index b88f700d4..bcf52ff7b 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_blue_butterfly.json +++ b/src/main/resources/data/botania/recipes/cosmetic_blue_butterfly.json @@ -13,7 +13,7 @@ "item": "botania:petal_purple" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json b/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json index 47fd8d079..efb795931 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json +++ b/src/main/resources/data/botania/recipes/cosmetic_botanist_emblem.json @@ -13,7 +13,7 @@ "item": "botania:dye_lime" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_cat_ears.json b/src/main/resources/data/botania/recipes/cosmetic_cat_ears.json index 18bc6c40f..6a0c2a1d6 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_cat_ears.json +++ b/src/main/resources/data/botania/recipes/cosmetic_cat_ears.json @@ -13,7 +13,7 @@ "item": "botania:petal_blue" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json b/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json index 0f4eb3e1e..ed11df481 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json +++ b/src/main/resources/data/botania/recipes/cosmetic_clock_eye.json @@ -13,7 +13,7 @@ "item": "botania:dye_orange" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json b/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json index cb2bdda55..56bb08cdc 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json +++ b/src/main/resources/data/botania/recipes/cosmetic_devil_horns.json @@ -13,7 +13,7 @@ "item": "botania:dye_light_blue" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_devil_tail.json b/src/main/resources/data/botania/recipes/cosmetic_devil_tail.json index ee7fe5498..6c5ce434f 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_devil_tail.json +++ b/src/main/resources/data/botania/recipes/cosmetic_devil_tail.json @@ -13,7 +13,7 @@ "item": "botania:petal_green" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json b/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json index 365eab7f3..b0ad08833 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json +++ b/src/main/resources/data/botania/recipes/cosmetic_eerie_mask.json @@ -13,7 +13,7 @@ "item": "botania:dye_gray" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_engineer_goggles.json b/src/main/resources/data/botania/recipes/cosmetic_engineer_goggles.json index 8a7eca7a4..a4408df50 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_engineer_goggles.json +++ b/src/main/resources/data/botania/recipes/cosmetic_engineer_goggles.json @@ -13,7 +13,7 @@ "item": "botania:petal_yellow" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_eyepatch.json b/src/main/resources/data/botania/recipes/cosmetic_eyepatch.json index 8f93f3e46..62a85697f 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_eyepatch.json +++ b/src/main/resources/data/botania/recipes/cosmetic_eyepatch.json @@ -13,7 +13,7 @@ "item": "botania:petal_lime" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_four_leaf_clover.json b/src/main/resources/data/botania/recipes/cosmetic_four_leaf_clover.json index 2e91aa814..0cbfa6a43 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_four_leaf_clover.json +++ b/src/main/resources/data/botania/recipes/cosmetic_four_leaf_clover.json @@ -13,7 +13,7 @@ "item": "botania:dye_white" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_googly_eyes.json b/src/main/resources/data/botania/recipes/cosmetic_googly_eyes.json index 1ce6a321e..6a1c429c2 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_googly_eyes.json +++ b/src/main/resources/data/botania/recipes/cosmetic_googly_eyes.json @@ -13,7 +13,7 @@ "item": "botania:petal_black" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json b/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json index 47d65d4e1..b1356cb54 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json +++ b/src/main/resources/data/botania/recipes/cosmetic_groucho_glasses.json @@ -13,7 +13,7 @@ "item": "botania:dye_blue" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json b/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json index 156d484d6..b32d6292d 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json +++ b/src/main/resources/data/botania/recipes/cosmetic_hyper_plus.json @@ -13,7 +13,7 @@ "item": "botania:dye_yellow" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_kamui_eye.json b/src/main/resources/data/botania/recipes/cosmetic_kamui_eye.json index b5060f549..ef900d745 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_kamui_eye.json +++ b/src/main/resources/data/botania/recipes/cosmetic_kamui_eye.json @@ -13,7 +13,7 @@ "item": "botania:petal_red" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json b/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json index c06925fb3..c401cf908 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json +++ b/src/main/resources/data/botania/recipes/cosmetic_lusitanic_shield.json @@ -13,7 +13,7 @@ "item": "botania:dye_green" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json b/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json index a67e9f121..85b1d5412 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json +++ b/src/main/resources/data/botania/recipes/cosmetic_orange_shades.json @@ -13,7 +13,7 @@ "item": "botania:dye_purple" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_pink_flower_bud.json b/src/main/resources/data/botania/recipes/cosmetic_pink_flower_bud.json index 9e0f81bcf..c2bfed832 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_pink_flower_bud.json +++ b/src/main/resources/data/botania/recipes/cosmetic_pink_flower_bud.json @@ -13,7 +13,7 @@ "item": "botania:petal_silver" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_polka_dotted_bows.json b/src/main/resources/data/botania/recipes/cosmetic_polka_dotted_bows.json index 7ed9904c0..96f6452ff 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_polka_dotted_bows.json +++ b/src/main/resources/data/botania/recipes/cosmetic_polka_dotted_bows.json @@ -13,7 +13,7 @@ "item": "botania:petal_cyan" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_puffy_scarf.json b/src/main/resources/data/botania/recipes/cosmetic_puffy_scarf.json index 15c4c7cf9..deff6ef6f 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_puffy_scarf.json +++ b/src/main/resources/data/botania/recipes/cosmetic_puffy_scarf.json @@ -13,7 +13,7 @@ "item": "botania:petal_light_blue" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json b/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json index e74d7a108..293d786fd 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json +++ b/src/main/resources/data/botania/recipes/cosmetic_questgiver_mark.json @@ -13,7 +13,7 @@ "item": "botania:dye_black" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_red_glasses.json b/src/main/resources/data/botania/recipes/cosmetic_red_glasses.json index 79515d8fa..0e8afad99 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_red_glasses.json +++ b/src/main/resources/data/botania/recipes/cosmetic_red_glasses.json @@ -13,7 +13,7 @@ "item": "botania:petal_magenta" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_red_ribbons.json b/src/main/resources/data/botania/recipes/cosmetic_red_ribbons.json index ff7bb2e87..469102ee0 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_red_ribbons.json +++ b/src/main/resources/data/botania/recipes/cosmetic_red_ribbons.json @@ -13,7 +13,7 @@ "item": "botania:petal_gray" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json b/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json index a922b461f..73391e2f6 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json +++ b/src/main/resources/data/botania/recipes/cosmetic_thick_eyebrows.json @@ -13,7 +13,7 @@ "item": "botania:dye_brown" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json b/src/main/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json index c020916f5..2646a9d50 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json +++ b/src/main/resources/data/botania/recipes/cosmetic_tiny_potato_mask.json @@ -13,7 +13,7 @@ "item": "botania:dye_red" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json b/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json index fb0c6127b..0aaa91865 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json +++ b/src/main/resources/data/botania/recipes/cosmetic_unicorn_horn.json @@ -13,7 +13,7 @@ "item": "botania:dye_magenta" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_wicked_eyepatch.json b/src/main/resources/data/botania/recipes/cosmetic_wicked_eyepatch.json index 0cfade08c..7466be8fb 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_wicked_eyepatch.json +++ b/src/main/resources/data/botania/recipes/cosmetic_wicked_eyepatch.json @@ -13,7 +13,7 @@ "item": "botania:petal_pink" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/cosmetic_witch_pin.json b/src/main/resources/data/botania/recipes/cosmetic_witch_pin.json index bc20a66fd..3a294e6a2 100644 --- a/src/main/resources/data/botania/recipes/cosmetic_witch_pin.json +++ b/src/main/resources/data/botania/recipes/cosmetic_witch_pin.json @@ -13,7 +13,7 @@ "item": "botania:petal_brown" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/craftcrate.json b/src/main/resources/data/botania/recipes/craftcrate.json index ea0052f09..98b5502dd 100644 --- a/src/main/resources/data/botania/recipes/craftcrate.json +++ b/src/main/resources/data/botania/recipes/craftcrate.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "C": { - "item": "#WORKBENCH" + "item": "minecraft:crafting_table" }, "W": { "item": "botania:dreamwood", diff --git a/src/main/resources/data/botania/recipes/craftinghalo.json b/src/main/resources/data/botania/recipes/craftinghalo.json index 0f5b29047..59e20b400 100644 --- a/src/main/resources/data/botania/recipes/craftinghalo.json +++ b/src/main/resources/data/botania/recipes/craftinghalo.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, "C": { - "item": "#WORKBENCH" + "item": "minecraft:crafting_table" }, "I": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/crystalbow.json b/src/main/resources/data/botania/recipes/crystalbow.json index 824df389a..d2c4c7776 100644 --- a/src/main/resources/data/botania/recipes/crystalbow.json +++ b/src/main/resources/data/botania/recipes/crystalbow.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dirtrod.json b/src/main/resources/data/botania/recipes/dirtrod.json index 183fb41e9..97c09413e 100644 --- a/src/main/resources/data/botania/recipes/dirtrod.json +++ b/src/main/resources/data/botania/recipes/dirtrod.json @@ -14,10 +14,10 @@ "data": 0 }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "E": { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/distributor.json b/src/main/resources/data/botania/recipes/distributor.json index 21824a569..93fee7b1d 100644 --- a/src/main/resources/data/botania/recipes/distributor.json +++ b/src/main/resources/data/botania/recipes/distributor.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/divacharm.json b/src/main/resources/data/botania/recipes/divacharm.json index d4f41a93a..76b07c0b5 100644 --- a/src/main/resources/data/botania/recipes/divacharm.json +++ b/src/main/resources/data/botania/recipes/divacharm.json @@ -13,13 +13,13 @@ "item": "botania:tinyplanet" }, "G": { - "item": "#INGOTGOLD" + "tag": "forge:ingots/gold" }, "H": { - "item": "#RUNEPRIDEB" + "tag": "botania:runes/pride" }, "L": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/diviningrod.json b/src/main/resources/data/botania/recipes/diviningrod.json index c2b402bf1..5697afa09 100644 --- a/src/main/resources/data/botania/recipes/diviningrod.json +++ b/src/main/resources/data/botania/recipes/diviningrod.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "D": { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dodgering.json b/src/main/resources/data/botania/recipes/dodgering.json index 189261bab..3dfd8cdf3 100644 --- a/src/main/resources/data/botania/recipes/dodgering.json +++ b/src/main/resources/data/botania/recipes/dodgering.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" }, "E": { - "item": "#GEMEMERALD" + "tag": "forge:gems/emerald" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dragonstone_block.json b/src/main/resources/data/botania/recipes/dragonstone_block.json index bdf69f978..a9c3596a4 100644 --- a/src/main/resources/data/botania/recipes/dragonstone_block.json +++ b/src/main/resources/data/botania/recipes/dragonstone_block.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "I": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dreamwood_1.json b/src/main/resources/data/botania/recipes/dreamwood_1.json index 24efc3d2e..b202fa62d 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_1.json +++ b/src/main/resources/data/botania/recipes/dreamwood_1.json @@ -6,7 +6,7 @@ }, "ingredients": [ { - "item": "#DREAMWOOD" + "item": "botania:dreamwood" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dreamwood_5.json b/src/main/resources/data/botania/recipes/dreamwood_5.json index 98ca69934..95154e87e 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_5.json +++ b/src/main/resources/data/botania/recipes/dreamwood_5.json @@ -5,10 +5,10 @@ }, "ingredients": [ { - "item": "#DREAMWOOD" + "item": "botania:dreamwood" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dreamwood_twig.json b/src/main/resources/data/botania/recipes/dreamwood_twig.json index 3b7b6f6cb..98385401f 100644 --- a/src/main/resources/data/botania/recipes/dreamwood_twig.json +++ b/src/main/resources/data/botania/recipes/dreamwood_twig.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "W": { - "item": "#DREAMWOOD" + "item": "botania:dreamwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/drum_canopy.json b/src/main/resources/data/botania/recipes/drum_canopy.json index 4158e1724..891b5a438 100644 --- a/src/main/resources/data/botania/recipes/drum_canopy.json +++ b/src/main/resources/data/botania/recipes/drum_canopy.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" }, "H": { "item": "botania:horn_leaves" }, "L": { - "item": "#LEATHER" + "item": "minecraft:leather" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/drum_gathering.json b/src/main/resources/data/botania/recipes/drum_gathering.json index 0c00c2340..3625dc50e 100644 --- a/src/main/resources/data/botania/recipes/drum_gathering.json +++ b/src/main/resources/data/botania/recipes/drum_gathering.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "W": { - "item": "#DREAMWOOD" + "item": "botania:dreamwood" }, "L": { - "item": "#LEATHER" + "item": "minecraft:leather" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/drum_wild.json b/src/main/resources/data/botania/recipes/drum_wild.json index 6efaee454..065036542 100644 --- a/src/main/resources/data/botania/recipes/drum_wild.json +++ b/src/main/resources/data/botania/recipes/drum_wild.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" }, "H": { "item": "botania:horn_grass" }, "L": { - "item": "#LEATHER" + "item": "minecraft:leather" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/dye_black.json b/src/main/resources/data/botania/recipes/dye_black.json index 2ead081a1..7052c6e32 100644 --- a/src/main/resources/data/botania/recipes/dye_black.json +++ b/src/main/resources/data/botania/recipes/dye_black.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_blue.json b/src/main/resources/data/botania/recipes/dye_blue.json index 1144712c6..ce12cfd51 100644 --- a/src/main/resources/data/botania/recipes/dye_blue.json +++ b/src/main/resources/data/botania/recipes/dye_blue.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_brown.json b/src/main/resources/data/botania/recipes/dye_brown.json index 62481e5ab..4762608ed 100644 --- a/src/main/resources/data/botania/recipes/dye_brown.json +++ b/src/main/resources/data/botania/recipes/dye_brown.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_cyan.json b/src/main/resources/data/botania/recipes/dye_cyan.json index 05a736357..5b4b40cce 100644 --- a/src/main/resources/data/botania/recipes/dye_cyan.json +++ b/src/main/resources/data/botania/recipes/dye_cyan.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_gray.json b/src/main/resources/data/botania/recipes/dye_gray.json index 44f553b7a..361397bc7 100644 --- a/src/main/resources/data/botania/recipes/dye_gray.json +++ b/src/main/resources/data/botania/recipes/dye_gray.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_green.json b/src/main/resources/data/botania/recipes/dye_green.json index 646d2668a..e31472ec7 100644 --- a/src/main/resources/data/botania/recipes/dye_green.json +++ b/src/main/resources/data/botania/recipes/dye_green.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_light_blue.json b/src/main/resources/data/botania/recipes/dye_light_blue.json index 86790d0ac..5f5396f86 100644 --- a/src/main/resources/data/botania/recipes/dye_light_blue.json +++ b/src/main/resources/data/botania/recipes/dye_light_blue.json @@ -10,11 +10,11 @@ "data": 1 }, { - "item": "#PETALLIGHTBLUE" + "tag": "botania:petals/lightblue" } ], { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_lime.json b/src/main/resources/data/botania/recipes/dye_lime.json index f601f9696..6a8d39c52 100644 --- a/src/main/resources/data/botania/recipes/dye_lime.json +++ b/src/main/resources/data/botania/recipes/dye_lime.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_magenta.json b/src/main/resources/data/botania/recipes/dye_magenta.json index 3edf2ce3c..ece05065c 100644 --- a/src/main/resources/data/botania/recipes/dye_magenta.json +++ b/src/main/resources/data/botania/recipes/dye_magenta.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_magenta_double.json b/src/main/resources/data/botania/recipes/dye_magenta_double.json index f4d3355d4..1ae39c05b 100644 --- a/src/main/resources/data/botania/recipes/dye_magenta_double.json +++ b/src/main/resources/data/botania/recipes/dye_magenta_double.json @@ -10,7 +10,7 @@ "data": 1 }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_orange.json b/src/main/resources/data/botania/recipes/dye_orange.json index f764e6707..7dd73c807 100644 --- a/src/main/resources/data/botania/recipes/dye_orange.json +++ b/src/main/resources/data/botania/recipes/dye_orange.json @@ -10,11 +10,11 @@ "data": 5 }, { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" } ], { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_pink.json b/src/main/resources/data/botania/recipes/dye_pink.json index 23fa72fa8..4591dc399 100644 --- a/src/main/resources/data/botania/recipes/dye_pink.json +++ b/src/main/resources/data/botania/recipes/dye_pink.json @@ -10,11 +10,11 @@ "data": 7 }, { - "item": "#PETALPINK" + "tag": "botania:petals/pink" } ], { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_pink_double.json b/src/main/resources/data/botania/recipes/dye_pink_double.json index 942f77679..da3b84913 100644 --- a/src/main/resources/data/botania/recipes/dye_pink_double.json +++ b/src/main/resources/data/botania/recipes/dye_pink_double.json @@ -10,7 +10,7 @@ "data": 5 }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_purple.json b/src/main/resources/data/botania/recipes/dye_purple.json index 1a84ce402..cbdd23a93 100644 --- a/src/main/resources/data/botania/recipes/dye_purple.json +++ b/src/main/resources/data/botania/recipes/dye_purple.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_red.json b/src/main/resources/data/botania/recipes/dye_red.json index 5f1d2b90d..f93c15bd6 100644 --- a/src/main/resources/data/botania/recipes/dye_red.json +++ b/src/main/resources/data/botania/recipes/dye_red.json @@ -14,11 +14,11 @@ "data": 4 }, { - "item": "#PETALRED" + "tag": "botania:petals/red" } ], { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_red_double.json b/src/main/resources/data/botania/recipes/dye_red_double.json index e14a0ed4e..795575334 100644 --- a/src/main/resources/data/botania/recipes/dye_red_double.json +++ b/src/main/resources/data/botania/recipes/dye_red_double.json @@ -10,7 +10,7 @@ "data": 4 }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_silver.json b/src/main/resources/data/botania/recipes/dye_silver.json index 05daff408..07c314a93 100644 --- a/src/main/resources/data/botania/recipes/dye_silver.json +++ b/src/main/resources/data/botania/recipes/dye_silver.json @@ -18,11 +18,11 @@ "data": 8 }, { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" } ], { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_white.json b/src/main/resources/data/botania/recipes/dye_white.json index 2a225eb9b..8e082bebf 100644 --- a/src/main/resources/data/botania/recipes/dye_white.json +++ b/src/main/resources/data/botania/recipes/dye_white.json @@ -5,10 +5,10 @@ "group": "botania:dye", "ingredients": [ { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_yellow.json b/src/main/resources/data/botania/recipes/dye_yellow.json index ef0aba873..939102a53 100644 --- a/src/main/resources/data/botania/recipes/dye_yellow.json +++ b/src/main/resources/data/botania/recipes/dye_yellow.json @@ -10,11 +10,11 @@ "data": 0 }, { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" } ], { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/dye_yellow_double.json b/src/main/resources/data/botania/recipes/dye_yellow_double.json index 76697ef73..b1bc5d8e3 100644 --- a/src/main/resources/data/botania/recipes/dye_yellow_double.json +++ b/src/main/resources/data/botania/recipes/dye_yellow_double.json @@ -10,7 +10,7 @@ "data": 0 }, { - "item": "#PESTLEANDMORTAR" + "item": "botania:pestle_and_mortar" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/elementium_block.json b/src/main/resources/data/botania/recipes/elementium_block.json index 9d617d31f..1b7e67bee 100644 --- a/src/main/resources/data/botania/recipes/elementium_block.json +++ b/src/main/resources/data/botania/recipes/elementium_block.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "I": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumaxe.json b/src/main/resources/data/botania/recipes/elementiumaxe.json index c75041b9b..93a4d44c0 100644 --- a/src/main/resources/data/botania/recipes/elementiumaxe.json +++ b/src/main/resources/data/botania/recipes/elementiumaxe.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "T": { - "item": "#DREAMWOODTWIG" + "item": "botania:dreamwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumboots.json b/src/main/resources/data/botania/recipes/elementiumboots.json index 6a2556837..3a3425c57 100644 --- a/src/main/resources/data/botania/recipes/elementiumboots.json +++ b/src/main/resources/data/botania/recipes/elementiumboots.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumchest.json b/src/main/resources/data/botania/recipes/elementiumchest.json index ebc47427a..3ae420d61 100644 --- a/src/main/resources/data/botania/recipes/elementiumchest.json +++ b/src/main/resources/data/botania/recipes/elementiumchest.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumhelm.json b/src/main/resources/data/botania/recipes/elementiumhelm.json index 57b9b1c26..9e87d40f4 100644 --- a/src/main/resources/data/botania/recipes/elementiumhelm.json +++ b/src/main/resources/data/botania/recipes/elementiumhelm.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumlegs.json b/src/main/resources/data/botania/recipes/elementiumlegs.json index 04551fabf..9c196e40b 100644 --- a/src/main/resources/data/botania/recipes/elementiumlegs.json +++ b/src/main/resources/data/botania/recipes/elementiumlegs.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumpick.json b/src/main/resources/data/botania/recipes/elementiumpick.json index 588804273..48667d076 100644 --- a/src/main/resources/data/botania/recipes/elementiumpick.json +++ b/src/main/resources/data/botania/recipes/elementiumpick.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "T": { - "item": "#DREAMWOODTWIG" + "item": "botania:dreamwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumshears.json b/src/main/resources/data/botania/recipes/elementiumshears.json index fa55669a8..ca623bc70 100644 --- a/src/main/resources/data/botania/recipes/elementiumshears.json +++ b/src/main/resources/data/botania/recipes/elementiumshears.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumshovel.json b/src/main/resources/data/botania/recipes/elementiumshovel.json index 8843b38ec..49f019a05 100644 --- a/src/main/resources/data/botania/recipes/elementiumshovel.json +++ b/src/main/resources/data/botania/recipes/elementiumshovel.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "T": { - "item": "#DREAMWOODTWIG" + "item": "botania:dreamwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elementiumsword.json b/src/main/resources/data/botania/recipes/elementiumsword.json index 619860ec0..07ccf0b40 100644 --- a/src/main/resources/data/botania/recipes/elementiumsword.json +++ b/src/main/resources/data/botania/recipes/elementiumsword.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "T": { - "item": "#DREAMWOODTWIG" + "item": "botania:dreamwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/elven_spreader.json b/src/main/resources/data/botania/recipes/elven_spreader.json index 02e160dd3..515aa8676 100644 --- a/src/main/resources/data/botania/recipes/elven_spreader.json +++ b/src/main/resources/data/botania/recipes/elven_spreader.json @@ -12,59 +12,59 @@ "key": { "P": [ { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, { - "item": "#PETALLIGHTBLUE" + "tag": "botania:petals/lightblue" }, { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, { - "item": "#PETALRED" + "tag": "botania:petals/red" }, { - "item": "#PETALBLACK" + "tag": "botania:petals/black" } ], "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "W": { - "item": "#DREAMWOOD" + "item": "botania:dreamwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/enderdagger.json b/src/main/resources/data/botania/recipes/enderdagger.json index 2f9aeccf8..13119df48 100644 --- a/src/main/resources/data/botania/recipes/enderdagger.json +++ b/src/main/resources/data/botania/recipes/enderdagger.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/endereyeblock.json b/src/main/resources/data/botania/recipes/endereyeblock.json index 99b1fa707..7ad8d1c6d 100644 --- a/src/main/resources/data/botania/recipes/endereyeblock.json +++ b/src/main/resources/data/botania/recipes/endereyeblock.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" }, "E": { "item": "minecraft:ender_eye" }, "O": { - "item": "#OBSIDIAN" + "item": "minecraft:obsidian" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/enderhand.json b/src/main/resources/data/botania/recipes/enderhand.json index 7e75c4bc3..c6ad78737 100644 --- a/src/main/resources/data/botania/recipes/enderhand.json +++ b/src/main/resources/data/botania/recipes/enderhand.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, "E": { "item": "minecraft:ender_chest" }, "L": { - "item": "#LEATHER" + "item": "minecraft:leather" }, "O": { - "item": "#OBSIDIAN" + "item": "minecraft:obsidian" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/exchangerod.json b/src/main/resources/data/botania/recipes/exchangerod.json index 096cea434..c67699506 100644 --- a/src/main/resources/data/botania/recipes/exchangerod.json +++ b/src/main/resources/data/botania/recipes/exchangerod.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#RUNESLOTHB" + "tag": "botania:runes/sloth" }, "S": { - "item": "#STONE" + "tag": "forge:stone" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/fertilizer_powder.json b/src/main/resources/data/botania/recipes/fertilizer_powder.json index 1e02bf691..238ee2c7b 100644 --- a/src/main/resources/data/botania/recipes/fertilizer_powder.json +++ b/src/main/resources/data/botania/recipes/fertilizer_powder.json @@ -17,16 +17,16 @@ "data": 15 }, { - "item": "#ALL_DYES" + "item": "#all_dyes" }, { - "item": "#ALL_DYES" + "item": "#all_dyes" }, { - "item": "#ALL_DYES" + "item": "#all_dyes" }, { - "item": "#ALL_DYES" + "item": "#all_dyes" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/firerod.json b/src/main/resources/data/botania/recipes/firerod.json index 72fa715d1..8d8929d0f 100644 --- a/src/main/resources/data/botania/recipes/firerod.json +++ b/src/main/resources/data/botania/recipes/firerod.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#RUNEFIREB" + "tag": "botania:runes/fire" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "F": { "item": "minecraft:blaze_powder" diff --git a/src/main/resources/data/botania/recipes/flare_chakram.json b/src/main/resources/data/botania/recipes/flare_chakram.json index 5c0d1c130..4ed6a8b91 100644 --- a/src/main/resources/data/botania/recipes/flare_chakram.json +++ b/src/main/resources/data/botania/recipes/flare_chakram.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, "B": { "item": "minecraft:blaze_powder" diff --git a/src/main/resources/data/botania/recipes/flighttiara_0.json b/src/main/resources/data/botania/recipes/flighttiara_0.json index ff52abff2..0de2d7b78 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_0.json +++ b/src/main/resources/data/botania/recipes/flighttiara_0.json @@ -11,16 +11,16 @@ "type": "forge:ore_shaped", "key": { "E": { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" }, "F": { - "item": "#FEATHER" + "item": "minecraft:feather" }, "I": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "L": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/flighttiara_1.json b/src/main/resources/data/botania/recipes/flighttiara_1.json index cbc485302..52e4d3117 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_1.json +++ b/src/main/resources/data/botania/recipes/flighttiara_1.json @@ -10,7 +10,7 @@ "data": 32767 }, { - "item": "#GEMQUARTZ" + "tag": "forge:gems/quartz" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/flighttiara_2.json b/src/main/resources/data/botania/recipes/flighttiara_2.json index c019b0128..92dc09838 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_2.json +++ b/src/main/resources/data/botania/recipes/flighttiara_2.json @@ -10,7 +10,7 @@ "data": 32767 }, { - "item": "#QUARTZDARK" + "item": "botania:quartz_dark" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/flighttiara_3.json b/src/main/resources/data/botania/recipes/flighttiara_3.json index 320a2bde6..a51ccfd92 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_3.json +++ b/src/main/resources/data/botania/recipes/flighttiara_3.json @@ -10,7 +10,7 @@ "data": 32767 }, { - "item": "#QUARTZMANA" + "item": "botania:quartz_mana" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/flighttiara_4.json b/src/main/resources/data/botania/recipes/flighttiara_4.json index 2cc6557d3..941ebcb5e 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_4.json +++ b/src/main/resources/data/botania/recipes/flighttiara_4.json @@ -10,7 +10,7 @@ "data": 32767 }, { - "item": "#QUARTZBLAZE" + "item": "botania:quartz_blaze" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/flighttiara_5.json b/src/main/resources/data/botania/recipes/flighttiara_5.json index 97a893d0a..2a926e04d 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_5.json +++ b/src/main/resources/data/botania/recipes/flighttiara_5.json @@ -10,7 +10,7 @@ "data": 32767 }, { - "item": "#QUARTZLAVENDER" + "item": "botania:quartz_lavender" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/flighttiara_6.json b/src/main/resources/data/botania/recipes/flighttiara_6.json index c4b9b0983..fc4b6d4d6 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_6.json +++ b/src/main/resources/data/botania/recipes/flighttiara_6.json @@ -10,7 +10,7 @@ "data": 32767 }, { - "item": "#QUARTZRED" + "item": "botania:quartz_red" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/flighttiara_7.json b/src/main/resources/data/botania/recipes/flighttiara_7.json index c88699d91..8bacf3dea 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_7.json +++ b/src/main/resources/data/botania/recipes/flighttiara_7.json @@ -10,7 +10,7 @@ "data": 32767 }, { - "item": "#QUARTZELVEN" + "item": "botania:quartz_elven" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/flighttiara_8.json b/src/main/resources/data/botania/recipes/flighttiara_8.json index 2c076dcad..19fdb2a7d 100644 --- a/src/main/resources/data/botania/recipes/flighttiara_8.json +++ b/src/main/resources/data/botania/recipes/flighttiara_8.json @@ -10,7 +10,7 @@ "data": 32767 }, { - "item": "#QUARTZSUNNY" + "item": "botania:quartz_sunny" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/flowerbag.json b/src/main/resources/data/botania/recipes/flowerbag.json index e50d9710f..6cf0e4949 100644 --- a/src/main/resources/data/botania/recipes/flowerbag.json +++ b/src/main/resources/data/botania/recipes/flowerbag.json @@ -10,11 +10,10 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "#ALL_PETALS" + "tag": "botania:petals" }, "W": { - "item": "minecraft:wool", - "data": 32767 + "tag": "minecraft:wools" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/foresteye.json b/src/main/resources/data/botania/recipes/foresteye.json index 8660694fc..0230a45e7 100644 --- a/src/main/resources/data/botania/recipes/foresteye.json +++ b/src/main/resources/data/botania/recipes/foresteye.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "E": { "item": "minecraft:ender_eye" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/gaia_ingot.json b/src/main/resources/data/botania/recipes/gaia_ingot.json index dbb8375cb..07879c8fa 100644 --- a/src/main/resources/data/botania/recipes/gaia_ingot.json +++ b/src/main/resources/data/botania/recipes/gaia_ingot.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "I": { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/gaia_spreader.json b/src/main/resources/data/botania/recipes/gaia_spreader.json index 98a9a64a7..e38e9d9bb 100644 --- a/src/main/resources/data/botania/recipes/gaia_spreader.json +++ b/src/main/resources/data/botania/recipes/gaia_spreader.json @@ -12,10 +12,10 @@ "item": "botania:elven_spreader" }, "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, "E": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json index 28a3eb911..fc9db1c82 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock.json @@ -16,7 +16,7 @@ "type": "forge:ore_shaped", "key": { "B": { - "item": "#POWDERBLAZE" + "item": "minecraft:blaze_powder" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json index 46fe6dc4c..d99304dba 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/blazeblock_deconstruct.json @@ -11,7 +11,7 @@ }, "ingredients": [ { - "item": "#BLOCKBLAZE" + "item": "botania:blaze_block" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json b/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json index 8281dfe84..cbb62aeb8 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/cocoon.json @@ -22,7 +22,7 @@ "item": "botania:felpumpkin" }, "I": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json b/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json index f9a0385fb..99fc7042c 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/end_portal_frame.json @@ -14,10 +14,10 @@ "type": "forge:ore_shaped", "key": { "G": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "O": { - "item": "#OBSIDIAN" + "item": "minecraft:obsidian" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json b/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json index 5faf15418..4d91ed7ed 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/fertilizer_powder.json @@ -11,20 +11,19 @@ }, "ingredients": [ { - "item": "minecraft:dye", - "data": 15 + "item": "minecraft:bone_meal" }, { - "item": "#ALL_DYES" + "item": "#all_dyes" }, { - "item": "#ALL_DYES" + "item": "#all_dyes" }, { - "item": "#ALL_DYES" + "item": "#all_dyes" }, { - "item": "#ALL_DYES" + "item": "#all_dyes" } ], "type": "minecraft:crafting_shapeless" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json b/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json index ff7b22c04..2fff4d663 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/mana_spreader.json @@ -18,59 +18,59 @@ "key": { "P": [ { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, { - "item": "#PETALLIGHTBLUE" + "tag": "botania:petals/lightblue" }, { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, { - "item": "#PETALRED" + "tag": "botania:petals/red" }, { - "item": "#PETALBLACK" + "tag": "botania:petals/black" } ], "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" }, "G": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json b/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json index 2873ce83e..86df7a4e7 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/pebble_to_cobblestone.json @@ -10,16 +10,16 @@ }, "ingredients": [ { - "item": "#PEBBLE" + "item": "botania:pebble" }, { - "item": "#PEBBLE" + "item": "botania:pebble" }, { - "item": "#PEBBLE" + "item": "botania:pebble" }, { - "item": "#PEBBLE" + "item": "botania:pebble" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_fertilizer.json b/src/main/resources/data/botania/recipes/garden_of_glass/root_to_fertilizer.json index e6ba2c1d3..507f067f1 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_fertilizer.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/root_to_fertilizer.json @@ -10,8 +10,8 @@ }, "ingredients": [ { - "item": "#LIVINGROOT" + "item": "botania:living_root" } ], - "type": "forge:ore_shapeless" + "type": "minecraft:crafting_shapeless" } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json b/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json index 23acc430a..0b6998e49 100644 --- a/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json +++ b/src/main/resources/data/botania/recipes/garden_of_glass/root_to_sapling.json @@ -11,16 +11,16 @@ }, "ingredients": [ { - "item": "#LIVINGROOT" + "item": "botania:living_root" }, { - "item": "#LIVINGROOT" + "item": "botania:living_root" }, { - "item": "#LIVINGROOT" + "item": "botania:living_root" }, { - "item": "#LIVINGROOT" + "item": "botania:living_root" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/glasspick.json b/src/main/resources/data/botania/recipes/glasspick.json index 0785ade38..97432ba2a 100644 --- a/src/main/resources/data/botania/recipes/glasspick.json +++ b/src/main/resources/data/botania/recipes/glasspick.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "G": { - "item": "#BLOCKGLASSCOLORLESS" + "item": "minecraft:glass" }, "I": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/goddesscharm.json b/src/main/resources/data/botania/recipes/goddesscharm.json index a97fc701e..1085222ea 100644 --- a/src/main/resources/data/botania/recipes/goddesscharm.json +++ b/src/main/resources/data/botania/recipes/goddesscharm.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "A": { - "item": "#RUNEWATERB" + "tag": "botania:runes/water" }, "S": { - "item": "#RUNESPRINGB" + "tag": "botania:runes/spring" }, "D": { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/gravityrod.json b/src/main/resources/data/botania/recipes/gravityrod.json index 98719887d..9acab7127 100644 --- a/src/main/resources/data/botania/recipes/gravityrod.json +++ b/src/main/resources/data/botania/recipes/gravityrod.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "T": { - "item": "#DREAMWOODTWIG" + "item": "botania:dreamwood_twig" }, "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, "W": { - "item": "#CROPWHEAT" + "item": "minecraft:wheat" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/holycloak.json b/src/main/resources/data/botania/recipes/holycloak.json index b2cf8ca43..bea8ec360 100644 --- a/src/main/resources/data/botania/recipes/holycloak.json +++ b/src/main/resources/data/botania/recipes/holycloak.json @@ -10,14 +10,14 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "W": { "item": "minecraft:wool", "data": 0 }, "G": { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/horn_grass.json b/src/main/resources/data/botania/recipes/horn_grass.json index 39e588935..75f80ea1e 100644 --- a/src/main/resources/data/botania/recipes/horn_grass.json +++ b/src/main/resources/data/botania/recipes/horn_grass.json @@ -13,7 +13,7 @@ "item": "botania:seeds_grass" }, "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/horn_leaves.json b/src/main/resources/data/botania/recipes/horn_leaves.json index 08fdf16fb..f5d1809d6 100644 --- a/src/main/resources/data/botania/recipes/horn_leaves.json +++ b/src/main/resources/data/botania/recipes/horn_leaves.json @@ -7,7 +7,7 @@ "item": "botania:horn_grass" }, { - "item": "#TREELEAVES" + "tag": "minecraft:leaves" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/hourglass.json b/src/main/resources/data/botania/recipes/hourglass.json index 66db808e1..97ccc8026 100644 --- a/src/main/resources/data/botania/recipes/hourglass.json +++ b/src/main/resources/data/botania/recipes/hourglass.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" }, "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "G": { - "item": "#INGOTGOLD" + "tag": "forge:ingots/gold" }, "M": { "item": "botania:managlass" diff --git a/src/main/resources/data/botania/recipes/icependant.json b/src/main/resources/data/botania/recipes/icependant.json index abff4870c..e1957cf74 100644 --- a/src/main/resources/data/botania/recipes/icependant.json +++ b/src/main/resources/data/botania/recipes/icependant.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#RUNEWATERB" + "tag": "botania:runes/water" }, "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" }, "W": { - "item": "#RUNEWINTERB" + "tag": "botania:runes/winter" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/incenseplate.json b/src/main/resources/data/botania/recipes/incenseplate.json index 5f897b31d..29617f2ee 100644 --- a/src/main/resources/data/botania/recipes/incenseplate.json +++ b/src/main/resources/data/botania/recipes/incenseplate.json @@ -12,7 +12,7 @@ "data": 0 }, "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/incensestick.json b/src/main/resources/data/botania/recipes/incensestick.json index bfc2679fb..cc3d985c6 100644 --- a/src/main/resources/data/botania/recipes/incensestick.json +++ b/src/main/resources/data/botania/recipes/incensestick.json @@ -13,7 +13,7 @@ "item": "minecraft:blaze_powder" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "G": { "item": "minecraft:ghast_tear" diff --git a/src/main/resources/data/botania/recipes/invisibilitycloak.json b/src/main/resources/data/botania/recipes/invisibilitycloak.json index 33b6aab30..c8ee8b77f 100644 --- a/src/main/resources/data/botania/recipes/invisibilitycloak.json +++ b/src/main/resources/data/botania/recipes/invisibilitycloak.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, "C": { "item": "minecraft:prismarine_crystals" diff --git a/src/main/resources/data/botania/recipes/itemfinder.json b/src/main/resources/data/botania/recipes/itemfinder.json index 5d75da97c..8c9f9b815 100644 --- a/src/main/resources/data/botania/recipes/itemfinder.json +++ b/src/main/resources/data/botania/recipes/itemfinder.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "E": { - "item": "#GEMEMERALD" + "tag": "forge:gems/emerald" }, "I": { - "item": "#INGOTIRON" + "tag": "forge:ingots/iron" }, "Y": { "item": "minecraft:ender_eye" diff --git a/src/main/resources/data/botania/recipes/keepivy.json b/src/main/resources/data/botania/recipes/keepivy.json index c2139232b..4541aeab7 100644 --- a/src/main/resources/data/botania/recipes/keepivy.json +++ b/src/main/resources/data/botania/recipes/keepivy.json @@ -4,13 +4,13 @@ }, "ingredients": [ { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { - "item": "#VINE" + "item": "minecraft:vine" }, { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/knockbackbelt.json b/src/main/resources/data/botania/recipes/knockbackbelt.json index cf0c143d6..5f4f989e9 100644 --- a/src/main/resources/data/botania/recipes/knockbackbelt.json +++ b/src/main/resources/data/botania/recipes/knockbackbelt.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#RUNEFIREB" + "tag": "botania:runes/fire" }, "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "E": { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" }, "L": { - "item": "#LEATHER" + "item": "minecraft:leather" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/laputashard_0.json b/src/main/resources/data/botania/recipes/laputashard_0.json index 7f3f00ada..c6f7d901c 100644 --- a/src/main/resources/data/botania/recipes/laputashard_0.json +++ b/src/main/resources/data/botania/recipes/laputashard_0.json @@ -11,19 +11,19 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#GEMPRISMARINE" + "tag": "forge:gems/prismarine" }, "A": { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" }, "S": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, "E": { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" }, "F": [ { diff --git a/src/main/resources/data/botania/recipes/laputashard_1.json b/src/main/resources/data/botania/recipes/laputashard_1.json index 801cb1148..4516716b3 100644 --- a/src/main/resources/data/botania/recipes/laputashard_1.json +++ b/src/main/resources/data/botania/recipes/laputashard_1.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_10.json b/src/main/resources/data/botania/recipes/laputashard_10.json index 7d0da523b..19c24dd99 100644 --- a/src/main/resources/data/botania/recipes/laputashard_10.json +++ b/src/main/resources/data/botania/recipes/laputashard_10.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_11.json b/src/main/resources/data/botania/recipes/laputashard_11.json index abf24c578..f5c2b4f67 100644 --- a/src/main/resources/data/botania/recipes/laputashard_11.json +++ b/src/main/resources/data/botania/recipes/laputashard_11.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_12.json b/src/main/resources/data/botania/recipes/laputashard_12.json index 40e1a6dfe..0ccc24b57 100644 --- a/src/main/resources/data/botania/recipes/laputashard_12.json +++ b/src/main/resources/data/botania/recipes/laputashard_12.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_13.json b/src/main/resources/data/botania/recipes/laputashard_13.json index 85e61c606..2c6f08260 100644 --- a/src/main/resources/data/botania/recipes/laputashard_13.json +++ b/src/main/resources/data/botania/recipes/laputashard_13.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_14.json b/src/main/resources/data/botania/recipes/laputashard_14.json index 95f2a86f4..1e0c6e067 100644 --- a/src/main/resources/data/botania/recipes/laputashard_14.json +++ b/src/main/resources/data/botania/recipes/laputashard_14.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_15.json b/src/main/resources/data/botania/recipes/laputashard_15.json index 7fbae5a20..bd552c975 100644 --- a/src/main/resources/data/botania/recipes/laputashard_15.json +++ b/src/main/resources/data/botania/recipes/laputashard_15.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_16.json b/src/main/resources/data/botania/recipes/laputashard_16.json index 01277c9b8..6a105006f 100644 --- a/src/main/resources/data/botania/recipes/laputashard_16.json +++ b/src/main/resources/data/botania/recipes/laputashard_16.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_17.json b/src/main/resources/data/botania/recipes/laputashard_17.json index 9ec886aee..033470331 100644 --- a/src/main/resources/data/botania/recipes/laputashard_17.json +++ b/src/main/resources/data/botania/recipes/laputashard_17.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_18.json b/src/main/resources/data/botania/recipes/laputashard_18.json index 3ccbc70d0..7bf8b9e49 100644 --- a/src/main/resources/data/botania/recipes/laputashard_18.json +++ b/src/main/resources/data/botania/recipes/laputashard_18.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_19.json b/src/main/resources/data/botania/recipes/laputashard_19.json index 445c6f336..c3b5d223c 100644 --- a/src/main/resources/data/botania/recipes/laputashard_19.json +++ b/src/main/resources/data/botania/recipes/laputashard_19.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_2.json b/src/main/resources/data/botania/recipes/laputashard_2.json index e8cc40aaf..5a7df0259 100644 --- a/src/main/resources/data/botania/recipes/laputashard_2.json +++ b/src/main/resources/data/botania/recipes/laputashard_2.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_3.json b/src/main/resources/data/botania/recipes/laputashard_3.json index f21a28f3f..eafaf7dfe 100644 --- a/src/main/resources/data/botania/recipes/laputashard_3.json +++ b/src/main/resources/data/botania/recipes/laputashard_3.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_4.json b/src/main/resources/data/botania/recipes/laputashard_4.json index eb88b7834..2c5ecf3b8 100644 --- a/src/main/resources/data/botania/recipes/laputashard_4.json +++ b/src/main/resources/data/botania/recipes/laputashard_4.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_5.json b/src/main/resources/data/botania/recipes/laputashard_5.json index 6e218973d..41fafedea 100644 --- a/src/main/resources/data/botania/recipes/laputashard_5.json +++ b/src/main/resources/data/botania/recipes/laputashard_5.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_6.json b/src/main/resources/data/botania/recipes/laputashard_6.json index 5a6922541..7f7948f37 100644 --- a/src/main/resources/data/botania/recipes/laputashard_6.json +++ b/src/main/resources/data/botania/recipes/laputashard_6.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_7.json b/src/main/resources/data/botania/recipes/laputashard_7.json index f3fb26d91..466cc7b04 100644 --- a/src/main/resources/data/botania/recipes/laputashard_7.json +++ b/src/main/resources/data/botania/recipes/laputashard_7.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_8.json b/src/main/resources/data/botania/recipes/laputashard_8.json index 89010195a..a7a27d57d 100644 --- a/src/main/resources/data/botania/recipes/laputashard_8.json +++ b/src/main/resources/data/botania/recipes/laputashard_8.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/laputashard_9.json b/src/main/resources/data/botania/recipes/laputashard_9.json index 407d9a3d9..1490dedea 100644 --- a/src/main/resources/data/botania/recipes/laputashard_9.json +++ b/src/main/resources/data/botania/recipes/laputashard_9.json @@ -6,7 +6,7 @@ "group": "botania:laputashard_upgrade", "ingredients": [ { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, { "item": "botania:laputashard", diff --git a/src/main/resources/data/botania/recipes/lavapendant.json b/src/main/resources/data/botania/recipes/lavapendant.json index 26b66627b..3a0f41f45 100644 --- a/src/main/resources/data/botania/recipes/lavapendant.json +++ b/src/main/resources/data/botania/recipes/lavapendant.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" }, "D": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "F": { - "item": "#RUNEFIREB" + "tag": "botania:runes/fire" }, "M": { - "item": "#RUNESUMMERB" + "tag": "botania:runes/summer" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_bounce.json b/src/main/resources/data/botania/recipes/lens_bounce.json index 0567a1499..3d13bb4b3 100644 --- a/src/main/resources/data/botania/recipes/lens_bounce.json +++ b/src/main/resources/data/botania/recipes/lens_bounce.json @@ -7,7 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "#RUNESUMMERB" + "tag": "botania:runes/summer" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_damage.json b/src/main/resources/data/botania/recipes/lens_damage.json index b7464481d..b138de46f 100644 --- a/src/main/resources/data/botania/recipes/lens_damage.json +++ b/src/main/resources/data/botania/recipes/lens_damage.json @@ -7,7 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "#RUNEWRATHB" + "tag": "botania:runes/wrath" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_efficiency.json b/src/main/resources/data/botania/recipes/lens_efficiency.json index bc7198ebb..1dc337c2e 100644 --- a/src/main/resources/data/botania/recipes/lens_efficiency.json +++ b/src/main/resources/data/botania/recipes/lens_efficiency.json @@ -7,7 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "#RUNEWATERB" + "tag": "botania:runes/water" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_explosive.json b/src/main/resources/data/botania/recipes/lens_explosive.json index 2365a9e52..c92eaeb02 100644 --- a/src/main/resources/data/botania/recipes/lens_explosive.json +++ b/src/main/resources/data/botania/recipes/lens_explosive.json @@ -7,7 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "#RUNEENVYB" + "tag": "botania:runes/envy" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_firework.json b/src/main/resources/data/botania/recipes/lens_firework.json index 9c97005ec..b8327248e 100644 --- a/src/main/resources/data/botania/recipes/lens_firework.json +++ b/src/main/resources/data/botania/recipes/lens_firework.json @@ -10,7 +10,7 @@ "item": "minecraft:fireworks" }, { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_flare.json b/src/main/resources/data/botania/recipes/lens_flare.json index 4e929632a..5ac25c311 100644 --- a/src/main/resources/data/botania/recipes/lens_flare.json +++ b/src/main/resources/data/botania/recipes/lens_flare.json @@ -10,7 +10,7 @@ "item": "botania:elfglass" }, { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_gravity.json b/src/main/resources/data/botania/recipes/lens_gravity.json index 84d5bb7ec..6db5395ef 100644 --- a/src/main/resources/data/botania/recipes/lens_gravity.json +++ b/src/main/resources/data/botania/recipes/lens_gravity.json @@ -7,7 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "#RUNEWINTERB" + "tag": "botania:runes/winter" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_influence.json b/src/main/resources/data/botania/recipes/lens_influence.json index 2113d5ade..0c7023a36 100644 --- a/src/main/resources/data/botania/recipes/lens_influence.json +++ b/src/main/resources/data/botania/recipes/lens_influence.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#GEMPRISMARINE" + "tag": "forge:gems/prismarine" }, "R": { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" }, "L": { "item": "botania:lens_normal" diff --git a/src/main/resources/data/botania/recipes/lens_light.json b/src/main/resources/data/botania/recipes/lens_light.json index cc8a4f23e..4c49d968a 100644 --- a/src/main/resources/data/botania/recipes/lens_light.json +++ b/src/main/resources/data/botania/recipes/lens_light.json @@ -13,7 +13,7 @@ "item": "minecraft:fire_charge" }, "G": { - "item": "#GLOWSTONE" + "item": "minecraft:glowstone" }, "L": { "item": "botania:lens_normal" diff --git a/src/main/resources/data/botania/recipes/lens_light_alt.json b/src/main/resources/data/botania/recipes/lens_light_alt.json index 3a1297ebb..da66d101c 100644 --- a/src/main/resources/data/botania/recipes/lens_light_alt.json +++ b/src/main/resources/data/botania/recipes/lens_light_alt.json @@ -13,7 +13,7 @@ "item": "minecraft:fire_charge" }, "G": { - "item": "#GLOWSTONE" + "item": "minecraft:glowstone" }, "L": { "item": "botania:lens_normal" diff --git a/src/main/resources/data/botania/recipes/lens_magnet.json b/src/main/resources/data/botania/recipes/lens_magnet.json index e300b737b..87d5497be 100644 --- a/src/main/resources/data/botania/recipes/lens_magnet.json +++ b/src/main/resources/data/botania/recipes/lens_magnet.json @@ -7,10 +7,10 @@ "item": "botania:lens_normal" }, { - "item": "#INGOTIRON" + "tag": "forge:ingots/iron" }, { - "item": "#INGOTGOLD" + "tag": "forge:ingots/gold" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_messenger.json b/src/main/resources/data/botania/recipes/lens_messenger.json index 5590ffe8e..10b697e3e 100644 --- a/src/main/resources/data/botania/recipes/lens_messenger.json +++ b/src/main/resources/data/botania/recipes/lens_messenger.json @@ -10,7 +10,7 @@ "type": "minecraft:crafting_shaped", "key": { "P": { - "item": "#PAPER" + "item": "minecraft:paper" }, "L": { "item": "botania:lens_normal" diff --git a/src/main/resources/data/botania/recipes/lens_mine.json b/src/main/resources/data/botania/recipes/lens_mine.json index 857018bb6..546d624eb 100644 --- a/src/main/resources/data/botania/recipes/lens_mine.json +++ b/src/main/resources/data/botania/recipes/lens_mine.json @@ -13,10 +13,10 @@ "item": "minecraft:piston" }, "A": { - "item": "#GEMLAPIS" + "tag": "forge:gems/lapis" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" }, "L": { "item": "botania:lens_normal" diff --git a/src/main/resources/data/botania/recipes/lens_normal_glass_block.json b/src/main/resources/data/botania/recipes/lens_normal_glass_block.json index c197569df..08c99fb45 100644 --- a/src/main/resources/data/botania/recipes/lens_normal_glass_block.json +++ b/src/main/resources/data/botania/recipes/lens_normal_glass_block.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "G": { - "item": "#BLOCKGLASSCOLORLESS" + "item": "minecraft:glass" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json b/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json index 41b7f19bc..5e7ac89db 100644 --- a/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json +++ b/src/main/resources/data/botania/recipes/lens_normal_glass_pane.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "G": { - "item": "#PANEGLASSCOLORLESS" + "item": "minecraft:glass_pane" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/lens_paint.json b/src/main/resources/data/botania/recipes/lens_paint.json index 02620e92a..dc303f424 100644 --- a/src/main/resources/data/botania/recipes/lens_paint.json +++ b/src/main/resources/data/botania/recipes/lens_paint.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "W": { "item": "minecraft:wool", diff --git a/src/main/resources/data/botania/recipes/lens_power.json b/src/main/resources/data/botania/recipes/lens_power.json index 5247765a8..f0b9a5555 100644 --- a/src/main/resources/data/botania/recipes/lens_power.json +++ b/src/main/resources/data/botania/recipes/lens_power.json @@ -7,7 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "#RUNEFIREB" + "tag": "botania:runes/fire" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_redirect.json b/src/main/resources/data/botania/recipes/lens_redirect.json index 36222904f..3e7398800 100644 --- a/src/main/resources/data/botania/recipes/lens_redirect.json +++ b/src/main/resources/data/botania/recipes/lens_redirect.json @@ -7,10 +7,10 @@ "item": "botania:lens_normal" }, { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" }, { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_speed.json b/src/main/resources/data/botania/recipes/lens_speed.json index e9de52bac..8758d9b7c 100644 --- a/src/main/resources/data/botania/recipes/lens_speed.json +++ b/src/main/resources/data/botania/recipes/lens_speed.json @@ -7,7 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_time.json b/src/main/resources/data/botania/recipes/lens_time.json index 752004b2e..5edd4efe9 100644 --- a/src/main/resources/data/botania/recipes/lens_time.json +++ b/src/main/resources/data/botania/recipes/lens_time.json @@ -7,7 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_tripwire.json b/src/main/resources/data/botania/recipes/lens_tripwire.json index 2931f3480..db9f72576 100644 --- a/src/main/resources/data/botania/recipes/lens_tripwire.json +++ b/src/main/resources/data/botania/recipes/lens_tripwire.json @@ -10,7 +10,7 @@ "item": "minecraft:tripwire_hook" }, { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_warp.json b/src/main/resources/data/botania/recipes/lens_warp.json index 70df27d14..e8d52083e 100644 --- a/src/main/resources/data/botania/recipes/lens_warp.json +++ b/src/main/resources/data/botania/recipes/lens_warp.json @@ -7,7 +7,7 @@ "item": "botania:lens_normal" }, { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lens_weight.json b/src/main/resources/data/botania/recipes/lens_weight.json index 196e41b96..bc49e445e 100644 --- a/src/main/resources/data/botania/recipes/lens_weight.json +++ b/src/main/resources/data/botania/recipes/lens_weight.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#GEMPRISMARINE" + "tag": "forge:gems/prismarine" }, "R": { - "item": "#RUNEWATERB" + "tag": "botania:runes/water" }, "L": { "item": "botania:lens_normal" diff --git a/src/main/resources/data/botania/recipes/lexicon.json b/src/main/resources/data/botania/recipes/lexicon.json index b293d4458..53b7d4c46 100644 --- a/src/main/resources/data/botania/recipes/lexicon.json +++ b/src/main/resources/data/botania/recipes/lexicon.json @@ -4,7 +4,7 @@ }, "ingredients": [ { - "item": "#TREESAPLING" + "tag": "minecraft:saplings" }, { "item": "minecraft:book" diff --git a/src/main/resources/data/botania/recipes/lightlauncher.json b/src/main/resources/data/botania/recipes/lightlauncher.json index d1017e96a..391688695 100644 --- a/src/main/resources/data/botania/recipes/lightlauncher.json +++ b/src/main/resources/data/botania/recipes/lightlauncher.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "D": { - "item": "#DREAMWOOD" + "item": "botania:dreamwood" }, "L": { "item": "botania:lightrelay", diff --git a/src/main/resources/data/botania/recipes/lightrelay_0.json b/src/main/resources/data/botania/recipes/lightrelay_0.json index 5e76cb693..f5b561cee 100644 --- a/src/main/resources/data/botania/recipes/lightrelay_0.json +++ b/src/main/resources/data/botania/recipes/lightrelay_0.json @@ -5,16 +5,16 @@ }, "ingredients": [ { - "item": "#BREDSTRING" + "item": "botania:red_string" }, { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/lightrelay_1.json b/src/main/resources/data/botania/recipes/lightrelay_1.json index e3f81e4ec..384125871 100644 --- a/src/main/resources/data/botania/recipes/lightrelay_1.json +++ b/src/main/resources/data/botania/recipes/lightrelay_1.json @@ -9,7 +9,7 @@ "data": 0 }, { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/livingrock_1.json b/src/main/resources/data/botania/recipes/livingrock_1.json index 6678b1697..99c762441 100644 --- a/src/main/resources/data/botania/recipes/livingrock_1.json +++ b/src/main/resources/data/botania/recipes/livingrock_1.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingrock_3.json b/src/main/resources/data/botania/recipes/livingrock_3.json index a79f023b1..a660577c4 100644 --- a/src/main/resources/data/botania/recipes/livingrock_3.json +++ b/src/main/resources/data/botania/recipes/livingrock_3.json @@ -10,7 +10,7 @@ "data": 1 }, { - "item": "#COBBLESTONE" + "tag": "forge:cobblestone" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/livingwood_1.json b/src/main/resources/data/botania/recipes/livingwood_1.json index 087c98989..023608782 100644 --- a/src/main/resources/data/botania/recipes/livingwood_1.json +++ b/src/main/resources/data/botania/recipes/livingwood_1.json @@ -6,7 +6,7 @@ }, "ingredients": [ { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/livingwood_5.json b/src/main/resources/data/botania/recipes/livingwood_5.json index 29fc0a3f9..a7343c4a1 100644 --- a/src/main/resources/data/botania/recipes/livingwood_5.json +++ b/src/main/resources/data/botania/recipes/livingwood_5.json @@ -5,10 +5,10 @@ }, "ingredients": [ { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/livingwood_twig.json b/src/main/resources/data/botania/recipes/livingwood_twig.json index 2bb006c0a..014bce6cf 100644 --- a/src/main/resources/data/botania/recipes/livingwood_twig.json +++ b/src/main/resources/data/botania/recipes/livingwood_twig.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/livingwoodbow.json b/src/main/resources/data/botania/recipes/livingwoodbow.json index e471341c7..70f702d8d 100644 --- a/src/main/resources/data/botania/recipes/livingwoodbow.json +++ b/src/main/resources/data/botania/recipes/livingwoodbow.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/magnetring.json b/src/main/resources/data/botania/recipes/magnetring.json index 6ecc0a516..87444ce42 100644 --- a/src/main/resources/data/botania/recipes/magnetring.json +++ b/src/main/resources/data/botania/recipes/magnetring.json @@ -13,7 +13,7 @@ "item": "botania:lens_magnet" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/magnetringgreater.json b/src/main/resources/data/botania/recipes/magnetringgreater.json index 4ef926bae..c9f3bef94 100644 --- a/src/main/resources/data/botania/recipes/magnetringgreater.json +++ b/src/main/resources/data/botania/recipes/magnetringgreater.json @@ -4,7 +4,7 @@ }, "ingredients": [ { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" }, { "item": "botania:magnetring" diff --git a/src/main/resources/data/botania/recipes/mana_diamond_block.json b/src/main/resources/data/botania/recipes/mana_diamond_block.json index 69b9ff754..d694f8fbd 100644 --- a/src/main/resources/data/botania/recipes/mana_diamond_block.json +++ b/src/main/resources/data/botania/recipes/mana_diamond_block.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "I": { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/mana_spreader.json b/src/main/resources/data/botania/recipes/mana_spreader.json index 3a2d1e189..ac6226cb8 100644 --- a/src/main/resources/data/botania/recipes/mana_spreader.json +++ b/src/main/resources/data/botania/recipes/mana_spreader.json @@ -21,59 +21,59 @@ "key": { "P": [ { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, { - "item": "#PETALLIGHTBLUE" + "tag": "botania:petals/lightblue" }, { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, { - "item": "#PETALRED" + "tag": "botania:petals/red" }, { - "item": "#PETALBLACK" + "tag": "botania:petals/black" } ], "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" }, "G": { - "item": "#INGOTGOLD" + "tag": "forge:ingots/gold" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manabomb.json b/src/main/resources/data/botania/recipes/manabomb.json index c63567caa..766db2e3c 100644 --- a/src/main/resources/data/botania/recipes/manabomb.json +++ b/src/main/resources/data/botania/recipes/manabomb.json @@ -13,10 +13,10 @@ "item": "minecraft:tnt" }, "G": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "L": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manadetector.json b/src/main/resources/data/botania/recipes/manadetector.json index c71ba797c..37a189ddf 100644 --- a/src/main/resources/data/botania/recipes/manadetector.json +++ b/src/main/resources/data/botania/recipes/manadetector.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" }, "C": { "item": "minecraft:comparator" }, "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/managun.json b/src/main/resources/data/botania/recipes/managun.json index 212ee4524..b96c68a49 100644 --- a/src/main/resources/data/botania/recipes/managun.json +++ b/src/main/resources/data/botania/recipes/managun.json @@ -13,16 +13,16 @@ "item": "botania:redstone_spreader" }, "D": { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" }, "T": { "item": "minecraft:tnt" }, "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" }, "M": { - "item": "#RUNEMANAB" + "tag": "botania:runes/mana" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manamirror.json b/src/main/resources/data/botania/recipes/manamirror.json index f47b3e434..d8a67ada4 100644 --- a/src/main/resources/data/botania/recipes/manamirror.json +++ b/src/main/resources/data/botania/recipes/manamirror.json @@ -11,19 +11,19 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "T": { "item": "botania:manatablet" }, "I": { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteel_block.json b/src/main/resources/data/botania/recipes/manasteel_block.json index 17dc97495..28af24245 100644 --- a/src/main/resources/data/botania/recipes/manasteel_block.json +++ b/src/main/resources/data/botania/recipes/manasteel_block.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "I": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteelaxe.json b/src/main/resources/data/botania/recipes/manasteelaxe.json index 3ff276de8..7d80ff2a6 100644 --- a/src/main/resources/data/botania/recipes/manasteelaxe.json +++ b/src/main/resources/data/botania/recipes/manasteelaxe.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteelboots.json b/src/main/resources/data/botania/recipes/manasteelboots.json index 742f5513e..bfc6efeb8 100644 --- a/src/main/resources/data/botania/recipes/manasteelboots.json +++ b/src/main/resources/data/botania/recipes/manasteelboots.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteelchest.json b/src/main/resources/data/botania/recipes/manasteelchest.json index 0d1b2ed2b..6e806d259 100644 --- a/src/main/resources/data/botania/recipes/manasteelchest.json +++ b/src/main/resources/data/botania/recipes/manasteelchest.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteelhelm.json b/src/main/resources/data/botania/recipes/manasteelhelm.json index 82a1f9b23..0c38f164c 100644 --- a/src/main/resources/data/botania/recipes/manasteelhelm.json +++ b/src/main/resources/data/botania/recipes/manasteelhelm.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteellegs.json b/src/main/resources/data/botania/recipes/manasteellegs.json index 33b28265f..6283838d2 100644 --- a/src/main/resources/data/botania/recipes/manasteellegs.json +++ b/src/main/resources/data/botania/recipes/manasteellegs.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteelpick.json b/src/main/resources/data/botania/recipes/manasteelpick.json index 6e81358ba..433e0086e 100644 --- a/src/main/resources/data/botania/recipes/manasteelpick.json +++ b/src/main/resources/data/botania/recipes/manasteelpick.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteelshears.json b/src/main/resources/data/botania/recipes/manasteelshears.json index 430d9c30b..5227c9a01 100644 --- a/src/main/resources/data/botania/recipes/manasteelshears.json +++ b/src/main/resources/data/botania/recipes/manasteelshears.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteelshovel.json b/src/main/resources/data/botania/recipes/manasteelshovel.json index ef69195e6..d880c02c4 100644 --- a/src/main/resources/data/botania/recipes/manasteelshovel.json +++ b/src/main/resources/data/botania/recipes/manasteelshovel.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manasteelsword.json b/src/main/resources/data/botania/recipes/manasteelsword.json index bc797afaf..9b9bce449 100644 --- a/src/main/resources/data/botania/recipes/manasteelsword.json +++ b/src/main/resources/data/botania/recipes/manasteelsword.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manatablet.json b/src/main/resources/data/botania/recipes/manatablet.json index 5a074ceb7..1cb0498a2 100644 --- a/src/main/resources/data/botania/recipes/manatablet.json +++ b/src/main/resources/data/botania/recipes/manatablet.json @@ -11,14 +11,14 @@ "key": { "P": [ { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" }, { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" } ], "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manavoid.json b/src/main/resources/data/botania/recipes/manavoid.json index c02ad2c15..73d18dca6 100644 --- a/src/main/resources/data/botania/recipes/manavoid.json +++ b/src/main/resources/data/botania/recipes/manavoid.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "O": { - "item": "#OBSIDIAN" + "item": "minecraft:obsidian" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manaweave_cloth.json b/src/main/resources/data/botania/recipes/manaweave_cloth.json index 34ddaf766..a6a593acb 100644 --- a/src/main/resources/data/botania/recipes/manaweave_cloth.json +++ b/src/main/resources/data/botania/recipes/manaweave_cloth.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manaweaveboots.json b/src/main/resources/data/botania/recipes/manaweaveboots.json index ad892ff5f..c7efa6be8 100644 --- a/src/main/resources/data/botania/recipes/manaweaveboots.json +++ b/src/main/resources/data/botania/recipes/manaweaveboots.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#CLOTHMANAWEAVE" + "item": "botania:manaweave_cloth" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manaweavechest.json b/src/main/resources/data/botania/recipes/manaweavechest.json index a82e2050a..59933d649 100644 --- a/src/main/resources/data/botania/recipes/manaweavechest.json +++ b/src/main/resources/data/botania/recipes/manaweavechest.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#CLOTHMANAWEAVE" + "item": "botania:manaweave_cloth" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manaweavehelm.json b/src/main/resources/data/botania/recipes/manaweavehelm.json index db1fb158a..71cdb25fa 100644 --- a/src/main/resources/data/botania/recipes/manaweavehelm.json +++ b/src/main/resources/data/botania/recipes/manaweavehelm.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#CLOTHMANAWEAVE" + "item": "botania:manaweave_cloth" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/manaweavelegs.json b/src/main/resources/data/botania/recipes/manaweavelegs.json index b6a39c5c8..57863b1c3 100644 --- a/src/main/resources/data/botania/recipes/manaweavelegs.json +++ b/src/main/resources/data/botania/recipes/manaweavelegs.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#CLOTHMANAWEAVE" + "item": "botania:manaweave_cloth" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/miningring.json b/src/main/resources/data/botania/recipes/miningring.json index c09169d60..a7072ff1a 100644 --- a/src/main/resources/data/botania/recipes/miningring.json +++ b/src/main/resources/data/botania/recipes/miningring.json @@ -13,10 +13,10 @@ "item": "minecraft:golden_pickaxe" }, "E": { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/missilerod.json b/src/main/resources/data/botania/recipes/missilerod.json index ff58a2c4a..3ae480373 100644 --- a/src/main/resources/data/botania/recipes/missilerod.json +++ b/src/main/resources/data/botania/recipes/missilerod.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, "T": { - "item": "#DREAMWOODTWIG" + "item": "botania:dreamwood_twig" }, "G": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/monocle.json b/src/main/resources/data/botania/recipes/monocle.json index af98d4375..3eab76258 100644 --- a/src/main/resources/data/botania/recipes/monocle.json +++ b/src/main/resources/data/botania/recipes/monocle.json @@ -13,7 +13,7 @@ "item": "botania:managlass" }, "I": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "N": { "item": "minecraft:gold_nugget" diff --git a/src/main/resources/data/botania/recipes/obediencestick.json b/src/main/resources/data/botania/recipes/obediencestick.json index 4caad4157..2755d7bfb 100644 --- a/src/main/resources/data/botania/recipes/obediencestick.json +++ b/src/main/resources/data/botania/recipes/obediencestick.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/openbucket.json b/src/main/resources/data/botania/recipes/openbucket.json index 38b3ebc8c..98179574a 100644 --- a/src/main/resources/data/botania/recipes/openbucket.json +++ b/src/main/resources/data/botania/recipes/openbucket.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pattern_craft_3_1.json b/src/main/resources/data/botania/recipes/pattern_craft_3_1.json index 2a7824ccd..e4427e4b3 100644 --- a/src/main/resources/data/botania/recipes/pattern_craft_3_1.json +++ b/src/main/resources/data/botania/recipes/pattern_craft_3_1.json @@ -11,10 +11,10 @@ "group": "botania:craft_pattern", "key": { "P": { - "item": "#BPLACEHOLDER" + "item": "botania:placeholder" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json b/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json index 510a180c2..8e9f02069 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_1_1.json @@ -11,10 +11,10 @@ "group": "botania:craft_pattern", "key": { "P": { - "item": "#BPLACEHOLDER" + "item": "botania:placeholder" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json b/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json index 4489dc0b7..5840d8319 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_1_2.json @@ -11,10 +11,10 @@ "group": "botania:craft_pattern", "key": { "P": { - "item": "#BPLACEHOLDER" + "item": "botania:placeholder" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json b/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json index 5459cac67..0535d67c2 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_1_3.json @@ -11,10 +11,10 @@ "group": "botania:craft_pattern", "key": { "P": { - "item": "#BPLACEHOLDER" + "item": "botania:placeholder" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json b/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json index 0e2664040..18b8e6d9f 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_2_1.json @@ -11,10 +11,10 @@ "group": "botania:craft_pattern", "key": { "P": { - "item": "#BPLACEHOLDER" + "item": "botania:placeholder" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json b/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json index acb69bf47..f480e24b7 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_2_2.json @@ -11,10 +11,10 @@ "group": "botania:craft_pattern", "key": { "P": { - "item": "#BPLACEHOLDER" + "item": "botania:placeholder" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json b/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json index 4e58bb3e1..a391cd110 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_2_3.json @@ -11,10 +11,10 @@ "group": "botania:craft_pattern", "key": { "P": { - "item": "#BPLACEHOLDER" + "item": "botania:placeholder" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json b/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json index ae1cfe8dd..2306fd4a1 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_3_2.json @@ -11,10 +11,10 @@ "group": "botania:craft_pattern", "key": { "P": { - "item": "#BPLACEHOLDER" + "item": "botania:placeholder" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pattern_crafty_donut.json b/src/main/resources/data/botania/recipes/pattern_crafty_donut.json index 206e67244..63bbd5f1e 100644 --- a/src/main/resources/data/botania/recipes/pattern_crafty_donut.json +++ b/src/main/resources/data/botania/recipes/pattern_crafty_donut.json @@ -11,10 +11,10 @@ "group": "botania:craft_pattern", "key": { "P": { - "item": "#BPLACEHOLDER" + "item": "botania:placeholder" }, "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pavement_0.json b/src/main/resources/data/botania/recipes/pavement_0.json index cbc85e9c4..13b285483 100644 --- a/src/main/resources/data/botania/recipes/pavement_0.json +++ b/src/main/resources/data/botania/recipes/pavement_0.json @@ -7,13 +7,13 @@ "group": "botania:pavement", "ingredients": [ { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, { - "item": "#COBBLESTONE" + "tag": "forge:cobblestone" }, { - "item": "#GRAVEL" + "item": "minecraft:gravel" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/pavement_1.json b/src/main/resources/data/botania/recipes/pavement_1.json index adc619531..a14440824 100644 --- a/src/main/resources/data/botania/recipes/pavement_1.json +++ b/src/main/resources/data/botania/recipes/pavement_1.json @@ -7,13 +7,13 @@ "group": "botania:pavement", "ingredients": [ { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, { - "item": "#COBBLESTONE" + "tag": "forge:cobblestone" }, { - "item": "#GRAVEL" + "item": "minecraft:gravel" }, { "item": "minecraft:coal", diff --git a/src/main/resources/data/botania/recipes/pavement_2.json b/src/main/resources/data/botania/recipes/pavement_2.json index 86b7b6255..794ffa123 100644 --- a/src/main/resources/data/botania/recipes/pavement_2.json +++ b/src/main/resources/data/botania/recipes/pavement_2.json @@ -7,13 +7,13 @@ "group": "botania:pavement", "ingredients": [ { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, { - "item": "#COBBLESTONE" + "tag": "forge:cobblestone" }, { - "item": "#GRAVEL" + "item": "minecraft:gravel" }, { "item": "minecraft:dye", diff --git a/src/main/resources/data/botania/recipes/pavement_3.json b/src/main/resources/data/botania/recipes/pavement_3.json index 1cdbc7630..28961d567 100644 --- a/src/main/resources/data/botania/recipes/pavement_3.json +++ b/src/main/resources/data/botania/recipes/pavement_3.json @@ -7,13 +7,13 @@ "group": "botania:pavement", "ingredients": [ { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, { - "item": "#COBBLESTONE" + "tag": "forge:cobblestone" }, { - "item": "#GRAVEL" + "item": "minecraft:gravel" }, { "item": "minecraft:redstone" diff --git a/src/main/resources/data/botania/recipes/pavement_4.json b/src/main/resources/data/botania/recipes/pavement_4.json index a8b6e47ca..fb20f94e4 100644 --- a/src/main/resources/data/botania/recipes/pavement_4.json +++ b/src/main/resources/data/botania/recipes/pavement_4.json @@ -7,13 +7,13 @@ "group": "botania:pavement", "ingredients": [ { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, { - "item": "#COBBLESTONE" + "tag": "forge:cobblestone" }, { - "item": "#GRAVEL" + "item": "minecraft:gravel" }, { "item": "minecraft:wheat" diff --git a/src/main/resources/data/botania/recipes/pavement_5.json b/src/main/resources/data/botania/recipes/pavement_5.json index 456290c73..08d9ba404 100644 --- a/src/main/resources/data/botania/recipes/pavement_5.json +++ b/src/main/resources/data/botania/recipes/pavement_5.json @@ -7,13 +7,13 @@ "group": "botania:pavement", "ingredients": [ { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, { - "item": "#COBBLESTONE" + "tag": "forge:cobblestone" }, { - "item": "#GRAVEL" + "item": "minecraft:gravel" }, { "item": "minecraft:slime_ball" diff --git a/src/main/resources/data/botania/recipes/pestleandmortar.json b/src/main/resources/data/botania/recipes/pestleandmortar.json index 3f4e9173c..f0d95a35f 100644 --- a/src/main/resources/data/botania/recipes/pestleandmortar.json +++ b/src/main/resources/data/botania/recipes/pestleandmortar.json @@ -13,10 +13,10 @@ "item": "minecraft:bowl" }, "S": { - "item": "#STICKWOOD" + "tag": "forge:rods/wooden" }, "W": { - "item": "#PLANKWOOD" + "tag": "minecraft:planks" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/petal_black.json b/src/main/resources/data/botania/recipes/petal_black.json index 289ad23bd..d11b86099 100644 --- a/src/main/resources/data/botania/recipes/petal_black.json +++ b/src/main/resources/data/botania/recipes/petal_black.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERBLACK" + "tag": "botania:flowers/black" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_black_double.json b/src/main/resources/data/botania/recipes/petal_black_double.json index 0c4afc06b..edc38c9da 100644 --- a/src/main/resources/data/botania/recipes/petal_black_double.json +++ b/src/main/resources/data/botania/recipes/petal_black_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERBLACKDOUBLE" + "tag": "botania:double_flowers/black" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_blue.json b/src/main/resources/data/botania/recipes/petal_blue.json index 111dec9d8..c7e4b6628 100644 --- a/src/main/resources/data/botania/recipes/petal_blue.json +++ b/src/main/resources/data/botania/recipes/petal_blue.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERBLUE" + "tag": "botania:flowers/blue" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_blue_double.json b/src/main/resources/data/botania/recipes/petal_blue_double.json index 831f72da0..c7e69c6e9 100644 --- a/src/main/resources/data/botania/recipes/petal_blue_double.json +++ b/src/main/resources/data/botania/recipes/petal_blue_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERBLUEDOUBLE" + "tag": "botania:double_flowers/blue" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_brown.json b/src/main/resources/data/botania/recipes/petal_brown.json index 42c8a166b..d77bcf9a4 100644 --- a/src/main/resources/data/botania/recipes/petal_brown.json +++ b/src/main/resources/data/botania/recipes/petal_brown.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERBROWN" + "tag": "botania:flowers/brown" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_brown_double.json b/src/main/resources/data/botania/recipes/petal_brown_double.json index 683638989..500f96dd7 100644 --- a/src/main/resources/data/botania/recipes/petal_brown_double.json +++ b/src/main/resources/data/botania/recipes/petal_brown_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERBROWNDOUBLE" + "tag": "botania:double_flowers/brown" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_cyan.json b/src/main/resources/data/botania/recipes/petal_cyan.json index 6de1efd5d..56a4fc347 100644 --- a/src/main/resources/data/botania/recipes/petal_cyan.json +++ b/src/main/resources/data/botania/recipes/petal_cyan.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERCYAN" + "tag": "botania:flowers/cyan" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_cyan_double.json b/src/main/resources/data/botania/recipes/petal_cyan_double.json index 2015a4bc4..bc2f0f6e4 100644 --- a/src/main/resources/data/botania/recipes/petal_cyan_double.json +++ b/src/main/resources/data/botania/recipes/petal_cyan_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERCYANDOUBLE" + "tag": "botania:double_flowers/cyan" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_gray.json b/src/main/resources/data/botania/recipes/petal_gray.json index 8f423edcb..5e6c5a8dc 100644 --- a/src/main/resources/data/botania/recipes/petal_gray.json +++ b/src/main/resources/data/botania/recipes/petal_gray.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERGRAY" + "tag": "botania:flowers/gray" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_gray_double.json b/src/main/resources/data/botania/recipes/petal_gray_double.json index c27063e16..3b0a59779 100644 --- a/src/main/resources/data/botania/recipes/petal_gray_double.json +++ b/src/main/resources/data/botania/recipes/petal_gray_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERGRAYDOUBLE" + "tag": "botania:double_flowers/gray" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_green.json b/src/main/resources/data/botania/recipes/petal_green.json index f5c80b38f..0ad1b7003 100644 --- a/src/main/resources/data/botania/recipes/petal_green.json +++ b/src/main/resources/data/botania/recipes/petal_green.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERGREEN" + "tag": "botania:flowers/green" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_green_double.json b/src/main/resources/data/botania/recipes/petal_green_double.json index 56ebc58ba..c2f43ff31 100644 --- a/src/main/resources/data/botania/recipes/petal_green_double.json +++ b/src/main/resources/data/botania/recipes/petal_green_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERGREENDOUBLE" + "tag": "botania:double_flowers/green" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_light_blue.json b/src/main/resources/data/botania/recipes/petal_light_blue.json index 50688e6b4..fe520a73b 100644 --- a/src/main/resources/data/botania/recipes/petal_light_blue.json +++ b/src/main/resources/data/botania/recipes/petal_light_blue.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERLIGHTBLUE" + "tag": "botania:flowers/lightblue" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_light_blue_double.json b/src/main/resources/data/botania/recipes/petal_light_blue_double.json index 8a444fd78..b3f2de47f 100644 --- a/src/main/resources/data/botania/recipes/petal_light_blue_double.json +++ b/src/main/resources/data/botania/recipes/petal_light_blue_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERLIGHTBLUEDOUBLE" + "tag": "botania:double_flowers/lightblue" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_lime.json b/src/main/resources/data/botania/recipes/petal_lime.json index 44f4bf85b..026edaef0 100644 --- a/src/main/resources/data/botania/recipes/petal_lime.json +++ b/src/main/resources/data/botania/recipes/petal_lime.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERLIME" + "tag": "botania:flowers/lime" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_lime_double.json b/src/main/resources/data/botania/recipes/petal_lime_double.json index eb8d818cc..63cf90b28 100644 --- a/src/main/resources/data/botania/recipes/petal_lime_double.json +++ b/src/main/resources/data/botania/recipes/petal_lime_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERLIMEDOUBLE" + "tag": "botania:double_flowers/lime" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_magenta.json b/src/main/resources/data/botania/recipes/petal_magenta.json index 8b5924ae8..1d5fe7669 100644 --- a/src/main/resources/data/botania/recipes/petal_magenta.json +++ b/src/main/resources/data/botania/recipes/petal_magenta.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERMAGENTA" + "tag": "botania:flowers/magenta" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_magenta_double.json b/src/main/resources/data/botania/recipes/petal_magenta_double.json index 6aaa22e76..92795bbf5 100644 --- a/src/main/resources/data/botania/recipes/petal_magenta_double.json +++ b/src/main/resources/data/botania/recipes/petal_magenta_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERMAGENTADOUBLE" + "tag": "botania:double_flowers/magenta" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_orange.json b/src/main/resources/data/botania/recipes/petal_orange.json index 75e0af9a5..49a75eb31 100644 --- a/src/main/resources/data/botania/recipes/petal_orange.json +++ b/src/main/resources/data/botania/recipes/petal_orange.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERORANGE" + "tag": "botania:flowers/orange" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_orange_double.json b/src/main/resources/data/botania/recipes/petal_orange_double.json index 5607cd485..6d9fcfcfa 100644 --- a/src/main/resources/data/botania/recipes/petal_orange_double.json +++ b/src/main/resources/data/botania/recipes/petal_orange_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERORANGEDOUBLE" + "tag": "botania:double_flowers/orange" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_pink.json b/src/main/resources/data/botania/recipes/petal_pink.json index 5fec7ee60..ddf6a0ec0 100644 --- a/src/main/resources/data/botania/recipes/petal_pink.json +++ b/src/main/resources/data/botania/recipes/petal_pink.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERPINK" + "tag": "botania:flowers/pink" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_pink_double.json b/src/main/resources/data/botania/recipes/petal_pink_double.json index dcedd76bd..3622e4692 100644 --- a/src/main/resources/data/botania/recipes/petal_pink_double.json +++ b/src/main/resources/data/botania/recipes/petal_pink_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERPINKDOUBLE" + "tag": "botania:double_flowers/pink" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_purple.json b/src/main/resources/data/botania/recipes/petal_purple.json index d37f83e35..4bc79cae0 100644 --- a/src/main/resources/data/botania/recipes/petal_purple.json +++ b/src/main/resources/data/botania/recipes/petal_purple.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERPURPLE" + "tag": "botania:flowers/purple" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_purple_double.json b/src/main/resources/data/botania/recipes/petal_purple_double.json index 261523f86..03c689896 100644 --- a/src/main/resources/data/botania/recipes/petal_purple_double.json +++ b/src/main/resources/data/botania/recipes/petal_purple_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERPURPLEDOUBLE" + "tag": "botania:double_flowers/purple" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_red.json b/src/main/resources/data/botania/recipes/petal_red.json index eeb304dab..97a23bd5d 100644 --- a/src/main/resources/data/botania/recipes/petal_red.json +++ b/src/main/resources/data/botania/recipes/petal_red.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERRED" + "tag": "botania:flowers/red" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_red_double.json b/src/main/resources/data/botania/recipes/petal_red_double.json index 1c97155ff..9e49a7cbf 100644 --- a/src/main/resources/data/botania/recipes/petal_red_double.json +++ b/src/main/resources/data/botania/recipes/petal_red_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERREDDOUBLE" + "tag": "botania:double_flowers/red" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_silver.json b/src/main/resources/data/botania/recipes/petal_silver.json index 4d8e444fe..8440699f8 100644 --- a/src/main/resources/data/botania/recipes/petal_silver.json +++ b/src/main/resources/data/botania/recipes/petal_silver.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERLIGHTGRAY" + "tag": "botania:flowers/lightgray" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_silver_double.json b/src/main/resources/data/botania/recipes/petal_silver_double.json index a88977354..d953f4ee4 100644 --- a/src/main/resources/data/botania/recipes/petal_silver_double.json +++ b/src/main/resources/data/botania/recipes/petal_silver_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERLIGHTGRAYDOUBLE" + "tag": "botania:double_flowers/lightgray" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_white.json b/src/main/resources/data/botania/recipes/petal_white.json index d1526d540..5abf36fe9 100644 --- a/src/main/resources/data/botania/recipes/petal_white.json +++ b/src/main/resources/data/botania/recipes/petal_white.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERWHITE" + "tag": "botania:flowers/white" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_white_double.json b/src/main/resources/data/botania/recipes/petal_white_double.json index bee88b06c..ef33cfb36 100644 --- a/src/main/resources/data/botania/recipes/petal_white_double.json +++ b/src/main/resources/data/botania/recipes/petal_white_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERWHITEDOUBLE" + "tag": "botania:double_flowers/white" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_yellow.json b/src/main/resources/data/botania/recipes/petal_yellow.json index df9607497..3d2a55686 100644 --- a/src/main/resources/data/botania/recipes/petal_yellow.json +++ b/src/main/resources/data/botania/recipes/petal_yellow.json @@ -6,7 +6,7 @@ "group": "botania:petal", "ingredients": [ { - "item": "#MYSTICFLOWERYELLOW" + "tag": "botania:flowers/yellow" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/petal_yellow_double.json b/src/main/resources/data/botania/recipes/petal_yellow_double.json index 11cdd1acb..b54fdac1b 100644 --- a/src/main/resources/data/botania/recipes/petal_yellow_double.json +++ b/src/main/resources/data/botania/recipes/petal_yellow_double.json @@ -6,7 +6,7 @@ "group": "botania:petal_double", "ingredients": [ { - "item": "#MYSTICFLOWERYELLOWDOUBLE" + "tag": "botania:double_flowers/yellow" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/phantomink.json b/src/main/resources/data/botania/recipes/phantomink.json index 42e326f24..2926621de 100644 --- a/src/main/resources/data/botania/recipes/phantomink.json +++ b/src/main/resources/data/botania/recipes/phantomink.json @@ -5,13 +5,13 @@ }, "ingredients": [ { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, { - "item": "#DYE" + "tag": "forge:dyes" }, { - "item": "#BLOCKGLASS" + "item": "#glass" }, { "item": "minecraft:glass_bottle" diff --git a/src/main/resources/data/botania/recipes/pixiering.json b/src/main/resources/data/botania/recipes/pixiering.json index 8e2a4126e..5564f75cb 100644 --- a/src/main/resources/data/botania/recipes/pixiering.json +++ b/src/main/resources/data/botania/recipes/pixiering.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "D": { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/placeholder.json b/src/main/resources/data/botania/recipes/placeholder.json index aa987ed2f..1389057a3 100644 --- a/src/main/resources/data/botania/recipes/placeholder.json +++ b/src/main/resources/data/botania/recipes/placeholder.json @@ -5,10 +5,10 @@ }, "ingredients": [ { - "item": "#WORKBENCH" + "item": "minecraft:crafting_table" }, { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/pool_default.json b/src/main/resources/data/botania/recipes/pool_default.json index 2a0d68fd8..74a612d8d 100644 --- a/src/main/resources/data/botania/recipes/pool_default.json +++ b/src/main/resources/data/botania/recipes/pool_default.json @@ -9,7 +9,7 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/prism.json b/src/main/resources/data/botania/recipes/prism.json index 8aa0f49ba..47564a539 100644 --- a/src/main/resources/data/botania/recipes/prism.json +++ b/src/main/resources/data/botania/recipes/prism.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#GEMPRISMARINE" + "tag": "forge:gems/prismarine" }, "S": { "item": "botania:spectral_platform" }, "G": { - "item": "#BLOCKGLASSCOLORLESS" + "item": "minecraft:glass" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pump.json b/src/main/resources/data/botania/recipes/pump.json index 085d8adf6..5df74bdaa 100644 --- a/src/main/resources/data/botania/recipes/pump.json +++ b/src/main/resources/data/botania/recipes/pump.json @@ -13,10 +13,10 @@ "item": "minecraft:bucket" }, "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "I": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pylon_gaia.json b/src/main/resources/data/botania/recipes/pylon_gaia.json index e208df57f..de40cd86b 100644 --- a/src/main/resources/data/botania/recipes/pylon_gaia.json +++ b/src/main/resources/data/botania/recipes/pylon_gaia.json @@ -13,10 +13,10 @@ "item": "botania:pylon_mana" }, "D": { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pylon_mana.json b/src/main/resources/data/botania/recipes/pylon_mana.json index eb107ee9f..a04022372 100644 --- a/src/main/resources/data/botania/recipes/pylon_mana.json +++ b/src/main/resources/data/botania/recipes/pylon_mana.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "D": { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" }, "G": { - "item": "#INGOTGOLD" + "tag": "forge:ingots/gold" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/pylon_natura.json b/src/main/resources/data/botania/recipes/pylon_natura.json index b477b1d98..90782509f 100644 --- a/src/main/resources/data/botania/recipes/pylon_natura.json +++ b/src/main/resources/data/botania/recipes/pylon_natura.json @@ -13,7 +13,7 @@ "item": "botania:pylon_mana" }, "T": { - "item": "#NUGGETTERRASTEEL" + "tag": "forge:nuggets/terrasteel" }, "E": { "item": "minecraft:ender_eye" diff --git a/src/main/resources/data/botania/recipes/quartz_blaze.json b/src/main/resources/data/botania/recipes/quartz_blaze.json index 6fbb5401e..09dd19e24 100644 --- a/src/main/resources/data/botania/recipes/quartz_blaze.json +++ b/src/main/resources/data/botania/recipes/quartz_blaze.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#GEMQUARTZ" + "tag": "forge:gems/quartz" }, "C": { "item": "minecraft:blaze_powder" diff --git a/src/main/resources/data/botania/recipes/quartz_dark.json b/src/main/resources/data/botania/recipes/quartz_dark.json index d51358a31..5bb595d78 100644 --- a/src/main/resources/data/botania/recipes/quartz_dark.json +++ b/src/main/resources/data/botania/recipes/quartz_dark.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#GEMQUARTZ" + "tag": "forge:gems/quartz" }, "C": [ { diff --git a/src/main/resources/data/botania/recipes/quartz_lavender.json b/src/main/resources/data/botania/recipes/quartz_lavender.json index f261bd7cc..c81adc433 100644 --- a/src/main/resources/data/botania/recipes/quartz_lavender.json +++ b/src/main/resources/data/botania/recipes/quartz_lavender.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#GEMQUARTZ" + "tag": "forge:gems/quartz" }, "C": [ { diff --git a/src/main/resources/data/botania/recipes/quartz_red.json b/src/main/resources/data/botania/recipes/quartz_red.json index 6bc19c848..d26c6e3c0 100644 --- a/src/main/resources/data/botania/recipes/quartz_red.json +++ b/src/main/resources/data/botania/recipes/quartz_red.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#GEMQUARTZ" + "tag": "forge:gems/quartz" }, "C": { "item": "minecraft:redstone" diff --git a/src/main/resources/data/botania/recipes/quartz_sunny.json b/src/main/resources/data/botania/recipes/quartz_sunny.json index 4164a66ec..e9d1ac3b9 100644 --- a/src/main/resources/data/botania/recipes/quartz_sunny.json +++ b/src/main/resources/data/botania/recipes/quartz_sunny.json @@ -11,7 +11,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#GEMQUARTZ" + "tag": "forge:gems/quartz" }, "C": { "item": "minecraft:double_plant", diff --git a/src/main/resources/data/botania/recipes/quartztypeblaze_0.json b/src/main/resources/data/botania/recipes/quartztypeblaze_0.json index 8a0d898f6..fc0b2e389 100644 --- a/src/main/resources/data/botania/recipes/quartztypeblaze_0.json +++ b/src/main/resources/data/botania/recipes/quartztypeblaze_0.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#QUARTZBLAZE" + "item": "botania:quartz_blaze" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartztypedark_0.json b/src/main/resources/data/botania/recipes/quartztypedark_0.json index f28cd6c34..9a7b406d4 100644 --- a/src/main/resources/data/botania/recipes/quartztypedark_0.json +++ b/src/main/resources/data/botania/recipes/quartztypedark_0.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#QUARTZDARK" + "item": "botania:quartz_dark" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartztypeelf_0.json b/src/main/resources/data/botania/recipes/quartztypeelf_0.json index fcf4d175d..41821f726 100644 --- a/src/main/resources/data/botania/recipes/quartztypeelf_0.json +++ b/src/main/resources/data/botania/recipes/quartztypeelf_0.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#QUARTZELVEN" + "item": "botania:quartz_elven" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartztypelavender_0.json b/src/main/resources/data/botania/recipes/quartztypelavender_0.json index e99e72e29..aa0f7968a 100644 --- a/src/main/resources/data/botania/recipes/quartztypelavender_0.json +++ b/src/main/resources/data/botania/recipes/quartztypelavender_0.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#QUARTZLAVENDER" + "item": "botania:quartz_lavender" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartztypemana_0.json b/src/main/resources/data/botania/recipes/quartztypemana_0.json index 08c06f1a8..55e31809c 100644 --- a/src/main/resources/data/botania/recipes/quartztypemana_0.json +++ b/src/main/resources/data/botania/recipes/quartztypemana_0.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#QUARTZMANA" + "item": "botania:quartz_mana" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartztypered_0.json b/src/main/resources/data/botania/recipes/quartztypered_0.json index 1fa0b56b3..72bf7b094 100644 --- a/src/main/resources/data/botania/recipes/quartztypered_0.json +++ b/src/main/resources/data/botania/recipes/quartztypered_0.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#QUARTZRED" + "item": "botania:quartz_red" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/quartztypesunny_0.json b/src/main/resources/data/botania/recipes/quartztypesunny_0.json index 855f9af79..0db850835 100644 --- a/src/main/resources/data/botania/recipes/quartztypesunny_0.json +++ b/src/main/resources/data/botania/recipes/quartztypesunny_0.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "Q": { - "item": "#QUARTZSUNNY" + "item": "botania:quartz_sunny" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/rainbowrod.json b/src/main/resources/data/botania/recipes/rainbowrod.json index 6b8083799..2fa9b4b89 100644 --- a/src/main/resources/data/botania/recipes/rainbowrod.json +++ b/src/main/resources/data/botania/recipes/rainbowrod.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/reachring.json b/src/main/resources/data/botania/recipes/reachring.json index 81bcfc096..5b6ee6d24 100644 --- a/src/main/resources/data/botania/recipes/reachring.json +++ b/src/main/resources/data/botania/recipes/reachring.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#RUNEPRIDEB" + "tag": "botania:runes/pride" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/red_string.json b/src/main/resources/data/botania/recipes/red_string.json index 777a5329a..052850412 100644 --- a/src/main/resources/data/botania/recipes/red_string.json +++ b/src/main/resources/data/botania/recipes/red_string.json @@ -7,13 +7,13 @@ "item": "minecraft:string" }, { - "item": "#BLOCKREDSTONE" + "tag": "forge:storage_blocks/redstone" }, { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/red_string_alt.json b/src/main/resources/data/botania/recipes/red_string_alt.json index 7cd275376..8403e5e03 100644 --- a/src/main/resources/data/botania/recipes/red_string_alt.json +++ b/src/main/resources/data/botania/recipes/red_string_alt.json @@ -7,13 +7,13 @@ "item": "minecraft:string" }, { - "item": "#BLOCKREDSTONE" + "tag": "forge:storage_blocks/redstone" }, { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" }, { "item": "minecraft:pumpkin" diff --git a/src/main/resources/data/botania/recipes/redstone_root.json b/src/main/resources/data/botania/recipes/redstone_root.json index ccba9108b..de830b924 100644 --- a/src/main/resources/data/botania/recipes/redstone_root.json +++ b/src/main/resources/data/botania/recipes/redstone_root.json @@ -4,7 +4,7 @@ }, "ingredients": [ { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" }, { "item": "minecraft:tallgrass", diff --git a/src/main/resources/data/botania/recipes/redstone_spreader.json b/src/main/resources/data/botania/recipes/redstone_spreader.json index 72efefe6e..99ef424d9 100644 --- a/src/main/resources/data/botania/recipes/redstone_spreader.json +++ b/src/main/resources/data/botania/recipes/redstone_spreader.json @@ -8,7 +8,7 @@ "item": "botania:mana_spreader" }, { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/redstringcomparator.json b/src/main/resources/data/botania/recipes/redstringcomparator.json index b6f3a1239..6ffd5e117 100644 --- a/src/main/resources/data/botania/recipes/redstringcomparator.json +++ b/src/main/resources/data/botania/recipes/redstringcomparator.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "S": { - "item": "#BREDSTRING" + "item": "botania:red_string" }, "C": { "item": "minecraft:comparator" diff --git a/src/main/resources/data/botania/recipes/redstringcontainer.json b/src/main/resources/data/botania/recipes/redstringcontainer.json index 9cc5a4d1b..b88c9b301 100644 --- a/src/main/resources/data/botania/recipes/redstringcontainer.json +++ b/src/main/resources/data/botania/recipes/redstringcontainer.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "S": { - "item": "#BREDSTRING" + "item": "botania:red_string" }, "C": { - "item": "#CHESTWOOD" + "tag": "forge:chests/wooden" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/redstringdispenser.json b/src/main/resources/data/botania/recipes/redstringdispenser.json index 6b7c9a5c4..ba6b9e70d 100644 --- a/src/main/resources/data/botania/recipes/redstringdispenser.json +++ b/src/main/resources/data/botania/recipes/redstringdispenser.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "S": { - "item": "#BREDSTRING" + "item": "botania:red_string" }, "D": { "item": "minecraft:dispenser" diff --git a/src/main/resources/data/botania/recipes/redstringfertilizer.json b/src/main/resources/data/botania/recipes/redstringfertilizer.json index f2153e8c9..6403d411c 100644 --- a/src/main/resources/data/botania/recipes/redstringfertilizer.json +++ b/src/main/resources/data/botania/recipes/redstringfertilizer.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "B": { "item": "botania:fertilizer" }, "S": { - "item": "#BREDSTRING" + "item": "botania:red_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/redstringinterceptor.json b/src/main/resources/data/botania/recipes/redstringinterceptor.json index 19ef8eb8a..37aaa0172 100644 --- a/src/main/resources/data/botania/recipes/redstringinterceptor.json +++ b/src/main/resources/data/botania/recipes/redstringinterceptor.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "S": { - "item": "#BREDSTRING" + "item": "botania:red_string" }, "M": { "item": "minecraft:stone_button" diff --git a/src/main/resources/data/botania/recipes/redstringrelay.json b/src/main/resources/data/botania/recipes/redstringrelay.json index 27c2127c0..8d4f5d0a0 100644 --- a/src/main/resources/data/botania/recipes/redstringrelay.json +++ b/src/main/resources/data/botania/recipes/redstringrelay.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "S": { - "item": "#BREDSTRING" + "item": "botania:red_string" }, "M": { "item": "botania:mana_spreader" diff --git a/src/main/resources/data/botania/recipes/rfgenerator.json b/src/main/resources/data/botania/recipes/rfgenerator.json index 020994800..e041d83bf 100644 --- a/src/main/resources/data/botania/recipes/rfgenerator.json +++ b/src/main/resources/data/botania/recipes/rfgenerator.json @@ -16,13 +16,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#BLOCKREDSTONE" + "tag": "forge:storage_blocks/redstone" }, "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/runealtar.json b/src/main/resources/data/botania/recipes/runealtar.json index 8639ac7fc..a4a4de445 100644 --- a/src/main/resources/data/botania/recipes/runealtar.json +++ b/src/main/resources/data/botania/recipes/runealtar.json @@ -10,14 +10,14 @@ "key": { "P": [ { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" } ], "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/sextant.json b/src/main/resources/data/botania/recipes/sextant.json index 7c46261df..5b479ceac 100644 --- a/src/main/resources/data/botania/recipes/sextant.json +++ b/src/main/resources/data/botania/recipes/sextant.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "I": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/shimmerrock.json b/src/main/resources/data/botania/recipes/shimmerrock.json index 337a94cb5..c44463b3c 100644 --- a/src/main/resources/data/botania/recipes/shimmerrock.json +++ b/src/main/resources/data/botania/recipes/shimmerrock.json @@ -4,7 +4,7 @@ }, "ingredients": [ { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, { "item": "botania:bifrostperm" diff --git a/src/main/resources/data/botania/recipes/shinyflower_0.json b/src/main/resources/data/botania/recipes/shinyflower_0.json index 503818ec0..56c0deef9 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_0.json +++ b/src/main/resources/data/botania/recipes/shinyflower_0.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERWHITE" + "tag": "botania:flowers/white" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_1.json b/src/main/resources/data/botania/recipes/shinyflower_1.json index 06eef0217..9c30b4add 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_1.json +++ b/src/main/resources/data/botania/recipes/shinyflower_1.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERORANGE" + "tag": "botania:flowers/orange" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_10.json b/src/main/resources/data/botania/recipes/shinyflower_10.json index e2f7e3255..5a61de5a9 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_10.json +++ b/src/main/resources/data/botania/recipes/shinyflower_10.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERPURPLE" + "tag": "botania:flowers/purple" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_11.json b/src/main/resources/data/botania/recipes/shinyflower_11.json index 4c9cfb83b..343675148 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_11.json +++ b/src/main/resources/data/botania/recipes/shinyflower_11.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERBLUE" + "tag": "botania:flowers/blue" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_12.json b/src/main/resources/data/botania/recipes/shinyflower_12.json index a7221c2dd..b90bfa46a 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_12.json +++ b/src/main/resources/data/botania/recipes/shinyflower_12.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERBROWN" + "tag": "botania:flowers/brown" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_13.json b/src/main/resources/data/botania/recipes/shinyflower_13.json index 7058fe28b..dc598a459 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_13.json +++ b/src/main/resources/data/botania/recipes/shinyflower_13.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERGREEN" + "tag": "botania:flowers/green" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_14.json b/src/main/resources/data/botania/recipes/shinyflower_14.json index 99141e199..5a44c1ba6 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_14.json +++ b/src/main/resources/data/botania/recipes/shinyflower_14.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERRED" + "tag": "botania:flowers/red" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_15.json b/src/main/resources/data/botania/recipes/shinyflower_15.json index 6f547f084..617ce204b 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_15.json +++ b/src/main/resources/data/botania/recipes/shinyflower_15.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERBLACK" + "tag": "botania:flowers/black" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_2.json b/src/main/resources/data/botania/recipes/shinyflower_2.json index 47942dd52..e3ece2cd9 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_2.json +++ b/src/main/resources/data/botania/recipes/shinyflower_2.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERMAGENTA" + "tag": "botania:flowers/magenta" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_3.json b/src/main/resources/data/botania/recipes/shinyflower_3.json index 8ac275719..bada199ff 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_3.json +++ b/src/main/resources/data/botania/recipes/shinyflower_3.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERLIGHTBLUE" + "tag": "botania:flowers/lightblue" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_4.json b/src/main/resources/data/botania/recipes/shinyflower_4.json index 9471a8915..32fa14d8e 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_4.json +++ b/src/main/resources/data/botania/recipes/shinyflower_4.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERYELLOW" + "tag": "botania:flowers/yellow" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_5.json b/src/main/resources/data/botania/recipes/shinyflower_5.json index 23ee5dfb1..fd8c05bac 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_5.json +++ b/src/main/resources/data/botania/recipes/shinyflower_5.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERLIME" + "tag": "botania:flowers/lime" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_6.json b/src/main/resources/data/botania/recipes/shinyflower_6.json index b3f9e1a16..06919a7f8 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_6.json +++ b/src/main/resources/data/botania/recipes/shinyflower_6.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERPINK" + "tag": "botania:flowers/pink" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_7.json b/src/main/resources/data/botania/recipes/shinyflower_7.json index b53dbe3b1..7fcac6391 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_7.json +++ b/src/main/resources/data/botania/recipes/shinyflower_7.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERGRAY" + "tag": "botania:flowers/gray" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_8.json b/src/main/resources/data/botania/recipes/shinyflower_8.json index 51726b164..d5ebb3255 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_8.json +++ b/src/main/resources/data/botania/recipes/shinyflower_8.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERLIGHTGRAY" + "tag": "botania:flowers/lightgray" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/shinyflower_9.json b/src/main/resources/data/botania/recipes/shinyflower_9.json index 4aad4bf01..276b9e640 100644 --- a/src/main/resources/data/botania/recipes/shinyflower_9.json +++ b/src/main/resources/data/botania/recipes/shinyflower_9.json @@ -6,13 +6,13 @@ "group": "botania:shinyflower", "ingredients": [ { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#DUSTGLOWSTONE" + "tag": "forge:dusts/glowstone" }, { - "item": "#MYSTICFLOWERCYAN" + "tag": "botania:flowers/cyan" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/skydirtrod.json b/src/main/resources/data/botania/recipes/skydirtrod.json index 33d9a5a19..9d243492d 100644 --- a/src/main/resources/data/botania/recipes/skydirtrod.json +++ b/src/main/resources/data/botania/recipes/skydirtrod.json @@ -7,10 +7,10 @@ "item": "botania:dirtrod" }, { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/slimebottle.json b/src/main/resources/data/botania/recipes/slimebottle.json index 176303a05..df4c05793 100644 --- a/src/main/resources/data/botania/recipes/slimebottle.json +++ b/src/main/resources/data/botania/recipes/slimebottle.json @@ -11,10 +11,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#SLIMEBALL" + "item": "minecraft:slime_ball" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "G": { "item": "botania:elfglass" diff --git a/src/main/resources/data/botania/recipes/slingshot.json b/src/main/resources/data/botania/recipes/slingshot.json index 453d6f230..82e845290 100644 --- a/src/main/resources/data/botania/recipes/slingshot.json +++ b/src/main/resources/data/botania/recipes/slingshot.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/smeltrod.json b/src/main/resources/data/botania/recipes/smeltrod.json index 9cb7deb39..f3eb6b590 100644 --- a/src/main/resources/data/botania/recipes/smeltrod.json +++ b/src/main/resources/data/botania/recipes/smeltrod.json @@ -13,10 +13,10 @@ "item": "minecraft:blaze_rod" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "F": { - "item": "#RUNEFIREB" + "tag": "botania:runes/fire" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/spark.json b/src/main/resources/data/botania/recipes/spark.json index 41ac6f4cd..ea43a2e88 100644 --- a/src/main/resources/data/botania/recipes/spark.json +++ b/src/main/resources/data/botania/recipes/spark.json @@ -11,59 +11,59 @@ "key": { "P": [ { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, { - "item": "#PETALLIGHTBLUE" + "tag": "botania:petals/lightblue" }, { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, { - "item": "#PETALRED" + "tag": "botania:petals/red" }, { - "item": "#PETALBLACK" + "tag": "botania:petals/black" } ], "B": { "item": "minecraft:blaze_powder" }, "N": { - "item": "#NUGGETGOLD" + "item": "minecraft:gold_nugget" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/spark_upgrade_dispersive.json b/src/main/resources/data/botania/recipes/spark_upgrade_dispersive.json index c053cb735..5d0fc9bf9 100644 --- a/src/main/resources/data/botania/recipes/spark_upgrade_dispersive.json +++ b/src/main/resources/data/botania/recipes/spark_upgrade_dispersive.json @@ -5,13 +5,13 @@ "group": "botania:spark_upgrade", "ingredients": [ { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, { - "item": "#RUNEWATERB" + "tag": "botania:runes/water" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/spark_upgrade_dominant.json b/src/main/resources/data/botania/recipes/spark_upgrade_dominant.json index f21764613..d93cc6489 100644 --- a/src/main/resources/data/botania/recipes/spark_upgrade_dominant.json +++ b/src/main/resources/data/botania/recipes/spark_upgrade_dominant.json @@ -5,13 +5,13 @@ "group": "botania:spark_upgrade", "ingredients": [ { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, { - "item": "#RUNEFIREB" + "tag": "botania:runes/fire" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/spark_upgrade_isolated.json b/src/main/resources/data/botania/recipes/spark_upgrade_isolated.json index d51640f2a..a8dad2a52 100644 --- a/src/main/resources/data/botania/recipes/spark_upgrade_isolated.json +++ b/src/main/resources/data/botania/recipes/spark_upgrade_isolated.json @@ -5,13 +5,13 @@ "group": "botania:spark_upgrade", "ingredients": [ { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/spark_upgrade_recessive.json b/src/main/resources/data/botania/recipes/spark_upgrade_recessive.json index 272d828a9..2e76c2f18 100644 --- a/src/main/resources/data/botania/recipes/spark_upgrade_recessive.json +++ b/src/main/resources/data/botania/recipes/spark_upgrade_recessive.json @@ -5,13 +5,13 @@ "group": "botania:spark_upgrade", "ingredients": [ { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" } ], "type": "forge:ore_shapeless" diff --git a/src/main/resources/data/botania/recipes/sparkchanger.json b/src/main/resources/data/botania/recipes/sparkchanger.json index 23cfca640..e9df03297 100644 --- a/src/main/resources/data/botania/recipes/sparkchanger.json +++ b/src/main/resources/data/botania/recipes/sparkchanger.json @@ -9,13 +9,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" }, "S": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/spawnerclaw.json b/src/main/resources/data/botania/recipes/spawnerclaw.json index 94ae7a81e..7aa1ceb42 100644 --- a/src/main/resources/data/botania/recipes/spawnerclaw.json +++ b/src/main/resources/data/botania/recipes/spawnerclaw.json @@ -17,10 +17,10 @@ "item": "minecraft:blaze_rod" }, "S": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "E": { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" }, "M": { "item": "botania:manasteel_block" diff --git a/src/main/resources/data/botania/recipes/spawnermover.json b/src/main/resources/data/botania/recipes/spawnermover.json index 3b640aa42..cbca9e021 100644 --- a/src/main/resources/data/botania/recipes/spawnermover.json +++ b/src/main/resources/data/botania/recipes/spawnermover.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" }, "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, "E": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "I": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/spectral_platform.json b/src/main/resources/data/botania/recipes/spectral_platform.json index 653aab428..adf7be419 100644 --- a/src/main/resources/data/botania/recipes/spectral_platform.json +++ b/src/main/resources/data/botania/recipes/spectral_platform.json @@ -22,7 +22,7 @@ "data": 4 }, "D": { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/spellcloth.json b/src/main/resources/data/botania/recipes/spellcloth.json index a350639e5..1678375ce 100644 --- a/src/main/resources/data/botania/recipes/spellcloth.json +++ b/src/main/resources/data/botania/recipes/spellcloth.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, "C": { - "item": "#CLOTHMANAWEAVE" + "item": "botania:manaweave_cloth" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/starfield.json b/src/main/resources/data/botania/recipes/starfield.json index 0657db3bb..0e884e984 100644 --- a/src/main/resources/data/botania/recipes/starfield.json +++ b/src/main/resources/data/botania/recipes/starfield.json @@ -9,13 +9,13 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "O": { - "item": "#OBSIDIAN" + "item": "minecraft:obsidian" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/starsword.json b/src/main/resources/data/botania/recipes/starsword.json index ff39bcd6c..570132006 100644 --- a/src/main/resources/data/botania/recipes/starsword.json +++ b/src/main/resources/data/botania/recipes/starsword.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" }, "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, "T": { "item": "botania:terrasword" }, "I": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/supercloudpendant.json b/src/main/resources/data/botania/recipes/supercloudpendant.json index 048afb39e..fcbe420bd 100644 --- a/src/main/resources/data/botania/recipes/supercloudpendant.json +++ b/src/main/resources/data/botania/recipes/supercloudpendant.json @@ -16,10 +16,10 @@ "item": "minecraft:ghast_tear" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "G": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "N": { "item": "minecraft:wool", diff --git a/src/main/resources/data/botania/recipes/superlavapendant.json b/src/main/resources/data/botania/recipes/superlavapendant.json index 4f99dcc66..d8efaed1a 100644 --- a/src/main/resources/data/botania/recipes/superlavapendant.json +++ b/src/main/resources/data/botania/recipes/superlavapendant.json @@ -16,7 +16,7 @@ "item": "minecraft:blaze_rod" }, "G": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "N": { "item": "minecraft:nether_brick" diff --git a/src/main/resources/data/botania/recipes/supertravelbelt.json b/src/main/resources/data/botania/recipes/supertravelbelt.json index 612f28f4c..038648f20 100644 --- a/src/main/resources/data/botania/recipes/supertravelbelt.json +++ b/src/main/resources/data/botania/recipes/supertravelbelt.json @@ -13,10 +13,10 @@ "item": "botania:travelbelt" }, "E": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" }, "L": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/swapring.json b/src/main/resources/data/botania/recipes/swapring.json index ded26c9e6..160e37d35 100644 --- a/src/main/resources/data/botania/recipes/swapring.json +++ b/src/main/resources/data/botania/recipes/swapring.json @@ -13,7 +13,7 @@ "item": "minecraft:clay" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/temperancestone.json b/src/main/resources/data/botania/recipes/temperancestone.json index 6a6fb5aa6..d4631fe82 100644 --- a/src/main/resources/data/botania/recipes/temperancestone.json +++ b/src/main/resources/data/botania/recipes/temperancestone.json @@ -11,10 +11,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" }, "S": { - "item": "#STONE" + "tag": "forge:stone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/terraaxe.json b/src/main/resources/data/botania/recipes/terraaxe.json index b05eda0b6..85096de38 100644 --- a/src/main/resources/data/botania/recipes/terraaxe.json +++ b/src/main/resources/data/botania/recipes/terraaxe.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "T": { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" }, "G": { - "item": "#GLOWSTONE" + "item": "minecraft:glowstone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/terraformrod.json b/src/main/resources/data/botania/recipes/terraformrod.json index 1a01f29e7..03ad454c1 100644 --- a/src/main/resources/data/botania/recipes/terraformrod.json +++ b/src/main/resources/data/botania/recipes/terraformrod.json @@ -10,25 +10,25 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#RUNEAUTUMNB" + "tag": "botania:runes/autumn" }, "R": { "item": "botania:dirtrod" }, "S": { - "item": "#RUNESPRINGB" + "tag": "botania:runes/spring" }, "T": { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" }, "G": { "item": "botania:seeds_grass" }, "W": { - "item": "#RUNEWINTERB" + "tag": "botania:runes/winter" }, "M": { - "item": "#RUNESUMMERB" + "tag": "botania:runes/summer" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/terraplate.json b/src/main/resources/data/botania/recipes/terraplate.json index 06e1c4a68..09803afac 100644 --- a/src/main/resources/data/botania/recipes/terraplate.json +++ b/src/main/resources/data/botania/recipes/terraplate.json @@ -10,22 +10,22 @@ "type": "forge:ore_shaped", "key": { "0": { - "item": "#RUNEWATERB" + "tag": "botania:runes/water" }, "1": { - "item": "#RUNEFIREB" + "tag": "botania:runes/fire" }, "2": { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" }, "3": { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" }, "8": { - "item": "#RUNEMANAB" + "tag": "botania:runes/mana" }, "L": { - "item": "#BLOCKLAPIS" + "tag": "forge:storage_blocks/lapis" }, "M": { "item": "botania:manasteel_block" diff --git a/src/main/resources/data/botania/recipes/terrasteel_block.json b/src/main/resources/data/botania/recipes/terrasteel_block.json index 6a1867ecc..e275f43fc 100644 --- a/src/main/resources/data/botania/recipes/terrasteel_block.json +++ b/src/main/resources/data/botania/recipes/terrasteel_block.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "I": { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/terrasword.json b/src/main/resources/data/botania/recipes/terrasword.json index 8dd110a21..3359cff84 100644 --- a/src/main/resources/data/botania/recipes/terrasword.json +++ b/src/main/resources/data/botania/recipes/terrasword.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "I": { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/teruterubozu.json b/src/main/resources/data/botania/recipes/teruterubozu.json index ca872af47..3b0f8cc96 100644 --- a/src/main/resources/data/botania/recipes/teruterubozu.json +++ b/src/main/resources/data/botania/recipes/teruterubozu.json @@ -10,7 +10,7 @@ "type": "forge:ore_shaped", "key": { "C": { - "item": "#CLOTHMANAWEAVE" + "item": "botania:manaweave_cloth" }, "S": { "item": "minecraft:double_plant", diff --git a/src/main/resources/data/botania/recipes/thirdeye.json b/src/main/resources/data/botania/recipes/thirdeye.json index c75b7fb05..980601165 100644 --- a/src/main/resources/data/botania/recipes/thirdeye.json +++ b/src/main/resources/data/botania/recipes/thirdeye.json @@ -17,10 +17,10 @@ "item": "minecraft:golden_carrot" }, "S": { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" }, "D": { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" }, "E": { "item": "minecraft:ender_eye" diff --git a/src/main/resources/data/botania/recipes/thorn_chakram.json b/src/main/resources/data/botania/recipes/thorn_chakram.json index 8e8426379..fc825a6d4 100644 --- a/src/main/resources/data/botania/recipes/thorn_chakram.json +++ b/src/main/resources/data/botania/recipes/thorn_chakram.json @@ -11,10 +11,10 @@ "type": "forge:ore_shaped", "key": { "T": { - "item": "#INGOTTERRASTEEL" + "tag": "forge:ingots/terrasteel" }, "V": { - "item": "#VINE" + "item": "minecraft:vine" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/thundersword.json b/src/main/resources/data/botania/recipes/thundersword.json index 1af8e79b4..22ae02ff6 100644 --- a/src/main/resources/data/botania/recipes/thundersword.json +++ b/src/main/resources/data/botania/recipes/thundersword.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#BENDERAIRBOTTLE" + "item": "botania:ender_air_bottle" }, "D": { - "item": "#MANADIAMOND" + "tag": "forge:gems/mana_diamond" }, "T": { "item": "botania:terrasword" }, "I": { - "item": "#INGOTELVENELEMENTIUM" + "tag": "forge:ingots/elementium" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/tinyplanet.json b/src/main/resources/data/botania/recipes/tinyplanet.json index 8b5b9588e..9ae1fcb71 100644 --- a/src/main/resources/data/botania/recipes/tinyplanet.json +++ b/src/main/resources/data/botania/recipes/tinyplanet.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "P": { - "item": "#MANAPEARL" + "item": "botania:mana_pearl" }, "S": { - "item": "#STONE" + "tag": "forge:stone" }, "L": { - "item": "#LIVINGROCK" + "tag": "botania:livingrock" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/tinyplanetblock.json b/src/main/resources/data/botania/recipes/tinyplanetblock.json index 53ec5c3eb..e35507dd3 100644 --- a/src/main/resources/data/botania/recipes/tinyplanetblock.json +++ b/src/main/resources/data/botania/recipes/tinyplanetblock.json @@ -13,7 +13,7 @@ "item": "botania:tinyplanet" }, "S": { - "item": "#STONE" + "tag": "forge:stone" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/tornadorod.json b/src/main/resources/data/botania/recipes/tornadorod.json index 9861b4b41..b6d3c1f7b 100644 --- a/src/main/resources/data/botania/recipes/tornadorod.json +++ b/src/main/resources/data/botania/recipes/tornadorod.json @@ -10,13 +10,13 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" }, "F": { - "item": "#FEATHER" + "item": "minecraft:feather" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/travelbelt.json b/src/main/resources/data/botania/recipes/travelbelt.json index 1327945ec..1c0da8ec9 100644 --- a/src/main/resources/data/botania/recipes/travelbelt.json +++ b/src/main/resources/data/botania/recipes/travelbelt.json @@ -10,16 +10,16 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#RUNEAIRB" + "tag": "botania:runes/air" }, "S": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" }, "E": { - "item": "#RUNEEARTHB" + "tag": "botania:runes/earth" }, "L": { - "item": "#LEATHER" + "item": "minecraft:leather" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/turntable.json b/src/main/resources/data/botania/recipes/turntable.json index cba301d13..72539dcdc 100644 --- a/src/main/resources/data/botania/recipes/turntable.json +++ b/src/main/resources/data/botania/recipes/turntable.json @@ -13,7 +13,7 @@ "item": "minecraft:sticky_piston" }, "W": { - "item": "#LIVINGWOOD" + "tag": "botania:livingwood" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/unholycloak.json b/src/main/resources/data/botania/recipes/unholycloak.json index 8988858b4..5e49996fa 100644 --- a/src/main/resources/data/botania/recipes/unholycloak.json +++ b/src/main/resources/data/botania/recipes/unholycloak.json @@ -10,10 +10,10 @@ "type": "forge:ore_shaped", "key": { "R": { - "item": "#DUSTREDSTONE" + "tag": "forge:dusts/redstone" }, "S": { - "item": "#ETERNALLIFEESSENCE" + "item": "botania:life_essence" }, "W": { "item": "minecraft:wool", diff --git a/src/main/resources/data/botania/recipes/virus_necrodermal.json b/src/main/resources/data/botania/recipes/virus_necrodermal.json index 47fe1bb16..d85be7f7c 100644 --- a/src/main/resources/data/botania/recipes/virus_necrodermal.json +++ b/src/main/resources/data/botania/recipes/virus_necrodermal.json @@ -4,7 +4,7 @@ }, "ingredients": [ { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { "item": "botania:vineball" diff --git a/src/main/resources/data/botania/recipes/virus_nullodermal.json b/src/main/resources/data/botania/recipes/virus_nullodermal.json index 6741bd78e..ed11be2f3 100644 --- a/src/main/resources/data/botania/recipes/virus_nullodermal.json +++ b/src/main/resources/data/botania/recipes/virus_nullodermal.json @@ -4,7 +4,7 @@ }, "ingredients": [ { - "item": "#ELVENPIXIEDUST" + "item": "botania:pixie_dust" }, { "item": "botania:vineball" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json index c940002fb..c0e7605c5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json index 87c0133e2..329c0bce1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json index 89791b3c8..a157c71b8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json index 8dc3fe0a5..08cd7343e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json index d0d149858..2402e928c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json index 37b23f140..8989940a8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_lightBlue.json deleted file mode 100644 index 385a5fa70..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:15,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALBLACK" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json index a9aa0f560..c7629a1b6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json index 418f0e927..45a510ea7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json index cb1483b1a..cdf34fc5b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json index 7652d9109..66f089d67 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json index 080349057..aa3c9eb5e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json index b0f6a9987..619e912ba 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json index 69939b857..fd0f60aef 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json index a1b45914a..ed7c69fc6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json index e9a6a40ad..43b8c90c0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_black_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json index 093d58415..ba0c148f9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json index a1e36d7a5..6ce5c2465 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json index cff8b1793..51d3163ef 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json index acd82688f..15491f7d4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json index 8d7aff367..227f86347 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json index 6ec9b86c0..de7d4eb22 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_lightBlue.json deleted file mode 100644 index 48acd2c6c..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:11,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALBLUE" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json index 932d27f7f..d3b288e34 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json index c9739713e..acf472a5c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json index 4ddc34012..4d994d308 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json index 94348be92..3c941c2e4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json index 20b41ce59..211311a1c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json index fd080b4d1..fc8ce8bd9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json index 28e4171a1..b4b76c037 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json index 20565b2b2..3c5506f46 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json index 4bbbc02d1..c9d842a24 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_blue_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json index 6b4da958b..0ee0a3d50 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json index 6b589a342..6ec944b81 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json index 1d68660d2..3fd200a97 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json index a13dafcca..6be8fc3c1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json index ae63737df..f04ffacc6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json index e18c30b32..72f409cdd 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_lightBlue.json deleted file mode 100644 index b4bf94a73..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:12,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALBROWN" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json index 3f0fd6213..e2fbd09a1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json index 698edca78..209065334 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json index 31fb4ddab..b37cef460 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json index 1a9cf4ccd..f204e3c32 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json index 1d4c0e3ee..f42af3b0b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json index 3190fda39..76e346704 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json index 901ebc0af..28695b33f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json index bc2efc6d6..4033137b5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json index 9e6b24b97..f3a714fa4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_brown_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json index bc8b5ee86..a2b6f1476 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json index 9dbf9a3bd..48cd7b708 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json index 00b0aa424..77000b02f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json index 569ecd343..6019d3c34 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json index a39e21095..58a2f7f7f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json index b4e07a2ee..7c21a19a9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lightBlue.json deleted file mode 100644 index b9cd3f480..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:9,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALCYAN" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json index 51127d174..1da308256 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json index a83099af6..44c03e460 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json index 9fdb8532e..38ede78c6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json index 6a33c134c..ace5d39e1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json index 8b8e9cd1f..34347d2b7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json index 15d0a3840..e62316248 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json index 05611d3e3..9ebe6f9a0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json index 1ba7fe2a0..28041f0f7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json index a3e78b4ef..4475d6a05 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_cyan_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json index ddd11e715..9e320386f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json index c36e37823..ced0613be 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json index f39d87b0c..8d31b9c05 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json index bc8b236e3..e3ee2ec6b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json index b2b2bd19c..045c31143 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json index a31eb4a4d..2ad7eb453 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_lightBlue.json deleted file mode 100644 index f3d8bfbc5..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:7,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALGRAY" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json index fd7bb91d2..fefe778f0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json index a4dd43db7..cc0a19895 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json index 2e0b4cc9a..3883114a6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json index dbe50dc2e..b339df765 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json index 63e172ed9..bd698c03a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json index 4ea68d627..5ad31230f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json index 5dbf79f04..25764fd42 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json index 0b1041d64..3b02236e4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json index 76aa6ba8b..cf85675b7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_gray_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json index 0c9ed07c3..5f11ca2a1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json index 986393b55..36f9017cc 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json index 695057bed..a282b40e4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json index 7e1a334af..06828f83d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json index 6127ab7d3..9c1011ed0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json index b01a6112c..18df2e123 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_lightBlue.json deleted file mode 100644 index c6283788e..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:13,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALGREEN" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json index 106487d87..53ce54a24 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json index 646428f4d..b71a30e5d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json index 23d69ab63..8fc647267 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json index a1d9e257c..13226377e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json index 7db3fe91f..bf5ba0390 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json index 305ad253d..eb94b02f5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json index d815ace71..a22ec4baf 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json index 27099adc6..459a953f6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json index 5ef87cb46..a54d798bc 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_green_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_black.json deleted file mode 100644 index 99adbdb14..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_black.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:15}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALBLACK" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_blue.json deleted file mode 100644 index e9b72f7d1..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_blue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:11}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_brown.json deleted file mode 100644 index 2e96798bf..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_brown.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:12}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALBROWN" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_cyan.json deleted file mode 100644 index 862db7337..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_cyan.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:9}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALCYAN" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_gray.json deleted file mode 100644 index a33b4fdf2..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_gray.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:7}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALGRAY" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_green.json deleted file mode 100644 index e5280debd..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_green.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:13}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALGREEN" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_lightBlue.json deleted file mode 100644 index 53179582a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_lime.json deleted file mode 100644 index b26be0d2a..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_lime.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:5}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALLIME" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_magenta.json deleted file mode 100644 index 721f71aef..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_magenta.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:2}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALMAGENTA" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_orange.json deleted file mode 100644 index c45c69136..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_orange.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:1}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALORANGE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_pink.json deleted file mode 100644 index 74ae95c46..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_pink.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:6}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALPINK" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_purple.json deleted file mode 100644 index 9c08312f0..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_purple.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:10}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALPURPLE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_red.json deleted file mode 100644 index 931803eaa..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_red.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:14}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALRED" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_silver.json deleted file mode 100644 index 52ed4a890..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_silver.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:8}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALLIGHTGRAY" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_white.json deleted file mode 100644 index d0eea8d01..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_white.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:0}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALWHITE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_yellow.json deleted file mode 100644 index 325cf700b..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lightBlue_yellow.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:3,color2:4}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTBLUE" - }, - "B": { - "item": "#PETALYELLOW" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json index 4475a534e..23ac75c11 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json index ff013ed61..ef03f3b15 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json index dd0b1d9cd..991755db1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json index c81a901b1..524ea4442 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json index 89391fb14..841e87fda 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json index 2b52af438..93eee6eb8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_lightBlue.json deleted file mode 100644 index 732772a60..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:5,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIME" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json index f4749f827..adb4913b5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json index 9222b2e2d..0bb507978 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json index fe87268b0..cbc1a8b00 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json index 97cb070c6..6d0bdffe4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json index d0575f568..f693bae25 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json index 8c00e94c5..0aef118bf 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json index 16d245889..3a20c724b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json index 8ce55d09c..f3de40851 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json index b7034bcb1..78802fdfa 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_lime_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json index 935786dfd..253c8bb6c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json index d43a42da4..0475e2041 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json index 86e0192e9..a02b1e7c1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json index d2508cd9c..0584f1dcc 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json index 9048badd5..2c5859e75 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json index 45c9d25c4..b825447dd 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lightBlue.json deleted file mode 100644 index c65387721..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:2,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALMAGENTA" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json index 3dfba4ac1..d7021f79e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json index a0ae2b46b..e8cc6da24 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json index a23e35355..19c7a13b8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json index a19862e77..9c8812092 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json index f2823cc51..8ef2cd428 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json index 318bdf001..8c19572b6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json index 9da0df1bb..04ac5b549 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json index 9f53efc95..558cac0de 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json index d7b155820..10f4aed41 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_magenta_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json index 84bb969d0..dc79ef2cf 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json index 2e2ed1b25..519f786dc 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json index 450de3b10..11bf906e6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json index 08bc70945..6189a60b0 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json index 6e5c19130..c6def14c9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json index 440e75c6d..94c242d7a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_lightBlue.json deleted file mode 100644 index 48c135ec6..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:1,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALORANGE" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json index 3ad5fc443..bc006c68b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json index e69ecae38..7e1433b45 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json index f11b4829e..82fbfedfb 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json index f1ed74df9..298a285b7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json index acb742ff9..db0644a46 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json index 2a7458beb..3803821b1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json index 6d9b32160..a676c5daa 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json index b1e5f5dc2..32d3dc6ab 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json index c7313823f..6fa30e03c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_orange_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json index dfb8c7598..638fb0f64 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json index a35a59ea8..f473be5bd 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json index 886a645f4..1654b8b6e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json index 907ae35f8..e9c1066e5 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json index aec3c9aa3..8556ce44e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json index 5e1be55b3..6b043bfa7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_lightBlue.json deleted file mode 100644 index 8e6675f66..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:6,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALPINK" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json index 13392fb18..91626b927 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json index d7b29fdc4..8761c1320 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json index c165c71ee..7c7fa3cc2 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json index ada84e4b0..8c11bd984 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json index 36334d447..f1ee45f56 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json index 456e48849..db63ef394 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json index c9ce5e1d2..7e80a7044 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json index 3992b49b5..d11d2cfa3 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json index a2212a511..5e55edf4a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_pink_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json index 818db19bd..a246d14c4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json index a88208ce4..358878138 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json index b321236f9..3287f77fe 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json index 7823670da..96450d3fd 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json index 9b515a5ce..1334b0269 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json index d19fa74d2..abace96d9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_lightBlue.json deleted file mode 100644 index c4dfe86ca..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:10,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALPURPLE" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json index 5211589e8..2c375cd6e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json index 86155c3b3..001860a91 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json index 9c3458dde..134ff117b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json index 436da09d9..29363aa11 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json index fadeb7121..8b704613a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json index 1f06da1c2..06951470b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json index 91872196c..160ead033 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json index 8a141f45e..362936f2b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json index bf681f31d..0c199e96f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_purple_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json index aea198c4b..cd3376bc8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json index 1795bd910..757cb5588 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json index d6c3ee232..1550e095d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json index ecd1f2814..4dc2198e4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json index 49ce72e7e..2359db007 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json index 1f396135f..aeef71e71 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_lightBlue.json deleted file mode 100644 index b6e7ca0ce..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:14,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALRED" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json index a71c4eb96..57b513069 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json index 1f2ac68b0..190b603df 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json index b50f104da..d1a3a6350 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json index 9b222d7ef..13a4812b7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json index f742e3077..cdef60ba8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json index 85c1f741c..11b29dffd 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json index e4b05e7bf..a090d8d41 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json index 857fde714..99ef09ece 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json index aa4809964..6b057044b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_red_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json index 2504891b8..71df0bd91 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json index 6a15345e8..f8e33188c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json index a7da6e39f..cec5423ff 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json index 36b8fc448..7eb5914ee 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json index 8376ee293..693a0eba1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json index c0884a18f..5fae4b599 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_lightBlue.json deleted file mode 100644 index 20a0f9c41..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:8,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALLIGHTGRAY" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json index 9f888d47d..f4bd69a38 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json index 0282a312c..06c2d6613 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json index 150e9f1e4..0a52ee89f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json index 637e344c4..9f013f378 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json index af7b51bc3..306ecf705 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json index 709890fd3..ce469463b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json index 8102dc71b..b70cdc972 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json index 90f1c090f..8bac616a9 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json index 8479c9cb8..79d8bd4a6 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_silver_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json index a12fef7ab..9b1a3af0f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json index 6ea5cd5f6..03b1c44f1 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json index e7d35cdc6..e6d5c8894 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json index 94bb6492e..26be03e67 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json index e2f939a9e..0a659b93d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json index 067905208..a4cdd3dc4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_lightBlue.json deleted file mode 100644 index 5914f9107..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:0,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALWHITE" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json index 695615cce..7885dbd00 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json index 67de4c876..0232043f8 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json index f688a9bce..5942eab6f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json index 130011e7f..cfd448949 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json index fec16a528..e6208ee8a 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json index 48614cfd3..12e980f03 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json index 895743f18..11bc22fd4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json index 86e55364c..7b5fd3cbf 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json index 2d310ae90..64c7bcfe7 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_white_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json index b15486045..6ea79b9b4 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_black.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALBLACK" + "tag": "botania:petals/black" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json index 922f0014f..9e31d8c52 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_blue.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALBLUE" + "tag": "botania:petals/blue" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json index 03cab34e6..36848d78d 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_brown.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALBROWN" + "tag": "botania:petals/brown" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json index b129c7bf5..6f0dcf2fc 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_cyan.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALCYAN" + "tag": "botania:petals/cyan" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json index d2dc7bee7..89ba7b52b 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_gray.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALGRAY" + "tag": "botania:petals/gray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json index dc5731ccc..020b6fb02 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_green.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALGREEN" + "tag": "botania:petals/green" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lightBlue.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lightBlue.json deleted file mode 100644 index 68f633a89..000000000 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lightBlue.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "result": { - "item": "botania:twigwand", - "data": 0, - "nbt": "{color1:4,color2:3}" - }, - "pattern": [ - " AS", - " SB", - "S " - ], - "type": "forge:ore_shaped", - "key": { - "A": { - "item": "#PETALYELLOW" - }, - "B": { - "item": "#PETALLIGHTBLUE" - }, - "S": { - "item": "#LIVINGWOODTWIG" - } - }, - "group": "botania:twigwand" -} \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json index 76e23225f..993335f3f 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_lime.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALLIME" + "tag": "botania:petals/lime" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json index 13ece8619..40222fdcf 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_magenta.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALMAGENTA" + "tag": "botania:petals/magenta" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json index 7780a9d4c..c44373b21 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_orange.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALORANGE" + "tag": "botania:petals/orange" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json index 0843ca435..32e39a98e 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_pink.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALPINK" + "tag": "botania:petals/pink" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json index e8cc0fa23..6dbcb2d34 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_purple.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALPURPLE" + "tag": "botania:petals/purple" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json index b44bdc541..617692dcc 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_red.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALRED" + "tag": "botania:petals/red" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json index 3e8f67dd4..a2b0ae566 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_silver.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALLIGHTGRAY" + "tag": "botania:petals/lightgray" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json index 05c83292f..07453ca2c 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_white.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALWHITE" + "tag": "botania:petals/white" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json index a05d29902..270dfc0fe 100644 --- a/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json +++ b/src/main/resources/data/botania/recipes/wands/twigwand_yellow_yellow.json @@ -12,13 +12,13 @@ "type": "forge:ore_shaped", "key": { "A": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "B": { - "item": "#PETALYELLOW" + "tag": "botania:petals/yellow" }, "S": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } }, "group": "botania:twigwand" diff --git a/src/main/resources/data/botania/recipes/waterring.json b/src/main/resources/data/botania/recipes/waterring.json index 9024ab916..eb9831216 100644 --- a/src/main/resources/data/botania/recipes/waterring.json +++ b/src/main/resources/data/botania/recipes/waterring.json @@ -18,10 +18,10 @@ "data": 1 }, "W": { - "item": "#RUNEWATERB" + "tag": "botania:runes/water" }, "M": { - "item": "#INGOTMANASTEEL" + "tag": "forge:ingots/manasteel" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/waterrod.json b/src/main/resources/data/botania/recipes/waterrod.json index f924decca..2a9538668 100644 --- a/src/main/resources/data/botania/recipes/waterrod.json +++ b/src/main/resources/data/botania/recipes/waterrod.json @@ -17,10 +17,10 @@ } }, "R": { - "item": "#RUNEWATERB" + "tag": "botania:runes/water" }, "T": { - "item": "#LIVINGWOODTWIG" + "item": "botania:livingwood_twig" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/web.json b/src/main/resources/data/botania/recipes/web.json index 67960ff30..8429e3a2b 100644 --- a/src/main/resources/data/botania/recipes/web.json +++ b/src/main/resources/data/botania/recipes/web.json @@ -13,7 +13,7 @@ "item": "minecraft:string" }, "M": { - "item": "#MANASTRING" + "item": "botania:mana_string" } } } \ No newline at end of file diff --git a/src/main/resources/data/botania/recipes/worldseed.json b/src/main/resources/data/botania/recipes/worldseed.json index 75a58051c..4215ade4d 100644 --- a/src/main/resources/data/botania/recipes/worldseed.json +++ b/src/main/resources/data/botania/recipes/worldseed.json @@ -14,7 +14,7 @@ "item": "minecraft:wheat_seeds" }, "D": { - "item": "#ELVENDRAGONSTONE" + "tag": "forge:gems/dragonstone" }, "G": { "item": "minecraft:grass" diff --git a/src/main/resources/data/botania/tags/blocks/magnet_ring_blacklist.json b/src/main/resources/data/botania/tags/blocks/magnet_ring_blacklist.json index 16b848752..5e404b591 100644 --- a/src/main/resources/data/botania/tags/blocks/magnet_ring_blacklist.json +++ b/src/main/resources/data/botania/tags/blocks/magnet_ring_blacklist.json @@ -7,6 +7,6 @@ "botania:diluted_pool", "botania:fabulous_pool", "botania:terra_plate", - "botania:rune_altar" + "botania:runic_altar" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/gems/quartz.json b/src/main/resources/data/forge/tags/items/gems/quartz.json index fddac2b1e..ca19b1b1c 100644 --- a/src/main/resources/data/forge/tags/items/gems/quartz.json +++ b/src/main/resources/data/forge/tags/items/gems/quartz.json @@ -1,12 +1,12 @@ { "replace": false, "values": [ - "botania:dark_quartz", - "botania:mana_quartz", - "botania:blaze_quartz", - "botania:lavender_quartz", - "botania:red_quartz", - "botania:elven_quartz", - "botania:sunny_quartz" + "botania:quartz_dark", + "botania:quartz_mana", + "botania:quartz_blaze", + "botania:quartz_lavender", + "botania:quartz_red", + "botania:quartz_elven", + "botania:quartz_sunny" ] } \ No newline at end of file