From f9a4ef453dd667b719b4610e2ab686f471f88f8c Mon Sep 17 00:00:00 2001 From: Alex_hawks Date: Tue, 9 Apr 2013 17:25:29 +0800 Subject: [PATCH] Fix up getDirection, and imports in 2 TE classes To make it compile with newer Forge versions --- .../common/machine/belt/TileEntityConveyorBelt.java | 4 ++-- .../common/machine/imprinter/TileEntityFilterable.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java index b688db39..484d0911 100644 --- a/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java +++ b/src/minecraft/assemblyline/common/machine/belt/TileEntityConveyorBelt.java @@ -1,7 +1,6 @@ package assemblyline.common.machine.belt; import java.util.ArrayList; -import java.util.EnumSet; import java.util.List; import net.minecraft.entity.Entity; @@ -12,6 +11,7 @@ import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.prefab.implement.IRotatable; @@ -273,7 +273,7 @@ public class TileEntityConveyorBelt extends TileEntityAssemblyNetwork implements } @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()); } diff --git a/src/minecraft/assemblyline/common/machine/imprinter/TileEntityFilterable.java b/src/minecraft/assemblyline/common/machine/imprinter/TileEntityFilterable.java index ca578b76..ec61c9c1 100644 --- a/src/minecraft/assemblyline/common/machine/imprinter/TileEntityFilterable.java +++ b/src/minecraft/assemblyline/common/machine/imprinter/TileEntityFilterable.java @@ -11,6 +11,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.prefab.implement.IRotatable; @@ -96,7 +97,7 @@ public abstract class TileEntityFilterable extends TileEntityAssemblyNetwork imp } @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()); }