aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/interfaces
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-04-22 22:33:35 -0700
committerGitHub <noreply@github.com>2023-04-23 07:33:35 +0200
commit56f2269f4af6d2130bdb2b6e6ac6e13bce89e47b (patch)
tree745e6d92025ec4ef449fc59fa5fdd741200b0489 /src/main/java/gregtech/api/interfaces
parentac0b7a7da46646d325def36eed811941dbfc5950 (diff)
downloadGT5-Unofficial-56f2269f4af6d2130bdb2b6e6ac6e13bce89e47b.tar.gz
GT5-Unofficial-56f2269f4af6d2130bdb2b6e6ac6e13bce89e47b.tar.bz2
GT5-Unofficial-56f2269f4af6d2130bdb2b6e6ac6e13bce89e47b.zip
Forge direction (#1895)
* ForgeDirection Also refactor the clusterfuck that was `getCoordinateScan` Co-authored by: Jason Mitchell <mitchej@gmail.com> * Fix rendering of Frame Boxes Frame boxes needed their own implementation of getTexture with int connexion mask, which is returning an error texture for the MetaTileEntity, because pipes (FrameBox **is** a pipe) do use this method to return different textures based on connexion status. --------- Co-authored-by: Léa Gris <lea.gris@noiraude.net>
Diffstat (limited to 'src/main/java/gregtech/api/interfaces')
-rw-r--r--src/main/java/gregtech/api/interfaces/IItemBehaviour.java7
-rw-r--r--src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java21
-rw-r--r--src/main/java/gregtech/api/interfaces/covers/IControlsWorkCover.java11
-rw-r--r--src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java8
-rw-r--r--src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java70
-rw-r--r--src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java10
-rw-r--r--src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java16
-rw-r--r--src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityPipe.java24
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java4
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java56
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java55
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java112
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IFibreConnected.java12
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IGearEnergyTileEntity.java7
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java5
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java51
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IPipeRenderedTileEntity.java8
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IRedstoneEmitter.java17
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IRedstoneReceiver.java6
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/ITexturedTileEntity.java3
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/ITurnable.java16
21 files changed, 225 insertions, 294 deletions
diff --git a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java
index 1f67b9c1a8..67bb505c6b 100644
--- a/src/main/java/gregtech/api/interfaces/IItemBehaviour.java
+++ b/src/main/java/gregtech/api/interfaces/IItemBehaviour.java
@@ -10,6 +10,7 @@ import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
import gregtech.api.enums.SubTag;
import gregtech.api.items.GT_MetaBase_Item;
@@ -18,11 +19,11 @@ public interface IItemBehaviour<E extends Item> {
boolean onLeftClickEntity(E aItem, ItemStack aStack, EntityPlayer aPlayer, Entity aEntity);
- boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide,
- float hitX, float hitY, float hitZ);
+ boolean onItemUse(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
+ int ordinalSide, float hitX, float hitY, float hitZ);
boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
- int aSide, float hitX, float hitY, float hitZ);
+ ForgeDirection side, float hitX, float hitY, float hitZ);
ItemStack onItemRightClick(E aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer);
diff --git a/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java b/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java
index 91219368b7..0eea6ca3a4 100644
--- a/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java
+++ b/src/main/java/gregtech/api/interfaces/IRedstoneCircuitBlock.java
@@ -2,6 +2,7 @@ package gregtech.api.interfaces;
import net.minecraft.block.Block;
import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.util.GT_CoverBehavior;
@@ -14,47 +15,47 @@ public interface IRedstoneCircuitBlock {
/**
* The Output Direction the Circuit Block is Facing
*/
- byte getOutputFacing();
+ ForgeDirection getOutputFacing();
/**
* sets Output Redstone State at Side
*/
- boolean setRedstone(byte aStrength, byte aSide);
+ boolean setRedstone(byte aStrength, ForgeDirection side);
/**
* returns Output Redstone State at Side Note that setRedstone checks if there is a Difference between the old and
* the new Setting before consuming any Energy
*/
- byte getOutputRedstone(byte aSide);
+ byte getOutputRedstone(ForgeDirection side);
/**
* returns Input Redstone Signal at Side
*/
- byte getInputRedstone(byte aSide);
+ byte getInputRedstone(ForgeDirection side);
/**
* If this Side is Covered up and therefor not doing any Redstone
*/
- GT_CoverBehavior getCover(byte aSide);
+ GT_CoverBehavior getCover(ForgeDirection side);
- int getCoverID(byte aSide);
+ int getCoverID(ForgeDirection side);
- int getCoverVariable(byte aSide);
+ int getCoverVariable(ForgeDirection side);
/**
* returns whatever Block-ID is adjacent to the Redstone Circuit Block
*/
- Block getBlockAtSide(byte aSide);
+ Block getBlockAtSide(ForgeDirection side);
/**
* returns whatever Meta-Value is adjacent to the Redstone Circuit Block
*/
- byte getMetaIDAtSide(byte aSide);
+ byte getMetaIDAtSide(ForgeDirection side);
/**
* returns whatever TileEntity is adjacent to the Redstone Circuit Block
*/
- TileEntity getTileEntityAtSide(byte aSide);
+ TileEntity getTileEntityAtSide(ForgeDirection side);
/**
* returns whatever TileEntity is used by the Redstone Circuit Block
diff --git a/src/main/java/gregtech/api/interfaces/covers/IControlsWorkCover.java b/src/main/java/gregtech/api/interfaces/covers/IControlsWorkCover.java
index cef20ac3b7..d4cd1e9ec2 100644
--- a/src/main/java/gregtech/api/interfaces/covers/IControlsWorkCover.java
+++ b/src/main/java/gregtech/api/interfaces/covers/IControlsWorkCover.java
@@ -1,6 +1,6 @@
package gregtech.api.interfaces.covers;
-import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
+import net.minecraftforge.common.util.ForgeDirection;
import gregtech.api.interfaces.tileentity.ICoverable;
import gregtech.api.interfaces.tileentity.IMachineProgress;
@@ -16,10 +16,11 @@ public interface IControlsWorkCover {
*
* @return true if the cover is the first (side) one
**/
- static boolean makeSureOnlyOne(byte aMySide, ICoverable aTileEntity) {
- for (byte tSide : ALL_VALID_SIDES) {
- if (aTileEntity.getCoverBehaviorAtSideNew(tSide) instanceof IControlsWorkCover && tSide < aMySide) {
- aTileEntity.dropCover(tSide, tSide, true);
+ static boolean makeSureOnlyOne(ForgeDirection aMySide, ICoverable aTileEntity) {
+ for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
+ if (aTileEntity.getCoverBehaviorAtSideNew(side) instanceof IControlsWorkCover
+ && side.ordinal() < aMySide.ordinal()) {
+ aTileEntity.dropCover(side, side, true);
aTileEntity.markDirty();
return false;
}
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java b/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java
index 76d8d082ef..0ca519d40b 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IConnectable.java
@@ -1,5 +1,7 @@
package gregtech.api.interfaces.metatileentity;
+import net.minecraftforge.common.util.ForgeDirection;
+
/**
* For pipes, wires, and other MetaTiles which need to be decided whether they should connect to the block at each side.
*/
@@ -21,12 +23,12 @@ public interface IConnectable {
* Try to connect to the Block at the specified side returns the connection state. Non-positive values for failed,
* others for succeeded.
*/
- int connect(byte aSide);
+ int connect(ForgeDirection side);
/**
* Try to disconnect to the Block at the specified side
*/
- void disconnect(byte aSide);
+ void disconnect(ForgeDirection side);
- boolean isConnectedAtSide(int aSide);
+ boolean isConnectedAtSide(ForgeDirection side);
}
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
index a24e05f1a2..c9377d10be 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntity.java
@@ -16,6 +16,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.IFluidHandler;
import net.minecraftforge.fluids.IFluidTank;
@@ -125,28 +126,30 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
* If a Cover of that Type can be placed on this Side. Also Called when the Facing of the Block Changes and a Cover
* is on said Side.
*/
- boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack);
+ boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack);
/**
* When a Player rightclicks the Facing with a Screwdriver.
*/
- void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ);
+ void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ);
/**
- * When a Player rightclicks the Facing with a Wrench.
+ * When a Player right-clicks the Facing with a Wrench.
*/
- boolean onWrenchRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ);
+ boolean onWrenchRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer entityPlayer, float aX,
+ float aY, float aZ);
/**
- * When a Player rightclicks the Facing with a wire cutter.
+ * When a Player right-clicks the Facing with a wire cutter.
*/
- boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ);
+ boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer entityPlayer,
+ float aX, float aY, float aZ);
/**
- * When a Player rightclicks the Facing with a soldering iron.
+ * When a Player right-clicks the Facing with a soldering iron.
*/
- boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
- float aZ);
+ boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer entityPlayer,
+ float aX, float aY, float aZ);
/**
* Called right before this Machine explodes
@@ -181,10 +184,10 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
void onRemoval();
/**
- * @param aFacing
+ * @param facing
* @return if aFacing would be a valid Facing for this Device. Used for wrenching.
*/
- boolean isFacingValid(byte aFacing);
+ boolean isFacingValid(ForgeDirection facing);
/**
* @return the Server Side Container
@@ -214,12 +217,12 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
/**
* From new ISidedInventory
*/
- boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack);
+ boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack);
/**
* From new ISidedInventory
*/
- boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack);
+ boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack);
/**
* @return if aIndex is a valid Slot. false for things like HoloSlots. Is used for determining if an Item is dropped
@@ -243,12 +246,12 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
/**
* If this Side can connect to inputting pipes
*/
- boolean isLiquidInput(byte aSide);
+ boolean isLiquidInput(ForgeDirection side);
/**
* If this Side can connect to outputting pipes
*/
- boolean isLiquidOutput(byte aSide);
+ boolean isLiquidOutput(ForgeDirection side);
/**
* Just an Accessor for the Name variable.
@@ -261,12 +264,12 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
boolean isAccessAllowed(EntityPlayer aPlayer);
/**
- * a Player rightclicks the Machine Sneaky rightclicks are not getting passed to this!
+ * a Player right-clicks the Machine Sneaky right clicks are not getting passed to this!
*
* @return
*/
- boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY,
- float aZ);
+ boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side, float aX,
+ float aY, float aZ);
/**
* a Player leftclicks the Machine Sneaky leftclicks are getting passed to this unlike with the rightclicks.
@@ -364,22 +367,17 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
/**
* Icon of the Texture. If this returns null then it falls back to getTextureIndex.
*
- * @param aSide is the Side of the Block
- * @param aFacing is the direction the Block is facing (or a Bitmask of all Connections in case of Pipes)
- * @param aColorIndex The Minecraft Color the Block is having
- * @param aActive if the Machine is currently active (use this instead of calling
- * mBaseMetaTileEntity.mActive!!!). Note: In case of Pipes this means if this Side is connected
- * to something or not.
- * @param aRedstone if the Machine is currently outputting a RedstoneSignal (use this instead of calling
- * mBaseMetaTileEntity.mRedstone!!!)
+ * @param side is the Side of the Block
+ * @param facing is the direction the Block is facing
+ * @param colorIndex The Minecraft Color the Block is having
+ * @param active if the Machine is currently active (use this instead of calling
+ * {@code mBaseMetaTileEntity.mActive)}. Note: In case of Pipes this means if this Side is
+ * connected to something or not.
+ * @param redstoneLevel if the Machine is currently outputting a RedstoneSignal (use this instead of calling
+ * {@code mBaseMetaTileEntity.mRedstone} !!!)
*/
- ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
- boolean aActive, boolean aRedstone);
-
- /**
- * The Textures used for the Item rendering. Return null if you want the regular 3D Block Rendering.
- */
- // public ITexture[] getItemTexture(ItemStack aStack);
+ ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
+ int colorIndex, boolean active, boolean redstoneLevel);
/**
* Register Icons here. This gets called when the Icons get initialized by the Base Block Best is you put your Icons
@@ -405,9 +403,9 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
/**
* Gets the Output for the comparator on the given Side
*/
- byte getComparatorValue(byte aSide);
+ byte getComparatorValue(ForgeDirection side);
- float getExplosionResistance(byte aSide);
+ float getExplosionResistance(ForgeDirection side);
String[] getInfoData();
@@ -415,7 +413,7 @@ public interface IMetaTileEntity extends ISidedInventory, IFluidTank, IFluidHand
ItemStack[] getRealInventory();
- boolean connectsToItemPipe(byte aSide);
+ boolean connectsToItemPipe(ForgeDirection side);
void onColorChangeServer(byte aColor);
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java
index 3f7bc73383..a2d672e765 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java
@@ -4,14 +4,16 @@ import java.util.ArrayList;
import java.util.HashSet;
import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.common.util.ForgeDirection;
-public interface IMetaTileEntityCable extends IMetaTileEntity {
+public interface IMetaTileEntityCable extends IMetaTileEntityPipe {
@Deprecated
- long transferElectricity(byte aSide, long aVoltage, long aAmperage,
+ long transferElectricity(ForgeDirection side, long aVoltage, long aAmperage,
ArrayList<TileEntity> aAlreadyPassedTileEntityList);
- default long transferElectricity(byte aSide, long aVoltage, long aAmperage, HashSet<TileEntity> aAlreadyPassedSet) {
- return transferElectricity(aSide, aVoltage, aAmperage, new ArrayList<>(aAlreadyPassedSet));
+ default long transferElectricity(ForgeDirection side, long aVoltage, long aAmperage,
+ HashSet<TileEntity> aAlreadyPassedSet) {
+ return transferElectricity(side, aVoltage, aAmperage, new ArrayList<>(aAlreadyPassedSet));
}
}
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java
index 76d3f56e74..0c2c5ebf28 100644
--- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityItemPipe.java
@@ -1,14 +1,13 @@
package gregtech.api.interfaces.metatileentity;
-import static gregtech.api.enums.GT_Values.ALL_VALID_SIDES;
-
import java.util.Map;
+import net.minecraftforge.common.util.ForgeDirection;
+
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.BaseMetaPipeEntity;
-import gregtech.api.util.GT_Utility;
-public interface IMetaTileEntityItemPipe extends IMetaTileEntity {
+public interface IMetaTileEntityItemPipe extends IMetaTileEntityPipe {
/**
* @return if this Pipe can still be used.
@@ -32,10 +31,10 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity {
* Executes the Sending Code for inserting Stacks into the TileEntities.
*
* @param aSender the BaseMetaTileEntity sending the Stack.
- * @param aSide the Side of the PIPE facing the TileEntity.
+ * @param side the Side of the PIPE facing the TileEntity.
* @return if this Side was allowed to Output into the Block.
*/
- boolean insertItemStackIntoTileEntity(Object aSender, byte aSide);
+ boolean insertItemStackIntoTileEntity(Object aSender, ForgeDirection side);
/**
* Can be used to make flow control Pipes, like Redpowers Restriction Tubes. Every normal Pipe returns a Value of
@@ -59,11 +58,10 @@ public interface IMetaTileEntityItemPipe extends IMetaTileEntity {
if (aMap.get(aMetaTileEntity) == null || aMap.get(aMetaTileEntity) > aStep) {
final IGregTechTileEntity aBaseMetaTileEntity = aMetaTileEntity.getBaseMetaTileEntity();
aMap.put(aMetaTileEntity, aStep);
- byte oppositeSide;
- for (byte side : ALL_VALID_SIDES) {
+ for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
if (aMetaTileEntity instanceof IConnectable
&& !((IConnectable) aMetaTileEntity).isConnectedAtSide(side)) continue;
- oppositeSide = GT_Utility.getOppositeSide(side);
+ final ForgeDirection oppositeSide = side.getOpposite();
if (aSuckItems) {
if (aBaseMetaTileEntity.getCoverInfoAtSide(side)
.letsItemsIn(-2)) {
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityPipe.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityPipe.java
new file mode 100644
index 0000000000..0ac29b2e45
--- /dev/null
+++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityPipe.java
@@ -0,0 +1,24 @@
+package gregtech.api.interfaces.metatileentity;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+
+public interface IMetaTileEntityPipe extends IMetaTileEntity {
+
+ /**
+ * Icon of the Texture. If this returns null then it falls back to getTextureIndex.
+ *
+ * @param side is the Side of the Block
+ * @param facingBitMask is the Bitmask of all Connections
+ * @param colorIndex The Minecraft Color the Block is having
+ * @param active if the Machine is currently active (use this instead of calling
+ * mBaseMetaTileEntity.mActive!!!). Note: In case of Pipes this means if this Side is connected
+ * to something or not.
+ * @param redstoneLevel if the Machine is currently outputting a RedstoneSignal (use this instead of calling
+ * mBaseMetaTileEntity.mRedstone!!!)
+ */
+ ITexture[] getTexture(IGregTechTileEntity baseMetaTileEntity, ForgeDirection side, int facingBitMask,
+ int colorIndex, boolean active, boolean redstoneLevel);
+}
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java
index 4e64742db0..37d62894bb 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java
@@ -1,5 +1,7 @@
package gregtech.api.interfaces.tileentity;
+import net.minecraftforge.common.util.ForgeDirection;
+
/**
* Interface for internal Code, which is mainly used for independent Energy conversion.
*/
@@ -57,7 +59,7 @@ public interface IBasicEnergyContainer extends IEnergyConnected, IHasWorldObject
/**
* Drain Energy Call for Electricity.
*/
- boolean drainEnergyUnits(byte aSide, long aVoltage, long aAmperage);
+ boolean drainEnergyUnits(ForgeDirection side, long aVoltage, long aAmperage);
/**
* returns the amount of Electricity, accepted by this Block the last 5 ticks as Average.
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java
index d3186258ef..112a7035d7 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/ICoverable.java
@@ -2,6 +2,7 @@ package gregtech.api.interfaces.tileentity;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
+import net.minecraftforge.common.util.ForgeDirection;
import gregtech.api.util.GT_CoverBehavior;
import gregtech.api.util.GT_CoverBehaviorBase;
@@ -10,80 +11,81 @@ import gregtech.common.covers.CoverInfo;
public interface ICoverable extends IRedstoneTileEntity, IHasInventory, IBasicEnergyContainer {
- boolean canPlaceCoverIDAtSide(byte aSide, int aID);
+ boolean canPlaceCoverIDAtSide(ForgeDirection side, int aID);
- boolean canPlaceCoverItemAtSide(byte aSide, ItemStack aCover);
+ boolean canPlaceCoverItemAtSide(ForgeDirection side, ItemStack aCover);
- boolean dropCover(byte aSide, byte aDroppedSide, boolean aForced);
+ boolean dropCover(ForgeDirection side, ForgeDirection droppedSide, boolean aForced);
@Deprecated
- void setCoverDataAtSide(byte aSide, int aData);
+ void setCoverDataAtSide(ForgeDirection side, int aData);
- default void setCoverDataAtSide(byte aSide, ISerializableObject aData) {
+ default void setCoverDataAtSide(ForgeDirection side, ISerializableObject aData) {
if (aData instanceof ISerializableObject.LegacyCoverData)
- setCoverDataAtSide(aSide, ((ISerializableObject.LegacyCoverData) aData).get());
+ setCoverDataAtSide(side, ((ISerializableObject.LegacyCoverData) aData).get());
}
- void setCoverIdAndDataAtSide(byte aSide, int aId, ISerializableObject aData);
+ void setCoverIdAndDataAtSide(ForgeDirection side, int aId, ISerializableObject aData);
- void setCoverIDAtSide(byte aSide, int aID);
+ void setCoverIDAtSide(ForgeDirection side, int aID);
- boolean setCoverIDAtSideNoUpdate(byte aSide, int aID);
+ boolean setCoverIDAtSideNoUpdate(ForgeDirection side, int aID);
- void setCoverItemAtSide(byte aSide, ItemStack aCover);
+ void setCoverItemAtSide(ForgeDirection side, ItemStack aCover);
@Deprecated
- int getCoverDataAtSide(byte aSide);
+ int getCoverDataAtSide(ForgeDirection side);
- default CoverInfo getCoverInfoAtSide(byte aSide) {
+ default CoverInfo getCoverInfoAtSide(ForgeDirection side) {
return null;
}
- default ISerializableObject getComplexCoverDataAtSide(byte aSide) {
- return new ISerializableObject.LegacyCoverData(getCoverDataAtSide(aSide));
+ default ISerializableObject getComplexCoverDataAtSide(ForgeDirection side) {
+ return new ISerializableObject.LegacyCoverData(getCoverDataAtSide(side));
}
- int getCoverIDAtSide(byte aSide);
+ int getCoverIDAtSide(ForgeDirection side);
- ItemStack getCoverItemAtSide(byte aSide);
+ ItemStack getCoverItemAtSide(ForgeDirection side);
@Deprecated
- GT_CoverBehavior getCoverBehaviorAtSide(byte aSide);
+ GT_CoverBehavior getCoverBehaviorAtSide(ForgeDirection side);
- default GT_CoverBehaviorBase<?> getCoverBehaviorAtSideNew(byte aSide) {
- return getCoverBehaviorAtSide(aSide);
+ default GT_CoverBehaviorBase<?> getCoverBehaviorAtSideNew(ForgeDirection side) {
+ return getCoverBehaviorAtSide(side);
}
/**
* For use by the regular MetaTileEntities. Returns the Cover Manipulated input Redstone. Don't use this if you are
* a Cover Behavior. Only for MetaTileEntities.
*/
- byte getInternalInputRedstoneSignal(byte aSide);
+ byte getInternalInputRedstoneSignal(ForgeDirection side);
/**
* For use by the regular MetaTileEntities. This makes it not conflict with Cover based Redstone Signals. Don't use
* this if you are a Cover Behavior. Only for MetaTileEntities.
*/
- void setInternalOutputRedstoneSignal(byte aSide, byte aStrength);
+ void setInternalOutputRedstoneSignal(ForgeDirection side, byte aStrength);
/**
* Causes a general Cover Texture update. Sends 6 Integers to Client + causes @issueTextureUpdate()
*/
- void issueCoverUpdate(byte aSide);
+ void issueCoverUpdate(ForgeDirection side);
/**
* Receiving a packet with cover data.
*/
- void receiveCoverData(byte coverSide, int coverID, int coverData);
+ void receiveCoverData(ForgeDirection coverSide, int coverID, int coverData);
/**
* Receiving a packet with cover data.
- *
- * @param aPlayer the player who made the change
+ *
+ * @param coverSide
+ * @param aPlayer the player who made the change
*/
- default void receiveCoverData(byte aCoverSide, int aCoverID, ISerializableObject aCoverData,
+ default void receiveCoverData(ForgeDirection coverSide, int aCoverID, ISerializableObject aCoverData,
EntityPlayerMP aPlayer) {
if (aCoverData instanceof ISerializableObject.LegacyCoverData)
- receiveCoverData(aCoverSide, aCoverID, ((ISerializableObject.LegacyCoverData) aCoverData).get());
+ receiveCoverData(coverSide, aCoverID, ((ISerializableObject.LegacyCoverData) aCoverData).get());
}
}
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index 55de2db088..f866092d38 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -24,28 +24,28 @@ public interface IEnergyConnected extends IColoredTileEntity {
* <p/>
* Note: you have to check for @inputEnergyFrom because the Network won't check for that by itself.
*
- * @param aSide 0 - 5 = Vanilla Directions of YOUR Block the Energy gets inserted to. 6 = No specific Side (don't do
- * Side checks for this Side)
+ * @param side 0 - 5 = Vanilla Directions of YOUR Block the Energy gets inserted to. 6 = No specific Side (don't do
+ * Side checks for this Side)
* @return amount of used Amperes. 0 if not accepted anything.
*/
- long injectEnergyUnits(byte aSide, long aVoltage, long aAmperage);
+ long injectEnergyUnits(ForgeDirection side, long aVoltage, long aAmperage);
/**
* Sided Energy Input
*/
- boolean inputEnergyFrom(byte aSide);
+ boolean inputEnergyFrom(ForgeDirection side);
- default boolean inputEnergyFrom(byte aSide, boolean waitForActive) {
- return inputEnergyFrom(aSide);
+ default boolean inputEnergyFrom(ForgeDirection side, boolean waitForActive) {
+ return inputEnergyFrom(side);
}
/**
* Sided Energy Output
*/
- boolean outputsEnergyTo(byte aSide);
+ boolean outputsEnergyTo(ForgeDirection side);
- default boolean outputsEnergyTo(byte aSide, boolean waitForActive) {
- return outputsEnergyTo(aSide);
+ default boolean outputsEnergyTo(ForgeDirection side, boolean waitForActive) {
+ return outputsEnergyTo(side);
}
/**
@@ -64,43 +64,38 @@ public interface IEnergyConnected extends IColoredTileEntity {
return 0;
}
- for (byte i = 0, j = 0; i < 6 && aAmperage > rUsedAmperes; i++) {
- if (!aEmitter.outputsEnergyTo(i)) {
+ for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) {
+ if (rUsedAmperes > aAmperage) break;
+ if (!aEmitter.outputsEnergyTo(side)) {
continue;
}
- j = GT_Utility.getOppositeSide(i);
- final TileEntity tTileEntity = emitterTile.getTileEntityAtSide(i);
+ final ForgeDirection oppositeSide = side.getOpposite();
+ final TileEntity tTileEntity = emitterTile.getTileEntityAtSide(side);
if (tTileEntity instanceof PowerLogicHost host) {
- PowerLogic logic = host.getPowerLogic(ForgeDirection.getOrientation(j));
+ final PowerLogic logic = host.getPowerLogic(oppositeSide);
if (logic == null || logic.isEnergyReceiver()) {
continue;
}