diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/Packet.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/Packet.java | 118 |
1 files changed, 80 insertions, 38 deletions
diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java index bd828ac4..65ac4095 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -11,26 +11,26 @@ import java.util.Set; public abstract class Packet { - public static IntHashMap j = new IntHashMap(); + public static IntHashMap l = new IntHashMap(); private static Map a = new HashMap(); private static Set b = new HashSet(); private static Set c = new HashSet(); public final long timestamp = System.currentTimeMillis(); - public static long l; - public static long m; public static long n; public static long o; + public static long p; + public static long q; public boolean lowPriority = false; public Packet() {} static void a(int i, boolean flag, boolean flag1, Class oclass) { - if (j.b(i)) { + if (l.b(i)) { throw new IllegalArgumentException("Duplicate packet id:" + i); } else if (a.containsKey(oclass)) { throw new IllegalArgumentException("Duplicate packet class:" + oclass); } else { - j.a(i, oclass); + l.a(i, oclass); a.put(oclass, Integer.valueOf(i)); if (flag) { b.add(Integer.valueOf(i)); @@ -42,9 +42,9 @@ public abstract class Packet { } } - public static Packet a(int i) { + public static Packet d(int i) { try { - Class oclass = (Class) j.get(i); + Class oclass = (Class) l.get(i); return oclass == null ? null : (Packet) oclass.newInstance(); } catch (Exception exception) { @@ -54,12 +54,29 @@ public abstract class Packet { } } - public final int b() { + public static void a(DataOutputStream dataoutputstream, byte[] abyte) throws IOException { // CraftBukkit - throws IOException + dataoutputstream.writeShort(abyte.length); + dataoutputstream.write(abyte); + } + + public static byte[] b(DataInputStream datainputstream) throws IOException { // CraftBukkit - throws IOException + short short1 = datainputstream.readShort(); + + if (short1 < 0) { + throw new IOException("Key was smaller than nothing! Weird key!"); + } else { + byte[] abyte = new byte[short1]; + + datainputstream.read(abyte); + return abyte; + } + } + + public final int k() { return ((Integer) a.get(this.getClass())).intValue(); } - // CraftBukkit - throws IOException - public static Packet a(DataInputStream datainputstream, boolean flag) throws IOException { + public static Packet a(DataInputStream datainputstream, boolean flag) throws IOException { // CraftBukkit - throws IOException boolean flag1 = false; Packet packet = null; @@ -75,14 +92,14 @@ public abstract class Packet { throw new IOException("Bad packet id " + i); } - packet = a(i); + packet = d(i); if (packet == null) { throw new IOException("Bad packet id " + i); } packet.a(datainputstream); - ++l; - m += (long) packet.a(); + ++n; + o += (long) packet.a(); } catch (EOFException eofexception) { System.out.println("Reached end of stream"); return null; @@ -98,22 +115,21 @@ public abstract class Packet { } // CraftBukkit end + PacketCounter.a(i, (long) packet.a()); - ++l; - m += (long) packet.a(); + ++n; + o += (long) packet.a(); return packet; } - // CraftBukkit - throws IOException - public static void a(Packet packet, DataOutputStream dataoutputstream) throws IOException { - dataoutputstream.write(packet.b()); + public static void a(Packet packet, DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - throws IOException + dataoutputstream.write(packet.k()); packet.a(dataoutputstream); - ++n; - o += (long) packet.a(); + ++p; + q += (long) packet.a(); } - // CraftBukkit - throws IOException - public static void a(String s, DataOutputStream dataoutputstream) throws IOException { + public static void a(String s, DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - throws IOException if (s.length() > 32767) { throw new IOException("String too big"); } else { @@ -122,8 +138,7 @@ public abstract class Packet { } } - // CraftBukkit - throws IOException - public static String a(DataInputStream datainputstream, int i) throws IOException { + public static String a(DataInputStream datainputstream, int i) throws IOException { // CraftBukkit - throws IOException short short1 = datainputstream.readShort(); if (short1 > i) { @@ -141,15 +156,33 @@ public abstract class Packet { } } - public abstract void a(DataInputStream datainputstream) throws IOException; // CraftBukkit + public abstract void a(DataInputStream datainputstream) throws IOException; // CraftBukkit - throws IOException - public abstract void a(DataOutputStream dataoutputstream) throws IOException; // CraftBukkit + public abstract void a(DataOutputStream dataoutputstream) throws IOException; // CraftBukkit - throws IOException public abstract void handle(NetHandler nethandler); public abstract int a(); - protected ItemStack b(DataInputStream datainputstream) throws IOException { // CraftBukkit + public boolean e() { + return false; + } + + public boolean a(Packet packet) { + return false; + } + + public boolean a_() { + return false; + } + + public String toString() { + String s = this.getClass().getSimpleName(); + + return s; + } + + public static ItemStack c(DataInputStream datainputstream) throws IOException { // CraftBukkit - throws IOException ItemStack itemstack = null; short short1 = datainputstream.readShort(); @@ -158,28 +191,30 @@ public abstract class Packet { short short2 = datainputstream.readShort(); itemstack = new ItemStack(short1, b0, short2); - if (Item.byId[short1].g() || Item.byId[short1].i()) { - itemstack.tag = this.c(datainputstream); - } + itemstack.tag = d(datainputstream); } return itemstack; } - protected void a(ItemStack itemstack, DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - if (itemstack == null || itemstack.id <= 0) { // CraftBukkit + public static void a(ItemStack itemstack, DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - throws IOException + if (itemstack == null) { dataoutputstream.writeShort(-1); } else { dataoutputstream.writeShort(itemstack.id); dataoutputstream.writeByte(itemstack.count); dataoutputstream.writeShort(itemstack.getData()); - if (itemstack.getItem().g() || itemstack.getItem().i()) { - this.a(itemstack.tag, dataoutputstream); + NBTTagCompound nbttagcompound = null; + + if (itemstack.getItem().m() || itemstack.getItem().p()) { + nbttagcompound = itemstack.tag; } + + a(nbttagcompound, dataoutputstream); } } - protected NBTTagCompound c(DataInputStream datainputstream) throws IOException { // CraftBukkit + public static NBTTagCompound d(DataInputStream datainputstream) throws IOException { // CraftBukkit - throws IOException short short1 = datainputstream.readShort(); if (short1 < 0) { @@ -192,7 +227,7 @@ public abstract class Packet { } } - protected void a(NBTTagCompound nbttagcompound, DataOutputStream dataoutputstream) throws IOException { // CraftBukkit + protected static void a(NBTTagCompound nbttagcompound, DataOutputStream dataoutputstream) throws IOException { // CraftBukkit - throws IOException if (nbttagcompound == null) { dataoutputstream.writeShort(-1); } else { @@ -206,7 +241,7 @@ public abstract class Packet { static { a(0, true, true, Packet0KeepAlive.class); a(1, true, true, Packet1Login.class); - a(2, true, true, Packet2Handshake.class); + a(2, false, true, Packet2Handshake.class); a(3, true, true, Packet3Chat.class); a(4, true, false, Packet4UpdateTime.class); a(5, true, false, Packet5EntityEquipment.class); @@ -245,13 +280,15 @@ public abstract class Packet { a(41, true, false, Packet41MobEffect.class); a(42, true, false, Packet42RemoveMobEffect.class); a(43, true, false, Packet43SetExperience.class); - a(50, true, false, Packet50PreChunk.class); a(51, true, false, Packet51MapChunk.class); a(52, true, false, Packet52MultiBlockChange.class); a(53, true, false, Packet53BlockChange.class); a(54, true, false, Packet54PlayNoteBlock.class); + a(55, true, false, Packet55BlockBreakAnimation.class); + a(56, true, false, Packet56MapChunkBulk.class); a(60, true, false, Packet60Explosion.class); a(61, true, false, Packet61WorldEvent.class); + a(62, true, false, Packet62NamedSoundEffect.class); a(70, true, false, Packet70Bed.class); a(71, true, false, Packet71Weather.class); a(100, true, false, Packet100OpenWindow.class); @@ -269,7 +306,12 @@ public abstract class Packet { a(200, true, false, Packet200Statistic.class); a(201, true, false, Packet201PlayerInfo.class); a(202, true, true, Packet202Abilities.class); + a(203, true, true, Packet203TabComplete.class); + a(204, false, true, Packet204LocaleAndViewDistance.class); + a(205, false, true, Packet205ClientCommand.class); a(250, true, true, Packet250CustomPayload.class); + a(252, true, true, Packet252KeyResponse.class); + a(253, true, false, Packet253KeyRequest.class); a(254, false, true, Packet254GetInfo.class); a(255, true, true, Packet255KickDisconnect.class); } |