diff --git a/mcp/mobius/opis/gui/helpers/UIHelper.java b/mcp/mobius/opis/gui/helpers/UIHelper.java index 43dfd46..a8793a9 100644 --- a/mcp/mobius/opis/gui/helpers/UIHelper.java +++ b/mcp/mobius/opis/gui/helpers/UIHelper.java @@ -54,5 +54,29 @@ public class UIHelper { GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glEnable(GL11.GL_TEXTURE_2D); } + + public void drawLine(int x, int y, int x2, int y2, int width, float... rgba) { + + Tessellator tess = Tessellator.instance; + GL11.glPushMatrix(); + //GL11.glLineWidth(3); + GL11.glLineWidth(width); + GL11.glDisable(GL11.GL_TEXTURE_2D); + tess.startDrawing(3); + + if(rgba.length == 4) + tess.setColorRGBA_F(rgba[0], rgba[1], rgba[2], rgba[3]); + //tess.setColorRGBA_F(1,1,1,1); + + tess.addVertex(x, y, 0); + tess.addVertex(x2, y2, 0); + + + tess.draw(); + GL11.glDisable(32826 /*GL_RESCALE_NORMAL_EXT*/); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glPopMatrix(); + + } } diff --git a/mcp/mobius/opis/modOpis.java b/mcp/mobius/opis/modOpis.java index e7f2682..c48509d 100644 --- a/mcp/mobius/opis/modOpis.java +++ b/mcp/mobius/opis/modOpis.java @@ -2,6 +2,7 @@ package mcp.mobius.opis; import java.util.logging.Logger; +import net.minecraft.network.packet.Packet; import net.minecraftforge.common.MinecraftForge; import mcp.mobius.mobiuscore.profiler.ProfilerRegistrar; import mcp.mobius.opis.client.OpisClientEventHandler; @@ -16,6 +17,7 @@ import mcp.mobius.opis.data.TileEntityProfiler; import mcp.mobius.opis.data.holders.CoordinatesBlock; import mcp.mobius.opis.network.OpisConnectionHandler; import mcp.mobius.opis.network.OpisPacketHandler; +import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.proxy.ProxyServer; import mcp.mobius.opis.server.OpisPlayerTracker; import mcp.mobius.opis.server.OpisServerTickHandler; @@ -54,6 +56,7 @@ public class modOpis { @EventHandler public void preInit(FMLPreInitializationEvent event) { MinecraftForge.EVENT_BUS.register(new OpisClientEventHandler()); + Packet.addIdClassMapping(251, true, true, Packet251Extended.class); } @EventHandler diff --git a/mcp/mobius/opis/network/Packet251Extended.java b/mcp/mobius/opis/network/Packet251Extended.java new file mode 100644 index 0000000..85217e5 --- /dev/null +++ b/mcp/mobius/opis/network/Packet251Extended.java @@ -0,0 +1,42 @@ +package mcp.mobius.opis.network; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; + +import net.minecraft.network.packet.Packet250CustomPayload; + +public class Packet251Extended extends Packet250CustomPayload { + + public Packet251Extended() {} + + public Packet251Extended(String par1Str, byte[] par2ArrayOfByte) + { + this.channel = par1Str; + this.data = par2ArrayOfByte; + + if (par2ArrayOfByte != null) + this.length = par2ArrayOfByte.length; + } + + @Override + public void readPacketData(DataInput par1DataInput) throws IOException + { + this.channel = readString(par1DataInput, 20); + this.length = par1DataInput.readInt(); + + this.data = new byte[this.length]; + par1DataInput.readFully(this.data); + } + + @Override + public void writePacketData(DataOutput par1DataOutput) throws IOException + { + writeString(this.channel, par1DataOutput); + par1DataOutput.writeInt(this.length); + + if (this.data != null) + par1DataOutput.write(this.data); + } + +} diff --git a/mcp/mobius/opis/network/server/Packet_ChunkTopList.java b/mcp/mobius/opis/network/server/Packet_ChunkTopList.java index c17cebf..d9eb713 100644 --- a/mcp/mobius/opis/network/server/Packet_ChunkTopList.java +++ b/mcp/mobius/opis/network/server/Packet_ChunkTopList.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.util.ArrayList; import mcp.mobius.opis.data.holders.ChunkStats; +import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -29,7 +30,7 @@ public class Packet_ChunkTopList { } public static Packet250CustomPayload create(ArrayList stats){ - Packet250CustomPayload packet = new Packet250CustomPayload(); + Packet251Extended packet = new Packet251Extended(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_Chunks.java b/mcp/mobius/opis/network/server/Packet_Chunks.java index 8873297..d84a5d6 100644 --- a/mcp/mobius/opis/network/server/Packet_Chunks.java +++ b/mcp/mobius/opis/network/server/Packet_Chunks.java @@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mapwriter.region.MwChunk; import mcp.mobius.opis.modOpis; +import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.client.Minecraft; import net.minecraft.network.packet.Packet250CustomPayload; @@ -53,7 +54,8 @@ public class Packet_Chunks { } public static Packet250CustomPayload create(int dim, boolean hasNoSky, ArrayList chunks){ - Packet250CustomPayload packet = new Packet250CustomPayload(); + //Packet250CustomPayload packet = new Packet250CustomPayload(); + Packet251Extended packet = new Packet251Extended(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); @@ -70,11 +72,13 @@ public class Packet_Chunks { packet.data = bos.toByteArray(); packet.length = bos.size(); + /* if (packet.length > 32767){ //throw new IllegalArgumentException(String.format("Payload may not be larger than 32k : %s", packet.length)); modOpis.log.log(Level.WARNING, String.format("Payload may not be larger than 32k : %s", packet.length)); return null; } + */ return packet; } diff --git a/mcp/mobius/opis/network/server/Packet_LoadedChunks.java b/mcp/mobius/opis/network/server/Packet_LoadedChunks.java index f4a3a88..4a1ed1e 100644 --- a/mcp/mobius/opis/network/server/Packet_LoadedChunks.java +++ b/mcp/mobius/opis/network/server/Packet_LoadedChunks.java @@ -7,6 +7,7 @@ import java.io.DataOutputStream; import java.io.IOException; import java.util.HashMap; +import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.world.ChunkCoordIntPair; @@ -33,7 +34,7 @@ public class Packet_LoadedChunks { } public static Packet250CustomPayload create(HashMap chunks){ - Packet250CustomPayload packet = new Packet250CustomPayload(); + Packet251Extended packet = new Packet251Extended(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_MeanTime.java b/mcp/mobius/opis/network/server/Packet_MeanTime.java index 300c6a2..f931d25 100644 --- a/mcp/mobius/opis/network/server/Packet_MeanTime.java +++ b/mcp/mobius/opis/network/server/Packet_MeanTime.java @@ -9,6 +9,7 @@ import java.util.HashMap; import mcp.mobius.opis.data.holders.ChunkStats; import mcp.mobius.opis.data.holders.CoordinatesChunk; +import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -36,7 +37,7 @@ public class Packet_MeanTime { } public static Packet250CustomPayload create(HashMap chunks, int dim){ - Packet250CustomPayload packet = new Packet250CustomPayload(); + Packet251Extended packet = new Packet251Extended(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_Tickets.java b/mcp/mobius/opis/network/server/Packet_Tickets.java index 4a2d5a9..1aacda6 100644 --- a/mcp/mobius/opis/network/server/Packet_Tickets.java +++ b/mcp/mobius/opis/network/server/Packet_Tickets.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.util.HashSet; import mcp.mobius.opis.data.holders.TicketData; +import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -30,7 +31,7 @@ public class Packet_Tickets { } public static Packet250CustomPayload create(HashSet data){ - Packet250CustomPayload packet = new Packet250CustomPayload(); + Packet251Extended packet = new Packet251Extended(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_TileEntitiesChunkList.java b/mcp/mobius/opis/network/server/Packet_TileEntitiesChunkList.java index b0a146c..10547e7 100644 --- a/mcp/mobius/opis/network/server/Packet_TileEntitiesChunkList.java +++ b/mcp/mobius/opis/network/server/Packet_TileEntitiesChunkList.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.Collections; import mcp.mobius.opis.data.holders.TileEntityStats; +import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -29,7 +30,7 @@ public class Packet_TileEntitiesChunkList { } public static Packet250CustomPayload create(ArrayList stats){ - Packet250CustomPayload packet = new Packet250CustomPayload(); + Packet251Extended packet = new Packet251Extended(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos); diff --git a/mcp/mobius/opis/network/server/Packet_TileEntitiesTopList.java b/mcp/mobius/opis/network/server/Packet_TileEntitiesTopList.java index bc51337..3e290e1 100644 --- a/mcp/mobius/opis/network/server/Packet_TileEntitiesTopList.java +++ b/mcp/mobius/opis/network/server/Packet_TileEntitiesTopList.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.Collections; import mcp.mobius.opis.data.holders.TileEntityStats; +import mcp.mobius.opis.network.Packet251Extended; import mcp.mobius.opis.network.Packets; import net.minecraft.network.packet.Packet250CustomPayload; @@ -29,7 +30,7 @@ public class Packet_TileEntitiesTopList { } public static Packet250CustomPayload create(ArrayList stats){ - Packet250CustomPayload packet = new Packet250CustomPayload(); + Packet251Extended packet = new Packet251Extended(); ByteArrayOutputStream bos = new ByteArrayOutputStream(1); DataOutputStream outputStream = new DataOutputStream(bos);