diff --git a/src/main/java/refinedstorage/storage/ItemGroup.java b/src/main/java/refinedstorage/storage/ItemGroup.java index 71ed19180..b326e9fe3 100755 --- a/src/main/java/refinedstorage/storage/ItemGroup.java +++ b/src/main/java/refinedstorage/storage/ItemGroup.java @@ -5,8 +5,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import refinedstorage.util.InventoryUtils; public class ItemGroup { @@ -14,7 +12,6 @@ public class ItemGroup { private int quantity; private int damage; private NBTTagCompound tag; - @SideOnly(Side.CLIENT) private int id; public ItemGroup(ByteBuf buf) { @@ -76,7 +73,6 @@ public class ItemGroup { this.tag = tag; } - @SideOnly(Side.CLIENT) public int getId() { return id; } diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 358173f0d..1911d95a1 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -9,8 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import refinedstorage.container.ContainerSolderer; import refinedstorage.inventory.InventorySimple; import refinedstorage.tile.solderer.ISoldererRecipe; @@ -34,7 +32,6 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven private boolean working = false; private int progress = 0; - @SideOnly(Side.CLIENT) private int duration; @Override @@ -144,12 +141,10 @@ public class TileSolderer extends TileMachine implements IInventory, ISidedInven return progress; } - @SideOnly(Side.CLIENT) public int getProgressScaled(int i) { return (int) ((float) progress / (float) duration * (float) i); } - @SideOnly(Side.CLIENT) public int getDuration() { return duration; } diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 0355f0a15..dc839882f 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -5,8 +5,6 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.block.BlockStorage; @@ -36,7 +34,6 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora private int priority = 0; private int compare = 0; private int mode = 0; - @SideOnly(Side.CLIENT) private int stored; @Override diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 8a2468fbf..f1c75536a 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -8,8 +8,6 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.block.BlockGrid; @@ -59,7 +57,6 @@ public class TileGrid extends TileMachine implements IGrid { private int sortingType = SORTING_TYPE_NAME; private int searchBoxMode = SEARCH_BOX_MODE_NORMAL; - @SideOnly(Side.CLIENT) private List itemGroups = new ArrayList(); @Override