Item sideonly checks

This commit is contained in:
Vincent Lee committed 2016-08-26 20:14:42 -05:00
1 parent ed1cbbe9dd
commit 9f66216832
33 files changed
+58 -6

No files matched your search

@@ -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);
}
@@ -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;
}
@@ -41,6 +41,7 @@ public class ItemAncientWill extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < SUBTYPES; i++)
list.add(new ItemStack(item, 1, i));
@@ -42,6 +42,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 2; i++)
list.add(new ItemStack(item, 1, i));
@@ -39,6 +39,7 @@ public class ItemCorporeaSpark extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 2; i++)
list.add(new ItemStack(item, 1, i));
@@ -51,6 +51,7 @@ public class ItemCraftPattern extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++)
list.add(new ItemStack(item, 1, i));
@@ -61,6 +61,7 @@ public class ItemGrassHorn extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < SUBTYPES; i++)
list.add(new ItemStack(item, 1, i));
@@ -69,6 +69,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs par2, List<ItemStack> par3) {
for(int i = 0; i < SUBTYPES; i++)
par3.add(new ItemStack(item, 1, i));
@@ -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<ItemStack> list) {
super.getSubItems(item, tab, list);
for(int i = 0; i < 4; i++)
@@ -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<ItemStack> list) {
list.add(new ItemStack(item));
ItemStack creative = new ItemStack(item);
@@ -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;
@@ -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<ItemStack> 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;
@@ -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<ItemStack> stacks) {
for(int i = 0; i < 16; i++)
stacks.add(forColor(i));
@@ -31,6 +31,7 @@ public class ItemSparkUpgrade extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < VARIANTS; i++)
list.add(new ItemStack(item, 1, i));
@@ -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;
@@ -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<ItemStack> 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;
@@ -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<ItemStack> 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;
@@ -38,6 +38,7 @@ public class ItemVial extends ItemMod implements IBrewContainer {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 2; i++)
list.add(new ItemStack(item, 1, i));
@@ -71,6 +71,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < SUBTYPES; i++)
list.add(new ItemStack(item, 1, i));
@@ -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<ItemStack> 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);
@@ -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<ItemStack> list) {
for(int i = 0; i < SUBTYPES + 1; i++)
list.add(new ItemStack(item, 1, i));
@@ -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);
@@ -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);
@@ -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<ItemStack> stacks) {
stacks.add(new ItemStack(item, 1, 10000));
}
@@ -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;
@@ -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);
@@ -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);
@@ -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
@@ -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<ItemStack> list) {
for(int mana : CREATIVE_MANA) {
ItemStack stack = new ItemStack(item);
@@ -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<ItemStack> list) {
list.add(new ItemStack(item, 1, USES));
list.add(new ItemStack(item));
@@ -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<ItemStack> 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;
}
@@ -34,6 +34,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++)
list.add(new ItemStack(item, 1, i));
@@ -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<ItemStack> stacks) {
for(int i = 0; i < 16; i++)
stacks.add(new ItemStack(item, 1, i));