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

compile on .10

Browse Source
This commit is contained in:
AlgorithmX2
2014-06-24 17:58:14 -05:00
parent 93b0c9bac0
commit 6a11d18e32
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/Platform.java
+2 -1
View File
@@ -9,6 +9,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@@ -890,7 +891,7 @@ public class Platform
} }
private static WeakHashMap<World, EntityPlayer> fakePlayers = new WeakHashMap<World, EntityPlayer>(); private static WeakHashMap<World, EntityPlayer> fakePlayers = new WeakHashMap<World, EntityPlayer>();
private static GameProfile myProfile = new GameProfile( "[appeng]", "AE2" ); private static GameProfile myProfile = new GameProfile( new UUID(0,0), "AE2" );
public static EntityPlayer getPlayer(WorldServer w) public static EntityPlayer getPlayer(WorldServer w)
{ {
util/item/AEFluidStack.java
+3 -1
View File
@@ -2,8 +2,10 @@ package appeng.util.item;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
@@ -265,7 +267,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
byte[] bd = new byte[len]; byte[] bd = new byte[len];
data.readBytes( bd ); data.readBytes( bd );
DataInput di = ByteStreams.newDataInput( bd ); DataInputStream di = new DataInputStream( new ByteArrayInputStream(bd) );
d.setTag( "tag", CompressedStreamTools.read( di ) ); d.setTag( "tag", CompressedStreamTools.read( di ) );
} }