From 17d0e20bdb180d8e0cc22fd2445e3367ffd551f5 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Wed, 16 Oct 2013 13:49:31 -0400 Subject: [PATCH] Fix server crash --- common/mekanism/common/block/BlockMachine.java | 8 ++------ common/mekanism/common/item/ItemWalkieTalkie.java | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java index daa8e945d..3edce02bd 100644 --- a/common/mekanism/common/block/BlockMachine.java +++ b/common/mekanism/common/block/BlockMachine.java @@ -1,8 +1,5 @@ package mekanism.common.block; -import ic2.api.energy.event.EnergyTileLoadEvent; -import ic2.api.energy.tile.IEnergyTile; - import java.util.List; import java.util.Random; @@ -14,14 +11,14 @@ import mekanism.common.IActiveState; import mekanism.common.IBoundingBlock; import mekanism.common.IElectricChest; import mekanism.common.IFactory; +import mekanism.common.IFactory.RecipeType; import mekanism.common.ISpecialBounds; import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; -import mekanism.common.Tier; -import mekanism.common.IFactory.RecipeType; import mekanism.common.PacketHandler.Transmission; +import mekanism.common.Tier; import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tileentity.TileEntityAdvancedFactory; @@ -62,7 +59,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.common.MinecraftForge; import buildcraft.api.tools.IToolWrench; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/common/mekanism/common/item/ItemWalkieTalkie.java b/common/mekanism/common/item/ItemWalkieTalkie.java index 4d9d903d8..37e27228d 100644 --- a/common/mekanism/common/item/ItemWalkieTalkie.java +++ b/common/mekanism/common/item/ItemWalkieTalkie.java @@ -14,7 +14,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemWalkieTalkie extends ItemMekanism { - @SideOnly(Side.CLIENT) public Icon[] icons = new Icon[256]; public ItemWalkieTalkie(int id) @@ -33,7 +32,6 @@ public class ItemWalkieTalkie extends ItemMekanism } @Override - @SideOnly(Side.CLIENT) public Icon getIconIndex(ItemStack itemStack) { if(!getOn(itemStack)) @@ -45,7 +43,6 @@ public class ItemWalkieTalkie extends ItemMekanism } @Override - @SideOnly(Side.CLIENT) public void registerIcons(IconRegister register) { icons[0] = register.registerIcon("mekanism:WalkieTalkieOff");