From d6bd0c021bc9864c5b9b5aa6ed49424fb0797d94 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 12 Mar 2019 19:28:17 -0500 Subject: [PATCH] Oredict/tag cleanup --- .../java/vazkii/botania/api/BotaniaAPI.java | 8 ----- .../botania/common/block/ModBlocks.java | 14 -------- .../subtile/functional/SubTileLoonuim.java | 7 ++-- .../common/crafting/recipe/HeadRecipe.java | 11 +++--- .../vazkii/botania/common/item/ModItems.java | 34 ------------------- .../vazkii/botania/common/lib/LibOreDict.java | 20 ----------- .../data/botania/tags/blocks/livingrock.json | 6 ++++ .../data/botania/tags/blocks/livingwood.json | 6 ++++ .../tags/items/double_flowers/black.json | 6 ++++ .../tags/items/double_flowers/blue.json | 6 ++++ .../tags/items/double_flowers/brown.json | 6 ++++ .../tags/items/double_flowers/cyan.json | 6 ++++ .../tags/items/double_flowers/gray.json | 6 ++++ .../tags/items/double_flowers/green.json | 6 ++++ .../tags/items/double_flowers/light_blue.json | 6 ++++ .../tags/items/double_flowers/light_gray.json | 6 ++++ .../tags/items/double_flowers/lime.json | 6 ++++ .../tags/items/double_flowers/magenta.json | 6 ++++ .../tags/items/double_flowers/orange.json | 6 ++++ .../tags/items/double_flowers/pink.json | 6 ++++ .../tags/items/double_flowers/purple.json | 6 ++++ .../tags/items/double_flowers/red.json | 6 ++++ .../tags/items/double_flowers/white.json | 6 ++++ .../tags/items/double_flowers/yellow.json | 6 ++++ .../botania/tags/items/flowers/black.json | 6 ++++ .../data/botania/tags/items/flowers/blue.json | 6 ++++ .../botania/tags/items/flowers/brown.json | 6 ++++ .../data/botania/tags/items/flowers/cyan.json | 6 ++++ .../data/botania/tags/items/flowers/gray.json | 6 ++++ .../botania/tags/items/flowers/green.json | 6 ++++ .../tags/items/flowers/light_blue.json | 6 ++++ .../tags/items/flowers/light_gray.json | 6 ++++ .../data/botania/tags/items/flowers/lime.json | 6 ++++ .../botania/tags/items/flowers/magenta.json | 6 ++++ .../botania/tags/items/flowers/orange.json | 6 ++++ .../data/botania/tags/items/flowers/pink.json | 6 ++++ .../botania/tags/items/flowers/purple.json | 6 ++++ .../data/botania/tags/items/flowers/red.json | 6 ++++ .../botania/tags/items/flowers/white.json | 6 ++++ .../botania/tags/items/flowers/yellow.json | 6 ++++ .../data/botania/tags/items/livingrock.json | 6 ++++ .../data/botania/tags/items/livingwood.json | 6 ++++ .../botania/tags/items/loonium_blacklist.json | 21 ++++++++++++ .../data/botania/tags/items/petals/black.json | 7 ++++ .../data/botania/tags/items/petals/blue.json | 7 ++++ .../data/botania/tags/items/petals/brown.json | 7 ++++ .../data/botania/tags/items/petals/cyan.json | 7 ++++ .../data/botania/tags/items/petals/gray.json | 7 ++++ .../data/botania/tags/items/petals/green.json | 7 ++++ .../botania/tags/items/petals/light_blue.json | 7 ++++ .../botania/tags/items/petals/light_gray.json | 7 ++++ .../data/botania/tags/items/petals/lime.json | 7 ++++ .../botania/tags/items/petals/magenta.json | 7 ++++ .../botania/tags/items/petals/orange.json | 7 ++++ .../data/botania/tags/items/petals/pink.json | 7 ++++ .../botania/tags/items/petals/purple.json | 7 ++++ .../data/botania/tags/items/petals/red.json | 7 ++++ .../data/botania/tags/items/petals/white.json | 7 ++++ .../botania/tags/items/petals/yellow.json | 7 ++++ .../data/botania/tags/items/runes/air.json | 6 ++++ .../data/botania/tags/items/runes/autumn.json | 6 ++++ .../data/botania/tags/items/runes/earth.json | 6 ++++ .../data/botania/tags/items/runes/envy.json | 6 ++++ .../data/botania/tags/items/runes/fire.json | 6 ++++ .../botania/tags/items/runes/gluttony.json | 6 ++++ .../data/botania/tags/items/runes/greed.json | 6 ++++ .../data/botania/tags/items/runes/lust.json | 6 ++++ .../data/botania/tags/items/runes/mana.json | 6 ++++ .../data/botania/tags/items/runes/pride.json | 6 ++++ .../data/botania/tags/items/runes/sloth.json | 6 ++++ .../data/botania/tags/items/runes/spring.json | 6 ++++ .../data/botania/tags/items/runes/summer.json | 6 ++++ .../data/botania/tags/items/runes/water.json | 6 ++++ .../data/botania/tags/items/runes/winter.json | 6 ++++ .../data/botania/tags/items/runes/wrath.json | 6 ++++ .../data/forge/tags/items/dyes/black.json | 6 ++++ .../data/forge/tags/items/dyes/blue.json | 6 ++++ .../data/forge/tags/items/dyes/brown.json | 6 ++++ .../data/forge/tags/items/dyes/cyan.json | 6 ++++ .../data/forge/tags/items/dyes/gray.json | 6 ++++ .../data/forge/tags/items/dyes/green.json | 6 ++++ .../forge/tags/items/dyes/light_blue.json | 6 ++++ .../forge/tags/items/dyes/light_gray.json | 6 ++++ .../data/forge/tags/items/dyes/lime.json | 6 ++++ .../data/forge/tags/items/dyes/magenta.json | 6 ++++ .../data/forge/tags/items/dyes/orange.json | 6 ++++ .../data/forge/tags/items/dyes/pink.json | 6 ++++ .../data/forge/tags/items/dyes/purple.json | 6 ++++ .../data/forge/tags/items/dyes/red.json | 6 ++++ .../data/forge/tags/items/dyes/white.json | 6 ++++ .../data/forge/tags/items/dyes/yellow.json | 6 ++++ 91 files changed, 552 insertions(+), 83 deletions(-) create mode 100644 src/main/resources/data/botania/tags/blocks/livingrock.json create mode 100644 src/main/resources/data/botania/tags/blocks/livingwood.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/black.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/blue.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/brown.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/cyan.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/gray.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/green.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/light_blue.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/light_gray.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/lime.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/magenta.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/orange.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/pink.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/purple.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/red.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/white.json create mode 100644 src/main/resources/data/botania/tags/items/double_flowers/yellow.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/black.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/blue.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/brown.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/cyan.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/gray.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/green.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/light_blue.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/light_gray.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/lime.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/magenta.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/orange.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/pink.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/purple.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/red.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/white.json create mode 100644 src/main/resources/data/botania/tags/items/flowers/yellow.json create mode 100644 src/main/resources/data/botania/tags/items/livingrock.json create mode 100644 src/main/resources/data/botania/tags/items/livingwood.json create mode 100644 src/main/resources/data/botania/tags/items/loonium_blacklist.json create mode 100644 src/main/resources/data/botania/tags/items/petals/black.json create mode 100644 src/main/resources/data/botania/tags/items/petals/blue.json create mode 100644 src/main/resources/data/botania/tags/items/petals/brown.json create mode 100644 src/main/resources/data/botania/tags/items/petals/cyan.json create mode 100644 src/main/resources/data/botania/tags/items/petals/gray.json create mode 100644 src/main/resources/data/botania/tags/items/petals/green.json create mode 100644 src/main/resources/data/botania/tags/items/petals/light_blue.json create mode 100644 src/main/resources/data/botania/tags/items/petals/light_gray.json create mode 100644 src/main/resources/data/botania/tags/items/petals/lime.json create mode 100644 src/main/resources/data/botania/tags/items/petals/magenta.json create mode 100644 src/main/resources/data/botania/tags/items/petals/orange.json create mode 100644 src/main/resources/data/botania/tags/items/petals/pink.json create mode 100644 src/main/resources/data/botania/tags/items/petals/purple.json create mode 100644 src/main/resources/data/botania/tags/items/petals/red.json create mode 100644 src/main/resources/data/botania/tags/items/petals/white.json create mode 100644 src/main/resources/data/botania/tags/items/petals/yellow.json create mode 100644 src/main/resources/data/botania/tags/items/runes/air.json create mode 100644 src/main/resources/data/botania/tags/items/runes/autumn.json create mode 100644 src/main/resources/data/botania/tags/items/runes/earth.json create mode 100644 src/main/resources/data/botania/tags/items/runes/envy.json create mode 100644 src/main/resources/data/botania/tags/items/runes/fire.json create mode 100644 src/main/resources/data/botania/tags/items/runes/gluttony.json create mode 100644 src/main/resources/data/botania/tags/items/runes/greed.json create mode 100644 src/main/resources/data/botania/tags/items/runes/lust.json create mode 100644 src/main/resources/data/botania/tags/items/runes/mana.json create mode 100644 src/main/resources/data/botania/tags/items/runes/pride.json create mode 100644 src/main/resources/data/botania/tags/items/runes/sloth.json create mode 100644 src/main/resources/data/botania/tags/items/runes/spring.json create mode 100644 src/main/resources/data/botania/tags/items/runes/summer.json create mode 100644 src/main/resources/data/botania/tags/items/runes/water.json create mode 100644 src/main/resources/data/botania/tags/items/runes/winter.json create mode 100644 src/main/resources/data/botania/tags/items/runes/wrath.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/black.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/blue.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/brown.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/cyan.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/gray.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/green.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/light_blue.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/light_gray.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/lime.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/magenta.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/orange.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/pink.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/purple.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/red.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/white.json create mode 100644 src/main/resources/data/forge/tags/items/dyes/yellow.json diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 1bc8a1246..519a09803 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -95,7 +95,6 @@ public final class BotaniaAPI { public static final Map oreWeights = new HashMap<>(); public static final Map oreWeightsNether = new HashMap<>(); - public static final Set looniumBlacklist = new LinkedHashSet<>(); public static final Map> paintableBlocks = new LinkedHashMap<>(); public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); public static final Set gaiaBreakBlacklist = new HashSet<>(); @@ -776,13 +775,6 @@ public final class BotaniaAPI { return oreWeightsNether.get(tag); } - /** - * Blacklists an item from the Loonium drop table. - */ - public static void blackListItemFromLoonium(Item item) { - looniumBlacklist.add(item); - } - /** * Registers a Wiki provider for a mod so it uses that instead of the fallback * FTB wiki. diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index ff95e9f37..87238131d 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -811,20 +811,6 @@ public final class ModBlocks { } private static void initOreDict() { - for(int i = 0; i < 16; i++) { - OreDictionary.registerOre(LibOreDict.FLOWER[i], new ItemStack(flower, 1, i)); - OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(mushroom, 1, i)); - } - - OreDictionary.registerOre(LibOreDict.LIVING_ROCK, livingrock); - OreDictionary.registerOre(LibOreDict.LIVING_WOOD, livingwood); - OreDictionary.registerOre(LibOreDict.DREAM_WOOD, dreamwood); - - for(int i = 0; i < 8; i++) { - OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i], new ItemStack(doubleFlower1, 1, i)); - OreDictionary.registerOre(LibOreDict.DOUBLE_FLOWER[i + 8], new ItemStack(doubleFlower2, 1, i)); - } - OreDictionary.registerOre(LibOreDict.BLAZE_BLOCK, blazeBlock); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 5906d4f06..d361bde68 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -26,9 +26,12 @@ import net.minecraft.entity.monster.EntitySpider; import net.minecraft.entity.monster.EntityStray; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.MobEffects; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -39,7 +42,6 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; @@ -57,6 +59,7 @@ public class SubTileLoonuim extends SubTileFunctional { private static final int RANGE = 5; private static final String TAG_LOOT_TABLE = "lootTable"; private static final String TAG_ITEMSTACK_TO_DROP = "botania:looniumItemStackToDrop"; + private static final Tag BLACKLIST = new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, "loonium_blacklist")); private ResourceLocation lootTable = new ResourceLocation("minecraft", "chests/simple_dungeon"); @@ -77,7 +80,7 @@ public class SubTileLoonuim extends SubTileFunctional { Collections.shuffle(stacks); stack = stacks.get(0); } - } while(stack.isEmpty() || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); + } while(stack.isEmpty() || BLACKLIST.contains(stack.getItem())); int bound = RANGE * 2 + 1; int xp = supertile.getPos().getX() - RANGE + rand.nextInt(bound); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java index 14a8b0b0b..1dd6722cb 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -12,14 +12,14 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; +import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.common.core.helper.ItemNBTHelper; public class HeadRecipe extends RecipeRuneAltar { - String name = ""; + private String name = ""; public HeadRecipe(ItemStack output, int mana, Object... inputs) { super(output, mana, inputs); @@ -36,8 +36,9 @@ public class HeadRecipe extends RecipeRuneAltar { break; if(stack.getItem() == Items.NAME_TAG) { - name = stack.getDisplayName(); - if(name.equals(I18n.translateToLocal("item.nameTag.name"))) + String defaultName = new TextComponentTranslation(Items.NAME_TAG.getTranslationKey()).getString(); + name = stack.getDisplayName().getString(); + if(name.equals(defaultName)) return false; } } @@ -48,7 +49,7 @@ public class HeadRecipe extends RecipeRuneAltar { @Override public ItemStack getOutput() { - ItemStack stack = new ItemStack(Items.SKULL, 1, 3); + ItemStack stack = new ItemStack(Items.PLAYER_HEAD); if(!name.isEmpty()) ItemNBTHelper.setString(stack, "SkullOwner", name); return stack; diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 720d0bd0d..cfee8236c 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -636,30 +636,7 @@ public final class ModItems { } private static void registerOreDictionary() { - /* todo 1.13 OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); - for(EnumDyeColor color : EnumDyeColor.values()) { - OreDictionary.registerOre(LibOreDict.PETAL[color.getMetadata()], new ItemStack(petals.get(color))); - OreDictionary.registerOre(LibOreDict.DYE[color.getMetadata()], new ItemStack(dyes.get(color))); - OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dyes.get(color))); - } - - OreDictionary.registerOre(LibOreDict.RUNE[0], new ItemStack(runeWater)); - OreDictionary.registerOre(LibOreDict.RUNE[1], new ItemStack(runeFire)); - OreDictionary.registerOre(LibOreDict.RUNE[2], new ItemStack(runeEarth)); - OreDictionary.registerOre(LibOreDict.RUNE[3], new ItemStack(runeAir)); - OreDictionary.registerOre(LibOreDict.RUNE[4], new ItemStack(runeSpring)); - OreDictionary.registerOre(LibOreDict.RUNE[5], new ItemStack(runeSummer)); - OreDictionary.registerOre(LibOreDict.RUNE[6], new ItemStack(runeAutumn)); - OreDictionary.registerOre(LibOreDict.RUNE[7], new ItemStack(runeWinter)); - OreDictionary.registerOre(LibOreDict.RUNE[8], new ItemStack(runeMana)); - OreDictionary.registerOre(LibOreDict.RUNE[9], new ItemStack(runeLust)); - OreDictionary.registerOre(LibOreDict.RUNE[10], new ItemStack(runeGluttony)); - OreDictionary.registerOre(LibOreDict.RUNE[11], new ItemStack(runeGreed)); - OreDictionary.registerOre(LibOreDict.RUNE[12], new ItemStack(runeSloth)); - OreDictionary.registerOre(LibOreDict.RUNE[13], new ItemStack(runeWrath)); - OreDictionary.registerOre(LibOreDict.RUNE[14], new ItemStack(runeEnvy)); - OreDictionary.registerOre(LibOreDict.RUNE[15], new ItemStack(runePride)); OreDictionary.registerOre(LibOreDict.QUARTZ[0], new ItemStack(darkQuartz)); OreDictionary.registerOre(LibOreDict.QUARTZ[1], new ItemStack(manaQuartz)); @@ -697,18 +674,7 @@ public final class ModItems { OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial)); OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(flask)); - BotaniaAPI.blackListItemFromLoonium(lexicon); - BotaniaAPI.blackListItemFromLoonium(overgrowthSeed); - BotaniaAPI.blackListItemFromLoonium(blackLotus); - BotaniaAPI.blackListItemFromLoonium(blackerLotus); - for(Item i : Item.REGISTRY) { - if("minecraft".equals(i.getRegistryName().getNamespace()) & i instanceof ItemRecord) { - BotaniaAPI.blackListItemFromLoonium(i); - } - } - OreDictionary.registerOre("rodBlaze", Items.BLAZE_ROD); OreDictionary.registerOre("powderBlaze", Items.BLAZE_POWDER); - */ } } diff --git a/src/main/java/vazkii/botania/common/lib/LibOreDict.java b/src/main/java/vazkii/botania/common/lib/LibOreDict.java index 0003909eb..de7db8b63 100644 --- a/src/main/java/vazkii/botania/common/lib/LibOreDict.java +++ b/src/main/java/vazkii/botania/common/lib/LibOreDict.java @@ -15,8 +15,6 @@ public final class LibOreDict { public static final String LEXICON = "lexicaBotania"; public static final String PESTLE_AND_MORTAR = "pestleAndMortar"; public static final String TWIG_WAND = "twigWand"; - public static final String LIVING_WOOD = "livingwood"; - public static final String LIVING_ROCK = "livingrock"; public static final String MANA_STEEL = "ingotManasteel"; public static final String MANA_PEARL = "manaPearl"; public static final String MANA_DIAMOND = "manaDiamond"; @@ -24,7 +22,6 @@ public final class LibOreDict { public static final String TERRA_STEEL = "ingotTerrasteel"; public static final String LIFE_ESSENCE = "eternalLifeEssence"; public static final String REDSTONE_ROOT = "redstoneRoot"; - public static final String DREAM_WOOD = "dreamwood"; public static final String ELEMENTIUM = "ingotElvenElementium"; public static final String PIXIE_DUST = "elvenPixieDust"; public static final String DRAGONSTONE = "elvenDragonstone"; @@ -45,11 +42,8 @@ public final class LibOreDict { public static final String VIAL = "bVial"; public static final String FLASK = "bFlask"; - public static final String PRISMARINE_BLOCK = "blockPrismarine"; public static final String BLAZE_BLOCK = "blockBlaze"; - public static final String DYE_WILDCARD = "dye"; - public static final String[] FLOWER = new String[] { "mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue", "mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray", @@ -57,13 +51,6 @@ public final class LibOreDict { "mysticFlowerBrown", "mysticFlowerGreen", "mysticFlowerRed", "mysticFlowerBlack" }; - public static final String[] DOUBLE_FLOWER = new String[] { - "mysticFlowerWhiteDouble", "mysticFlowerOrangeDouble", "mysticFlowerMagentaDouble", "mysticFlowerLightBlueDouble", - "mysticFlowerYellowDouble", "mysticFlowerLimeDouble", "mysticFlowerPinkDouble", "mysticFlowerGrayDouble", - "mysticFlowerLightGrayDouble", "mysticFlowerCyanDouble", "mysticFlowerPurpleDouble", "mysticFlowerBlueDouble", - "mysticFlowerBrownDouble", "mysticFlowerGreenDouble", "mysticFlowerRedDouble", "mysticFlowerBlackDouble" - }; - public static final String[] PETAL = new String[] { "petalWhite", "petalOrange", "petalMagenta", "petalLightBlue", "petalYellow", "petalLime", "petalPink", "petalGray", @@ -71,13 +58,6 @@ public final class LibOreDict { "petalBrown", "petalGreen", "petalRed", "petalBlack" }; - public static final String[] DYE = new String[] { - "dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", - "dyeYellow", "dyeLime", "dyePink", "dyeGray", - "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", - "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack" - }; - public static final String[] RUNE = new String[] { "runeWaterB", "runeFireB", "runeEarthB", "runeAirB", "runeSpringB", "runeSummerB", "runeAutumnB", "runeWinterB", diff --git a/src/main/resources/data/botania/tags/blocks/livingrock.json b/src/main/resources/data/botania/tags/blocks/livingrock.json new file mode 100644 index 000000000..a2c038cd4 --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/livingrock.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:livingrock" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/blocks/livingwood.json b/src/main/resources/data/botania/tags/blocks/livingwood.json new file mode 100644 index 000000000..d4d15f8d9 --- /dev/null +++ b/src/main/resources/data/botania/tags/blocks/livingwood.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:livingwood" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/black.json b/src/main/resources/data/botania/tags/items/double_flowers/black.json new file mode 100644 index 000000000..aabc72a60 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/black.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:black_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/blue.json b/src/main/resources/data/botania/tags/items/double_flowers/blue.json new file mode 100644 index 000000000..7c450e2e7 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:blue_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/brown.json b/src/main/resources/data/botania/tags/items/double_flowers/brown.json new file mode 100644 index 000000000..aa1fd5190 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:brown_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/cyan.json b/src/main/resources/data/botania/tags/items/double_flowers/cyan.json new file mode 100644 index 000000000..06404a37b --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/cyan.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:cyan_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/gray.json b/src/main/resources/data/botania/tags/items/double_flowers/gray.json new file mode 100644 index 000000000..e8dc1017e --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:gray_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/green.json b/src/main/resources/data/botania/tags/items/double_flowers/green.json new file mode 100644 index 000000000..348bf3ebb --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/green.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:green_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/light_blue.json b/src/main/resources/data/botania/tags/items/double_flowers/light_blue.json new file mode 100644 index 000000000..0cf1848a5 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/light_blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:light_blue_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/light_gray.json b/src/main/resources/data/botania/tags/items/double_flowers/light_gray.json new file mode 100644 index 000000000..daec9ecb3 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/light_gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:light_gray_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/lime.json b/src/main/resources/data/botania/tags/items/double_flowers/lime.json new file mode 100644 index 000000000..c9568fcf3 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/lime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:lime_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/magenta.json b/src/main/resources/data/botania/tags/items/double_flowers/magenta.json new file mode 100644 index 000000000..0d003bdcf --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/magenta.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:magenta_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/orange.json b/src/main/resources/data/botania/tags/items/double_flowers/orange.json new file mode 100644 index 000000000..4b99d89e4 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/orange.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:orange_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/pink.json b/src/main/resources/data/botania/tags/items/double_flowers/pink.json new file mode 100644 index 000000000..bdb582c79 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/pink.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:pink_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/purple.json b/src/main/resources/data/botania/tags/items/double_flowers/purple.json new file mode 100644 index 000000000..80fcdfe2f --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:purple_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/red.json b/src/main/resources/data/botania/tags/items/double_flowers/red.json new file mode 100644 index 000000000..ca7208c68 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:red_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/white.json b/src/main/resources/data/botania/tags/items/double_flowers/white.json new file mode 100644 index 000000000..603acd52a --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/white.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:white_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/double_flowers/yellow.json b/src/main/resources/data/botania/tags/items/double_flowers/yellow.json new file mode 100644 index 000000000..1637c1313 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/double_flowers/yellow.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:yellow_double_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/black.json b/src/main/resources/data/botania/tags/items/flowers/black.json new file mode 100644 index 000000000..c067ca9dc --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/black.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:black_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/blue.json b/src/main/resources/data/botania/tags/items/flowers/blue.json new file mode 100644 index 000000000..3b28c1ee6 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:blue_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/brown.json b/src/main/resources/data/botania/tags/items/flowers/brown.json new file mode 100644 index 000000000..840e6d9e7 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:brown_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/cyan.json b/src/main/resources/data/botania/tags/items/flowers/cyan.json new file mode 100644 index 000000000..02fc31af4 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/cyan.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:cyan_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/gray.json b/src/main/resources/data/botania/tags/items/flowers/gray.json new file mode 100644 index 000000000..0b2630a5c --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:gray_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/green.json b/src/main/resources/data/botania/tags/items/flowers/green.json new file mode 100644 index 000000000..f9ffd8ce6 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/green.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:green_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/light_blue.json b/src/main/resources/data/botania/tags/items/flowers/light_blue.json new file mode 100644 index 000000000..74d2893ed --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/light_blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:light_blue_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/light_gray.json b/src/main/resources/data/botania/tags/items/flowers/light_gray.json new file mode 100644 index 000000000..8260085c3 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/light_gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:light_gray_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/lime.json b/src/main/resources/data/botania/tags/items/flowers/lime.json new file mode 100644 index 000000000..56947cf89 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/lime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:lime_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/magenta.json b/src/main/resources/data/botania/tags/items/flowers/magenta.json new file mode 100644 index 000000000..c5e6b645a --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/magenta.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:magenta_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/orange.json b/src/main/resources/data/botania/tags/items/flowers/orange.json new file mode 100644 index 000000000..0b4172c68 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/orange.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:orange_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/pink.json b/src/main/resources/data/botania/tags/items/flowers/pink.json new file mode 100644 index 000000000..61177b2a2 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/pink.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:pink_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/purple.json b/src/main/resources/data/botania/tags/items/flowers/purple.json new file mode 100644 index 000000000..118a2dd55 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:purple_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/red.json b/src/main/resources/data/botania/tags/items/flowers/red.json new file mode 100644 index 000000000..b1e31c8fd --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:red_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/white.json b/src/main/resources/data/botania/tags/items/flowers/white.json new file mode 100644 index 000000000..de24ada39 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/white.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:white_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/flowers/yellow.json b/src/main/resources/data/botania/tags/items/flowers/yellow.json new file mode 100644 index 000000000..7e13b8884 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/flowers/yellow.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:yellow_mystical_flower" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/livingrock.json b/src/main/resources/data/botania/tags/items/livingrock.json new file mode 100644 index 000000000..a2c038cd4 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/livingrock.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:livingrock" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/livingwood.json b/src/main/resources/data/botania/tags/items/livingwood.json new file mode 100644 index 000000000..d4d15f8d9 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/livingwood.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:livingwood" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/loonium_blacklist.json b/src/main/resources/data/botania/tags/items/loonium_blacklist.json new file mode 100644 index 000000000..242c67b36 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/loonium_blacklist.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "botania:lexicon", + "botania:overgrowthseed", + "botania:black_lotus", + "botania:blacker_lotus", + "minecraft:music_disc_13", + "minecraft:music_disc_cat", + "minecraft:music_disc_blocks", + "minecraft:music_disc_chirp", + "minecraft:music_disc_far", + "minecraft:music_disc_mall", + "minecraft:music_disc_mellohi", + "minecraft:music_disc_stal", + "minecraft:music_disc_strad", + "minecraft:music_disc_ward", + "minecraft:music_disc_11", + "minecraft:music_disc_wait" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/black.json b/src/main/resources/data/botania/tags/items/petals/black.json new file mode 100644 index 000000000..fe6e6b339 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/black.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:black_petal", + "botania:black_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/blue.json b/src/main/resources/data/botania/tags/items/petals/blue.json new file mode 100644 index 000000000..de096c5aa --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/blue.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:blue_petal", + "botania:blue_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/brown.json b/src/main/resources/data/botania/tags/items/petals/brown.json new file mode 100644 index 000000000..bd458a82d --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/brown.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:brown_petal", + "botania:brown_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/cyan.json b/src/main/resources/data/botania/tags/items/petals/cyan.json new file mode 100644 index 000000000..da3e334d0 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/cyan.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:cyan_petal", + "botania:cyan_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/gray.json b/src/main/resources/data/botania/tags/items/petals/gray.json new file mode 100644 index 000000000..0cc596386 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/gray.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:gray_petal", + "botania:gray_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/green.json b/src/main/resources/data/botania/tags/items/petals/green.json new file mode 100644 index 000000000..f259efe9c --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/green.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:green_petal", + "botania:green_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/light_blue.json b/src/main/resources/data/botania/tags/items/petals/light_blue.json new file mode 100644 index 000000000..6d8f267bd --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/light_blue.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:light_blue_petal", + "botania:light_blue_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/light_gray.json b/src/main/resources/data/botania/tags/items/petals/light_gray.json new file mode 100644 index 000000000..ee24710a3 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/light_gray.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:light_gray_petal", + "botania:light_gray_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/lime.json b/src/main/resources/data/botania/tags/items/petals/lime.json new file mode 100644 index 000000000..5617e3c0a --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/lime.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:lime_petal", + "botania:lime_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/magenta.json b/src/main/resources/data/botania/tags/items/petals/magenta.json new file mode 100644 index 000000000..bc464495e --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/magenta.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:magenta_petal", + "botania:magenta_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/orange.json b/src/main/resources/data/botania/tags/items/petals/orange.json new file mode 100644 index 000000000..91106727b --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/orange.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:orange_petal", + "botania:orange_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/pink.json b/src/main/resources/data/botania/tags/items/petals/pink.json new file mode 100644 index 000000000..898b4565e --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/pink.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:pink_petal", + "botania:pink_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/purple.json b/src/main/resources/data/botania/tags/items/petals/purple.json new file mode 100644 index 000000000..7c0ba16dd --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/purple.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:purple_petal", + "botania:purple_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/red.json b/src/main/resources/data/botania/tags/items/petals/red.json new file mode 100644 index 000000000..38e6ae96d --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/red.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:red_petal", + "botania:red_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/white.json b/src/main/resources/data/botania/tags/items/petals/white.json new file mode 100644 index 000000000..77bf0df5c --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/white.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:white_petal", + "botania:white_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/petals/yellow.json b/src/main/resources/data/botania/tags/items/petals/yellow.json new file mode 100644 index 000000000..0415d1a75 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/petals/yellow.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "botania:yellow_petal", + "botania:yellow_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/air.json b/src/main/resources/data/botania/tags/items/runes/air.json new file mode 100644 index 000000000..b3932101d --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/air.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_air" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/autumn.json b/src/main/resources/data/botania/tags/items/runes/autumn.json new file mode 100644 index 000000000..d3a8c5a58 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/autumn.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_autumn" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/earth.json b/src/main/resources/data/botania/tags/items/runes/earth.json new file mode 100644 index 000000000..4d477f464 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/earth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_earth" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/envy.json b/src/main/resources/data/botania/tags/items/runes/envy.json new file mode 100644 index 000000000..d2afa05cb --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/envy.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_envy" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/fire.json b/src/main/resources/data/botania/tags/items/runes/fire.json new file mode 100644 index 000000000..d52c68b3f --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/fire.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_fire" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/gluttony.json b/src/main/resources/data/botania/tags/items/runes/gluttony.json new file mode 100644 index 000000000..4d2c0c1db --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/gluttony.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_gluttony" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/greed.json b/src/main/resources/data/botania/tags/items/runes/greed.json new file mode 100644 index 000000000..0e947e093 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/greed.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_greed" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/lust.json b/src/main/resources/data/botania/tags/items/runes/lust.json new file mode 100644 index 000000000..2a9e9ee3d --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/lust.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_lust" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/mana.json b/src/main/resources/data/botania/tags/items/runes/mana.json new file mode 100644 index 000000000..f59ca3f38 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/mana.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_mana" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/pride.json b/src/main/resources/data/botania/tags/items/runes/pride.json new file mode 100644 index 000000000..38631091c --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/pride.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_pride" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/sloth.json b/src/main/resources/data/botania/tags/items/runes/sloth.json new file mode 100644 index 000000000..8fac4a1a5 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/sloth.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_sloth" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/spring.json b/src/main/resources/data/botania/tags/items/runes/spring.json new file mode 100644 index 000000000..19352b401 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/spring.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_spring" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/summer.json b/src/main/resources/data/botania/tags/items/runes/summer.json new file mode 100644 index 000000000..07ec114d9 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/summer.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_summer" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/water.json b/src/main/resources/data/botania/tags/items/runes/water.json new file mode 100644 index 000000000..bf933f738 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/water.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_water" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/winter.json b/src/main/resources/data/botania/tags/items/runes/winter.json new file mode 100644 index 000000000..b63afdb5c --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/winter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_winter" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/botania/tags/items/runes/wrath.json b/src/main/resources/data/botania/tags/items/runes/wrath.json new file mode 100644 index 000000000..2060786b1 --- /dev/null +++ b/src/main/resources/data/botania/tags/items/runes/wrath.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:rune_wrath" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/black.json b/src/main/resources/data/forge/tags/items/dyes/black.json new file mode 100644 index 000000000..d7785062f --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/black.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:black_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/blue.json b/src/main/resources/data/forge/tags/items/dyes/blue.json new file mode 100644 index 000000000..79553c111 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:blue_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/brown.json b/src/main/resources/data/forge/tags/items/dyes/brown.json new file mode 100644 index 000000000..98e35d0e6 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:brown_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/cyan.json b/src/main/resources/data/forge/tags/items/dyes/cyan.json new file mode 100644 index 000000000..8b40cd2a1 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/cyan.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:cyan_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/gray.json b/src/main/resources/data/forge/tags/items/dyes/gray.json new file mode 100644 index 000000000..7f17d5e57 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:gray_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/green.json b/src/main/resources/data/forge/tags/items/dyes/green.json new file mode 100644 index 000000000..9007a4a79 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/green.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:green_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/light_blue.json b/src/main/resources/data/forge/tags/items/dyes/light_blue.json new file mode 100644 index 000000000..934aa4c0a --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/light_blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:light_blue_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/light_gray.json b/src/main/resources/data/forge/tags/items/dyes/light_gray.json new file mode 100644 index 000000000..c47b5f7cb --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/light_gray.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:light_gray_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/lime.json b/src/main/resources/data/forge/tags/items/dyes/lime.json new file mode 100644 index 000000000..b2d06cf11 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/lime.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:lime_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/magenta.json b/src/main/resources/data/forge/tags/items/dyes/magenta.json new file mode 100644 index 000000000..cd330e7f9 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/magenta.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:magenta_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/orange.json b/src/main/resources/data/forge/tags/items/dyes/orange.json new file mode 100644 index 000000000..00c7b4de1 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/orange.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:orange_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/pink.json b/src/main/resources/data/forge/tags/items/dyes/pink.json new file mode 100644 index 000000000..be80dd42e --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/pink.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:pink_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/purple.json b/src/main/resources/data/forge/tags/items/dyes/purple.json new file mode 100644 index 000000000..e64ce262f --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:purple_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/red.json b/src/main/resources/data/forge/tags/items/dyes/red.json new file mode 100644 index 000000000..eda5fefbd --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:red_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/white.json b/src/main/resources/data/forge/tags/items/dyes/white.json new file mode 100644 index 000000000..61eba521c --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/white.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:white_dye" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dyes/yellow.json b/src/main/resources/data/forge/tags/items/dyes/yellow.json new file mode 100644 index 000000000..ad0cb4151 --- /dev/null +++ b/src/main/resources/data/forge/tags/items/dyes/yellow.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "botania:yellow_dye" + ] +} \ No newline at end of file