xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Initial commit (Forge 1291).

Browse Source
This commit is contained in:
gamerforEA
2015-03-22 20:38:04 +03:00
commit 16773ead6a
611 changed files with 64826 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/net/minecraft/network/play/client/C01PacketChatMessage.java.patch Normal file
View File

@ -0,0 +1,14 @@
--- ../src-base/minecraft/net/minecraft/network/play/client/C01PacketChatMessage.java
+++ ../src-work/minecraft/net/minecraft/network/play/client/C01PacketChatMessage.java
@@ -52,4 +52,11 @@
{
this.processPacket((INetHandlerPlayServer)p_148833_1_);
}
+
+ // CraftBukkit start - make chat async
+ public boolean hasPriority()
+ {
+ return !this.field_149440_a.startsWith("/");
+ }
+ // CraftBukkit end
}

28
patches/net/minecraft/network/play/client/C03PacketPlayer.java.patch Normal file
View File

@ -0,0 +1,28 @@
--- ../src-base/minecraft/net/minecraft/network/play/client/C03PacketPlayer.java
+++ ../src-work/minecraft/net/minecraft/network/play/client/C03PacketPlayer.java
@@ -10,15 +10,17 @@
public class C03PacketPlayer extends Packet
{
- protected double field_149479_a;
- protected double field_149477_b;
- protected double field_149478_c;
- protected double field_149475_d;
- protected float field_149476_e;
- protected float field_149473_f;
+ // CraftBukkit start - protected -> public
+ public double field_149479_a;
+ public double field_149477_b;
+ public double field_149478_c;
+ public double field_149475_d;
+ public float field_149476_e;
+ public float field_149473_f;
+ // CraftBukkit end
protected boolean field_149474_g;
- protected boolean field_149480_h;
- protected boolean field_149481_i;
+ public boolean field_149480_h; // CraftBukkit - protected -> public
+ public boolean field_149481_i;
private static final String __OBFID = "CL_00001360";
public C03PacketPlayer() {}

16
patches/net/minecraft/network/play/client/C0DPacketCloseWindow.java.patch Normal file
View File

@ -0,0 +1,16 @@
--- ../src-base/minecraft/net/minecraft/network/play/client/C0DPacketCloseWindow.java
+++ ../src-work/minecraft/net/minecraft/network/play/client/C0DPacketCloseWindow.java
@@ -15,11 +15,12 @@
public C0DPacketCloseWindow() {}
- @SideOnly(Side.CLIENT)
+ // CraftBukkit start - Add constructor
public C0DPacketCloseWindow(int p_i45247_1_)
{
this.field_149556_a = p_i45247_1_;
}
+ // CraftBukkit end
public void processPacket(INetHandlerPlayServer p_148833_1_)
{

11
patches/net/minecraft/network/play/client/C17PacketCustomPayload.java.patch Normal file
View File

@ -0,0 +1,11 @@
--- ../src-base/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java
+++ ../src-work/minecraft/net/minecraft/network/play/client/C17PacketCustomPayload.java
@@ -12,7 +12,7 @@
public class C17PacketCustomPayload extends Packet
{
private String field_149562_a;
- private int field_149560_b;
+ public int field_149560_b; // CraftBukkit - private -> public
private byte[] field_149561_c;
private static final String __OBFID = "CL_00001356";

15
patches/net/minecraft/network/play/server/S05PacketSpawnPosition.java.patch Normal file
View File

@ -0,0 +1,15 @@
--- ../src-base/minecraft/net/minecraft/network/play/server/S05PacketSpawnPosition.java
+++ ../src-work/minecraft/net/minecraft/network/play/server/S05PacketSpawnPosition.java
@@ -10,9 +10,9 @@
public class S05PacketSpawnPosition extends Packet
{
- private int field_149364_a;
- private int field_149362_b;
- private int field_149363_c;
+ public int field_149364_a; // CraftBukkit - private -> public
+ public int field_149362_b; // CraftBukkit - private -> public
+ public int field_149363_c; // CraftBukkit - private -> public
private static final String __OBFID = "CL_00001336";
public S05PacketSpawnPosition() {}

54
patches/net/minecraft/network/play/server/S21PacketChunkData.java.patch Normal file
View File

@ -0,0 +1,54 @@
--- ../src-base/minecraft/net/minecraft/network/play/server/S21PacketChunkData.java
+++ ../src-work/minecraft/net/minecraft/network/play/server/S21PacketChunkData.java
@@ -198,8 +198,10 @@
if (aextendedblockstorage[l] != null && (!p_149269_1_ || !aextendedblockstorage[l].isEmpty()) && (p_149269_2_ & 1 << l) != 0)
{
nibblearray = aextendedblockstorage[l].getMetadataArray();
- System.arraycopy(nibblearray.data, 0, abyte, j, nibblearray.data.length);
- j += nibblearray.data.length;
+ // Spigot start
+ nibblearray.copyToByteArray(abyte, j);
+ j += nibblearray.getByteLength();
+ // Spigot end
}
}
@@ -208,8 +210,10 @@
if (aextendedblockstorage[l] != null && (!p_149269_1_ || !aextendedblockstorage[l].isEmpty()) && (p_149269_2_ & 1 << l) != 0)
{
nibblearray = aextendedblockstorage[l].getBlocklightArray();
- System.arraycopy(nibblearray.data, 0, abyte, j, nibblearray.data.length);
- j += nibblearray.data.length;
+ // Spigot start
+ nibblearray.copyToByteArray(abyte, j);
+ j += nibblearray.getByteLength();
+ // Spigot end
}
}
@@ -220,8 +224,10 @@
if (aextendedblockstorage[l] != null && (!p_149269_1_ || !aextendedblockstorage[l].isEmpty()) && (p_149269_2_ & 1 << l) != 0)
{
nibblearray = aextendedblockstorage[l].getSkylightArray();
- System.arraycopy(nibblearray.data, 0, abyte, j, nibblearray.data.length);
- j += nibblearray.data.length;
+ // Spigot start
+ nibblearray.copyToByteArray(abyte, j);
+ j += nibblearray.getByteLength();
+ // Spigot end
}
}
}
@@ -233,8 +239,10 @@
if (aextendedblockstorage[l] != null && (!p_149269_1_ || !aextendedblockstorage[l].isEmpty()) && aextendedblockstorage[l].getBlockMSBArray() != null && (p_149269_2_ & 1 << l) != 0)
{
nibblearray = aextendedblockstorage[l].getBlockMSBArray();
- System.arraycopy(nibblearray.data, 0, abyte, j, nibblearray.data.length);
- j += nibblearray.data.length;
+ // Spigot start
+ nibblearray.copyToByteArray(abyte, j);
+ j += nibblearray.getByteLength();
+ // Spigot end
}
}
}

117
patches/net/minecraft/network/play/server/S26PacketMapChunkBulk.java.patch Normal file
View File

@ -0,0 +1,117 @@
--- ../src-base/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.java
+++ ../src-work/minecraft/net/minecraft/network/play/server/S26PacketMapChunkBulk.java
@@ -24,10 +24,18 @@
private byte[][] field_149260_f;
private int field_149261_g;
private boolean field_149267_h;
- private static byte[] field_149268_i = new byte[0];
- private static final String __OBFID = "CL_00001306";
- private int maxLen = 0;
- private Semaphore deflateGate;
+ private byte[] field_149268_i = new byte[0]; // CraftBukkit - remove static
+ // CraftBukkit start
+ static final ThreadLocal<Deflater> localDeflater = new ThreadLocal<Deflater>()
+ {
+ @Override
+ protected Deflater initialValue()
+ {
+ // Don't use higher compression level, slows things down too much
+ return new Deflater(6);
+ }
+ };
+ // CraftBukkit end
public S26PacketMapChunkBulk() {}
@@ -46,6 +54,15 @@
{
Chunk chunk = (Chunk)p_i45197_1_.get(k);
S21PacketChunkData.Extracted extracted = S21PacketChunkData.func_149269_a(chunk, true, 65535);
+
+ if (field_149268_i.length < j + extracted.field_150282_a.length)
+ {
+ byte[] abyte = new byte[j + extracted.field_150282_a.length];
+ System.arraycopy(field_149268_i, 0, abyte, 0, field_149268_i.length);
+ field_149268_i = abyte;
+ }
+
+ System.arraycopy(extracted.field_150282_a, 0, field_149268_i, j, extracted.field_150282_a.length);
j += extracted.field_150282_a.length;
this.field_149266_a[k] = chunk.xPosition;
this.field_149264_b[k] = chunk.zPosition;
@@ -53,34 +70,36 @@
this.field_149262_d[k] = extracted.field_150281_c;
this.field_149260_f[k] = extracted.field_150282_a;
}
- this.deflateGate = new Semaphore(1);
- maxLen = j;
- }
-
- private void deflate()
- {
- byte[] data = new byte[maxLen];
- int offset = 0;
- for (int x = 0; x < field_149260_f.length; x++)
- {
- System.arraycopy(field_149260_f[x], 0, data, offset, field_149260_f[x].length);
- offset += field_149260_f[x].length;
- }
+ /* CraftBukkit start - Moved to compress()
Deflater deflater = new Deflater(-1);
- try
- {
- deflater.setInput(data, 0, data.length);
+ try {
+ deflater.setInput(buildBuffer, 0, j);
deflater.finish();
- byte[] deflated = new byte[data.length];
- this.field_149261_g = deflater.deflate(deflated);
- this.field_149263_e = deflated;
+ this.buffer = new byte[j];
+ this.size = deflater.deflate(this.buffer);
+ } finally {
+ deflater.end();
}
- finally
+ */
+ }
+
+ // Add compression method
+ public void compress()
+ {
+ if (this.field_149263_e != null)
{
- deflater.end();
+ return;
}
+
+ Deflater deflater = localDeflater.get();
+ deflater.reset();
+ deflater.setInput(this.field_149268_i);
+ deflater.finish();
+ this.field_149263_e = new byte[this.field_149268_i.length + 100];
+ this.field_149261_g = deflater.deflate(this.field_149263_e);
}
+ // CraftBukkit end
public static int func_149258_c()
{
@@ -155,16 +174,7 @@
public void writePacketData(PacketBuffer p_148840_1_) throws IOException
{
- if (this.field_149263_e == null)
- {
- deflateGate.acquireUninterruptibly();
- if (this.field_149263_e == null)
- {
- deflate();
- }
- deflateGate.release();
- }
-
+ compress(); // CraftBukkit
p_148840_1_.writeShort(this.field_149266_a.length);
p_148840_1_.writeInt(this.field_149261_g);
p_148840_1_.writeBoolean(this.field_149267_h);