Merge branch 'master' into endercore

Conflicts:
	src/main/java/crazypants/enderio/conduit/item/ItemConduitNetwork.java
	src/main/java/crazypants/enderio/config/Config.java
	src/main/java/crazypants/enderio/item/darksteel/PacketUpgradeState.java
	src/main/java/crazypants/enderio/item/darksteel/upgrade/SolarUpgrade.java
	src/main/java/crazypants/enderio/machine/PacketProgress.java
	src/main/java/crazypants/enderio/machine/generator/zombie/TileZombieGenerator.java
	src/main/java/crazypants/enderio/machine/invpanel/GuiInventoryPanel.java
	src/main/java/crazypants/enderio/machine/invpanel/TileInventoryPanel.java
	src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java
	src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java
	src/main/java/crazypants/enderio/machine/tank/TankFluidRenderer.java
	src/main/java/crazypants/enderio/machine/tank/TileTank.java
	src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java
	src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java
	src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java
	src/main/java/crazypants/gui/GuiContainerBase.java
	src/main/java/crazypants/util/BlockCoord.java
This commit is contained in:
tterrag1098 committed 2015-05-20 10:35:59 -04:00
commit 6324c7ee69
61 files changed
+1006 -512

No files matched your search

@@ -0,0 +1,46 @@
package crazypants.enderio.machine;
import io.netty.buffer.ByteBuf;
import net.minecraft.tileentity.TileEntity;
import com.enderio.core.api.common.util.IProgressTile;
import com.enderio.core.common.network.MessageTileEntity;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import crazypants.enderio.EnderIO;
public class PacketProgress extends MessageTileEntity<TileEntity> implements IMessageHandler<PacketProgress, IMessage> {
private float progress;
public PacketProgress() {
}
public PacketProgress(IProgressTile tile) {
super(tile.getTileEntity());
progress = tile.getProgress();
}
@Override
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
buf.writeFloat(progress);
}
@Override
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
progress = buf.readFloat();
}
@Override
public IMessage onMessage(PacketProgress message, MessageContext ctx) {
TileEntity tile = message.getTileEntity(EnderIO.proxy.getClientWorld());
if(tile instanceof IProgressTile) {
((IProgressTile) tile).setProgress(message.progress);
}
return null;
}
}