diff options
Diffstat (limited to 'src/main/java/gregtech/api/multitileentity/interfaces')
5 files changed, 38 insertions, 33 deletions
diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockController.java b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockController.java index 1168f8e7ce..6f508ab6f5 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockController.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockController.java @@ -19,17 +19,17 @@ public interface IMultiBlockController extends IMultiTileEntity, IMultiBlockFlui @Override ChunkCoordinates getCoords(); - FluidStack getDrainableFluid(byte aSide); + FluidStack getDrainableFluid(ForgeDirection side); - FluidStack getDrainableFluid(byte aSide, Fluid fluid); + FluidStack getDrainableFluid(ForgeDirection side, Fluid fluid); - boolean isLiquidInput(byte aSide); + boolean isLiquidInput(ForgeDirection side); - boolean isLiquidOutput(byte aSide); + boolean isLiquidOutput(ForgeDirection side); - void registerCoveredPartOnSide(final int aSide, IMultiBlockPart part); + void registerCoveredPartOnSide(final ForgeDirection side, IMultiBlockPart part); - void unregisterCoveredPartOnSide(final int aSide, IMultiBlockPart part); + void unregisterCoveredPartOnSide(final ForgeDirection side, IMultiBlockPart part); void registerInventory(String aName, String aID, int aInventorySize, int aType); diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockEnergy.java b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockEnergy.java index 598c057882..d6d8bf5310 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockEnergy.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockEnergy.java @@ -1,5 +1,7 @@ package gregtech.api.multitileentity.interfaces; +import net.minecraftforge.common.util.ForgeDirection; + import gregtech.api.multitileentity.multiblock.base.MultiBlockPart; interface IMultiBlockEnergy { @@ -22,9 +24,9 @@ interface IMultiBlockEnergy { boolean increaseStoredEnergyUnits(MultiBlockPart aPart, long aEnergy, boolean aIgnoreTooMuchEnergy); - boolean drainEnergyUnits(MultiBlockPart aPart, byte aSide, long aVoltage, long aAmperage); + boolean drainEnergyUnits(MultiBlockPart aPart, ForgeDirection side, long aVoltage, long aAmperage); - long injectEnergyUnits(MultiBlockPart aPart, byte aSide, long aVoltage, long aAmperage); + long injectEnergyUnits(MultiBlockPart aPart, ForgeDirection side, long aVoltage, long aAmperage); long getAverageElectricInput(MultiBlockPart aPart); @@ -34,7 +36,7 @@ interface IMultiBlockEnergy { long getEUCapacity(MultiBlockPart aPart); - boolean inputEnergyFrom(MultiBlockPart aPart, byte aSide); + boolean inputEnergyFrom(MultiBlockPart aPart, ForgeDirection side); - boolean outputsEnergyTo(MultiBlockPart aPart, byte aSide); + boolean outputsEnergyTo(MultiBlockPart aPart, ForgeDirection side); } diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockInventory.java b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockInventory.java index e095b739b7..b3473a3260 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockInventory.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockInventory.java @@ -4,6 +4,7 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable; import gregtech.api.multitileentity.multiblock.base.MultiBlockPart; @@ -18,11 +19,11 @@ public interface IMultiBlockInventory { boolean addStackToSlot(MultiBlockPart aPart, int aIndex, ItemStack aStack, int aAmount); - int[] getAccessibleSlotsFromSide(MultiBlockPart aPart, byte aSide); + int[] getAccessibleSlotsFromSide(MultiBlockPart aPart, ForgeDirection side); - boolean canInsertItem(MultiBlockPart aPart, int aSlot, ItemStack aStack, byte aSide); + boolean canInsertItem(MultiBlockPart aPart, int aSlot, ItemStack aStack, ForgeDirection side); - boolean canExtractItem(MultiBlockPart aPart, int aSlot, ItemStack aStack, byte aSide); + boolean canExtractItem(MultiBlockPart aPart, int aSlot, ItemStack aStack, ForgeDirection side); int getSizeInventory(MultiBlockPart aPart); diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockPart.java index dcee4ad9d9..017954f554 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockPart.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiBlockPart.java @@ -1,6 +1,7 @@ package gregtech.api.multitileentity.interfaces; import net.minecraft.util.ChunkCoordinates; +import net.minecraftforge.common.util.ForgeDirection; public interface IMultiBlockPart extends IMultiTileEntity { @@ -12,5 +13,5 @@ public interface IMultiBlockPart extends IMultiTileEntity { int getLockedInventoryIndex(); - boolean tickCoverAtSide(byte aSide, long aTickTimer); + boolean tickCoverAtSide(ForgeDirection side, long aTickTimer); } diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java index cafde57de5..a490e4275c 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java @@ -16,6 +16,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.Explosion; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional; @@ -130,19 +131,19 @@ public interface IMultiTileEntity int getPaint(); /** - * Sets the main facing to {aSide} and update as appropriately + * Sets the main facing to {side} and update as appropriately * * @return Whether the facing was changed */ - boolean setMainFacing(byte aSide); + boolean setMainFacing(ForgeDirection side); - boolean isFacingValid(byte aFacing); + boolean isFacingValid(ForgeDirection facing); void onFacingChange(); @Override - default void setFrontFacing(byte aSide) { - setMainFacing(aSide); + default void setFrontFacing(ForgeDirection side) { + setMainFacing(side); } boolean shouldTriggerBlockUpdate(); @@ -155,13 +156,13 @@ public interface IMultiTileEntity /* do nothing */ } - boolean onBlockActivated(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ); + boolean onBlockActivated(EntityPlayer aPlayer, ForgeDirection side, float aX, float aY, float aZ); - boolean onRightClick(EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ); + boolean onRightClick(EntityPlayer aPlayer, ForgeDirection side, float aX, float aY, float aZ); ArrayList<ItemStack> getDrops(int aFortune, boolean aSilkTouch); - boolean isSideSolid(byte aSide); + boolean isSideSolid(ForgeDirection side); float getExplosionResistance(Entity aExploder, double aExplosionX, double aExplosionY, double aExplosionZ); @@ -169,7 +170,7 @@ public interface IMultiTileEntity void onExploded(Explosion aExplosion); - boolean recolourBlock(byte aSide, byte aColor); + boolean recolourBlock(ForgeDirection side, byte aColor); /** Adds to the Creative Tab. return false to prevent it from being added. */ boolean getSubItems(MultiTileEntityBlockInternal aBlock, Item aItem, CreativeTabs aTab, List<ItemStack> aList, @@ -177,11 +178,11 @@ public interface IMultiTileEntity ItemStack getPickBlock(MovingObjectPosition aTarget); - boolean shouldSideBeRendered(byte aSide); + boolean shouldSideBeRendered(ForgeDirection side); - boolean isSurfaceOpaque(byte aSide); + boolean isSurfaceOpaque(ForgeDirection side); - boolean onPlaced(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, byte aSide, + boolean onPlaced(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, ForgeDirection side, float aHitX, float aHitY, float aHitZ); // ItemStack getPickBlock(MovingObjectPosition aTarget); @@ -198,18 +199,18 @@ public interface IMultiTileEntity interface IMTE_IsProvidingWeakPower extends IMultiTileEntity { /** Remember that it passes the opposite Side due to the way vanilla works! */ - int isProvidingWeakPower(byte aOppositeSide); + int isProvidingWeakPower(ForgeDirection oppositeSide); } interface IMTE_IsProvidingStrongPower extends IMultiTileEntity { /** Remember that it passes the opposite Side due to the way vanilla works! */ - int isProvidingStrongPower(byte aOppositeSide); + int isProvidingStrongPower(ForgeDirection oppositeSide); } interface IMTE_ShouldCheckWeakPower extends IMultiTileEntity { - boolean shouldCheckWeakPower(byte aSide); + boolean shouldCheckWeakPower(ForgeDirection side); } interface IMTE_GetWeakChanges extends IMultiTileEntity { @@ -219,7 +220,7 @@ public interface IMultiTileEntity interface IMTE_GetComparatorInputOverride extends IMultiTileEntity { - int getComparatorInputOverride(byte aSide); + int getComparatorInputOverride(ForgeDirection side); } interface IMTE_BreakBlock extends IMultiTileEntity { @@ -258,14 +259,14 @@ public interface IMultiTileEntity * pipes/wires. */ boolean ignoreEntityCollisionWhenPlacing(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, - int aZ, byte aSide, float aHitX, float aHitY, float aHitZ); + int aZ, ForgeDirection side, float aHitX, float aHitY, float aHitZ); } interface IMTE_CanPlace extends IMultiTileEntity { /** Return false if this TileEntity cannot be placed at that Location. */ - boolean canPlace(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, byte aSide, - float aHitX, float aHitY, float aHitZ); + boolean canPlace(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, + ForgeDirection side, float aHitX, float aHitY, float aHitZ); } interface IMTE_GetMaxStackSize extends IMultiTileEntity { |