fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All parameters on one line (for now)

Browse Source 
Easier picking of 1.7 changes
This commit is contained in:
yueh
2016-01-01 02:02:05 +01:00
parent e08ab38c52
commit f84b9a7e1d
147 changed files with 840 additions and 1506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java
+8 -14
View File
@@ -39,11 +39,7 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement
{
@Override
public void onPacketData(
final INetworkInfo manager,
final INetHandler handler,
final FMLProxyPacket packet,
final EntityPlayer player )
public void onPacketData( final INetworkInfo manager, final INetHandler handler, final FMLProxyPacket packet, final EntityPlayer player )
{
final ByteBuf stream = packet.payload();
@@ -52,16 +48,14 @@ public class AppEngClientPacketHandler extends AppEngPacketHandlerBase implement
final int packetType = stream.readInt();
final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
final PacketCallState callState =
new PacketCallState(){
final PacketCallState callState = new PacketCallState(){
@Override
public void call(
final AppEngPacket appEngPacket )
{
appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().thePlayer );
}
};
@Override
public void call( final AppEngPacket appEngPacket )
{
appEngPacket.clientPacketData( manager, appEngPacket, Minecraft.getMinecraft().thePlayer );
}
};
pack.setCallParam( callState );
PacketThreadUtil.checkThreadAndEnqueue( pack, handler, Minecraft.getMinecraft() );
src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java
+7 -9
View File
@@ -48,16 +48,14 @@ public final class AppEngServerPacketHandler extends AppEngPacketHandlerBase imp
final int packetType = stream.readInt();
final AppEngPacket pack = PacketTypes.getPacket( packetType ).parsePacket( stream );
final PacketCallState callState =
new PacketCallState(){
final PacketCallState callState = new PacketCallState(){
@Override
public void call(
final AppEngPacket appEngPacket )
{
appEngPacket.serverPacketData( manager, appEngPacket, player );
}
};
@Override
public void call( final AppEngPacket appEngPacket )
{
appEngPacket.serverPacketData( manager, appEngPacket, player );
}
};
pack.setCallParam( callState );
PacketThreadUtil.checkThreadAndEnqueue( pack, handler, ( (EntityPlayerMP) player ).getServerForPlayer() );
src/main/java/appeng/core/sync/packets/PacketCompressedNBT.java
+2 -4
View File
@@ -58,8 +58,7 @@ public class PacketCompressedNBT extends AppEngPacket
this.data = null;
this.compressFrame = null;
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
{
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream(){
@Override
public int read() throws IOException
@@ -87,8 +86,7 @@ public class PacketCompressedNBT extends AppEngPacket
this.in = din;
this.compressFrame = new GZIPOutputStream( new OutputStream()
{
this.compressFrame = new GZIPOutputStream( new OutputStream(){
@Override
public void write( final int value ) throws IOException
src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java
+2 -4
View File
@@ -82,8 +82,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
// int originalBytes = stream.readableBytes();
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream()
{
final GZIPInputStream gzReader = new GZIPInputStream( new InputStream(){
@Override
public int read() throws IOException
{
@@ -133,8 +132,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket
this.data.writeInt( this.getPacketID() );
this.data.writeByte( this.ref );
this.compressFrame = new GZIPOutputStream( new OutputStream()
{
this.compressFrame = new GZIPOutputStream( new OutputStream(){
@Override
public void write( final int value ) throws IOException
{