generated from tilera/1710mod
This commit is contained in:
parent
bf7b13f96c
commit
7059e622f2
|
@ -27,7 +27,7 @@ sourceSets {
|
||||||
api {}
|
api {}
|
||||||
}
|
}
|
||||||
|
|
||||||
version = "1.0.3"
|
version = "1.0.4"
|
||||||
group = "universalelectricity"
|
group = "universalelectricity"
|
||||||
archivesBaseName = "icbm"
|
archivesBaseName = "icbm"
|
||||||
|
|
||||||
|
|
|
@ -4,9 +4,6 @@ import cpw.mods.fml.client.FMLClientHandler;
|
||||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
|
||||||
import icbm.gangshao.packet.PacketHandlerTurret;
|
|
||||||
import icbm.gangshao.packet.PacketTurret;
|
|
||||||
import icbm.gangshao.platform.TTurretPlatform;
|
import icbm.gangshao.platform.TTurretPlatform;
|
||||||
import icbm.gangshao.render.BlockRenderingHandler;
|
import icbm.gangshao.render.BlockRenderingHandler;
|
||||||
import icbm.gangshao.render.FXBeam;
|
import icbm.gangshao.render.FXBeam;
|
||||||
|
@ -18,8 +15,6 @@ import icbm.gangshao.render.RRailgun;
|
||||||
import icbm.gangshao.shimian.GuiPlatformAccess;
|
import icbm.gangshao.shimian.GuiPlatformAccess;
|
||||||
import icbm.gangshao.shimian.GuiPlatformSlots;
|
import icbm.gangshao.shimian.GuiPlatformSlots;
|
||||||
import icbm.gangshao.shimian.GuiPlatformTerminal;
|
import icbm.gangshao.shimian.GuiPlatformTerminal;
|
||||||
import icbm.gangshao.terminal.TerminalOutputPacket;
|
|
||||||
import icbm.gangshao.terminal.TerminalOutputPacketHandler;
|
|
||||||
import icbm.gangshao.turret.mount.ESeat;
|
import icbm.gangshao.turret.mount.ESeat;
|
||||||
import icbm.gangshao.turret.mount.TRailgunTurret;
|
import icbm.gangshao.turret.mount.TRailgunTurret;
|
||||||
import icbm.gangshao.turret.sentries.TAATurret;
|
import icbm.gangshao.turret.sentries.TAATurret;
|
||||||
|
@ -34,20 +29,6 @@ import net.minecraft.world.World;
|
||||||
import universalelectricity.core.vector.Vector3;
|
import universalelectricity.core.vector.Vector3;
|
||||||
|
|
||||||
public class ClientProxy extends CommonProxy {
|
public class ClientProxy extends CommonProxy {
|
||||||
@Override
|
|
||||||
public void preInit() {
|
|
||||||
int pktId = 1;
|
|
||||||
ICBMSentry.channel.registerMessage(
|
|
||||||
PacketHandlerTurret.class, PacketTurret.class, pktId++, Side.CLIENT
|
|
||||||
);
|
|
||||||
ICBMSentry.channel.registerMessage(
|
|
||||||
TerminalOutputPacketHandler.class,
|
|
||||||
TerminalOutputPacket.class,
|
|
||||||
pktId++,
|
|
||||||
Side.CLIENT
|
|
||||||
);
|
|
||||||
super.preInit();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init() {
|
public void init() {
|
||||||
|
|
|
@ -126,16 +126,26 @@ public class ICBMSentry extends MainBase {
|
||||||
|
|
||||||
ICBMTab.itemStack = new ItemStack(ICBMSentry.blockTurret);
|
ICBMTab.itemStack = new ItemStack(ICBMSentry.blockTurret);
|
||||||
|
|
||||||
channel = NetworkRegistry.INSTANCE.newSimpleChannel("icbm_sentry");
|
|
||||||
|
|
||||||
ICBMSentry.proxy.preInit();
|
ICBMSentry.proxy.preInit();
|
||||||
|
|
||||||
|
channel = NetworkRegistry.INSTANCE.newSimpleChannel("icbm_sentry");
|
||||||
|
|
||||||
|
int pktId = 0;
|
||||||
channel.registerMessage(
|
channel.registerMessage(
|
||||||
TerminalCommandPacketHandler.class,
|
TerminalCommandPacketHandler.class,
|
||||||
TerminalCommandPacket.class,
|
TerminalCommandPacket.class,
|
||||||
0,
|
pktId++,
|
||||||
Side.SERVER
|
Side.SERVER
|
||||||
);
|
);
|
||||||
|
ICBMSentry.channel.registerMessage(
|
||||||
|
PacketHandlerTurret.class, PacketTurret.class, pktId++, Side.CLIENT
|
||||||
|
);
|
||||||
|
ICBMSentry.channel.registerMessage(
|
||||||
|
TerminalOutputPacketHandler.class,
|
||||||
|
TerminalOutputPacket.class,
|
||||||
|
pktId++,
|
||||||
|
Side.CLIENT
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Mod.EventHandler
|
@Mod.EventHandler
|
||||||
|
|
|
@ -4,12 +4,15 @@ import cpw.mods.fml.client.FMLClientHandler;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import icbm.gangshao.turret.TTurretBase;
|
import icbm.gangshao.turret.TTurretBase;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
public class PacketHandlerTurret implements IMessageHandler<PacketTurret, IMessage> {
|
public class PacketHandlerTurret implements IMessageHandler<PacketTurret, IMessage> {
|
||||||
@Override
|
@Override
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
public IMessage onMessage(PacketTurret message, MessageContext ctx) {
|
public IMessage onMessage(PacketTurret message, MessageContext ctx) {
|
||||||
World world = FMLClientHandler.instance().getWorldClient();
|
World world = FMLClientHandler.instance().getWorldClient();
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package icbm.gangshao.terminal;
|
package icbm.gangshao.terminal;
|
||||||
|
|
||||||
|
import cpw.mods.fml.common.network.ByteBufUtils;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import universalelectricity.core.vector.Vector3;
|
import universalelectricity.core.vector.Vector3;
|
||||||
|
@ -18,10 +19,7 @@ public class TerminalCommandPacket implements IMessage {
|
||||||
@Override
|
@Override
|
||||||
public void fromBytes(ByteBuf buf) {
|
public void fromBytes(ByteBuf buf) {
|
||||||
this.pos = new Vector3(buf.readInt(), buf.readInt(), buf.readInt());
|
this.pos = new Vector3(buf.readInt(), buf.readInt(), buf.readInt());
|
||||||
int len = buf.readInt();
|
this.cmd = ByteBufUtils.readUTF8String(buf);
|
||||||
byte[] data = new byte[len];
|
|
||||||
buf.readBytes(data);
|
|
||||||
this.cmd = new String(data);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -30,7 +28,6 @@ public class TerminalCommandPacket implements IMessage {
|
||||||
buf.writeInt(this.pos.intY());
|
buf.writeInt(this.pos.intY());
|
||||||
buf.writeInt(this.pos.intZ());
|
buf.writeInt(this.pos.intZ());
|
||||||
|
|
||||||
buf.writeInt(this.cmd.getBytes().length);
|
ByteBufUtils.writeUTF8String(buf, this.cmd);
|
||||||
buf.writeBytes(this.cmd.getBytes());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,7 @@ package icbm.gangshao.terminal;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import cpw.mods.fml.common.network.ByteBufUtils;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import universalelectricity.core.vector.Vector3;
|
import universalelectricity.core.vector.Vector3;
|
||||||
|
@ -25,10 +26,7 @@ public class TerminalOutputPacket implements IMessage {
|
||||||
this.pos = new Vector3(buf.readInt(), buf.readInt(), buf.readInt());
|
this.pos = new Vector3(buf.readInt(), buf.readInt(), buf.readInt());
|
||||||
int c = buf.readInt();
|
int c = buf.readInt();
|
||||||
for (int i = 0; i < c; i++) {
|
for (int i = 0; i < c; i++) {
|
||||||
int slen = buf.readInt();
|
output.add(ByteBufUtils.readUTF8String(buf));
|
||||||
byte[] out = new byte[slen];
|
|
||||||
buf.readBytes(out);
|
|
||||||
output.add(new String(out));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,8 +38,7 @@ public class TerminalOutputPacket implements IMessage {
|
||||||
|
|
||||||
buf.writeInt(this.output.size());
|
buf.writeInt(this.output.size());
|
||||||
for (String s : this.output) {
|
for (String s : this.output) {
|
||||||
buf.writeInt(s.getBytes().length);
|
ByteBufUtils.writeUTF8String(buf, s);
|
||||||
buf.writeBytes(s.getBytes());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,12 +4,15 @@ import cpw.mods.fml.client.FMLClientHandler;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||||
|
import cpw.mods.fml.relauncher.Side;
|
||||||
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
public class TerminalOutputPacketHandler
|
public class TerminalOutputPacketHandler
|
||||||
implements IMessageHandler<TerminalOutputPacket, IMessage> {
|
implements IMessageHandler<TerminalOutputPacket, IMessage> {
|
||||||
@Override
|
@Override
|
||||||
|
@SideOnly(Side.CLIENT)
|
||||||
public IMessage onMessage(TerminalOutputPacket message, MessageContext ctx) {
|
public IMessage onMessage(TerminalOutputPacket message, MessageContext ctx) {
|
||||||
World world = FMLClientHandler.instance().getWorldClient();
|
World world = FMLClientHandler.instance().getWorldClient();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue