tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix server crash

Browse source
This commit is contained in:
Aidan C. Brady 2013-10-16 13:49:31 -04:00
parent a5a4c7a65a
commit 17d0e20bdb
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/mekanism/common/block/BlockMachine.java
View file

@ -1,8 +1,5 @@
package mekanism.common.block; package mekanism.common.block;
import ic2.api.energy.event.EnergyTileLoadEvent;
import ic2.api.energy.tile.IEnergyTile;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
@ -14,14 +11,14 @@ import mekanism.common.IActiveState;
import mekanism.common.IBoundingBlock; import mekanism.common.IBoundingBlock;
import mekanism.common.IElectricChest; import mekanism.common.IElectricChest;
import mekanism.common.IFactory; import mekanism.common.IFactory;
import mekanism.common.IFactory.RecipeType;
import mekanism.common.ISpecialBounds; import mekanism.common.ISpecialBounds;
import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedInventory;
import mekanism.common.ISustainedTank; import mekanism.common.ISustainedTank;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.Tier;
import mekanism.common.IFactory.RecipeType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.Tier;
import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.tileentity.TileEntityAdvancedFactory; import mekanism.common.tileentity.TileEntityAdvancedFactory;
@ -62,7 +59,6 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;
import buildcraft.api.tools.IToolWrench; import buildcraft.api.tools.IToolWrench;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

3
common/mekanism/common/item/ItemWalkieTalkie.java
View file

@ -14,7 +14,6 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemWalkieTalkie extends ItemMekanism public class ItemWalkieTalkie extends ItemMekanism
{ {
@SideOnly(Side.CLIENT)
public Icon[] icons = new Icon[256]; public Icon[] icons = new Icon[256];
public ItemWalkieTalkie(int id) public ItemWalkieTalkie(int id)
@ -33,7 +32,6 @@ public class ItemWalkieTalkie extends ItemMekanism
} }
@Override @Override
@SideOnly(Side.CLIENT)
public Icon getIconIndex(ItemStack itemStack) public Icon getIconIndex(ItemStack itemStack)
{ {
if(!getOn(itemStack)) if(!getOn(itemStack))
@ -45,7 +43,6 @@ public class ItemWalkieTalkie extends ItemMekanism
} }
@Override @Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister register) public void registerIcons(IconRegister register)
{ {
icons[0] = register.registerIcon("mekanism:WalkieTalkieOff"); icons[0] = register.registerIcon("mekanism:WalkieTalkieOff");