From 569305d3cd4bdad06e36e5edf3f0478e0cc211eb Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 22 Jan 2016 00:21:12 +0000 Subject: [PATCH] Some changes to external apis for EnumFacing --- src/api/java/cofh/api/energy/IEnergyConnection.java | 4 ++-- src/api/java/cofh/api/energy/IEnergyReceiver.java | 8 ++++---- src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java | 5 ++--- src/api/java/ic2/api/energy/tile/IEnergySink.java | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/api/java/cofh/api/energy/IEnergyConnection.java b/src/api/java/cofh/api/energy/IEnergyConnection.java index 79bdf77af..75ba9f548 100644 --- a/src/api/java/cofh/api/energy/IEnergyConnection.java +++ b/src/api/java/cofh/api/energy/IEnergyConnection.java @@ -1,6 +1,6 @@ package cofh.api.energy; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not @@ -16,6 +16,6 @@ public interface IEnergyConnection { /** * Returns TRUE if the TileEntity can connect on a given side. */ - boolean canConnectEnergy(ForgeDirection from); + boolean canConnectEnergy(EnumFacing from); } diff --git a/src/api/java/cofh/api/energy/IEnergyReceiver.java b/src/api/java/cofh/api/energy/IEnergyReceiver.java index c726e09e0..775cc11b6 100644 --- a/src/api/java/cofh/api/energy/IEnergyReceiver.java +++ b/src/api/java/cofh/api/energy/IEnergyReceiver.java @@ -1,6 +1,6 @@ package cofh.api.energy; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects. @@ -23,16 +23,16 @@ public interface IEnergyReceiver extends IEnergyConnection { * If TRUE, the charge will only be simulated. * @return Amount of energy that was (or would have been, if simulated) received. */ - int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate); + int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate); /** * Returns the amount of energy currently stored. */ - int getEnergyStored(ForgeDirection from); + int getEnergyStored(EnumFacing from); /** * Returns the maximum amount of energy that can be stored. */ - int getMaxEnergyStored(ForgeDirection from); + int getMaxEnergyStored(EnumFacing from); } diff --git a/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java index 1735ff5e4..0ecd6c8cc 100644 --- a/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java +++ b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java @@ -1,8 +1,7 @@ package ic2.api.energy.tile; import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * For internal/multi-block usage only. @@ -22,6 +21,6 @@ public interface IEnergyAcceptor extends IEnergyTile { * @param emitter energy emitter, may also be null or an IMetaDelegate * @param direction direction the energy is being received from */ - boolean acceptsEnergyFrom(TileEntity emitter, ForgeDirection direction); + boolean acceptsEnergyFrom(TileEntity emitter, EnumFacing direction); } diff --git a/src/api/java/ic2/api/energy/tile/IEnergySink.java b/src/api/java/ic2/api/energy/tile/IEnergySink.java index 4ae8e7954..827425467 100644 --- a/src/api/java/ic2/api/energy/tile/IEnergySink.java +++ b/src/api/java/ic2/api/energy/tile/IEnergySink.java @@ -1,6 +1,6 @@ package ic2.api.energy.tile; -import net.minecraftforge.common.util.ForgeDirection; +import net.minecraft.util.EnumFacing; /** * Allows a tile entity (mostly a machine) to receive energy. @@ -40,6 +40,6 @@ public interface IEnergySink extends IEnergyAcceptor { * @param amount energy to be transferred * @return Energy not consumed (leftover) */ - double injectEnergy(ForgeDirection directionFrom, double amount, double voltage); + double injectEnergy(EnumFacing directionFrom, double amount, double voltage); }