Add missing sideonly to blocks

This commit is contained in:
Vincent Lee committed 2016-08-15 12:00:51 -05:00
1 parent 4f26ea9893
commit 9e13eda148
40 files changed
+61 -6

No files matched your search

@@ -14,6 +14,8 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
/**
* Any block that implements this has a HUD rendered when being hovered
@@ -21,6 +23,7 @@ import net.minecraft.world.World;
*/
public interface IWandHUD {
@SideOnly(Side.CLIENT)
public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos);
}
@@ -82,6 +82,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 6; i++)
@@ -120,6 +121,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
return type == EnumPlantType.Plains || type == EnumPlantType.Beach;
}
@SideOnly(Side.CLIENT)
@Override
public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random r) {
if (state.getBlock() != this)
@@ -110,6 +110,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
return state;
}
@SideOnly(Side.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
@@ -121,6 +122,7 @@ public class BlockAltar extends BlockMod implements ILexiconable {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 9; i++)
@@ -24,6 +24,8 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.tile.TileBifrost;
@@ -66,6 +68,7 @@ public class BlockBifrost extends BlockMod implements ILexiconable {
return block != this && super.shouldSideBeRendered(state, world, pos, side);
}
@SideOnly(Side.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
@@ -20,6 +20,8 @@ import net.minecraft.util.EnumFacing;
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;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.Botania;
@@ -59,6 +61,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable {
Botania.proxy.sparkleFX(world, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6);
}
@SideOnly(Side.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
@@ -34,7 +34,6 @@ public abstract class BlockCamo extends BlockMod {
}
@Override
@SuppressWarnings("unchecked")
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack currentStack, EnumFacing side, float hitX, float hitY, float hitZ) {
TileEntity tile = world.getTileEntity(pos);
@@ -205,6 +205,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
((TileSpecialFlower) world.getTileEntity(pos)).onBlockAdded(world, pos, state);
}
@SideOnly(Side.CLIENT)
@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) {
((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res);
@@ -191,6 +191,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable,
return false;
}
@SideOnly(Side.CLIENT)
@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) {
TileHourglass tile = (TileHourglass) world.getTileEntity(pos);
@@ -88,6 +88,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 2; i++)
@@ -76,6 +76,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
for(int i = 0; i < LivingRockVariant.values().length; i++)
@@ -80,6 +80,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
for(int i = 0; i < LivingWoodVariant.values().length; i++)
@@ -118,6 +118,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
return true;
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List<ItemStack> stacks) {
for(int i = 0; i < 16; i++)
@@ -129,6 +130,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
return getMetaFromState(state);
}
@SideOnly(Side.CLIENT)
@Override
public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {
int hex = state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue;
@@ -101,6 +101,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
for(int i = 0; i < CrateVariant.values().length; i++)
@@ -156,6 +157,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
return crate.onWanded(world, player, stack);
}
@SideOnly(Side.CLIENT)
@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) {
TileEntity tile = world.getTileEntity(pos);
@@ -112,6 +112,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable,
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
for(int i = 0; i < PlatformVariant.values().length; i++)
@@ -93,6 +93,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
return getMetaFromState(state);
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List<ItemStack> par3) {
for(int i = 0; i < PylonVariant.values().length; i++)
@@ -204,12 +204,14 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
return true;
}
@SideOnly(Side.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
return BlockRenderLayer.CUTOUT;
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List<ItemStack> stacks) {
for(String s : BotaniaAPI.subtilesForCreativeMenu) {
@@ -336,6 +338,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I
return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ);
}
@SideOnly(Side.CLIENT)
@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) {
((TileSpecialFlower) world.getTileEntity(pos)).renderHUD(mc, res);
@@ -66,6 +66,7 @@ public class BlockStorage extends BlockMod implements ILexiconable {
return getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.values()[meta]);
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List<ItemStack> par3) {
for(int i = 0; i < StorageVariant.values().length; i++)
@@ -46,6 +46,7 @@ public class BlockBuriedPetals extends BlockModFlower {
return AABB;
}
@SideOnly(Side.CLIENT)
@Override
public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {
EnumDyeColor color = state.getValue(BotaniaStateProps.COLOR);
@@ -77,6 +77,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
for(int i = 0; i < CustomBrickVariant.values().length; i++)
@@ -80,6 +80,7 @@ public class BlockManaBeacon extends BlockMod implements ILexiconable {
return AABB;
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
for(int i = 0; i < 16; i++)
@@ -91,7 +91,7 @@ public class BlockManaFlame extends BlockMod implements ILexiconable {
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) {
return null;
return NULL_AABB;
}
@Override
@@ -21,6 +21,8 @@ import net.minecraft.util.EnumFacing;
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;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.BlockMod;
@@ -47,12 +49,14 @@ public class BlockManaGlass extends BlockMod implements ILexiconable {
return false;
}
@SideOnly(Side.CLIENT)
@Override
public boolean shouldSideBeRendered(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, EnumFacing side) {
Block block = world.getBlockState(pos.offset(side)).getBlock();
return block == this ? false : super.shouldSideBeRendered(state, world, pos, side);
}
@SideOnly(Side.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
@@ -95,6 +95,7 @@ public class BlockPavement extends BlockMod {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
for(int i = 0; i < TYPES; i++)
@@ -67,6 +67,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable {
return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta));
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 16; i++)
@@ -22,6 +22,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;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
@@ -50,6 +52,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable {
return AABB;
}
@SideOnly(Side.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
@@ -95,6 +95,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable {
public void registerItemForm() {
GameRegistry.register(new ItemBlockTinyPotato(this), getRegistryName());
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) {
TileEntity tile = world.getTileEntity(pos);
@@ -83,6 +83,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable {
return AABB;
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> stacks) {
for(int i = 0; i < 16; i++)
@@ -21,6 +21,8 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.BlockMod;
@@ -39,6 +41,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable {
setSoundType(SoundType.STONE);
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 16; i++)
@@ -24,6 +24,7 @@ public class BlockAlfglassPane extends BlockModPane {
super(ModBlocks.elfGlass);
}
@SideOnly(Side.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
@@ -24,6 +24,7 @@ public class BlockBifrostPane extends BlockModPane {
super(ModBlocks.bifrostPerm);
}
@SideOnly(Side.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
@@ -24,6 +24,7 @@ public class BlockManaglassPane extends BlockModPane {
super(ModBlocks.manaGlass);
}
@SideOnly(Side.CLIENT)
@Nonnull
@Override
public BlockRenderLayer getBlockLayer() {
@@ -72,6 +72,7 @@ public class BlockBiomeStoneWall extends BlockModWall {
GameRegistry.register(new ItemBlockWithMetadataAndName(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List<ItemStack> list) {
for(int i = 0; i < 8; i++)
@@ -99,6 +99,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM
GameRegistry.register(new ItemBlockMod(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List<ItemStack> list) {
list.add(new ItemStack(item));
@@ -150,6 +150,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD {
return LexiconData.brewery;
}
@SideOnly(Side.CLIENT)
@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) {
((TileBrewery) world.getTileEntity(pos)).renderHUD(mc, res);
@@ -179,6 +179,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable,
return LexiconData.manaEnchanting;
}
@SideOnly(Side.CLIENT)
@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) {
((TileEnchanter) world.getTileEntity(pos)).renderHUD(res);
@@ -108,6 +108,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
return state.getBlock().getMetaFromState(state);
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List<ItemStack> list) {
for(int i = 0; i < 3; i++)
@@ -140,6 +140,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
return drops;
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List<ItemStack> par3) {
par3.add(new ItemStack(item, 1, 0));
@@ -97,7 +97,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable,
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) {
return null;
return NULL_AABB;
}
@Override
@@ -87,6 +87,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
GameRegistry.register(new ItemBlockWithMetaNameAndColor(this), getRegistryName());
}
@SideOnly(Side.CLIENT)
@Override
public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List<ItemStack> par3) {
for(int i = 0; i < 4; i++)
@@ -233,9 +234,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
@Override
public AxisAlignedBB getWireframeAABB(World world, BlockPos pos) {
float f = 1F / 16F;
return new AxisAlignedBB(pos.getX() + f, pos.getY() + f, pos.getZ() + f,
pos.getX() + 1 - f, pos.getY() + 1 - f, pos.getZ() + 1 - f);
return FULL_BLOCK_AABB.offset(pos).contract(1.0/16.0);
}
@SideOnly(Side.CLIENT)
@@ -21,6 +21,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.wand.IWandHUD;
@@ -51,6 +53,7 @@ public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILe
return new TileTurntable();
}
@SideOnly(Side.CLIENT)
@Override
public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) {
((TileTurntable) world.getTileEntity(pos)).renderHUD(mc, res);