From eca5490dcb5e04a104750cf6d8c4d3268d532b9a Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Mon, 17 Dec 2012 09:30:21 +0800 Subject: [PATCH] Fixed critial server bug --- buildnumber.txt | 2 +- info.txt | 3 ++- src/minecraft/assemblyline/common/machine/BlockMulti.java | 3 +++ .../assemblyline/common/machine/belt/BlockConveyorBelt.java | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/buildnumber.txt b/buildnumber.txt index e3efa925..22df249f 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -25 +26 diff --git a/info.txt b/info.txt index cd5d23fd..6111ed35 100644 --- a/info.txt +++ b/info.txt @@ -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 diff --git a/src/minecraft/assemblyline/common/machine/BlockMulti.java b/src/minecraft/assemblyline/common/machine/BlockMulti.java index 5a1123d7..0825ddfc 100644 --- a/src/minecraft/assemblyline/common/machine/BlockMulti.java +++ b/src/minecraft/assemblyline/common/machine/BlockMulti.java @@ -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() { diff --git a/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java b/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java index 5d819f15..9d9603e0 100644 --- a/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java +++ b/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java @@ -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() {