keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix a missed patch and cleaned up other patches

Browse source 
Rollback a method name change that breaks a lot of mods
Update FML: fb701cd
fb701cd Revert MCP name change for canConnectRedstone - it conflicts with a forge method of the same name and breaks 1
This commit is contained in:
Christian 2012-12-29 00:29:15 -05:00
parent 19347c5322
commit e4a1693495
5 changed files with 129 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
fml-src-1.4.7-4.7.0.516-master.zip → fml-src-1.4.7-4.7.1.517-master.zip
View file

Binary file not shown.

2
patches/minecraft/net/minecraft/block/Block.java.patch
View file

@ -734,7 +734,7 @@
+ * @param side The side that is trying to make the connection + * @param side The side that is trying to make the connection
+ * @return True to make the connection + * @return True to make the connection
+ */ + */
+ public boolean canMakeRedstoneConnectionOnSide(IBlockAccess world, int x, int y, int z, int side) + public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side)
+ { + {
+ return Block.blocksList[blockID].canProvidePower() && side != -1; + return Block.blocksList[blockID].canProvidePower() && side != -1;
+ } + }

2
patches/minecraft/net/minecraft/block/BlockRedstoneWire.java.patch
View file

@ -5,7 +5,7 @@
else if (var5 != Block.redstoneRepeaterIdle.blockID && var5 != Block.redstoneRepeaterActive.blockID) else if (var5 != Block.redstoneRepeaterIdle.blockID && var5 != Block.redstoneRepeaterActive.blockID)
{ {
- return Block.blocksList[var5].canProvidePower() && par4 != -1; - return Block.blocksList[var5].canProvidePower() && par4 != -1;
+ return (Block.blocksList[var5] != null && Block.blocksList[var5].canMakeRedstoneConnectionOnSide(par0IBlockAccess, par1, par2, par3, par4)); + return (Block.blocksList[var5] != null && Block.blocksList[var5].canConnectRedstone(par0IBlockAccess, par1, par2, par3, par4));
} }
else else
{ {

11
patches/minecraft/net/minecraft/network/packet/Packet51MapChunk.java.patch
View file

@ -17,7 +17,7 @@
public Packet51MapChunk() public Packet51MapChunk()
{ {
this.isChunkDataPacket = true; this.isChunkDataPacket = true;
@@ -59,24 +62,29 @@ @@ -59,17 +62,22 @@
this.zCh = par1Chunk.zPosition; this.zCh = par1Chunk.zPosition;
this.includeInitialize = par2; this.includeInitialize = par2;
Packet51MapChunkData var4 = getMapChunkData(par1Chunk, par2, par3); Packet51MapChunkData var4 = getMapChunkData(par1Chunk, par2, par3);
@ -46,15 +46,6 @@
} }
finally finally
{ {
var5.end();
}
- }
-
+
+ }
/**
* Abstract. Reads the raw packet data from the data stream.
*/
@@ -97,13 +105,16 @@ @@ -97,13 +105,16 @@
par1DataInputStream.readFully(temp, 0, this.tempLength); par1DataInputStream.readFully(temp, 0, this.tempLength);
int var2 = 0; int var2 = 0;

26
patches/minecraft/net/minecraft/network/packet/Packet56MapChunks.java.patch
View file

@ -34,7 +34,7 @@
var3 += var6.compressedData.length; var3 += var6.compressedData.length;
this.chunkPostX[var4] = var5.xPosition; this.chunkPostX[var4] = var5.xPosition;
this.chunkPosZ[var4] = var5.zPosition; this.chunkPosZ[var4] = var5.zPosition;
@@ -60,21 +55,35 @@ @@ -60,15 +55,29 @@
this.field_73588_b[var4] = var6.chunkHasAddSectionFlag; this.field_73588_b[var4] = var6.chunkHasAddSectionFlag;
this.field_73584_f[var4] = var6.compressedData; this.field_73584_f[var4] = var6.compressedData;
} }
@ -53,7 +53,7 @@
+ } + }
Deflater var11 = new Deflater(-1); Deflater var11 = new Deflater(-1);
-
try try
{ {
- var11.setInput(chunkDataNotCompressed, 0, var3); - var11.setInput(chunkDataNotCompressed, 0, var3);
@ -67,10 +67,20 @@
} }
finally finally
{ {
var11.end(); @@ -150,6 +159,16 @@
} */
} public void writePacketData(DataOutputStream par1DataOutputStream) throws IOException
{
+ if (this.chunkDataBuffer == null)
+ {
+ deflateGate.acquireUninterruptibly();
+ if (this.chunkDataBuffer == null)
+ {
+ deflate();
+ }
+ deflateGate.release();
+ }
+ +
par1DataOutputStream.writeShort(this.chunkPostX.length);
/** par1DataOutputStream.writeInt(this.dataLength);
* Abstract. Reads the raw packet data from the data stream. par1DataOutputStream.writeBoolean(this.field_92024_h);