Added client side only annotation to all IItemColors and IBlockColor

This commit is contained in:
GirafiStudios 2016-06-03 17:04:19 +02:00
parent 271377ad79
commit 6bddc9c462
30 changed files with 95 additions and 2 deletions

View File

@ -1,4 +1,4 @@
minecraft_version=1.9.4
forge_version=12.17.0.1922-1.9.4
forge_version=12.17.0.1940
mod_version=4.1.0
mappings_version=snapshot_nodoc_20160519

View File

@ -27,6 +27,8 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPBones extends Block implements IBOPBlock
{
@ -51,8 +53,10 @@ public class BlockBOPBones extends Block implements IBOPBlock
@Override
protected BlockStateContainer createBlockState() {return new BlockStateContainer(this, new IProperty[] { AXIS, VARIANT });}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
// implement IBOPBlock

View File

@ -25,6 +25,8 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPCrystal extends Block implements IBOPBlock
{
@ -39,8 +41,10 @@ public class BlockBOPCrystal extends Block implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPCrystal() {

View File

@ -42,8 +42,10 @@ public class BlockBOPDecoration extends Block implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
// constructor

View File

@ -31,6 +31,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPDirt extends Block implements IBOPBlock, ISustainsPlantType
{
@ -67,8 +69,10 @@ public class BlockBOPDirt extends Block implements IBOPBlock, ISustainsPlantType
return (Boolean.TRUE.equals(state.getValue(COARSE)) ? "coarse_" : "") + ((BOPDirtType) state.getValue(VARIANT)).getName() + "_dirt";
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPDirt() {

View File

@ -44,8 +44,10 @@ public class BlockBOPDoor extends BlockDoor implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
// Map from woods to BlockBOPDoor instance and back

View File

@ -87,8 +87,10 @@ public class BlockBOPDoubleWoodSlab extends BlockSlab implements IBOPBlock
return "double_" + ((BOPWoods)state.getValue(this.variantProperty)).getName() + "_wood_slab";
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
private BlockBOPDoubleWoodSlab()

View File

@ -37,6 +37,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPFarmland extends BlockFarmland implements IBOPBlock
{
@ -78,8 +80,10 @@ public class BlockBOPFarmland extends BlockFarmland implements IBOPBlock
return ((BlockBOPDirt.BOPDirtType) state.getValue(this.variantProperty)).getName() + "_farmland";
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPFarmland()

View File

@ -26,6 +26,8 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPFence extends BlockFence implements IBOPBlock
{
@ -40,8 +42,10 @@ public class BlockBOPFence extends BlockFence implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
// Map from woods to BlockBOPFence instance and back

View File

@ -25,6 +25,8 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock
{
@ -40,8 +42,10 @@ public class BlockBOPFenceGate extends BlockFenceGate implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
// Map from woods to BlockBOPFenceGate instance and back

View File

@ -44,8 +44,10 @@ public class BlockBOPFlesh extends Block implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPFlesh() {

View File

@ -20,6 +20,8 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.color.IBlockColor;
import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.ItemBlock;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPGem extends Block implements IBOPBlock
{
@ -42,8 +44,10 @@ public class BlockBOPGem extends Block implements IBOPBlock
return ((BOPGems) state.getValue(VARIANT)).getName() + "_block";
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPGem()

View File

@ -30,6 +30,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPGemOre extends Block implements IBOPBlock
{
@ -52,8 +54,10 @@ public class BlockBOPGemOre extends Block implements IBOPBlock
return ((BOPGems) state.getValue(VARIANT)).getName() + "_ore";
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPGemOre()

View File

@ -24,6 +24,8 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPGeneric extends Block implements IBOPBlock, ISustainsPlantType
{
@ -38,8 +40,10 @@ public class BlockBOPGeneric extends Block implements IBOPBlock, ISustainsPlantT
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPGeneric() {

View File

@ -84,8 +84,10 @@ public class BlockBOPGrass extends BlockGrass implements IBOPBlock, ISustainsPla
}
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return BlockColoring.GRASS_COLORING; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return BlockColoring.BLOCK_ITEM_COLORING; }
public BlockBOPGrass()

View File

@ -85,8 +85,10 @@ public class BlockBOPHalfOtherSlab extends BlockSlab implements IBOPBlock
return ((SlabType) state.getValue(VARIANT)).getName() + "_slab";
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public IBlockState getFullBlockVariantState(SlabType type)

View File

@ -85,8 +85,10 @@ public class BlockBOPHalfWoodSlab extends BlockSlab implements IBOPBlock
return ((BOPWoods) state.getValue(this.variantProperty)).getName() + "_wood_slab";
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
private BlockBOPHalfWoodSlab()

View File

@ -27,6 +27,8 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPHive extends Block implements IBOPBlock
{
@ -64,8 +66,10 @@ public class BlockBOPHive extends Block implements IBOPBlock
return ((HiveType) state.getValue(VARIANT)).getName() + "_block";
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPHive()

View File

@ -34,8 +34,10 @@ public class BlockBOPHoney extends Block implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPHoney() {

View File

@ -88,6 +88,7 @@ public class BlockBOPLilypad extends BlockLilyPad implements IBOPBlock
};
}
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPLilypad()

View File

@ -22,6 +22,8 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPLog extends BlockLog implements IBOPBlock
{
@ -79,8 +81,10 @@ public class BlockBOPLog extends BlockLog implements IBOPBlock
}
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
private BlockBOPLog()

View File

@ -33,6 +33,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType
{
@ -71,8 +73,10 @@ public class BlockBOPMud extends Block implements IBOPBlock, ISustainsPlantType
return ((MudType) state.getValue(VARIANT)).getName();
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPMud() {

View File

@ -24,6 +24,8 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPPlanks extends Block implements IBOPBlock
{
@ -75,8 +77,10 @@ public class BlockBOPPlanks extends Block implements IBOPBlock
return ((BOPWoods) state.getValue(this.variantProperty)).getName() + "_planks";
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPPlanks()

View File

@ -27,6 +27,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPSand extends BlockFalling implements IBOPBlock, ISustainsPlantType
{
@ -64,8 +66,10 @@ public class BlockBOPSand extends BlockFalling implements IBOPBlock, ISustainsPl
return ((SandType) state.getValue(VARIANT)).getName();
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPSand() {

View File

@ -25,6 +25,8 @@ import net.minecraft.util.IStringSerializable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.Explosion;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPStone extends Block implements IBOPBlock
{
@ -63,8 +65,10 @@ public class BlockBOPStone extends Block implements IBOPBlock
return (Boolean.TRUE.equals(state.getValue(POLISHED)) ? "polished_" : "") + ((StoneType) state.getValue(VARIANT)).getName();
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPStone()

View File

@ -24,6 +24,8 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPTerrarium extends Block implements IBOPBlock
{
@ -67,8 +69,10 @@ public class BlockBOPTerrarium extends Block implements IBOPBlock
}
}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
public BlockBOPTerrarium()

View File

@ -21,6 +21,8 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.EnumPlantType;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
// TODO: stop snow settling on this (floats above it)
public class BlockBOPTurnip extends BlockCrops implements IBOPBlock
@ -36,8 +38,10 @@ public class BlockBOPTurnip extends BlockCrops implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
@Override

View File

@ -20,6 +20,8 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPVine extends BlockVine implements IBOPBlock
{
@ -34,8 +36,10 @@ public class BlockBOPVine extends BlockVine implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return useGreyScaleTextures ? BlockColoring.FOLIAGE_COLORING : null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return BlockColoring.BLOCK_ITEM_COLORING; }
// if set to true, (the default), use BlockVine getBlockColor(), getRenderColor() and colorMultiplier() functions to color the texture based on biome

View File

@ -23,6 +23,8 @@ import net.minecraft.item.ItemBlock;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock
{
@ -38,8 +40,10 @@ public class BlockBOPWoodStairs extends BlockStairs implements IBOPBlock
@Override
public String getStateName(IBlockState state) {return "";}
@Override
@SideOnly(Side.CLIENT)
public IBlockColor getBlockColor() { return null; }
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor() { return null; }
// Map from woods to BlockBOPStairs instance and back

View File

@ -86,8 +86,8 @@ public class ItemBOPSpawnEgg extends Item implements IColoredItem
return super.getUnlocalizedName(stack)+"_"+entityName;
}
@SideOnly(Side.CLIENT)
@Override
@SideOnly(Side.CLIENT)
public IItemColor getItemColor()
{
return new IItemColor()