From 6a11d18e325924d955fe237db362cd9ddb96dbb5 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Tue, 24 Jun 2014 17:58:14 -0500 Subject: [PATCH] compile on .10 --- util/Platform.java | 3 ++- util/item/AEFluidStack.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/util/Platform.java b/util/Platform.java index 35140c90b..4bb2bd583 100644 --- a/util/Platform.java +++ b/util/Platform.java @@ -9,6 +9,7 @@ import java.util.Iterator; import java.util.List; import java.util.Random; import java.util.Set; +import java.util.UUID; import java.util.WeakHashMap; import net.minecraft.block.Block; @@ -890,7 +891,7 @@ public class Platform } private static WeakHashMap fakePlayers = new WeakHashMap(); - 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) { diff --git a/util/item/AEFluidStack.java b/util/item/AEFluidStack.java index f511f6e9a..f7c09b8f8 100644 --- a/util/item/AEFluidStack.java +++ b/util/item/AEFluidStack.java @@ -2,8 +2,10 @@ package appeng.util.item; import io.netty.buffer.ByteBuf; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInput; +import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -265,7 +267,7 @@ public final class AEFluidStack extends AEStack implements IAEFlu byte[] bd = new byte[len]; data.readBytes( bd ); - DataInput di = ByteStreams.newDataInput( bd ); + DataInputStream di = new DataInputStream( new ByteArrayInputStream(bd) ); d.setTag( "tag", CompressedStreamTools.read( di ) ); }