diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index 56c7d394cd8..694cb0d995b 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -13,7 +13,7 @@ import tconstruct.library.TConstructRegistry; import mantle.blocks.abstracts.InventorySlab; import tconstruct.library.util.IActiveLogic; -import tconstruct.library.util.IFacingLogic; +import mantle.blocks.iface.IFacingLogic; public class FurnaceSlab extends InventorySlab { diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java index 1add6daad23..6ea9e1423e6 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/blocks/SmelteryBlock.java @@ -21,7 +21,7 @@ import tconstruct.client.block.SmelteryRender; import tconstruct.library.TConstructRegistry; import mantle.blocks.abstracts.InventoryBlock; -import tconstruct.library.util.IFacingLogic; +import mantle.blocks.iface.IFacingLogic; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java index 4330d44f8c3..70f8e3ba851 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -1,8 +1,6 @@ package tconstruct.blocks.logic; -import tconstruct.TConstruct; -import tconstruct.library.crafting.AlloyMix; -import tconstruct.library.util.IFacingLogic; +import mantle.blocks.iface.IFacingLogic; import tconstruct.library.util.IMasterLogic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java index ca8e0b60207..798fbe3046b 100644 --- a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java @@ -2,7 +2,7 @@ import tconstruct.TConstruct; import tconstruct.library.util.IActiveLogic; -import tconstruct.library.util.IFacingLogic; +import mantle.blocks.iface.IFacingLogic;; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index a281d17784d..0674a848f9a 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -22,7 +22,7 @@ import tconstruct.inventory.FurnaceContainer; import mantle.blocks.abstracts.InventoryLogic; import tconstruct.library.util.IActiveLogic; -import tconstruct.library.util.IFacingLogic; +import mantle.blocks.iface.IFacingLogic; import cpw.mods.fml.common.registry.GameRegistry; /* Slots diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java index d4a881598d2..7cf41856134 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -1,7 +1,6 @@ package tconstruct.blocks.logic; -import tconstruct.library.crafting.AlloyMix; -import tconstruct.library.util.IFacingLogic; +import mantle.blocks.iface.IFacingLogic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index 91b748b424d..64fe4c703f3 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -37,7 +37,7 @@ import tconstruct.library.crafting.Smeltery; import tconstruct.library.util.CoordTuple; import tconstruct.library.util.IActiveLogic; -import tconstruct.library.util.IFacingLogic; +import mantle.blocks.iface.IFacingLogic; import tconstruct.library.util.IMasterLogic; import tconstruct.library.util.IServantLogic; import tconstruct.util.SmelteryDamageSource; diff --git a/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java index 35038ce33d5..68b3e6cffc4 100644 --- a/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TowerFurnaceLogic.java @@ -1,14 +1,8 @@ package tconstruct.blocks.logic; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; import tconstruct.library.blocks.AdaptiveInventoryLogic; import tconstruct.library.util.IActiveLogic; -import tconstruct.library.util.IFacingLogic; +import mantle.blocks.iface.IFacingLogic; import tconstruct.library.util.IMasterLogic; //Not actually abstract diff --git a/src/main/java/tconstruct/client/block/SlimeChannelRender.java b/src/main/java/tconstruct/client/block/SlimeChannelRender.java index b3210f2afdb..518781037f5 100644 --- a/src/main/java/tconstruct/client/block/SlimeChannelRender.java +++ b/src/main/java/tconstruct/client/block/SlimeChannelRender.java @@ -1,14 +1,12 @@ package tconstruct.client.block; import tconstruct.client.TProxyClient; -import tconstruct.library.util.IFacingLogic; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fluids.BlockFluidBase; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/library/blocks/AdaptiveInventoryLogic.java b/src/main/java/tconstruct/library/blocks/AdaptiveInventoryLogic.java index be5b30c5bc5..72470d8723a 100644 --- a/src/main/java/tconstruct/library/blocks/AdaptiveInventoryLogic.java +++ b/src/main/java/tconstruct/library/blocks/AdaptiveInventoryLogic.java @@ -5,7 +5,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.util.IFacingLogic; +import mantle.blocks.iface.IFacingLogic; import mantle.blocks.abstracts.InventoryLogic; public abstract class AdaptiveInventoryLogic extends InventoryLogic implements IFacingLogic diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index c280c17fa08..23c00bc1742 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity; import tconstruct.TConstruct; import tconstruct.library.util.*; +import mantle.blocks.iface.IFacingLogic; public class TankLayerScan extends LogicComponent { diff --git a/src/main/java/tconstruct/library/util/IFacingLogic.java b/src/main/java/tconstruct/library/util/IFacingLogic.java deleted file mode 100644 index a2c42f2f656..00000000000 --- a/src/main/java/tconstruct/library/util/IFacingLogic.java +++ /dev/null @@ -1,20 +0,0 @@ -package tconstruct.library.util; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraftforge.common.ForgeDirection; - -public interface IFacingLogic -{ - public byte getRenderDirection (); - - public ForgeDirection getForgeDirection (); - - @Deprecated - public void setDirection (int side); - - @Deprecated - public void setDirection (float yaw, float pitch, EntityLivingBase player); - - /** This will be added next version - * public void setDirection(int side, float yaw, float pitch, EntityLivingBase player); */ -} \ No newline at end of file