Remove @SideOnly(Side.CLIENT) from getSubBlocks as it is no longer on…

…ly a client side method. (SlimeKnights/Mantle#103) MinecraftForge/MinecraftForge@368d206
progwml6 · Apr 10, 2018 · 974887c · 974887c
1 parent 2f9ab9a
commit 974887c
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 16 deletions.
diff --git a/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves.java b/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves.java
@@ -26,8 +26,6 @@
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import slimeknights.mantle.block.EnumBlock;
 
 public class BlockNetherLeaves extends BlockLeavesBase
@@ -49,7 +47,6 @@ public void updateTick(World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockStat
         super.updateTick(worldIn, pos, state, rand);
     }
 
-    @SideOnly(Side.CLIENT)
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list)
     {

diff --git a/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves2.java b/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves2.java
@@ -26,8 +26,6 @@
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import slimeknights.mantle.block.EnumBlock;
 
 public class BlockNetherLeaves2 extends BlockLeavesBase
@@ -49,7 +47,6 @@ public void updateTick(World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockStat
         super.updateTick(worldIn, pos, state, rand);
     }
 
-    @SideOnly(Side.CLIENT)
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list)
     {

diff --git a/src/main/java/com/progwml6/natura/nether/block/obelisk/BlockRespawnObelisk.java b/src/main/java/com/progwml6/natura/nether/block/obelisk/BlockRespawnObelisk.java
@@ -41,7 +41,6 @@ public BlockRespawnObelisk()
         this.setSoundType(SoundType.WOOD);
     }
 
-    @SideOnly(Side.CLIENT)
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list)
     {

diff --git a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves.java b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves.java
@@ -22,8 +22,6 @@
 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 BlockOverworldLeaves extends BlockLeavesBase
 {
@@ -42,7 +40,6 @@ public void updateTick(World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockStat
         super.updateTick(worldIn, pos, state, rand);
     }
 
-    @SideOnly(Side.CLIENT)
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list)
     {

diff --git a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves2.java b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves2.java
@@ -22,8 +22,6 @@
 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 BlockOverworldLeaves2 extends BlockLeavesBase
 {
@@ -42,7 +40,6 @@ public void updateTick(World worldIn, @Nonnull BlockPos pos, @Nonnull IBlockStat
         super.updateTick(worldIn, pos, state, rand);
     }
 
-    @SideOnly(Side.CLIENT)
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list)
     {

diff --git a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockRedwoodLeaves.java b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockRedwoodLeaves.java
@@ -25,8 +25,6 @@
 import net.minecraft.util.math.BlockPos.MutableBlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import slimeknights.mantle.block.EnumBlock;
 
 public class BlockRedwoodLeaves extends BlockLeavesBase
@@ -85,7 +83,6 @@ private void destroy(World worldIn, BlockPos pos)
         worldIn.setBlockToAir(pos);
     }
 
-    @SideOnly(Side.CLIENT)
     @Override
     public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> list)
     {