diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 7a326964f..02aa6ce18 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -79,7 +79,6 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.values()[meta]); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { for(int i = 0; i < 6; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index df45fe631..16e553b5e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -121,7 +121,6 @@ public class BlockAltar extends BlockMod implements ILexiconable { return BlockRenderLayer.CUTOUT; } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { for(int i = 0; i < 9; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index d78c8f3cb..c78fdd3c8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -113,7 +113,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {} - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index bf902faf3..79a2a96bf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -85,7 +85,6 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable return getDefaultState().withProperty(BotaniaStateProps.POWERED, powered).withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.class.getEnumConstants()[meta]); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { for(int i = 0; i < 4; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 75d351a64..5ebc75572 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -72,7 +72,6 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < LivingRockVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 4cbc8ed29..af39612a7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -76,7 +76,6 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < LivingWoodVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 968fa7f31..860bc36c4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -106,7 +106,6 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IGrowab return true; } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, @Nonnull NonNullList stacks) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index a11b76ed7..baa19e029 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -97,7 +97,6 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, return state; } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < CrateVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 3862df8fd..2960fe6b9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -113,7 +113,6 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, return getMetaFromState(state); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < PlatformVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 6987d926b..8842d8019 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -88,7 +88,6 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi return getMetaFromState(state); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs par2, NonNullList par3) { for(int i = 0; i < PylonVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index eec3efed3..41de93094 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -199,7 +199,6 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, @Nonnull NonNullList stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 8e8981057..19a3a798b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -67,7 +67,6 @@ public class BlockStorage extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.values()[meta]); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs par2, NonNullList par3) { for(int i = 0; i < StorageVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 85d961b9b..85e3faded 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -73,7 +73,6 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { return getMetaFromState(state); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(int i = 4; i < CustomBrickVariant.values().length; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 5762e0608..58036f54a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -145,7 +145,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu Botania.proxy.sparkleFX(pos.getX() + 0.3 + rand.nextFloat() * 0.5, pos.getY() + 0.5 + rand.nextFloat() * 0.5, pos.getZ() + 0.3 + rand.nextFloat() * 0.5, r / 255F, g / 255F, b / 255F, rand.nextFloat(), 5); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs par2, NonNullList par3) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index d5db5d89e..6d417049c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -108,7 +108,6 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index de2443f61..f3808c957 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -91,7 +91,6 @@ public class BlockPavement extends BlockMod { return getMetaFromState(state); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < TYPES; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 6992fecc5..d099b1912 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -68,7 +68,6 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index dfc2b977f..3c6f908bd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -38,7 +38,6 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { setSoundType(SoundType.STONE); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { for(int i = 0; i < 16; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index c0d217ddd..6c2845df8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -111,7 +111,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { } @Override - @SideOnly(Side.CLIENT) public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { stacks.add(new ItemStack(this, 1, 0)); stacks.add(new ItemStack(this, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index f8dcaad7b..23dd2ca73 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -65,7 +65,6 @@ public class BlockBiomeStoneWall extends BlockModWall { return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONEWALL_VARIANT, BiomeStoneVariant.values()[meta + 8]); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tabs, @Nonnull NonNullList list) { for(int i = 0; i < 8; i++) diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 94a554146..2a4b79bb7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -88,7 +88,6 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM return true; } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tabs, @Nonnull NonNullList list) { list.add(new ItemStack(this)); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 88903da13..d8119c1ec 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -105,7 +105,6 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona return state.getBlock().getMetaFromState(state); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs tab, NonNullList list) { for(int i = 0; i < 3; i++) diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index d2cc39228..7fcbda8dd 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -130,7 +130,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon drops.add(new ItemStack(this, 1, state.getBlock().getMetaFromState(state))); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs par2, NonNullList par3) { par3.add(new ItemStack(this, 1, 0)); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index d9d3fca19..075f36097 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -84,7 +84,6 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex return getDefaultState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.values()[meta]); } - @SideOnly(Side.CLIENT) @Override public void getSubBlocks(CreativeTabs par2, NonNullList par3) { for(int i = 0; i < 4; i++)