From 58346ad1078779db28c8b475e6e2614a9ffe06a2 Mon Sep 17 00:00:00 2001 From: Hubry Date: Fri, 13 Jul 2018 07:58:16 +0200 Subject: [PATCH] Update Thaumcraft integration (#2667) * Pull TC6 from Curseforge's maven thing, remove API classes from repo * Update Thaumcraft integration * Make upgrade recipes move attached Thaumcraft item data properly * Fix full mana inkwells pulled from creative menu not working * Blacklist flux rifts instead of (removed) aura nodes from gravity rod * Clean up a few TODOs around Thaumcraft integration * Finally, assign Thaumcraft aspects to Botania items * Add config for aspects. Just in case of some bugs in Thaumcraft, or for modpack makers who want to customize, so they don't have to disable everything by hand. --- build.gradle | 6 +- .../api/crafting/IInfusionStabiliser.java | 20 - .../java/thaumcraft/api/items/IGoggles.java | 22 - .../java/thaumcraft/api/items/IRevealer.java | 22 - .../thaumcraft/api/items/IScribeTools.java | 14 - .../java/vazkii/botania/common/Botania.java | 4 +- .../common/core/handler/ConfigHandler.java | 6 +- .../common/crafting/ModCraftingRecipes.java | 11 - .../crafting/recipe/ArmorUpgradeRecipe.java | 7 +- .../crafting/recipe/HelmRevealingRecipe.java | 30 +- .../integration/thaumcraft/TCAspects.java | 415 ++++++++++++++++++ .../thaumcraft/ItemManaInkwell.java | 4 +- 12 files changed, 458 insertions(+), 103 deletions(-) delete mode 100644 src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java delete mode 100644 src/api/java/thaumcraft/api/items/IGoggles.java delete mode 100644 src/api/java/thaumcraft/api/items/IRevealer.java delete mode 100644 src/api/java/thaumcraft/api/items/IScribeTools.java create mode 100644 src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java diff --git a/build.gradle b/build.gradle index ae9211b68..537a4b55e 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,10 @@ repositories { url = "http://maven.thiakil.com" } maven { - url "http://dvs1.progwml6.com/files/maven" + url = "http://dvs1.progwml6.com/files/maven" + } + maven { + url = "http://minecraft.curseforge.com/api/maven/" } } @@ -80,6 +83,7 @@ jar { dependencies { deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" deobfCompile "mezz.jei:jei_1.12:4.7.0.67" + deobfCompile "thaumcraft:Thaumcraft:1.12.2:6.1.BETA17" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java deleted file mode 100644 index 79d597d9f..000000000 --- a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java +++ /dev/null @@ -1,20 +0,0 @@ -package thaumcraft.api.crafting; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * - * @author Azanor - * - * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls - * - */ -public interface IInfusionStabiliser { - - /** - * returns true if the block can stabilise things - */ - public boolean canStabaliseInfusion(World world, BlockPos pos); - -} diff --git a/src/api/java/thaumcraft/api/items/IGoggles.java b/src/api/java/thaumcraft/api/items/IGoggles.java deleted file mode 100644 index 8dcb4aa63..000000000 --- a/src/api/java/thaumcraft/api/items/IGoggles.java +++ /dev/null @@ -1,22 +0,0 @@ -package thaumcraft.api.items; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Equipped or held items that extend this class will be able to perform most functions that - * goggles of revealing can apart from view nodes which is handled by IRevealer. - * - */ - -public interface IGoggles { - - /* - * If this method returns true things like block essentia contents will be shown. - */ - public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player); - -} diff --git a/src/api/java/thaumcraft/api/items/IRevealer.java b/src/api/java/thaumcraft/api/items/IRevealer.java deleted file mode 100644 index 63916b135..000000000 --- a/src/api/java/thaumcraft/api/items/IRevealer.java +++ /dev/null @@ -1,22 +0,0 @@ -package thaumcraft.api.items; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Equipped or held items that extend this class will make nodes or related objects visible in world. - * - */ - -public interface IRevealer { - - /* - * If this method returns true the nodes will be visible. - */ - public boolean showNodes(ItemStack itemstack, EntityLivingBase player); - - -} diff --git a/src/api/java/thaumcraft/api/items/IScribeTools.java b/src/api/java/thaumcraft/api/items/IScribeTools.java deleted file mode 100644 index 006c363c3..000000000 --- a/src/api/java/thaumcraft/api/items/IScribeTools.java +++ /dev/null @@ -1,14 +0,0 @@ -package thaumcraft.api.items; - - -/** - * - * @author Azanor - * - * Interface used to identify scribing tool items used in research table - * - */ - -public interface IScribeTools { - -} diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 69a7b1561..84060b358 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -84,6 +84,7 @@ import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.entity.ModEntities; +import vazkii.botania.common.integration.thaumcraft.TCAspects; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.GuiHandler; @@ -179,9 +180,10 @@ public class Botania { if(Botania.thaumcraftLoaded) { ModBrews.initTC(); ModBrewRecipes.initTC(); + TCAspects.init(); try { @SuppressWarnings("unchecked") - Class clazz = (Class) Class.forName("thaumcraft.common.lib.aura.EntityAuraNode"); + Class clazz = (Class) Class.forName("thaumcraft.common.entities.EntityFluxRift"); BotaniaAPI.blacklistEntityFromGravityRod(clazz); } catch (ClassNotFoundException ignored) {} } diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 8a64f8214..e1b6395d3 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -83,6 +83,7 @@ public final class ConfigHandler { public static boolean ringOfOdinFireResist = true; public static boolean invertMagnetRing = false; public static boolean enableThaumcraftStablizers = true; + public static boolean enableThaumcraftAspects = true; public static boolean enableShedding = false; public static int harvestLevelWeight = 2; @@ -229,9 +230,12 @@ public final class ConfigHandler { desc = "Set this to false to disable Thaumcraft Infusion Stabilizing in botania blocks"; enableThaumcraftStablizers = loadPropBool("thaumraftStabilizers.enabled", desc, enableThaumcraftStablizers); + desc = "Set this to false to disable Thaumcraft aspects on Botania items"; + enableThaumcraftAspects = loadPropBool("thaumcraftAspects.enabled", desc, enableThaumcraftAspects); + desc = "Set this to true to enable the Shedding feature from 1.7.10. You'll need to load the game to generate the options. No options are enabled by default. This increases load time."; enableShedding = loadPropBool("shedding.enable", desc, enableShedding); - + desc = "The harvest level of the Mana Lens: Weight. 3 is diamond level. Defaults to 2 (iron level)"; harvestLevelWeight = loadPropInt("harvestLevel.weightLens", desc, harvestLevelWeight); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index dfa5b7923..3d47d5df1 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -406,17 +406,6 @@ public final class ModCraftingRecipes { 'I', LibOreDict.TERRA_STEEL, 'L', LibOreDict.LIVINGWOOD_TWIG).setRegistryName(ModItems.terraPick.getRegistryName())); - /* - todo if tc ever comes back? - // Revealing Helmet Recipes - if(Botania.thaumcraftLoaded) { - Item goggles = Item.REGISTRY.getObject(new ResourceLocation("thaumcraft", "goggles")); - addShapelessRecipe(new ItemStack(ModItems.manasteelHelmRevealing), new ItemStack(ModItems.manasteelHelm), goggles); - recipeHelmetOfRevealing = BotaniaAPI.getLatestAddedRecipe(); //We want manasteel to show in the Lexicon - addShapelessRecipe(new ItemStack(ModItems.terrasteelHelmRevealing), new ItemStack(ModItems.terrasteelHelm), goggles); - addShapelessRecipe(new ItemStack(ModItems.elementiumHelmRevealing), new ItemStack(ModItems.elementiumHelm), goggles); - } - */ } public static void init() { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java index 4fe0ec409..d516995f9 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java @@ -15,7 +15,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; -import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.Botania; public class ArmorUpgradeRecipe extends ShapedOreRecipe { @@ -30,9 +30,8 @@ public class ArmorUpgradeRecipe extends ShapedOreRecipe { ItemStack stack = var1.getStackInSlot(i); if (!stack.isEmpty() && stack.getItem() instanceof ItemArmor && stack.hasTagCompound()) { EnchantmentHelper.setEnchantments(EnchantmentHelper.getEnchantments(stack), out); - byte runicHardening = ItemNBTHelper.getByte(stack, "RS.HARDEN", (byte)0); - if (runicHardening != 0) - ItemNBTHelper.setByte(out, "RS.HARDEN", runicHardening); + if(Botania.thaumcraftLoaded) + HelmRevealingRecipe.copyTCData(stack, out); break; } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 7f1b380f1..c1208584b 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -71,11 +71,7 @@ public class HelmRevealingRecipe extends ShapelessRecipes { NBTTagList enchList = ItemNBTHelper.getList(helmCopy, "ench", 10, true); if(enchList != null) ItemNBTHelper.setList(newHelm, "ench", enchList); - - //Copy Runic Hardening - // TODO does tc6 still have this? - byte runicHardening = ItemNBTHelper.getByte(helmCopy, "RS.HARDEN", (byte)0); - ItemNBTHelper.setByte(newHelm, "RS.HARDEN", runicHardening); + copyTCData(helmCopy, newHelm); return newHelm; } @@ -84,4 +80,26 @@ public class HelmRevealingRecipe extends ShapelessRecipes { public boolean isDynamic() { return true; } -} \ No newline at end of file + + private static final String TAG_RUNIC = "TC.RUNIC"; + private static final String TAG_WARP = "TC.WARP"; + private static final String TAG_INFUSION_ENCH = "infench"; + + /** + * Copies Thaumcraft's infusion enchantments, runic shielding, + * and warping (which is sometimes added as a side effect of infusion enchanting) + */ + public static void copyTCData(ItemStack source, ItemStack destination) { + byte runicShielding = ItemNBTHelper.getByte(source, TAG_RUNIC, (byte)0); + if(runicShielding != 0) + ItemNBTHelper.setByte(destination, TAG_RUNIC, runicShielding); + + byte warp = ItemNBTHelper.getByte(source, TAG_WARP, (byte)0); + if(warp != 0) + ItemNBTHelper.setByte(destination, TAG_WARP, warp); + + NBTTagList infEnchList = ItemNBTHelper.getList(source, TAG_INFUSION_ENCH, 10, true); + if(infEnchList != null) + ItemNBTHelper.setList(destination, TAG_INFUSION_ENCH, infEnchList); + } +} diff --git a/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java b/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java new file mode 100644 index 000000000..5e8b555d5 --- /dev/null +++ b/src/main/java/vazkii/botania/common/integration/thaumcraft/TCAspects.java @@ -0,0 +1,415 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jun 19, 2018, 8:25:10 PM (GMT)] + */ + +package vazkii.botania.common.integration.thaumcraft; + +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.ModFluffBlocks; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.lib.LibBlockNames; +import vazkii.botania.common.lib.LibEntityNames; +import vazkii.botania.common.lib.LibOreDict; + +import static thaumcraft.api.aspects.Aspect.*; + +public class TCAspects { + private static final int ANY = OreDictionary.WILDCARD_VALUE; + + public static void init() { + if(ConfigHandler.enableThaumcraftAspects) { + registerFlowerAspects(); + registerItemAspects(); + registerEntityAspects(); + } + } + + private static void registerFlowerAspects() { + registerFlower(LibBlockNames.SUBTILE_PUREDAISY, new AspectList().add(LIFE, 10).add(EXCHANGE, 5)); + registerFlower(LibBlockNames.SUBTILE_MANASTAR, new AspectList().add(SENSES, 5).add(AURA, 5)); + + registerFlower(LibBlockNames.SUBTILE_ENDOFLAME, new AspectList().add(FIRE, 10)); + registerFlower(LibBlockNames.SUBTILE_HYDROANGEAS, new AspectList().add(WATER, 10)); + registerFlower(LibBlockNames.SUBTILE_THERMALILY, new AspectList().add(FIRE, 5).add(EARTH, 5)); + registerFlower(LibBlockNames.SUBTILE_ARCANE_ROSE, new AspectList().add(MIND, 15)); + registerFlower(LibBlockNames.SUBTILE_MUNCHDEW, new AspectList().add(PLANT, 5).add(DESIRE, 5)); + registerFlower(LibBlockNames.SUBTILE_ENTROPINNYUM, new AspectList().add(ENTROPY, 5).add(ALCHEMY, 5)); + registerFlower(LibBlockNames.SUBTILE_KEKIMURUS, new AspectList().add(DESIRE, 10)); + registerFlower(LibBlockNames.SUBTILE_GOURMARYLLIS, new AspectList().add(DESIRE, 5).add(LIFE, 5)); + registerFlower(LibBlockNames.SUBTILE_NARSLIMMUS, new AspectList().add(WATER, 5).add(LIFE, 5)); + registerFlower(LibBlockNames.SUBTILE_RAFFLOWSIA, new AspectList().add(VOID, 10)); + registerFlower(LibBlockNames.SUBTILE_SHULK_ME_NOT, new AspectList().add(FLIGHT, 5).add(TRAP, 5)); + registerFlower(LibBlockNames.SUBTILE_DANDELIFEON, new AspectList().add(ORDER, 5).add(MECHANISM, 5).add(LIFE, 5)); + + registerFlower(LibBlockNames.SUBTILE_JADED_AMARANTHUS, new AspectList().add(LIFE, 5).add(PLANT, 5).add(SENSES, 5)); + registerFlower(LibBlockNames.SUBTILE_BELLETHORN, new AspectList().add(AVERSION, 10)); + registerFlower(LibBlockNames.SUBTILE_DREADTHORN, new AspectList().add(AVERSION, 5).add(BEAST, 5)); + registerFlower(LibBlockNames.SUBTILE_HEISEI_DREAM, new AspectList().add(SOUL, 5).add(BEAST, 5)); + registerFlower(LibBlockNames.SUBTILE_TIGERSEYE, new AspectList().add(MOTION, 5).add(TRAP, 5)); + registerFlower(LibBlockNames.SUBTILE_ORECHID, new AspectList().add(DESIRE, 10).add(METAL, 5).add(EARTH, 5)); + registerFlower(LibBlockNames.SUBTILE_ORECHID_IGNEM, new AspectList().add(DESIRE, 10).add(METAL, 5).add(FIRE, 5)); + registerFlower(LibBlockNames.SUBTILE_FALLEN_KANADE, new AspectList().add(LIFE, 10)); + registerFlower(LibBlockNames.SUBTILE_EXOFLAME, new AspectList().add(FIRE, 5).add(MOTION, 5)); + registerFlower(LibBlockNames.SUBTILE_AGRICARNATION, new AspectList().add(LIFE, 5).add(PLANT, 5)); + registerFlower(LibBlockNames.SUBTILE_HOPPERHOCK, new AspectList().add(VOID, 5).add(EXCHANGE, 5)); + registerFlower(LibBlockNames.SUBTILE_TANGLEBERRIE, new AspectList().add(TRAP, 10)); + registerFlower(LibBlockNames.SUBTILE_JIYUULIA, new AspectList().add(PROTECT, 5).add(TRAP, 5)); + registerFlower(LibBlockNames.SUBTILE_RANNUNCARPUS, new AspectList().add(MAN, 5).add(EXCHANGE, 5)); + registerFlower(LibBlockNames.SUBTILE_HYACIDUS, new AspectList().add(DEATH, 10)); + registerFlower(LibBlockNames.SUBTILE_POLLIDISIAC, new AspectList().add(BEAST, 5).add(DESIRE, 5)); + registerFlower(LibBlockNames.SUBTILE_CLAYCONIA, new AspectList().add(WATER, 5).add(EXCHANGE, 5)); + registerFlower(LibBlockNames.SUBTILE_LOONIUM, new AspectList().add(DESIRE, 10).add(BEAST, 5).add(UNDEAD, 5)); + registerFlower(LibBlockNames.SUBTILE_DAFFOMILL, new AspectList().add(MOTION, 10)); + registerFlower(LibBlockNames.SUBTILE_VINCULOTUS, new AspectList().add(ELDRITCH, 5).add(TRAP, 10)); + registerFlower(LibBlockNames.SUBTILE_SPECTRANTHEMUM, new AspectList().add(ELDRITCH, 5).add(MOTION, 5)); + registerFlower(LibBlockNames.SUBTILE_MEDUMONE, new AspectList().add(TRAP, 5).add(COLD, 5)); + registerFlower(LibBlockNames.SUBTILE_MARIMORPHOSIS, new AspectList().add(EARTH, 5).add(SENSES, 5)); + registerFlower(LibBlockNames.SUBTILE_BUBBELL, new AspectList().add(AIR, 5).add(VOID, 5)); + registerFlower(LibBlockNames.SUBTILE_SOLEGNOLIA, new AspectList().add(METAL, 5).add(TRAP, 5)); + registerFlower(LibBlockNames.SUBTILE_BERGAMUTE, new AspectList().add(SENSES, 5).add(TRAP, 5)); + } + + //Each category is mostly ordered by order of its recipe registration. + private static void registerItemAspects() { + //Pure Daisy + register(LibOreDict.LIVING_WOOD, new AspectList(new ItemStack(Blocks.LOG)).add(LIFE, 5)); + register(LibOreDict.LIVING_ROCK, new AspectList(new ItemStack(Blocks.STONE)).add(LIFE, 3)); + + //Mana Infusion + register(LibOreDict.MANA_STEEL, new AspectList().add(METAL, 10).add(MAGIC, 5)); + register(LibOreDict.MANA_PEARL, new AspectList().add(ELDRITCH, 10).add(MAGIC, 5).add(MOTION, 5)); + register(LibOreDict.MANA_DIAMOND, new AspectList(new ItemStack(Items.DIAMOND)).add(MAGIC, 5)); + register(LibOreDict.MANA_POWDER, new AspectList().add(ENERGY, 3).add(MAGIC, 3)); + register(ModBlocks.pistonRelay, ANY, new AspectList(new ItemStack(Blocks.PISTON)).add(AURA, 10)); + register(ModItems.manaCookie, ANY, new AspectList(new ItemStack(Items.COOKIE)).merge(LIFE, 20).add(MAGIC, 5)); + + AspectList grassSeedAspects = new AspectList().add(PLANT, 5).add(LIFE, 5).add(EXCHANGE, 2); + register(ModItems.grassSeeds, 0, grassSeedAspects); //Pasture Seed + register(ModItems.grassSeeds, 1, grassSeedAspects); //Boreal Seed + register(ModItems.grassSeeds, 2, grassSeedAspects.copy().add(DARKNESS, 5).add(FLUX, 1)); //Infestation Spore + + register(ModItems.quartz, 1, new AspectList(new ItemStack(Items.QUARTZ)).add(MAGIC, 2)); //Mana Quartz + register(ModBlocks.tinyPotato, ANY, new AspectList(new ItemStack(Items.POTATO)).add(LIFE, 5).add(MOTION, 2)); + register(ModItems.manaInkwell, ANY, new AspectList().add(SENSES, 5).add(MAGIC, 5).add(WATER, 2).add(BEAST, 1)); + register(ModBlocks.manaGlass, ANY, new AspectList(new ItemStack(Blocks.GLASS)).add(LIGHT, 5).add(MAGIC, 1)); + register(ModItems.manaResource, 16, new AspectList(new ItemStack(Items.STRING)).merge(CRAFT, 2).add(MAGIC, 2)); //Mana Infused String + register(ModItems.manaBottle, ANY, new AspectList().add(MAGIC, 5).add(CRYSTAL, 5)); + + //Elven Trade + register(LibOreDict.DREAM_WOOD, new AspectList(new ItemStack(Blocks.LOG)).add(ELDRITCH, 3)); + register(LibOreDict.ELEMENTIUM, new AspectList().add(METAL, 10).add(ELDRITCH, 5)); + register(LibOreDict.PIXIE_DUST, new AspectList(new ItemStack(Items.ENDER_PEARL)).add(MAGIC, 10)); + register(LibOreDict.DRAGONSTONE, new AspectList(new ItemStack(Items.DIAMOND)).add(ELDRITCH, 10)); + register(ModItems.quartz, 5, new AspectList(new ItemStack(Items.QUARTZ)).add(ELDRITCH, 1)); + register(ModBlocks.elfGlass, ANY, new AspectList(new ItemStack(Blocks.GLASS)).add(LIGHT, 5).add(ELDRITCH, 1)); + + //Runic Altar + AspectList runeAspects = new AspectList().add(EARTH, 5).add(MAGIC, 5); + register(ModItems.rune, 0, runeAspects.copy().add(WATER, 25)); //Water + register(ModItems.rune, 1, runeAspects.copy().add(FIRE, 25)); //Fire + register(ModItems.rune, 2, runeAspects.copy().add(EARTH, 25)); //Earth + register(ModItems.rune, 3, runeAspects.copy().add(AIR, 25)); //Air + register(ModItems.rune, 4, runeAspects.copy().add(LIFE, 10).add(PLANT, 15)); //Spring + register(ModItems.rune, 5, runeAspects.copy().add(LIFE, 10).add(FIRE, 15)); //Summer + register(ModItems.rune, 6, runeAspects.copy().add(LIFE, 10).add(DEATH, 15)); //Autumn + register(ModItems.rune, 7, runeAspects.copy().add(LIFE, 10).add(COLD, 15)); //Winter + register(ModItems.rune, 8, runeAspects.copy().add(AURA, 25)); //Mana + register(ModItems.rune, 9, runeAspects.copy().add(DESIRE, 10).add(MAN, 15)); //Lust + register(ModItems.rune, 10, runeAspects.copy().add(DESIRE, 10).add(LIFE, 15)); //Gluttony + register(ModItems.rune, 11, runeAspects.copy().add(DESIRE, 25)); //Greed + register(ModItems.rune, 12, runeAspects.copy().add(DESIRE, 10).add(TRAP, 15)); //Sloth + register(ModItems.rune, 13, runeAspects.copy().add(DESIRE, 10).add(AVERSION, 15)); //Wrath + register(ModItems.rune, 14, runeAspects.copy().add(DESIRE, 10).add(EXCHANGE, 15)); //Envy + register(ModItems.rune, 15, runeAspects.copy().add(DESIRE, 10).add(SENSES, 15)); //Pride + + //The rest - items with no recipes, loot, overrides of autoassigned aspects, etc. + //Ordered mostly by ModItems / ModBlocks + register(LibOreDict.TERRA_STEEL, new AspectList().add(METAL, 15).add(MAGIC, 20).add(EARTH, 10)); + register(LibOreDict.LIFE_ESSENCE, new AspectList().add(LIFE, 15).add(EARTH, 10).add(SOUL, 10).add(ORDER, 10).add(MAGIC, 10).add(ELDRITCH, 5)); + register(LibOreDict.ENDER_AIR_BOTTLE, new AspectList().add(ELDRITCH, 5).add(AIR, 5)); + register(LibOreDict.PLACEHOLDER, new AspectList().add(CRAFT, 1)); + + for(String name : LibOreDict.FLOWER) + register(name, new AspectList(new ItemStack(Blocks.RED_FLOWER))); + for(String name : LibOreDict.DOUBLE_FLOWER) + register(name, new AspectList(new ItemStack(Blocks.DOUBLE_PLANT))); + for(String name : LibOreDict.PETAL) + register(name, new AspectList().add(SENSES, 5).add(PLANT, 5)); + + register(ModItems.dye, ANY, new AspectList().add(SENSES, 5).add(PLANT, 1)); + + registerComplex(ModItems.pestleAndMortar, ANY, new AspectList().add(TOOL, 4)); + register(LibOreDict.LIVINGWOOD_TWIG, new AspectList().add(PLANT, 8).add(LIFE, 4)); + register(LibOreDict.DREAMWOOD_TWIG, new AspectList().add(PLANT, 8).add(ELDRITCH, 4)); + registerComplex(ModItems.twigWand, ANY, new AspectList().add(TOOL, 8)); + + //Rods + registerComplex(ModItems.terraformRod, ANY, new AspectList().add(EXCHANGE, 15)); + registerComplex(ModItems.rainbowRod, ANY, new AspectList().add(SENSES, 10).add(LIGHT, 10)); + registerComplex(ModItems.tornadoRod, ANY, new AspectList().add(FLIGHT, 20)); + registerComplex(ModItems.diviningRod, ANY, new AspectList().add(SENSES, 20)); + registerComplex(ModItems.gravityRod, ANY, new AspectList().add(MOTION, 20)); + registerComplex(ModItems.missileRod, ANY, new AspectList().add(AVERSION, 30)); + registerComplex(ModItems.cobbleRod, ANY, new AspectList().add(EARTH, 20)); + registerComplex(ModItems.exchangeRod, ANY, new AspectList().add(EXCHANGE, 30)); + + register(LibOreDict.RED_STRING, new AspectList() + .add(ENERGY, 30).add(EXCHANGE, 20).add(ELDRITCH, 15).add(MECHANISM, 15).add(MAGIC, 10)); + registerComplex(ModItems.manaTablet, ANY, new AspectList().add(VOID, 5).add(MAGIC, 5)); + registerComplex(ModItems.fertilizer, ANY, new AspectList().add(LIFE, 4)); + registerComplex(ModItems.grassHorn, ANY, new AspectList().add(SENSES, 10).add(TOOL, 8)); + register(ModItems.manaMirror, ANY, new AspectList() + .add(EARTH, 10).add(PLANT, 10).add(ELDRITCH, 10).add(EXCHANGE, 5).add(MAGIC, 10).add(METAL, 10)); + registerComplex(ModItems.travelBelt, ANY, new AspectList().add(MOTION, 10)); + registerComplex(ModItems.magnetRing, ANY, new AspectList().add(DESIRE, 10)); + registerComplex(ModItems.flightTiara, ANY, new AspectList().add(FLIGHT, 30)); + + if(ConfigHandler.darkQuartzEnabled) + register(ModItems.quartz, 0, new AspectList(new ItemStack(Items.QUARTZ)).add(ENERGY, 1).add(DARKNESS, 1)); //Smokey + register(ModItems.quartz, 2, new AspectList(new ItemStack(Items.QUARTZ)).add(FIRE, 1).add(ALCHEMY, 1)); //Blaze + register(ModItems.quartz, 3, new AspectList(new ItemStack(Items.QUARTZ)).add(SENSES, 1).add(PLANT, 1)); //Lavender + register(ModItems.quartz, 4, new AspectList(new ItemStack(Items.QUARTZ)).add(ENERGY, 2)); //Redquartz + register(ModItems.quartz, 6, new AspectList(new ItemStack(Items.QUARTZ)).add(SENSES, 1).add(PLANT, 1)); //Sunny + + registerComplex(ModItems.openBucket, ANY, new AspectList().add(VOID, 15)); + registerComplex(ModItems.pixieRing, ANY, new AspectList().add(AURA, 5).add(FLIGHT, 5)); + registerComplex(ModItems.superTravelBelt, ANY, new AspectList().add(MOTION, 10)); + registerComplex(ModItems.itemFinder, ANY, new AspectList().add(SENSES, 20)); + register(ModItems.enderHand, ANY, new AspectList(new ItemStack(Blocks.ENDER_CHEST)).add(BEAST, 15)); + register(ModItems.spark, 0, new AspectList().add(AURA, 15).add(MOTION, 15).add(FIRE, 10).add(SENSES, 10)); + register(ModItems.vial, 0, new AspectList(new ItemStack(ModBlocks.manaGlass)).add(VOID, 2)); + register(ModItems.vial, 1, new AspectList(new ItemStack(ModBlocks.elfGlass)).add(VOID, 3)); + registerComplex(ModItems.holyCloak, ANY, new AspectList().add(PROTECT, 15)); + registerComplex(ModItems.unholyCloak, ANY, new AspectList().add(AVERSION, 15)); + registerComplex(ModItems.balanceCloak, ANY, new AspectList().add(PROTECT, 10).add(AVERSION, 10)); + registerComplex(ModItems.craftingHalo, ANY, new AspectList().add(CRAFT, 15)); + register(ModItems.blackLotus, 0, new AspectList().add(MAGIC, 10).add(ORDER, 10).add(ELDRITCH, 5)); + register(ModItems.blackLotus, 1, new AspectList().add(MAGIC, 30).add(ORDER, 20).add(ELDRITCH, 10)); + registerComplex(ModItems.monocle, ANY, new AspectList().add(SENSES, 10)); + register(ModItems.clip, 0, new AspectList(new ItemStack(ModBlocks.dreamwood)).add(VOID, 5).add(MECHANISM, 2)); + registerComplex(ModItems.worldSeed, ANY, new AspectList().add(MOTION, 10).add(PLANT, 5).add(ELDRITCH, 3)); + registerComplex(ModItems.thornChakram, 0, new AspectList().add(AVERSION, 12).add(DEATH, 6)); + registerComplex(ModItems.thornChakram, 1, new AspectList().merge(AVERSION, 16)); //Flare Chakram + register(ModItems.overgrowthSeed, ANY, new AspectList().add(LIFE, 30).add(MAGIC, 25)); + register(ModItems.craftPattern, ANY, new AspectList().add(CRAFT, 10).add(ENERGY, 10)); + + registerComplex(ModItems.swapRing, 0, new AspectList().add(TOOL, 8).add(EXCHANGE, 8)); + registerComplex(ModItems.flowerBag, 0, new AspectList().add(VOID, 5)); + registerComplex(ModItems.phantomInk, 0, new AspectList().add(SENSES, 9).add(VOID, 4)); + register(ModItems.corporeaSpark, 0, new AspectList(new ItemStack(ModItems.spark)).add(EXCHANGE, 15).add(ELDRITCH, 10)); + + AspectList willAspects = new AspectList().add(MAGIC, 10).add(AVERSION, 10).add(SOUL, 10); + register(ModItems.ancientWill, 0, willAspects.copy().add(PROTECT, 10)); //Ahrim - weakness + register(ModItems.ancientWill, 1, willAspects.copy().add(BEAST, 10)); //Dharok - low HP damage boost + register(ModItems.ancientWill, 2, willAspects.copy().add(UNDEAD, 10)); //Guthan - lifesteal + register(ModItems.ancientWill, 3, willAspects.copy().add(TRAP, 10)); //Torag - slowness + register(ModItems.ancientWill, 4, willAspects.copy().add(DEATH, 10)); //Verac - armor pierce + register(ModItems.ancientWill, 5, willAspects.copy().add(FLUX, 10)); //Karil - withering + + register(ModItems.pinkinator, ANY, new AspectList().add(LIFE, 30).add(ORDER, 20).add(EXCHANGE, 20)); + + AspectList relicAspects = new AspectList().add(MAGIC, 30).add(DESIRE, 25).add(ELDRITCH, 15); + register(ModItems.dice, ANY, relicAspects.copy().add(ELDRITCH, 15)); + register(ModItems.infiniteFruit, ANY, relicAspects.copy().add(LIFE, 50).add(PLANT, 30)); + register(ModItems.kingKey, ANY, relicAspects.copy().add(AVERSION, 50).add(TRAP, 30)); + register(ModItems.flugelEye, ANY, relicAspects.copy().add(MOTION, 50).add(FLIGHT, 30)); + register(ModItems.thorRing, ANY, relicAspects.copy().add(TOOL, 50).add(ENTROPY, 30)); + register(ModItems.odinRing, ANY, relicAspects.copy().add(PROTECT, 50).add(LIFE, 30)); + register(ModItems.lokiRing, ANY, relicAspects.copy().add(AURA, 50).add(MAN, 30)); + + register(ModItems.recordGaia1, ANY, new AspectList().add(SENSES, 15).add(DESIRE, 10).add(AIR, 5).add(VOID, 5)); //Endure Emptiness + register(ModItems.recordGaia2, ANY, new AspectList().add(SENSES, 15).add(DESIRE, 10).add(AIR, 5).add(AVERSION, 5)); //Fight For Quiescence + + registerComplex(ModItems.blackHoleTalisman, ANY, new AspectList().add(VOID, 30)); + registerComplex(ModItems.temperanceStone, ANY, new AspectList().add(TRAP, 5)); + registerComplex(ModItems.obedienceStick, ANY, new AspectList().add(TOOL, 4)); + registerComplex(ModItems.slimeBottle, ANY, new AspectList(new ItemStack(Items.SLIME_BALL)).add(SENSES, 10)); + registerComplex(ModItems.thunderSword, ANY, new AspectList().add(ENERGY, 15)); + registerComplex(ModItems.autocraftingHalo, ANY, new AspectList().add(CRAFT, 15).add(EXCHANGE, 10)); + register(ModItems.gaiaHead, ANY, new AspectList().add(DEATH, 10).add(SOUL, 15).add(ELDRITCH, 10).add(EARTH, 10)); + register(ModBlocks.gaiaHead, ANY, new AspectList(new ItemStack(ModItems.gaiaHead))); + registerComplex(ModItems.sextant, ANY, new AspectList().add(TOOL, 8)); + registerComplex(ModItems.speedUpBelt, ANY, new AspectList().add(MOTION, 10)); + registerComplex(ModItems.baubleBox, ANY, new AspectList().add(VOID, 5)); + registerComplex(ModItems.dodgeRing, ANY, new AspectList().add(MOTION, 10)); + registerComplex(ModItems.invisibilityCloak, ANY, new AspectList().add(SENSES, 15)); + + //Blocks + registerComplex(ModBlocks.altar, ANY, new AspectList().add(CRAFT, 10)); + registerComplex(ModBlocks.runeAltar, ANY, new AspectList().add(CRAFT, 10).add(MAGIC, 5)); + + registerComplex(ModBlocks.spreader, 0, new AspectList().add(MOTION, 10).add(MAGIC, 10)); + registerComplex(ModBlocks.spreader, 1, new AspectList(new ItemStack(ModBlocks.spreader)).add(ENERGY, 10).add(MECHANISM, 5)); + registerComplex(ModBlocks.spreader, 2, new AspectList().add(MOTION, 15).add(MAGIC, 15)); + registerComplex(ModBlocks.spreader, 3, new AspectList().add(MOTION, 8).add(MAGIC, 8).add(SENSES, 10)); + + registerComplex(ModBlocks.pool, 0, new AspectList().add(VOID, 10).add(MAGIC, 5)); //Mana Pool + registerComplex(ModBlocks.pool, 2, new AspectList().add(VOID, 3).add(MAGIC, 3)); //Diluted + //Next entry is made with shimmerrock, and proper autoassignment depends on this + register(ModBlocks.bifrostPerm, ANY, new AspectList(new ItemStack(ModBlocks.elfGlass)).add(SENSES, 5)); + registerComplex(ModBlocks.pool, 3, new AspectList().add(VOID, 10).add(MAGIC, 5)); //Fabulous + + registerComplex(ModBlocks.distributor, ANY, new AspectList().add(MECHANISM, 5).add(MAGIC, 5)); + registerComplex(ModBlocks.manaVoid, ANY, new AspectList().add(VOID, 20)); + registerComplex(ModBlocks.manaDetector, ANY, new AspectList().add(SENSES, 10)); + register(ModBlocks.enchanter, ANY, new AspectList(new ItemStack(Blocks.LAPIS_BLOCK)).add(MAGIC, 25).add(CRAFT, 15)); + registerComplex(ModBlocks.tinyPlanet, ANY, new AspectList().add(EARTH, 50)); + registerComplex(ModBlocks.openCrate, 0, new AspectList().add(VOID, 5)); + registerComplex(ModBlocks.openCrate, 1, new AspectList().add(MECHANISM, 5)); //Crafty Crate + registerComplex(ModBlocks.forestEye, 0, new AspectList().add(SENSES, 10).add(BEAST, 10)); + registerComplex(ModBlocks.forestDrum, 1, new AspectList().add(SENSES, 5).add(TOOL, 5)); + register(ModBlocks.bifrost, ANY, new AspectList(new ItemStack(ModBlocks.bifrostPerm))); + registerComplex(ModBlocks.floatingFlower, ANY, new AspectList().add(FLIGHT, 5)); + registerComplex(ModBlocks.spawnerClaw, ANY, new AspectList().add(LIFE, 30)); + registerComplex(ModBlocks.alfPortal, ANY, new AspectList().merge(EXCHANGE, 20).add(ELDRITCH, 20)); + + register(ModBlocks.customBrick, ANY, new AspectList(new ItemStack(Blocks.QUARTZ_BLOCK)) + .add(SENSES, 3).add(DESIRE, 1).add(EARTH, 1)); //Azulejo + registerComplex(ModBlocks.enderEye, ANY, new AspectList().add(MECHANISM, 10)); + registerComplex(ModBlocks.starfield, ANY, new AspectList().add(DARKNESS, 20).add(LIGHT, 20)); + registerComplex(ModBlocks.rfGenerator, ANY, new AspectList().add(MECHANISM, 20)); + registerComplex(ModBlocks.terraPlate, ANY, new AspectList().add(CRAFT, 20).add(EXCHANGE, 20)); + register(ModBlocks.enchantedSoil, ANY, new AspectList().add(LIFE, 20).add(MAGIC, 15).add(EARTH, 10)); + + AspectList corporeaAspects = new AspectList(new ItemStack(ModItems.corporeaSpark)).add(MECHANISM, 15).merge(ELDRITCH, 15); + register(ModBlocks.corporeaIndex, ANY, corporeaAspects.copy().add(DESIRE, 25).add(MIND, 25)); + register(ModBlocks.corporeaCrystalCube, ANY, corporeaAspects.copy().add(SENSES, 15).add(CRYSTAL, 15)); + register(ModBlocks.corporeaFunnel, ANY, corporeaAspects.copy().add(DESIRE, 20)); + register(ModBlocks.corporeaInterceptor, ANY, corporeaAspects.copy().add(ENERGY, 20)); + register(ModBlocks.corporeaRetainer, ANY, corporeaAspects.copy().add(VOID, 20)); + + registerComplex(ModBlocks.pump, ANY, new AspectList().add(MECHANISM, 10).add(EXCHANGE, 10)); + registerComplex(ModBlocks.incensePlate, ANY, new AspectList().add(ALCHEMY, 15)); + registerComplex(ModBlocks.hourglass, ANY, new AspectList().add(MECHANISM, 10)); + registerComplex(ModBlocks.ghostRail, ANY, new AspectList().add(SOUL, 10)); + registerComplex(ModBlocks.sparkChanger, ANY, new AspectList().add(MECHANISM, 10)); + register(ModBlocks.felPumpkin, ANY, new AspectList().add(ENTROPY, 15).add(SOUL, 10).add(LIFE, 5).add(BEAST, 5).add(PLANT, 5)); + registerComplex(ModBlocks.cocoon, ANY, new AspectList().add(LIFE, 10)); + registerComplex(ModBlocks.lightRelay, 0, new AspectList().add(MOTION, 15)); + register(ModBlocks.cacophonium, ANY, new AspectList(new ItemStack(Blocks.NOTEBLOCK)).add(DESIRE, 10)); + registerComplex(ModBlocks.teruTeruBozu, ANY, new AspectList().add(EXCHANGE, 10).add(SENSES, 10)); + registerComplex(ModBlocks.avatar, ANY, new AspectList().add(MECHANISM, 15).add(MAN, 10)); + + register(ModBlocks.altGrass, ANY, new AspectList(new ItemStack(Blocks.GRASS)).add(SENSES, 3)); + registerComplex(ModBlocks.animatedTorch, ANY, new AspectList().add(MOTION, 5)); + + //Livingrock Brick variants + register(ModBlocks.livingrock, 2, new AspectList(new ItemStack(ModBlocks.livingrock, 1, 1)).add(PLANT, 3)); //Mossy + register(ModBlocks.livingrock, 3, new AspectList(new ItemStack(ModBlocks.livingrock, 1, 1)).add(ENTROPY, 1)); //Cracked + register(ModBlocks.livingrock, 4, new AspectList(new ItemStack(ModBlocks.livingrock, 1, 1)).add(ORDER, 1)); //Chiseled + + //Metamorphic stone from the Marimorphosis + AspectList stoneAspects = new AspectList(new ItemStack(Blocks.STONE)); + register(ModFluffBlocks.biomeStoneA, 0, stoneAspects.copy().add(PLANT, 1)); //Forest + register(ModFluffBlocks.biomeStoneA, 1, stoneAspects.copy().add(AIR, 1)); //Plains + register(ModFluffBlocks.biomeStoneA, 2, stoneAspects.copy().add(EARTH, 1)); //Mountain + register(ModFluffBlocks.biomeStoneA, 3, stoneAspects.copy().add(FLUX, 1)); //Fungal + register(ModFluffBlocks.biomeStoneA, 4, stoneAspects.copy().add(WATER, 1)); //Swamp + register(ModFluffBlocks.biomeStoneA, 5, stoneAspects.copy().add(ENTROPY, 1)); //Desert + register(ModFluffBlocks.biomeStoneA, 6, stoneAspects.copy().add(COLD, 1)); //Taiga + register(ModFluffBlocks.biomeStoneA, 7, stoneAspects.copy().add(FIRE, 1)); //Mesa + + //Metamorphic cobble and chiseled bricks + for(int i = 0; i < 8; i++) { + register(ModFluffBlocks.biomeStoneA, i + 8, + new AspectList(new ItemStack(ModFluffBlocks.biomeStoneA, 1, i)).add(ENTROPY, 1)); + register(ModFluffBlocks.biomeStoneB, i + 8, + new AspectList(new ItemStack(ModFluffBlocks.biomeStoneB, 1, i)).add(ORDER, 1)); + } + + //Garden of Glass + if(Botania.gardenOfGlassLoaded) { + register(ModItems.waterBowl, 0, new AspectList(new ItemStack(Items.BOWL)).add(WATER, 10)); + register(LibOreDict.PEBBLE, new AspectList().add(EARTH, 1)); + register(ModBlocks.root, 0, new AspectList().add(PLANT, 15).add(LIFE, 5)); + register(ModItems.manaResource, 20, new AspectList().add(PLANT, 5).add(LIFE, 2)); //Living Root item + } + } + + private static void registerEntityAspects() { + registerEntity(LibEntityNames.MANA_BURST, new AspectList().add(ENERGY, 5).add(MOTION, 5).add(AURA, 5)); + registerEntity(LibEntityNames.SIGNAL_FLARE, new AspectList().add(SENSES, 10).add(LIGHT, 5)); + registerEntity(LibEntityNames.PIXIE, new AspectList().add(FLIGHT, 5).add(ELDRITCH, 5).add(LIGHT, 5)); + registerEntity(LibEntityNames.FLAME_RING, new AspectList().add(FIRE, 20)); + registerEntity(LibEntityNames.VINE_BALL, new AspectList(new ItemStack(ModItems.vineBall))); + registerEntity(LibEntityNames.DOPPLEGANGER, new AspectList().add(MAN, 30).add(EARTH, 30).add(DARKNESS, 30).add(ELDRITCH, 30).add(PROTECT, 30)); + registerEntity(LibEntityNames.MAGIC_LANDMINE, new AspectList().add(AVERSION, 10).add(DEATH, 10)); + registerEntity(LibEntityNames.SPARK, new AspectList(new ItemStack(ModItems.spark))); + registerEntity(LibEntityNames.MAGIC_MISSILE, new AspectList().add(AVERSION, 5).add(MAGIC, 5)); + registerEntity(LibEntityNames.THORN_CHAKRAM, new AspectList(new ItemStack(ModItems.thornChakram))); + registerEntity(LibEntityNames.CORPOREA_SPARK, new AspectList(new ItemStack(ModItems.corporeaSpark))); + registerEntity(LibEntityNames.ENDER_AIR_BOTTLE, new AspectList(new ItemStack(ModItems.manaResource, 1, 15))); + registerEntity(LibEntityNames.POOL_MINECART, new AspectList(new ItemStack(ModItems.poolMinecart))); + registerEntity(LibEntityNames.PINK_WITHER, new AspectList().add(LIFE, 50).add(UNDEAD, 30).add(ORDER, 25).add(FIRE, 25)); + registerEntity(LibEntityNames.PLAYER_MOVER, new AspectList().add(MOTION, 15).add(LIGHT, 5)); + registerEntity(LibEntityNames.MANA_STORM, new AspectList().add(ENTROPY, 150).add(FIRE, 100).add(MAGIC, 50).add(ALCHEMY, 50)); + registerEntity(LibEntityNames.BABYLON_WEAPON, new AspectList().add(AVERSION, 30).add(ELDRITCH, 20)); + registerEntity(LibEntityNames.FALLING_STAR, new AspectList().add(AVERSION, 10).add(ELDRITCH, 10).add(LIGHT, 5)); + } + + private static void registerFlower(String flowerId, AspectList extraAspects) { + AspectList aspects = extraAspects.copy().add(PLANT, 15).add(SENSES, 15).add(MAGIC, 5); + AspectList floatingAspects = aspects.copy().add(FLIGHT, 5).add(LIGHT, 5).add(EARTH, 3); + + ThaumcraftApi.registerObjectTag(ItemBlockSpecialFlower.ofType(flowerId), aspects); + ThaumcraftApi.registerObjectTag(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), flowerId), floatingAspects); + + if (BotaniaAPI.miniFlowers.containsKey(flowerId)) { + String miniFlowerId = BotaniaAPI.miniFlowers.get(flowerId); + ThaumcraftApi.registerObjectTag(ItemBlockSpecialFlower.ofType(miniFlowerId), petiteAspects(aspects)); + ThaumcraftApi.registerObjectTag(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), miniFlowerId), petiteAspects(floatingAspects)); + } + } + + private static AspectList petiteAspects(AspectList aspects) { + AspectList list = new AspectList(); + for (Aspect a : aspects.getAspects()) + list.add(a, aspects.getAmount(a) / 2 + 1); + return list; + } + + //Convenience aspect registration methods + private static void register(Item item, int meta, AspectList aspects) { + ThaumcraftApi.registerObjectTag(new ItemStack(item, 1, meta), aspects); + } + + private static void register(Block block, int meta, AspectList aspects) { + ThaumcraftApi.registerObjectTag(new ItemStack(block, 1, meta), aspects); + } + + private static void register(String oreDict, AspectList aspects) { + ThaumcraftApi.registerObjectTag(oreDict, aspects); + } + + private static void registerComplex(Item item, int meta, AspectList aspects) { + ThaumcraftApi.registerComplexObjectTag(new ItemStack(item, 1, meta), aspects); + } + + private static void registerComplex(Block block, int meta, AspectList aspects) { + ThaumcraftApi.registerComplexObjectTag(new ItemStack(block, 1, meta), aspects); + } + + private static void registerEntity(String entityName, AspectList aspects) { + ThaumcraftApi.registerEntityTag(entityName, aspects); + } +} diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index 7859c0712..039e937f2 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -46,7 +46,9 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { if(isInCreativeTab(tab)) { list.add(new ItemStack(this, 1, USES)); - list.add(new ItemStack(this)); + ItemStack full = new ItemStack(this); + setMana(full, MAX_MANA); + list.add(full); } }