mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-21 20:52:26 +00:00
Fix IFacingLogic using the wrong interface (now in Mantle).
This commit is contained in:
1 parent
08fd425c8f
commit
9ccbe48bfe
12 files changed
+10
-40
No files matched your search
@@ -13,7 +13,7 @@ import tconstruct.common.TProxyCommon;
|
||||
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
|
||||
{
|
||||
|
||||
@@ -21,7 +21,7 @@ import tconstruct.blocks.logic.SmelteryLogic;
|
||||
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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.blocks.logic;
|
||||
|
||||
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;
|
||||
|
||||
@@ -22,7 +22,7 @@ import net.minecraftforge.common.ForgeDirection;
|
||||
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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -37,7 +37,7 @@ import mantle.blocks.abstracts.InventoryLogic;
|
||||
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;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import java.util.Random;
|
||||
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
|
||||
|
||||
@@ -6,6 +6,7 @@ import net.minecraft.nbt.*;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.library.util.*;
|
||||
import mantle.blocks.iface.IFacingLogic;
|
||||
|
||||
public class TankLayerScan extends LogicComponent
|
||||
{
|
||||
|
||||
@@ -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); */
|
||||
}
|
||||
Reference in new issue
Block a user