From 27772725d8ab6af1467416783e015288e4b7e96e Mon Sep 17 00:00:00 2001
From: AlgorithmX2 <AlgorithmX2@gmail.com>
Date: Tue, 24 Jun 2014 20:19:42 -0500
Subject: [PATCH] MC .10 compatibility patch.

---
 transformer/AppEngCore.java |  2 +-
 util/Platform.java          | 14 ++++----------
 util/item/AEFluidStack.java |  5 +----
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/transformer/AppEngCore.java b/transformer/AppEngCore.java
index e70f3b701..9a21e314f 100644
--- a/transformer/AppEngCore.java
+++ b/transformer/AppEngCore.java
@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.FMLRelaunchLog;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 
-@MCVersion("1.7.2")
+@MCVersion()
 public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
 {
 
diff --git a/util/Platform.java b/util/Platform.java
index 4bb2bd583..cebb74f6f 100644
--- a/util/Platform.java
+++ b/util/Platform.java
@@ -9,7 +9,6 @@ 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;
@@ -95,9 +94,6 @@ import appeng.util.item.ItemList;
 import appeng.util.item.OreHelper;
 import appeng.util.item.OreRefrence;
 import buildcraft.api.tools.IToolWrench;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
@@ -891,7 +887,6 @@ public class Platform
 	}
 
 	private static WeakHashMap<World, EntityPlayer> fakePlayers = new WeakHashMap<World, EntityPlayer>();
-	private static GameProfile myProfile = new GameProfile( new UUID(0,0), "AE2" );
 
 	public static EntityPlayer getPlayer(WorldServer w)
 	{
@@ -899,7 +894,7 @@ public class Platform
 		if ( wrp != null )
 			return wrp;
 
-		EntityPlayer p = FakePlayerFactory.get( w, myProfile );
+		EntityPlayer p = FakePlayerFactory.getMinecraft( w );
 		fakePlayers.put( w, p );
 		return p;
 	}
@@ -1234,10 +1229,9 @@ public class Platform
 
 		Vec3 vec31 = vec3.addVector( (double) f7 * d3, (double) f6 * d3, (double) f8 * d3 );
 
-		AxisAlignedBB bb = AxisAlignedBB
-				.getBoundingBox( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ),
-						Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) )
-				.expand( 16, 16, 16 );
+		AxisAlignedBB bb = AxisAlignedBB.getBoundingBox( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ),
+				Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ),
+				Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 );
 
 		Entity entity = null;
 		double Closeest = 9999999.0D;
diff --git a/util/item/AEFluidStack.java b/util/item/AEFluidStack.java
index f7c09b8f8..0ac889ed9 100644
--- a/util/item/AEFluidStack.java
+++ b/util/item/AEFluidStack.java
@@ -4,7 +4,6 @@ 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;
@@ -20,8 +19,6 @@ import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAETagCompound;
 import appeng.util.Platform;
 
-import com.google.common.io.ByteStreams;
-
 public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFluidStack, Comparable<AEFluidStack>
 {
 
@@ -267,7 +264,7 @@ public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFlu
 			byte[] bd = new byte[len];
 			data.readBytes( bd );
 
-			DataInputStream di = new DataInputStream( new ByteArrayInputStream(bd) );
+			DataInputStream di = new DataInputStream( new ByteArrayInputStream( bd ) );
 			d.setTag( "tag", CompressedStreamTools.read( di ) );
 		}