From b2c8cfb4ec8b82337a95f51364277964ec968b52 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Mon, 1 May 2023 02:45:56 -0700 Subject: ForgeDirection (#608) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ForgeDirection WIP * Fix GTPP_Render_MachineBlock Fix handling of getTexture with facing mask for pipes Kill a bunch of magic numbers * spotlessApply (#612) Co-authored-by: GitHub GTNH Actions <> * Bump bw/tt deps --------- Co-authored-by: Léa Gris Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../gtPlusPlus/api/interfaces/IGregtechPower.java | 26 +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java') diff --git a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java index 205ff05dc1..f121926005 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java +++ b/src/main/java/gtPlusPlus/api/interfaces/IGregtechPower.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.IDescribable; import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; @@ -41,7 +42,7 @@ public abstract interface IGregtechPower public boolean increaseStoredEnergyUnits(long p0, boolean p1); @Override - public boolean drainEnergyUnits(byte p0, long p1, long p2); + public boolean drainEnergyUnits(ForgeDirection side, long p1, long p2); @Override public long getAverageElectricInput(); @@ -65,10 +66,10 @@ public abstract interface IGregtechPower public boolean increaseStoredSteam(long p0, boolean p1); @Override - public Block getBlockAtSide(byte p0); + public Block getBlockAtSide(ForgeDirection side); @Override - public Block getBlockAtSideAndDistance(byte p0, int p1); + public Block getBlockAtSideAndDistance(ForgeDirection side, int p1); @Override public Block getBlockOffset(int p0, int p1, int p2); @@ -77,10 +78,10 @@ public abstract interface IGregtechPower public TileEntity getTileEntity(int p0, int p1, int p2); @Override - public TileEntity getTileEntityAtSide(byte p0); + public TileEntity getTileEntityAtSide(ForgeDirection side); @Override - public TileEntity getTileEntityAtSideAndDistance(byte p0, int p1); + public TileEntity getTileEntityAtSideAndDistance(ForgeDirection side, int p1); @Override public TileEntity getTileEntityOffset(int p0, int p1, int p2); @@ -116,19 +117,19 @@ public abstract interface IGregtechPower public void writeToNBT(NBTTagCompound p0); @Override - public boolean acceptsRotationalEnergy(byte p0); + public boolean acceptsRotationalEnergy(ForgeDirection side); @Override - public boolean injectRotationalEnergy(byte p0, long p1, long p2); + public boolean injectRotationalEnergy(ForgeDirection side, long p1, long p2); @Override - public long injectEnergyUnits(byte p0, long p1, long p2); + public long injectEnergyUnits(ForgeDirection side, long p1, long p2); @Override - public boolean inputEnergyFrom(byte p0); + public boolean inputEnergyFrom(ForgeDirection side); @Override - public boolean outputsEnergyTo(byte p0); + public boolean outputsEnergyTo(ForgeDirection side); @Override public String[] getInfoData(); @@ -138,9 +139,4 @@ public abstract interface IGregtechPower return true; } - /* - * boolean onPreTick(TilePoweredGT tilePoweredGT, long mTickTimer2); boolean onTick(TilePoweredGT - * iGregTechTileEntity, long mTickTimer2); boolean onPostTick(TilePoweredGT iGregTechTileEntity, long mTickTimer2); - */ - } -- cgit