Move colorhandlers and get rid of icolorable

This commit is contained in:
Vincent Lee committed 2016-08-28 11:50:06 -05:00
1 parent f6a68a0d83
commit f0d863d30f
22 files changed
+104 -250

No files matched your search

@@ -5,28 +5,36 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
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.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.common.registry.RegistryDelegate;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.brew.IBrewItem;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.PoolVariant;
import vazkii.botania.api.state.enums.SpreaderVariant;
import vazkii.botania.common.Botania;
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.block.tile.mana.TilePool;
import vazkii.botania.common.entity.EntityManaBurst;
import vazkii.botania.common.item.ItemManaGun;
import vazkii.botania.common.item.ItemManaMirror;
import vazkii.botania.common.item.ItemManaTablet;
import vazkii.botania.common.item.ItemSignalFlare;
import vazkii.botania.common.item.ItemTwigWand;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant;
import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
import vazkii.botania.common.item.lens.ItemLens;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.awt.*;
import java.util.Map;
@@ -87,17 +95,69 @@ public final class ColorHandler {
ItemColors items = Minecraft.getMinecraft().getItemColors();
items.registerItemColorHandler((stack, tintIndex) -> {
Item item = stack.getItem();
if (item instanceof IColorable) {
return ((IColorable) item).getColorFromItemStack(stack, tintIndex);
} else {
return 0xFFFFFF;
}
}, ModItems.manaResource, ModItems.twigWand, 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), Item.getItemFromBlock(ModBlocks.pool), Item.getItemFromBlock(ModBlocks.spreader));
items.registerItemColorHandler((s, t) -> (s.getItemDamage() == 5 || s.getItemDamage() == 14)
? Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F) : -1,
ModItems.manaResource);
items.registerItemColorHandler((s, t) ->
t == 1 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor1(s)).getMapColor().colorValue
: t == 2 ? EnumDyeColor.byMetadata(ItemTwigWand.getColor2(s)).getMapColor().colorValue
: -1,
ModItems.twigWand);
items.registerItemColorHandler((s, t) -> EnumDyeColor.byMetadata(s.getItemDamage()).getMapColor().colorValue, ModItems.dye, ModItems.petal);
items.registerItemColorHandler((s, t) -> Minecraft.getMinecraft().getBlockColors().colorMultiplier(((ItemBlock)s.getItem()).block.getStateFromMeta(s.getMetadata()), null, null, t),
ModBlocks.manaBeacon, ModBlocks.petalBlock, ModBlocks.unstableBlock, ModBlocks.pool, ModBlocks.spreader);
items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaMirror) ModItems.manaMirror).getMana(s) / TilePool.MAX_MANA, 1F) : -1, ModItems.manaMirror);
items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.528F, ((ItemManaTablet) ModItems.manaTablet).getMana(s) / ItemManaTablet.MAX_MANA, 1F) : -1, ModItems.manaTablet);
items.registerItemColorHandler((s, t) -> t == 1 ? EnumDyeColor.byMetadata(ItemSignalFlare.getColor(s)).getMapColor().colorValue : -1, ModItems.signalFlare);
items.registerItemColorHandler((s, t) -> Color.HSBtoRGB(0.55F, ((float) s.getMaxDamage() - (float) s.getItemDamage()) / s.getMaxDamage() * 0.5F, 1F), ModItems.spellCloth);
items.registerItemColorHandler((s, t) -> {
if(t != 1)
return -1;
Brew brew = ((IBrewItem) s.getItem()).getBrew(s);
if(brew == BotaniaAPI.fallbackBrew)
return s.getItem() instanceof ItemBloodPendant ? 0xC6000E : 0x989898;
Color color = new Color(brew.getColor(s));
double speed = s.getItem() == ModItems.brewFlask || s.getItem() == ModItems.brewVial ? 0.1 : 0.2;
int add = (int) (Math.sin(ClientTickHandler.ticksInGame * speed) * 24);
int r = Math.max(0, Math.min(255, color.getRed() + add));
int g = Math.max(0, Math.min(255, color.getGreen() + add));
int b = Math.max(0, Math.min(255, color.getBlue() + add));
return r << 16 | g << 8 | b;
}, ModItems.bloodPendant, ModItems.incenseStick, ModItems.brewFlask, ModItems.brewVial);
items.registerItemColorHandler((s, t) -> {
ItemStack lens = ItemManaGun.getLens(s);
if(lens != null && t == 0)
return Minecraft.getMinecraft().getItemColors().getColorFromItemstack(lens, t);
if(t == 2) {
EntityManaBurst burst = ((ItemManaGun) s.getItem()).getBurst(Minecraft.getMinecraft().thePlayer, s, false);
Color color = new Color(burst == null ? 0x20FF20 : burst.getColor());
float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F);
int c = (int) (255 * mul);
return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB();
} else return -1;
}, ModItems.manaGun);
items.registerItemColorHandler((s, t) -> t == 1 ? Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)) : -1, ModItems.enderDagger);
items.registerItemColorHandler((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick);
items.registerItemColorHandler((s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1, ModItems.lens);
}
private ColorHandler() {}
@@ -35,7 +35,7 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.block.tile.TileManaBeacon;
import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -93,7 +93,7 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable {
@Override
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName());
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -31,7 +31,7 @@ import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -80,7 +80,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable {
@Override
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName());
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -36,7 +36,7 @@ import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -96,7 +96,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable {
@Override
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName());
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@Override
@@ -46,7 +46,7 @@ import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.block.tile.mana.TileSpreader;
import vazkii.botania.common.core.helper.InventoryHelper;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -88,7 +88,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
@Override
public void registerItemForm() {
GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName());
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@@ -1,10 +0,0 @@
package vazkii.botania.common.item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public interface IColorable {
@SideOnly(Side.CLIENT)
int getColorFromItemStack(ItemStack stack, int tintIndex);
}
@@ -21,19 +21,13 @@ import vazkii.botania.client.core.handler.ModelHandler;
import javax.annotation.Nonnull;
import java.util.List;
public class Item16Colors extends ItemMod implements IColorable {
public class Item16Colors extends ItemMod {
public Item16Colors(String name) {
super(name);
setHasSubtypes(true);
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
return EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()).getMapColor().colorValue;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
@@ -56,7 +56,7 @@ import java.awt.*;
import java.util.ArrayList;
import java.util.List;
public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable {
public class ItemManaGun extends ItemMod implements IManaUsingItem {
private static final String TAG_LENS = "lens";
private static final String TAG_CLIP = "clip";
@@ -138,25 +138,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable {
return stack.getDisplayName().equalsIgnoreCase("desu gun");
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int tintIndex) {
ItemStack lens = getLens(stack);
if(lens != null && tintIndex == 0)
return ((IColorable) ModItems.lens).getColorFromItemStack(lens, tintIndex);
if(tintIndex == 2) {
EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, stack, false);
Color color = new Color(burst == null ? 0x20FF20 : burst.getColor());
float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F);
int c = (int) (255 * mul);
return new Color(Math.max(0, Math.min(255, color.getRed() + c)), Math.max(0, Math.min(255, color.getGreen() + c)), Math.max(0, Math.min(255, color.getBlue() + c))).getRGB();
} else return 0xFFFFFF;
}
@Override
public boolean hasContainerItem(ItemStack stack) {
return getLens(stack) != null;
@@ -168,7 +149,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem, IColorable {
return getLens(itemStack);
}
private EntityManaBurst getBurst(EntityPlayer player, ItemStack stack, boolean request) {
public EntityManaBurst getBurst(EntityPlayer player, ItemStack stack, boolean request) {
EntityManaBurst burst = new EntityManaBurst(player);
int maxMana = 120;
@@ -37,7 +37,7 @@ import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
import java.awt.*;
public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay, IColorable {
public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay {
private static final String TAG_MANA = "mana";
private static final String TAG_MANA_BACKLOG = "manaBacklog";
@@ -56,13 +56,6 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte
setNoRepair();
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
float mana = getMana(par1ItemStack);
return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / TilePool.MAX_MANA, 1F) : 0xFFFFFF;
}
@Override
public int getDamage(ItemStack stack) {
float mana = getMana(stack);
@@ -29,9 +29,9 @@ import javax.annotation.Nonnull;
import java.awt.*;
import java.util.List;
public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay, IColorable {
public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay {
private static final int MAX_MANA = 500000;
public static final int MAX_MANA = 500000;
private static final String TAG_MANA = "mana";
private static final String TAG_CREATIVE = "creative";
@@ -62,13 +62,6 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP
stacks.add(creative);
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
float mana = getMana(par1ItemStack);
return par2 == 1 ? Color.HSBtoRGB(0.528F, mana / MAX_MANA, 1F) : 0xFFFFFF;
}
@Override
public int getDamage(ItemStack stack) {
// Compatibility shim, so tablets from previous versions of botania
@@ -39,7 +39,7 @@ import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
import java.util.List;
public class ItemSignalFlare extends ItemMod implements IColorable {
public class ItemSignalFlare extends ItemMod {
private static final String TAG_COLOR = "color";
@@ -90,15 +90,6 @@ public class ItemSignalFlare extends ItemMod implements IColorable {
par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
if(par2 == 0)
return 0xFFFFFF;
return EnumDyeColor.byMetadata(getColor(par1ItemStack)).getMapColor().colorValue;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
@@ -22,7 +22,7 @@ import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
import java.awt.*;
public class ItemSpellCloth extends ItemMod implements IColorable {
public class ItemSpellCloth extends ItemMod {
public ItemSpellCloth() {
super(LibItemNames.SPELL_CLOTH);
@@ -39,12 +39,6 @@ public class ItemSpellCloth extends ItemMod implements IColorable {
return false;
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
return Color.HSBtoRGB(0.55F, ((float) par1ItemStack.getMaxDamage() - (float) par1ItemStack.getItemDamage()) / par1ItemStack.getMaxDamage() * 0.5F, 1F);
}
@Override
public boolean hasContainerItem(ItemStack stack) {
return true;
@@ -204,16 +204,6 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
return ActionResult.newResult(EnumActionResult.SUCCESS, stack);
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
if(par2 == 0 || par2 == 3)
return 0xFFFFFF;
EnumDyeColor color = EnumDyeColor.byMetadata(par2 == 1 ? getColor1(par1ItemStack) : getColor2(par1ItemStack));
return color.getMapColor().colorValue;
}
@Override
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
for(int i = 0; i < 16; i++)
@@ -27,7 +27,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
public class ItemBlockPool extends ItemBlockWithMetaNameAndColor {
public class ItemBlockPool extends ItemBlockWithMetadataAndName {
public ItemBlockPool(Block par2Block) {
super(par2Block);
@@ -1,21 +0,0 @@
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 implements IColorable {
public ItemBlockWithMetaNameAndColor(Block block) {
super(block);
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int renderPass) {
return Minecraft.getMinecraft().getBlockColors()
.colorMultiplier(this.block.getStateFromMeta(stack.getMetadata()), null, null, renderPass);
}
}
@@ -17,7 +17,6 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.EnumAction;
import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
@@ -35,20 +34,16 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.brew.IBrewItem;
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;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.awt.*;
import java.util.List;
public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement, IColorable {
public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickupAchievement {
private static final String TAG_BREW_KEY = "brewKey";
private static final String TAG_SWIGS_LEFT = "swigsLeft";
@@ -127,22 +122,6 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
}
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int pass) {
if(pass == 0)
return 0xFFFFFF;
Color color = new Color(getBrew(stack).getColor(stack));
int add = (int) (Math.sin(ClientTickHandler.ticksInGame * 0.1) * 16);
int r = Math.max(0, Math.min(255, color.getRed() + add));
int g = Math.max(0, Math.min(255, color.getGreen() + add));
int b = Math.max(0, Math.min(255, color.getBlue() + add));
return r << 16 | g << 8 | b;
}
@Nonnull
@Override
public String getItemStackDisplayName(@Nonnull ItemStack stack) {
@@ -24,17 +24,14 @@ import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.Brew;
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;
import javax.annotation.Nonnull;
import java.awt.*;
import java.util.List;
public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer, IColorable {
public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer {
private static final String TAG_BREW_KEY = "brewKey";
public static final int TIME_MULTIPLIER = 60;
@@ -55,26 +52,6 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain
}
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int pass) {
if(pass == 0)
return 0xFFFFFF;
Brew brew = getBrew(stack);
if(brew == BotaniaAPI.fallbackBrew)
return 0x989898;
Color color = new Color(brew.getColor(stack));
int add = (int) (Math.sin(ClientTickHandler.ticksInGame * 0.2) * 24);
int r = Math.max(0, Math.min(255, color.getRed() + add));
int g = Math.max(0, Math.min(255, color.getGreen() + add));
int b = Math.max(0, Math.min(255, color.getBlue() + add));
return r << 16 | g << 8 | b;
}
@SideOnly(Side.CLIENT)
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean adv) {
@@ -37,18 +37,16 @@ import vazkii.botania.api.brew.IBrewItem;
import vazkii.botania.api.item.IBaubleRender;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
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 javax.annotation.Nonnull;
import java.awt.*;
import java.util.List;
public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender, IColorable {
public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender {
private static final String TAG_BREW_KEY = "brewKey";
@@ -68,26 +66,6 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
}
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int pass) {
if(pass == 0)
return 0xFFFFFF;
Brew brew = getBrew(stack);
if(brew == BotaniaAPI.fallbackBrew)
return 0xC6000E;
Color color = new Color(brew.getColor(stack));
int add = (int) (Math.sin(ClientTickHandler.ticksInGame * 0.2) * 24);
int r = Math.max(0, Math.min(255, color.getRed() + add));
int g = Math.max(0, Math.min(255, color.getGreen() + add));
int b = Math.max(0, Math.min(255, color.getBlue() + add));
return r << 16 | g << 8 | b;
}
@SideOnly(Side.CLIENT)
@Override
public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List<String> list, boolean adv) {
@@ -185,7 +163,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
float f3 = icon.getMaxV();
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);
Color color = new Color(getColorFromItemStack(stack, 1));
Color color = new Color(Minecraft.getMinecraft().getItemColors().getColorFromItemstack(stack, 1));
GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
int light = 15728880;
int lightmapX = light % 65536;
@@ -18,21 +18,16 @@ import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.monster.EntityEnderman;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
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;
import javax.annotation.Nonnull;
import java.awt.*;
public class ItemEnderDagger extends ItemManasteelSword implements IColorable {
public class ItemEnderDagger extends ItemManasteelSword {
public ItemEnderDagger() {
super(BotaniaAPI.manasteelToolMaterial, LibItemNames.ENDER_DAGGER);
@@ -40,15 +35,6 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable {
setNoRepair();
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
if(par2 == 0)
return 0xFFFFFF;
return Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F));
}
@Override
public boolean hitEntity(ItemStack stack, EntityLivingBase target, @Nonnull EntityLivingBase attacker) {
if(!target.worldObj.isRemote
@@ -15,10 +15,8 @@ import net.minecraft.client.resources.I18n;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Enchantments;
import net.minecraft.item.IItemPropertyGetter;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -45,7 +43,6 @@ import vazkii.botania.api.sound.BotaniaSoundEvents;
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;
@@ -55,10 +52,9 @@ import vazkii.botania.common.item.relic.ItemThorRing;
import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
import java.awt.*;
import java.util.List;
public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker, IColorable {
public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker {
private static final String TAG_ENABLED = "enabled";
private static final String TAG_MANA = "mana";
@@ -209,15 +205,6 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
ItemNBTHelper.setBoolean(stack, TAG_TIPPED, true);
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
if(par2 == 0 || !isEnabled(par1ItemStack))
return 0xFFFFFF;
return Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F);
}
public static boolean isEnabled(ItemStack stack) {
return ItemNBTHelper.getBoolean(stack, TAG_ENABLED, false);
}
@@ -36,7 +36,6 @@ 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;
@@ -44,7 +43,7 @@ import javax.annotation.Nonnull;
import java.awt.*;
import java.util.List;
public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt, IColorable {
public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt {
public static final int SUBTYPES = 22;
@@ -155,12 +154,6 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
stacks.add(new ItemStack(item, 1, i));
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF;
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
@@ -39,15 +39,13 @@ 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.lib.LibItemNames;
import javax.annotation.Nonnull;
import java.awt.*;
import java.util.List;
public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement, IColorable {
public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement {
final int types = 24;
@@ -130,15 +128,6 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
stacks.add(new ItemStack(item, 1, i));
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
if(par1ItemStack.getItemDamage() == 5 || par1ItemStack.getItemDamage() == 14)
return Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F);
return 0xFFFFFF;
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {