From 9f66216832502418825f3a60b2dad51d8c2829d7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 26 Aug 2016 20:14:42 -0500 Subject: [PATCH] Item sideonly checks --- src/main/java/vazkii/botania/common/item/IColorable.java | 3 +++ .../java/vazkii/botania/common/item/Item16Colors.java | 1 + .../java/vazkii/botania/common/item/ItemAncientWill.java | 1 + .../java/vazkii/botania/common/item/ItemBlackLotus.java | 1 + .../vazkii/botania/common/item/ItemCorporeaSpark.java | 1 + .../vazkii/botania/common/item/ItemCraftPattern.java | 1 + .../java/vazkii/botania/common/item/ItemGrassHorn.java | 1 + .../java/vazkii/botania/common/item/ItemGrassSeeds.java | 1 + .../java/vazkii/botania/common/item/ItemLaputaShard.java | 1 + .../java/vazkii/botania/common/item/ItemLexicon.java | 1 + .../java/vazkii/botania/common/item/ItemManaMirror.java | 3 +++ .../java/vazkii/botania/common/item/ItemManaTablet.java | 2 ++ .../java/vazkii/botania/common/item/ItemSignalFlare.java | 2 ++ .../vazkii/botania/common/item/ItemSparkUpgrade.java | 1 + .../java/vazkii/botania/common/item/ItemTwigWand.java | 1 + .../vazkii/botania/common/item/brew/ItemBrewBase.java | 2 ++ .../botania/common/item/brew/ItemIncenseStick.java | 2 ++ .../java/vazkii/botania/common/item/brew/ItemVial.java | 1 + .../common/item/equipment/bauble/ItemBaubleCosmetic.java | 1 + .../common/item/equipment/bauble/ItemBloodPendant.java | 3 +++ .../common/item/equipment/bauble/ItemFlightTiara.java | 1 + .../common/item/equipment/bauble/ItemIcePendant.java | 3 +++ .../common/item/equipment/bauble/ItemLavaPendant.java | 3 +++ .../common/item/equipment/bauble/ItemManaRing.java | 3 +++ .../common/item/equipment/bauble/ItemMonocle.java | 1 + .../item/equipment/bauble/ItemSuperLavaPendant.java | 3 +++ .../common/item/equipment/bauble/ItemTinyPlanet.java | 3 +++ .../common/item/equipment/tool/ItemEnderDagger.java | 9 +++------ .../item/equipment/tool/terrasteel/ItemTerraPick.java | 1 + .../item/interaction/thaumcraft/ItemManaInkwell.java | 3 +++ .../java/vazkii/botania/common/item/lens/ItemLens.java | 2 ++ .../vazkii/botania/common/item/material/ItemQuartz.java | 1 + .../vazkii/botania/common/item/material/ItemRune.java | 1 + 33 files changed, 58 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/IColorable.java b/src/main/java/vazkii/botania/common/item/IColorable.java index b2f40d2d3..c48eacd1f 100644 --- a/src/main/java/vazkii/botania/common/item/IColorable.java +++ b/src/main/java/vazkii/botania/common/item/IColorable.java @@ -1,7 +1,10 @@ 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); } diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index a49210a4e..8651d44d9 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -29,6 +29,7 @@ public class Item16Colors extends ItemMod implements IColorable { } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { return EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()).getMapColor().colorValue; } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 0e064e8a6..8a9a6b710 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -41,6 +41,7 @@ public class ItemAncientWill extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 76d0c4bb5..8a62d69b1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -42,6 +42,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 13d182023..aa55c48a2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -39,6 +39,7 @@ public class ItemCorporeaSpark extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 05f2499f6..cbdad90d7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -51,6 +51,7 @@ public class ItemCraftPattern extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 7d2bd265b..e706ed3de 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -61,6 +61,7 @@ public class ItemGrassHorn extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 93ff2b0ae..4bac00777 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -69,6 +69,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs par2, List par3) { for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index ebb93eada..b3643d874 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -73,6 +73,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(int i = 0; i < 4; i++) diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 8766e377a..a7e7a7ba0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -95,6 +95,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); ItemStack creative = new ItemStack(item); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index c5c847677..df4e24c42 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -23,6 +23,8 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaTooltipDisplay; @@ -55,6 +57,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte } @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; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 1346022e5..13385afbd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -45,6 +45,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { // Empty tablet stacks.add(new ItemStack(item, 1)); @@ -62,6 +63,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @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; diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index 857822fba..eddb4ec18 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -91,6 +91,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0) return 0xFFFFFF; @@ -99,6 +100,7 @@ public class ItemSignalFlare extends ItemMod implements IColorable { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) stacks.add(forColor(i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index adbeac582..368567c21 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -31,6 +31,7 @@ public class ItemSparkUpgrade extends ItemMod { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < VARIANTS; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 199cc3625..fe5dbe745 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -205,6 +205,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0 || par2 == 3) return 0xFFFFFF; 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 25346cf71..e24adffa3 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -118,6 +118,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack stack = new ItemStack(item); @@ -127,6 +128,7 @@ 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; 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 cf016d2d0..8d0bafc8d 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -45,6 +45,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { @@ -55,6 +56,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) return 0xFFFFFF; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 5c53ccf00..6fe3b8421 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -38,6 +38,7 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 1b88f89cb..83c48aa05 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -71,6 +71,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); 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 a7a2e3b66..12ee6863a 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 @@ -58,6 +58,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { @@ -68,6 +69,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack stack, int pass) { if(pass == 0) return 0xFFFFFF; @@ -166,6 +168,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 032d05e07..c63f591b2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -98,6 +98,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index cafbe379b..dec6f32f5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -22,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -50,6 +52,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 189cca99d..49179c98d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -20,6 +20,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -43,6 +45,7 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index 40810a6e0..099ada167 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -16,6 +16,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -47,6 +49,7 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { stacks.add(new ItemStack(item, 1, 10000)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index 40c330048..0c6dd68d8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -49,6 +49,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index 563eb43ae..701697414 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -22,6 +22,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; @@ -54,6 +56,7 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index f3abaf290..f59b350d5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -22,6 +22,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.ITinyPlanetExcempt; @@ -101,6 +103,7 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { } @Override + @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); 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 f947bbf1a..7c4e8da50 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 @@ -22,6 +22,8 @@ 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; @@ -39,6 +41,7 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { if(par2 == 0) return 0xFFFFFF; @@ -46,12 +49,6 @@ public class ItemEnderDagger extends ItemManasteelSword implements IColorable { return Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F)); } - @Nonnull - @Override - public EnumAction getItemUseAction(ItemStack par1ItemStack) { - return EnumAction.NONE; - } - @Override public boolean hitEntity(ItemStack stack, EntityLivingBase target, @Nonnull EntityLivingBase attacker) { if(!target.worldObj.isRemote 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 0b6f8762d..942cacf6a 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 @@ -86,6 +86,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int mana : CREATIVE_MANA) { ItemStack stack = new ItemStack(item); 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 d0f285d84..a99b2d4bf 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 @@ -16,6 +16,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.items.IScribeTools; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -42,6 +44,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, USES)); list.add(new ItemStack(item)); 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 57bfad516..190b1a197 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -149,12 +149,14 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < SUBTYPES; i++) stacks.add(new ItemStack(item, 1, i)); } @Override + @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF; } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index d08ba180a..6c935047e 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -34,6 +34,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 4be693ca3..24f7163f1 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -37,6 +37,7 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override + @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i));