tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed critial server bug

Browse source
This commit is contained in:
Henry Mao 2012-12-17 09:30:21 +08:00
parent f73da078df
commit eca5490dcb
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildnumber.txt
View file

@ -1 +1 @@
25
26

3
info.txt
View file

@ -19,4 +19,5 @@ Minecraft 1.4.2
x AssemblyLine_v0.1.6.22.jar AssemblyLine_v0.1.6.22_api.zip
x AssemblyLine_v0.1.6.23.jar AssemblyLine_v0.1.6.23_api.zip
* AssemblyLine_v0.1.6.24.jar AssemblyLine_v0.1.6.24_api.zip
* AssemblyLine_v0.1.7.25.jar AssemblyLine_v0.1.7.25_api.zip
@ AssemblyLine_v0.1.7.25.jar AssemblyLine_v0.1.7.25_api.zip
* AssemblyLine_v0.1.7.26.jar AssemblyLine_v0.1.7.26_api.zip

3
src/minecraft/assemblyline/common/machine/BlockMulti.java
View file

@ -16,6 +16,8 @@ import universalelectricity.prefab.UETab;
import universalelectricity.prefab.implement.IRedstoneReceptor;
import assemblyline.client.render.RenderHelper;
import assemblyline.common.AssemblyLine;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
import cpw.mods.fml.common.network.PacketDispatcher;
/**
@ -223,6 +225,7 @@ public class BlockMulti extends BlockMachine
return MachineType.get(metadata).instantiateTileEntity();
}
@SideOnly(Side.CLIENT)
@Override
public int getRenderType()
{

6
src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java
View file

@ -1,13 +1,10 @@
package assemblyline.common.machine.belt;
import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
@ -16,6 +13,8 @@ import universalelectricity.prefab.BlockMachine;
import universalelectricity.prefab.UETab;
import assemblyline.client.render.RenderHelper;
import assemblyline.common.machine.belt.TileEntityConveyorBelt.SlantType;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
/**
* The block for the actual conveyor belt!
@ -180,6 +179,7 @@ public class BlockConveyorBelt extends BlockMachine
return new TileEntityConveyorBelt();
}
@SideOnly(Side.CLIENT)
@Override
public int getRenderType()
{