diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java new file mode 100644 index 000000000..e5fc5ba02 --- /dev/null +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -0,0 +1,74 @@ +package vazkii.botania.client.core.handler; + +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.client.renderer.color.BlockColors; +import net.minecraft.client.renderer.color.IBlockColor; +import net.minecraft.client.renderer.color.IItemColor; +import net.minecraft.client.renderer.color.ItemColors; +import net.minecraft.item.EnumDyeColor; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.common.block.BlockCamo; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileCamo; +import vazkii.botania.common.item.IColorable; +import vazkii.botania.common.item.ModItems; + +public final class ColorHandler { + + public static void init() { + BlockColors blocks = Minecraft.getMinecraft().getBlockColors(); + + // 16 colors + blocks.registerBlockColorHandler( + new IBlockColor() { + @Override + public int colorMultiplier(IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { + return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; + } + }, + ModBlocks.specialFlower, ModBlocks.manaBeacon, ModBlocks.petalBlock, ModBlocks.unstableBlock); + + // Platforms + blocks.registerBlockColorHandler( + new IBlockColor() { + @Override + public int colorMultiplier(IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) { + TileEntity tile = world.getTileEntity(pos); + if(tile instanceof TileCamo) { + TileCamo camo = (TileCamo) tile; + IBlockState camoState = camo.camoState; + if(camoState != null) + return camoState.getBlock() instanceof BlockCamo ? 0xFFFFFF : Minecraft.getMinecraft().getBlockColors().colorMultiplier(camoState, world, pos, tintIndex); + } + return 0xFFFFFF; + } + }, ModBlocks.platform); + + ItemColors items = Minecraft.getMinecraft().getItemColors(); + + items.registerItemColorHandler(new IItemColor() { + @Override + public int getColorFromItemstack(ItemStack stack, int tintIndex) { + Item item = stack.getItem(); + if (item instanceof IColorable) { + return ((IColorable) item).getColorFromItemStack(stack, tintIndex); + } else { + return 0xFFFFFF; + } + } + }, ModItems.dye, ModItems.petal, ModItems.manaGun, ModItems.manaMirror, ModItems.manaTablet, ModItems.signalFlare, + ModItems.spellCloth, ModItems.brewFlask, ModItems.brewVial, ModItems.incenseStick, ModItems.bloodPendant, ModItems.enderDagger, + ModItems.terraPick, ModItems.lens, Item.getItemFromBlock(ModBlocks.manaBeacon), Item.getItemFromBlock(ModBlocks.petalBlock), Item.getItemFromBlock(ModBlocks.unstableBlock)); + } + + private ColorHandler() {} + +} diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 374a999dd..8858f7dd9 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -48,6 +48,7 @@ import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.BotaniaPlayerController; import vazkii.botania.client.core.handler.BoundTileRenderer; import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.ColorHandler; import vazkii.botania.client.core.handler.ContributorFancinessHandler; import vazkii.botania.client.core.handler.CorporeaAutoCompleteHandler; import vazkii.botania.client.core.handler.DebugHandler; @@ -180,6 +181,7 @@ public class ClientProxy extends CommonProxy { MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE); ModelHandler.registerModels(); + ColorHandler.init(); initRenderers(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index c1fbeeee3..cd8a008e6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -89,19 +89,6 @@ public abstract class BlockCamo extends BlockMod { return false; } - @Override - @SideOnly(Side.CLIENT) - public int colorMultiplier(IBlockAccess par1World, BlockPos pos, int pass) { - TileEntity tile = par1World.getTileEntity(pos); - if(tile instanceof TileCamo) { - TileCamo camo = (TileCamo) tile; - IBlockState state = camo.camoState; - if(state != null) - return state.getBlock() instanceof BlockCamo ? 0xFFFFFF : state.getBlock().getRenderColor(state); - } - return 0xFFFFFF; - } - @Override public boolean hasTileEntity(IBlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index f3552909b..616cb97a3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -193,11 +193,6 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I return ImmutableList.of(); } - @Override - public int colorMultiplier(IBlockAccess blockAccess, BlockPos pos, int pass) { - return 16777215; - } - @Override public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { for(int i = 0; i < COUNT; ++i) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 27615dff9..87ef5f93b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -286,17 +286,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I ((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state); } - @Override - public int getRenderColor(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR) - .getMapColor().colorValue; - } - - @Override - public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { - return getRenderColor(world.getBlockState(pos)); - } - @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getCurrentEquippedItem(); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index e726e8a10..42b8083d6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -98,16 +98,6 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @Override - public int getRenderColor(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - } - - @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, BlockPos pos, int pass) { - return getRenderColor(par1iBlockAccess.getBlockState(pos)); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.unstableBlocks; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index f34d18c53..a252b6d8e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -78,16 +78,6 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { return super.setUnlocalizedName(par1Str); } - @Override - public int getRenderColor(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - } - - @Override - public int colorMultiplier(IBlockAccess world, BlockPos pos, int pass) { - return getRenderColor(world.getBlockState(pos)); - } - @Override public int damageDropped(IBlockState state) { return getMetaFromState(state); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index 758a58edb..d65911cb1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -110,16 +110,6 @@ public class BlockUnstable extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @Override - public int getRenderColor(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; - } - - @Override - public int colorMultiplier(IBlockAccess par1iBlockAccess, BlockPos pos, int pass) { - return getRenderColor(par1iBlockAccess.getBlockState(pos)); - } - @Override public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { return LexiconData.unstableBlocks; diff --git a/src/main/java/vazkii/botania/common/item/IColorable.java b/src/main/java/vazkii/botania/common/item/IColorable.java new file mode 100644 index 000000000..b2f40d2d3 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/IColorable.java @@ -0,0 +1,7 @@ +package vazkii.botania.common.item; + +import net.minecraft.item.ItemStack; + +public interface IColorable { + int getColorFromItemStack(ItemStack stack, int tintIndex); +} diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index fd422919c..9108fbcb3 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -17,7 +17,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -public class Item16Colors extends ItemMod { +public class Item16Colors extends ItemMod implements IColorable { public Item16Colors(String name) { super(); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index aa5e60fa4..f4b6e802a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -47,7 +47,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemManaGun extends ItemMod implements IManaUsingItem { +public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable { private static final String TAG_LENS = "lens"; private static final String TAG_CLIP = "clip"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index b05b7836c..c984f36ff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -33,7 +33,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay { +public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay, IColorable { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_BACKLOG = "manaBacklog"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 3a7403a6a..a9aa9b347 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -26,7 +26,7 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay { +public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay, IColorable { private static final int MAX_MANA = 500000; diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 1658087fb..5bbd08d1c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -36,7 +36,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; -public class ItemSignalFlare extends ItemMod { +public class ItemSignalFlare extends ItemMod implements IColorable { private static final String TAG_COLOR = "color"; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index dc95b05e8..1e6a2ef68 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemSpellCloth extends ItemMod { +public class ItemSpellCloth extends ItemMod implements IColorable { public ItemSpellCloth() { setMaxDamage(35); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java index 093dc909e..d9debbd76 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetaNameAndColor.java @@ -1,19 +1,21 @@ package vazkii.botania.common.item.block; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.item.IColorable; -public class ItemBlockWithMetaNameAndColor extends ItemBlockWithMetadataAndName { +public class ItemBlockWithMetaNameAndColor extends ItemBlockWithMetadataAndName implements IColorable { public ItemBlockWithMetaNameAndColor(Block block) { super(block); } @Override @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack stack, int renderPass) - { - return this.block.getRenderColor(this.block.getStateFromMeta(stack.getMetadata())); + public int getColorFromItemStack(ItemStack stack, int renderPass) { + return Minecraft.getMinecraft().getBlockColors() + .colorMultiplier(this.block.getStateFromMeta(stack.getMetadata()), null, null, renderPass); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 6dc26feb7..92c349ef5 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -33,9 +33,10 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; -public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement { +public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement, IColorable { private static final String TAG_BREW_KEY = "brewKey"; private static final String TAG_SWIGS_LEFT = "swigsLeft"; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index cf1fc426a..b337a4cce 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -28,10 +28,11 @@ import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer { +public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer, IColorable { private static final String TAG_BREW_KEY = "brewKey"; public static final int TIME_MULTIPLIER = 60; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 6e3d81f7e..52cf31808 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -44,10 +44,11 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; -public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender { +public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender, IColorable { private static final String TAG_BREW_KEY = "brewKey"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 9ed324536..1c7496269 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -21,10 +21,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; -public class ItemEnderDagger extends ItemManasteelSword { +public class ItemEnderDagger extends ItemManasteelSword implements IColorable { public ItemEnderDagger() { super(BotaniaAPI.manasteelToolMaterial, LibItemNames.ENDER_DAGGER); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index c1fa35d9a..5c48202a2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -37,6 +37,7 @@ import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -48,7 +49,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker { +public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker, IColorable { private static final String TAG_ENABLED = "enabled"; private static final String TAG_MANA = "mana"; diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 8936d241c..c615afc9d 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -35,11 +35,12 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { +public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt, IColorable { public static final int SUBTYPES = 22; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index a1d2c3e5d..636472e9f 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -36,6 +36,7 @@ import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.entity.EntityEnderAirBottle; +import vazkii.botania.common.item.IColorable; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; @@ -43,7 +44,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { +public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement, IColorable { final int types = 24;