Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #4 from Alex-hawks/master

Browse source 
Fix up getDirection and imports in 2 TE Classes
This commit is contained in:
Robert WC Seifert 2013-04-09 16:44:25 -07:00
commit 47d64b6440
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java
View file

@ -1,7 +1,6 @@
package assemblyline.common.machine.belt; package assemblyline.common.machine.belt;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List; import java.util.List;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
@ -12,6 +11,7 @@ import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.implement.IRotatable; import universalelectricity.prefab.implement.IRotatable;
@ -273,7 +273,7 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements
} }
@Override @Override
public ForgeDirection getDirection(World world, int x, int y, int z) public ForgeDirection getDirection(IBlockAccess world, int x, int y, int z)
{ {
return ForgeDirection.getOrientation(this.getBlockMetadata()); return ForgeDirection.getOrientation(this.getBlockMetadata());
} }

3
src/minecraft/assemblyline/common/machine/imprinter/TileEntityFilterable.java
View file

@ -11,6 +11,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.implement.IRotatable; import universalelectricity.prefab.implement.IRotatable;
@ -96,7 +97,7 @@ public abstract class TileEntityFilterable extends TileEntityAssemblyNetwork imp
} }
@Override @Override
public ForgeDirection getDirection(World world, int x, int y, int z) public ForgeDirection getDirection(IBlockAccess world, int x, int y, int z)
{ {
return ForgeDirection.getOrientation(this.getBlockMetadata()); return ForgeDirection.getOrientation(this.getBlockMetadata());
} }