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

MC .10 compatibility patch.

Browse Source
This commit is contained in:
AlgorithmX2
2014-06-24 20:19:42 -05:00
parent 6a11d18e32
commit 27772725d8
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
transformer/AppEngCore.java
+1 -1
View File
@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.FMLRelaunchLog;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
@MCVersion("1.7.2") @MCVersion()
public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin public class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
{ {
util/Platform.java
+4 -10
View File
@@ -9,7 +9,6 @@ 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;
@@ -95,9 +94,6 @@ import appeng.util.item.ItemList;
import appeng.util.item.OreHelper; import appeng.util.item.OreHelper;
import appeng.util.item.OreRefrence; import appeng.util.item.OreRefrence;
import buildcraft.api.tools.IToolWrench; import buildcraft.api.tools.IToolWrench;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer; 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 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) public static EntityPlayer getPlayer(WorldServer w)
{ {
@@ -899,7 +894,7 @@ public class Platform
if ( wrp != null ) if ( wrp != null )
return wrp; return wrp;
EntityPlayer p = FakePlayerFactory.get( w, myProfile ); EntityPlayer p = FakePlayerFactory.getMinecraft( w );
fakePlayers.put( w, p ); fakePlayers.put( w, p );
return p; return p;
} }
@@ -1234,10 +1229,9 @@ public class Platform
Vec3 vec31 = vec3.addVector( (double) f7 * d3, (double) f6 * d3, (double) f8 * d3 ); Vec3 vec31 = vec3.addVector( (double) f7 * d3, (double) f6 * d3, (double) f8 * d3 );
AxisAlignedBB bb = AxisAlignedBB AxisAlignedBB bb = AxisAlignedBB.getBoundingBox( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ),
.getBoundingBox( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.min( vec3.zCoord, vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ),
Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ) Math.max( vec3.zCoord, vec31.zCoord ) ).expand( 16, 16, 16 );
.expand( 16, 16, 16 );
Entity entity = null; Entity entity = null;
double Closeest = 9999999.0D; double Closeest = 9999999.0D;
util/item/AEFluidStack.java
+1 -4
View File
@@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataInput;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
@@ -20,8 +19,6 @@ import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IAETagCompound; import appeng.api.storage.data.IAETagCompound;
import appeng.util.Platform; import appeng.util.Platform;
import com.google.common.io.ByteStreams;
public final class AEFluidStack extends AEStack<IAEFluidStack> implements IAEFluidStack, Comparable<AEFluidStack> 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]; byte[] bd = new byte[len];
data.readBytes( bd ); data.readBytes( bd );
DataInputStream di = new DataInputStream( new ByteArrayInputStream(bd) ); DataInputStream di = new DataInputStream( new ByteArrayInputStream( bd ) );
d.setTag( "tag", CompressedStreamTools.read( di ) ); d.setTag( "tag", CompressedStreamTools.read( di ) );
} }