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> --- .../basic/GT_MetaTileEntity_CropHarvestor.java | 21 ++++--- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 26 +++++---- .../GregtechMetaAtmosphericReconditioner.java | 18 +++--- .../machines/basic/GregtechMetaCondensor.java | 17 +++--- .../basic/GregtechMetaGarbageCollector.java | 36 ++++++------ .../basic/GregtechMetaPollutionCreator.java | 36 ++++++------ .../basic/GregtechMetaPollutionDetector.java | 58 +++++++++---------- .../basic/GregtechMetaTileEntityChunkLoader.java | 26 +++++---- ...GregtechMetaTileEntityThaumcraftResearcher.java | 38 +++++++------ .../basic/GregtechMetaTileEntity_AutoChisel.java | 8 +-- .../basic/GregtechMetaTileEntity_BasicWasher.java | 6 +- .../GregtechMetaTileEntity_ChemicalReactor.java | 60 ++++++++------------ ...regtechMetaTileEntity_CompactFusionReactor.java | 65 +++++++++++----------- .../basic/GregtechMetaTileEntity_PocketFusion.java | 65 +++++++++++----------- .../GregtechMetaTileEntity_ReactorColdTrap.java | 6 +- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 6 +- .../basic/GregtechMetaWirelessCharger.java | 42 +++++++------- .../multi/misc/GregtechMTE_TeslaTower.java | 4 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 7 +++ ...regtechMetaTileEntity_IndustrialArcFurnace.java | 4 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 3 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 11 +++- ...echMetaTileEntity_IndustrialCuttingMachine.java | 3 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 9 ++- ...GregtechMetaTileEntity_IndustrialMacerator.java | 6 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 3 +- ...aTileEntity_IndustrialMolecularTransformer.java | 7 +++ ...gtechMetaTileEntity_IndustrialMultiMachine.java | 3 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 3 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 10 ++-- .../GregtechMetaTileEntity_IndustrialSinter.java | 27 ++++----- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 8 +++ ...GregtechMetaTileEntity_IndustrialWashPlant.java | 10 ++-- .../GregtechMetaTileEntity_IndustrialWireMill.java | 3 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 30 +++++----- .../processing/GregtechMetaTileEntity_IsaMill.java | 10 ++-- .../GregtechMetaTileEntity_SpargeTower.java | 2 +- ...egtechMetaTileEntity_Adv_DistillationTower.java | 9 ++- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 10 +++- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 8 ++- .../GregtechMetaTileEntity_Adv_Fusion_MK5.java | 8 ++- .../GregtechMetaTileEntity_Adv_Implosion.java | 9 +++ .../GregtechMetaTileEntity_SteamCompressor.java | 1 + .../GregtechMetaTileEntity_SteamMacerator.java | 1 + .../multi/production/GT4Entity_AutoCrafter.java | 1 + .../multi/production/GT4Entity_ThermalBoiler.java | 1 + .../GregtechMTE_ElementalDuplicator.java | 13 ++++- .../production/GregtechMTE_FastNeutronReactor.java | 4 +- .../production/GregtechMTE_FrothFlotationCell.java | 5 +- .../production/GregtechMTE_LargeNaqReactor.java | 2 +- .../production/GregtechMTE_MiniFusionPlant.java | 14 ++--- .../production/GregtechMTE_NuclearReactor.java | 13 +++-- .../production/GregtechMetaTileEntityTreeFarm.java | 1 + .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 3 +- .../GregtechMetaTileEntity_Cyclotron.java | 5 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 9 +-- ...techMetaTileEntity_LargeSemifluidGenerator.java | 1 + .../GregtechMetaTileEntity_MassFabricator.java | 3 +- ...techMetaTileEntity_QuantumForceTransformer.java | 14 ++--- .../GregtechMetaTileEntity_Refinery.java | 1 + .../GregtechMetaTileEntity_SolarTower.java | 13 +++-- .../algae/GregtechMTE_AlgaePondBase.java | 14 ++--- ...chMetaTileEntity_BedrockMiningPlatformBase.java | 20 ++++--- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 12 ++-- .../turbines/GT_MTE_LargeTurbine_Gas.java | 1 + .../turbines/GT_MTE_LargeTurbine_Plasma.java | 1 + .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 8 ++- .../turbines/GT_MTE_LargeTurbine_Steam.java | 9 ++- .../GregtechMetaTileEntity_LargerTurbineBase.java | 19 ++++--- .../storage/GregtechMetaTileEntity_MultiTank.java | 8 +-- ...chMetaTileEntity_PowerSubStationController.java | 18 +++--- 71 files changed, 539 insertions(+), 417 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java index 1b12b6cb41..9dc531edd9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java @@ -11,6 +11,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import com.gtnewhorizon.gtnhlib.util.map.ItemStackMap; import com.gtnewhorizons.modularui.api.screen.ModularWindow; @@ -87,7 +88,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank } @Override - public boolean isInputFacing(byte aSide) { + public boolean isInputFacing(ForgeDirection side) { return true; } @@ -485,12 +486,14 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank } @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { return aStack != null && aIndex >= SLOT_OUTPUT_START && aIndex < this.getSizeInventory(); } @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { if (aStack != null) { if (aStack.getItem().getUnlocalizedName().equals("ic2.itemFertilizer")) { return aIndex >= SLOT_FERT_1 && aIndex <= SLOT_FERT_4; @@ -515,7 +518,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank } @Override - public boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { return true; } @@ -550,16 +553,16 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank } @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - if (aSide == 0 || aSide == 1) { + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + if (side == ForgeDirection.DOWN || side == ForgeDirection.UP) { return this.mTextures[3][aColorIndex + 1]; } else { return this.mTextures[4][aColorIndex + 1]; } /* - * return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide == - * GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1]; + * return this.mTextures[(aActive ? 5 : 0) + (side == facing ? 0 : aSide == GT_Utility.getOppositeSide(aFacing) + * ? 1 : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + 1]; */ } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java index 9c7ab14e89..9a26ea57ec 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java @@ -92,22 +92,26 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered } @Override - public ITexture[] getTexture(IGregTechTileEntity pBaseMetaTileEntity, byte pSide, byte pFacing, byte pColorIndex, - boolean pActive, boolean pRedstone) { - if (mMode == 0) return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], (pSide < 2) + public ITexture[] getTexture(IGregTechTileEntity pBaseMetaTileEntity, ForgeDirection side, ForgeDirection sacing, + int pColorIndex, boolean pActive, boolean pRedstone) { + if (mMode == 0) return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], + (side.offsetY != 0) ? null + : pActive ? new GT_RenderedTexture(_mGTIco_Norm_Active) + : new GT_RenderedTexture(_mGTIco_Norm_Idle) }; + else return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], (side.offsetY != 0) ? null - : pActive ? new GT_RenderedTexture(_mGTIco_Norm_Active) : new GT_RenderedTexture(_mGTIco_Norm_Idle) }; - else return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], (pSide < 2) ? null : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle) }; } @Override - public boolean allowPullStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, byte pSide, ItemStack pStack) { + public boolean allowPullStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side, + ItemStack pStack) { return false; } @Override - public boolean allowPutStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, byte pSide, ItemStack pStack) { + public boolean allowPutStack(IGregTechTileEntity pBaseMetaTileEntity, int pIndex, ForgeDirection side, + ItemStack pStack) { return false; } @@ -136,7 +140,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered } @Override - public boolean isFacingValid(byte aFacing) { + public boolean isFacingValid(ForgeDirection facing) { return true; } @@ -146,7 +150,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered } @Override - public boolean isInputFacing(byte aSide) { + public boolean isInputFacing(ForgeDirection side) { return true; } @@ -178,7 +182,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered private static String[] mModeStr = { "Blocks", "TileEntities" }; @Override - public void onScrewdriverRightClick(byte pSide, EntityPlayer pPlayer, float pX, float pY, float pZ) { + public void onScrewdriverRightClick(ForgeDirection pSide, EntityPlayer pPlayer, float pX, float pY, float pZ) { mMode = (byte) (mMode == 0x00 ? 0x01 : 0x00); markDirty(); PlayerUtils.messagePlayer(pPlayer, String.format("Switched mode to: %s", mModeStr[mMode])); @@ -220,7 +224,7 @@ public class GT_MetaTileEntity_WorldAccelerator extends GT_MetaTileEntity_Tiered if (!pBaseMetaTileEntity.isActive()) getBaseMetaTileEntity().setActive(true); for (ForgeDirection tDir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity tTile = pBaseMetaTileEntity.getTileEntityAtSide((byte) tDir.ordinal()); + TileEntity tTile = pBaseMetaTileEntity.getTileEntityAtSide(tDir); if (isTEBlackListed(tTile)) continue; long tMaxTime = System.nanoTime() + 1000000; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java index 2d734b5bf9..0e8106dd2a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; +import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.ArrayUtils; @@ -739,7 +740,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } @Override - public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) { + public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { if (aIndex == SLOT_FILTER) { if (aStack.getItem() instanceof ItemAirFilter) { Logger.INFO("Inserting Air Filter into " + aIndex); @@ -758,17 +759,16 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } } } - // return super.canInsertItem(aIndex, aStack, aSide); return false; } @Override - public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { + super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } - public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, - float aZ) { + public boolean onSolderingToolRightclick(ForgeDirection side, byte aWrenchingSide, EntityPlayer aPlayer, float aX, + float aY, float aZ) { this.mSaveRotor = Utils.invertBoolean(mSaveRotor); if (mSaveRotor) { PlayerUtils.messagePlayer(aPlayer, "Running in low efficiency mode, rotors will not break."); @@ -843,11 +843,11 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } @Override - public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCoverID) { - if (aSide <= 1) { + public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCoverID) { + if (side.offsetY != 0) { return false; } - return super.allowCoverOnSide(aSide, aCoverID); + return super.allowCoverOnSide(side, aCoverID); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java index 8ec6408ba3..1ff0f8eef6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java @@ -95,20 +95,19 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd this.mTemperature -= 1; this.mLossTimer = 0; } - for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte) (i + 1)) { - if (i != aBaseMetaTileEntity.getFrontFacing()) { - final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i); + for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { + if (this.mSteam == null) break; + if (side != aBaseMetaTileEntity.getFrontFacing()) { + final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(side); if (tTileEntity != null) { final FluidStack tDrained = aBaseMetaTileEntity - .drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false); + .drain(side, Math.max(1, this.mSteam.amount / 2), false); if (tDrained != null) { - final int tFilledAmount = tTileEntity - .fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false); + final int tFilledAmount = tTileEntity.fill(side.getOpposite(), tDrained, false); if (tFilledAmount > 0) { tTileEntity.fill( - ForgeDirection.getOrientation(i).getOpposite(), - aBaseMetaTileEntity - .drain(ForgeDirection.getOrientation(i), tFilledAmount, true), + side.getOpposite(), + aBaseMetaTileEntity.drain(side, tFilledAmount, true), true); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java index de4d8f1890..e815a622d9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java @@ -4,13 +4,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -57,11 +57,13 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity { } @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 - : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex - + 1]; + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + return this.mTextures[(aActive ? 5 : 0) + + (side == facing ? 0 + : side == facing.getOpposite() ? 1 + : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + + 1]; } public ITexture[] getFront(final byte aColor) { @@ -115,14 +117,14 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity { } @Override - public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (mFrequency < 180) { mFrequency += 5; } else { mFrequency = 5; } PlayerUtils.messagePlayer(aPlayer, "Running every " + mFrequency + " minutes."); - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } @Override @@ -146,7 +148,7 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity { } @Override - public boolean isFacingValid(final byte aFacing) { + public boolean isFacingValid(final ForgeDirection facing) { return true; } @@ -161,13 +163,13 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity { } @Override - public boolean isInputFacing(final byte aSide) { - return aSide != this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isInputFacing(final ForgeDirection side) { + return side != this.getBaseMetaTileEntity().getFrontFacing(); } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getFrontFacing(); } @Override @@ -263,14 +265,14 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity { } @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { + public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { return false; } @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { + public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java index eaa0878cd8..0c0e9664b5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java @@ -4,13 +4,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; @@ -60,11 +60,13 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { } @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 - : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex - + 1]; + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + return this.mTextures[(aActive ? 5 : 0) + + (side == facing ? 0 + : side == facing.getOpposite() ? 1 + : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + + 1]; } public ITexture[] getFront(final byte aColor) { @@ -118,14 +120,14 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { } @Override - public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (pollutionMultiplier > 99) { pollutionMultiplier = 1; } else { pollutionMultiplier++; } PlayerUtils.messagePlayer(aPlayer, "Pollution Mutliplier is now " + pollutionMultiplier + "."); - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } @Override @@ -154,7 +156,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { } @Override - public boolean isFacingValid(final byte aFacing) { + public boolean isFacingValid(final ForgeDirection facing) { return true; } @@ -169,13 +171,13 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { } @Override - public boolean isInputFacing(final byte aSide) { - return aSide != this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isInputFacing(final ForgeDirection side) { + return side != this.getBaseMetaTileEntity().getFrontFacing(); } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getFrontFacing(); } @Override @@ -282,14 +284,14 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { } @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { + public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { return false; } @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { + public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java index bcb3abbc57..0c75d91a1b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -46,9 +47,9 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { } @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - return aSide == aFacing + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + return side == facing ? new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Screen_Frequency) } : new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Dimensional), @@ -75,9 +76,9 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { /* * @Override public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final - * byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) { return - * this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : - * aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1]; } + * byte aFacing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { return + * this.mTextures[(aActive ? 5 : 0) + (side == facing ? 0 : side == facing.getOpposite() ? 1 : side == + * ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + 1]; } */ public ITexture[] getFront(final byte aColor) { @@ -156,7 +157,7 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { } @Override - public boolean isFacingValid(final byte aFacing) { + public boolean isFacingValid(final ForgeDirection facing) { return true; } @@ -171,13 +172,13 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { } @Override - public boolean isInputFacing(final byte aSide) { - return aSide != this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isInputFacing(final ForgeDirection side) { + return side != this.getBaseMetaTileEntity().getFrontFacing(); } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getFrontFacing(); } @Override @@ -274,14 +275,14 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { } @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { + public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { return false; } @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { + public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { return false; } @@ -407,8 +408,8 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { super.onFirstTick(aBaseMetaTileEntity); } - public boolean allowCoverOnSide(final byte aSide, final int aCoverID) { - return aSide != this.getBaseMetaTileEntity().getFrontFacing(); + public boolean allowCoverOnSide(final ForgeDirection side, final int aCoverID) { + return side != this.getBaseMetaTileEntity().getFrontFacing(); } @Override @@ -421,13 +422,13 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { } // Emit Redstone if (this.getCurrentChunkPollution() >= this.mRedstoneLevel) { - for (int i = 0; i < 6; i++) { - this.getBaseMetaTileEntity().setStrongOutputRedstoneSignal((byte) i, (byte) 16); + for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { + this.getBaseMetaTileEntity().setStrongOutputRedstoneSignal(side, (byte) 16); } this.markDirty(); } else { - for (int i = 0; i < 6; i++) { - this.getBaseMetaTileEntity().setStrongOutputRedstoneSignal((byte) i, (byte) 0); + for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { + this.getBaseMetaTileEntity().setStrongOutputRedstoneSignal(side, (byte) 0); } this.markDirty(); } @@ -450,10 +451,10 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { } @Override - public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (aSide == this.getBaseMetaTileEntity().getFrontFacing()) { - final float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ); + if (side == this.getBaseMetaTileEntity().getFrontFacing()) { + final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { case 0: this.mRedstoneLevel -= 5000; @@ -471,9 +472,10 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone at Pollution Level: " + this.mRedstoneLevel); } - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } + @Override public boolean allowGeneralRedstoneOutput() { if (this.getCurrentChunkPollution() >= this.mRedstoneLevel) { this.markDirty(); @@ -483,9 +485,9 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { } @Override - public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, - float aY, float aZ) { - return super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ); + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side, + float aX, float aY, float aZ) { + return super.onRightclick(aBaseMetaTileEntity, aPlayer, side, aX, aY, aZ); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java index 72a287e7dd..84cef090fc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java @@ -15,6 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.ChunkCoordIntPair; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager.Ticket; +import net.minecraftforge.common.util.ForgeDirection; import com.google.common.collect.MapMaker; @@ -25,7 +26,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.chunkloading.GTPP_ChunkManager; import gtPlusPlus.core.lib.CORE; @@ -111,11 +111,13 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa } @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 - : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex - + 1]; + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + return this.mTextures[(aActive ? 5 : 0) + + (side == facing ? 0 + : side == facing.getOpposite() ? 1 + : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + + 1]; } public ITexture[] getFront(final byte aColor) { @@ -179,8 +181,8 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa } @Override - public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { + super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } @Override @@ -195,14 +197,14 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa } @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { + public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { return false; } @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { + public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java index 21dbbe25f4..e25ebb5daa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityThaumcraftResearcher.java @@ -3,12 +3,12 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -48,11 +48,13 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile } @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 - : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex - + 1]; + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + return this.mTextures[(aActive ? 5 : 0) + + (side == facing ? 0 + : side == facing.getOpposite() ? 1 + : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + + 1]; } public ITexture[] getFront(final byte aColor) { @@ -100,8 +102,8 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile } @Override - public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); + public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { + super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } @Override @@ -130,7 +132,7 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile } @Override - public boolean isFacingValid(final byte aFacing) { + public boolean isFacingValid(final ForgeDirection facing) { return true; } @@ -145,13 +147,13 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile } @Override - public boolean isInputFacing(final byte aSide) { - return aSide != this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isInputFacing(final ForgeDirection side) { + return side != this.getBaseMetaTileEntity().getFrontFacing(); } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getBackFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getBackFacing(); } @Override @@ -208,14 +210,14 @@ public class GregtechMetaTileEntityThaumcraftResearcher extends GregtechMetaTile } @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { - return aSide == this.getBaseMetaTileEntity().getBackFacing(); + public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { + return side == this.getBaseMetaTileEntity().getBackFacing(); } @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, final byte aSide, - final ItemStack aStack) { + public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, + final ForgeDirection side, final ItemStack aStack) { return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java index 5952f1f220..d14121e116 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_AutoChisel.java @@ -3,8 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import java.util.List; import net.minecraft.item.ItemStack; - -import team.chisel.carving.Carving; +import net.minecraftforge.common.util.ForgeDirection; import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.math.Pos2d; @@ -25,6 +24,7 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import team.chisel.carving.Carving; public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMachine { @@ -103,10 +103,10 @@ public class GregtechMetaTileEntity_AutoChisel extends GT_MetaTileEntity_BasicMa } @Override - protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, + protected boolean allowPutStackValidated(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { return hasValidCache(aStack, this.getSpecialSlot(), false) ? true - : super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, aSide, aStack) && hasChiselResults(aStack); + : super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, side, aStack) && hasChiselResults(aStack); } // lets make sure the user isn't trying to make something from a block that doesn't have this as a valid target diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java index f7a326aead..f97a831590 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.Textures; @@ -70,8 +71,9 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM } @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { + return (super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack)) && (getRecipeList().containsInput(aStack)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java index c9f188f44f..5e4d6d7348 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java @@ -92,8 +92,9 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba } @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { + return (super.allowPutStack(aBaseMetaTileEntity, aIndex, side, aStack)) && (getRecipeList().containsInput(aStack)); } @@ -113,13 +114,13 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba } @Override - public boolean isLiquidInput(byte aSide) { - return aSide > 1; + public boolean isLiquidInput(ForgeDirection side) { + return side.offsetY == 0; } @Override - public boolean isLiquidOutput(byte aSide) { - return aSide < 2; + public boolean isLiquidOutput(ForgeDirection side) { + return side.offsetY != 0; } @Override @@ -190,19 +191,23 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba * Custom Fluid Handling - TODO */ + @Override public FluidStack getFillableStack() { return this.mFluid; } + @Override public FluidStack setFillableStack(FluidStack aFluid) { this.mFluid = aFluid; return this.mFluid; } + @Override public FluidStack getDrainableStack() { return this.mFluid; } + @Override public FluidStack setDrainableStack(FluidStack aFluid) { this.mFluid = aFluid; return this.mFluid; @@ -277,15 +282,9 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba if (tTank != null) { FluidStack tDrained = this.drain(1000, false); if (tDrained != null) { - int tFilledAmount = tTank.fill( - ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), - tDrained, - false); + int tFilledAmount = tTank.fill(aBaseMetaTileEntity.getBackFacing(), tDrained, false); if (tFilledAmount > 0) { - tTank.fill( - ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), - this.drain(tFilledAmount, true), - true); + tTank.fill(aBaseMetaTileEntity.getBackFacing(), this.drain(tFilledAmount, true), true); } } } @@ -459,8 +458,9 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba } @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return super.allowPullStack(aBaseMetaTileEntity, aIndex, aSide, aStack); + public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { + return super.allowPullStack(aBaseMetaTileEntity, aIndex, side, aStack); } @Override @@ -471,22 +471,6 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba @Override public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPreTick(aBaseMetaTileEntity, aTick); - - /* - * if (aBaseMetaTileEntity != null) { if (!aBaseMetaTileEntity.getWorld().isRemote) { itemslots : for (int - * i=3;i<7;i++) { ItemStack aStack = aBaseMetaTileEntity.getStackInSlot(i); if (aStack != null) { if - * (FluidContainerRegistry.isContainer(aStack)) { if (this.isItemValidForSlot(i, aStack)) { // Add Fluid - * FluidStack aContainerFluid = FluidContainerRegistry.getFluidForFilledItem(aStack); if (aContainerFluid != - * null) { fluidslots : for (FluidStack u : mInputFluids) { if (u != null && u.isFluidEqual(aContainerFluid)) { - * if (u.amount <= (this.getCapacity() - aContainerFluid.amount)) { // Matching, not full, let's fill, then - * continue u.amount += aContainerFluid.amount; // Update stack size if (aStack.stackSize > 1) { - * aStack.stackSize--; } else { aStack = null; } // Add Output container // TODO continue itemslots; } else { // - * Too full break fluidslots; } } else { if (u == null ) { // Empty, let's fill, then continue u = - * aContainerFluid.copy(); // Update stack size if (aStack.stackSize > 1) { aStack.stackSize--; } else { aStack - * = null; } // Add Output container // TODO continue itemslots; } else { // Not empty, doesn't match, check - * next slot. continue fluidslots; } } } } // Eat Input // Add Container to Output } } } } } } - */ - } @Override @@ -523,22 +507,22 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba } @Override - public int[] getAccessibleSlotsFromSide(int aSide) { - return super.getAccessibleSlotsFromSide(aSide); + public int[] getAccessibleSlotsFromSide(int ordinalSide) { + return super.getAccessibleSlotsFromSide(ordinalSide); } @Override - public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) { + public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { if (aIndex >= 3 && aIndex <= 6) { - return super.canInsertItem(aIndex, aStack, aSide); + return super.canInsertItem(aIndex, aStack, ordinalSide); } return false; } @Override - public boolean canExtractItem(int aIndex, ItemStack aStack, int aSide) { + public boolean canExtractItem(int aIndex, ItemStack aStack, int ordinalSide) { if (aIndex >= 7 && aIndex <= 11) { - return super.canExtractItem(aIndex, aStack, aSide); + return super.canExtractItem(aIndex, aStack, ordinalSide); } return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java index 5de366dfa4..ba84bf6faf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_CompactFusionReactor.java @@ -97,11 +97,13 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti } @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 - : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex - + 1]; + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + return this.mTextures[(aActive ? 5 : 0) + + (side == facing ? 0 + : side == facing.getOpposite() ? 1 + : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + + 1]; } @Override @@ -110,8 +112,8 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getBackFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getBackFacing(); } @Override @@ -269,9 +271,9 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti super.onPreTick(aBaseMetaTileEntity, aTick); onRunningTickMulti(); if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive()) - && (aBaseMetaTileEntity.getFrontFacing() != 1) - && (aBaseMetaTileEntity.getCoverIDAtSide((byte) 1) == 0) - && (!aBaseMetaTileEntity.getOpacityAtSide((byte) 1))) { + && (aBaseMetaTileEntity.getFrontFacing() != ForgeDirection.UP) + && (aBaseMetaTileEntity.getCoverIDAtSide(ForgeDirection.UP) == 0) + && (!aBaseMetaTileEntity.getOpacityAtSide(ForgeDirection.UP))) { if (MathUtils.randInt(0, 4) == 4) { final Random tRandom = aBaseMetaTileEntity.getWorld().rand; aBaseMetaTileEntity.getWorld().spawnParticle( @@ -532,19 +534,19 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti } @Override - public boolean isLiquidInput(byte aSide) { - switch (aSide) { - case 0: + public boolean isLiquidInput(ForgeDirection side) { + switch (side) { + case DOWN: return true; - case 1: + case UP: return true; - case 2: + case NORTH: return true; - case 3: + case SOUTH: return false; - case 4: + case WEST: return false; - case 5: + case EAST: return false; default: return false; @@ -552,19 +554,19 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti } @Override - public boolean isLiquidOutput(byte aSide) { - switch (aSide) { - case 0: + public boolean isLiquidOutput(ForgeDirection side) { + switch (side) { + case DOWN: return false; - case 1: + case UP: return false; - case 2: + case NORTH: return false; - case 3: + case SOUTH: return true; - case 4: + case WEST: return true; - case 5: + case EAST: return true; default: return true; @@ -652,19 +654,20 @@ public class GregtechMetaTileEntity_CompactFusionReactor extends GT_MetaTileEnti } @Override - public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, - float aY, float aZ) { + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side, + float aX, float aY, float aZ) { // TODO Auto-generated method stub - return super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ); + return super.onRightclick(aBaseMetaTileEntity, aPlayer, side, aX, aY, aZ); } @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { return false; } @Override - public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) { + public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java index 03618b587b..7a16d0affa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java @@ -98,11 +98,13 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux } @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 - : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex - + 1]; + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + return this.mTextures[(aActive ? 5 : 0) + + (side == facing ? 0 + : side == facing.getOpposite() ? 1 + : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex + + 1]; } @Override @@ -111,8 +113,8 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getBackFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getBackFacing(); } @Override @@ -272,9 +274,9 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux super.onPreTick(aBaseMetaTileEntity, aTick); onRunningTickMulti(); if ((aBaseMetaTileEntity.isClientSide()) && (aBaseMetaTileEntity.isActive()) - && (aBaseMetaTileEntity.getFrontFacing() != 1) - && (aBaseMetaTileEntity.getCoverIDAtSide((byte) 1) == 0) - && (!aBaseMetaTileEntity.getOpacityAtSide((byte) 1))) { + && (aBaseMetaTileEntity.getFrontFacing() != ForgeDirection.UP) + && (aBaseMetaTileEntity.getCoverIDAtSide(ForgeDirection.UP) == 0) + && (!aBaseMetaTileEntity.getOpacityAtSide(ForgeDirection.UP))) { if (MathUtils.randInt(0, 4) == 4) { final Random tRandom = aBaseMetaTileEntity.getWorld().rand; aBaseMetaTileEntity.getWorld().spawnParticle( @@ -535,19 +537,19 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux } @Override - public boolean isLiquidInput(byte aSide) { - switch (aSide) { - case 0: + public boolean isLiquidInput(ForgeDirection side) { + switch (side) { + case DOWN: return true; - case 1: + case UP: return true; - case 2: + case NORTH: return true; - case 3: + case SOUTH: return false; - case 4: + case WEST: return false; - case 5: + case EAST: return false; default: return false; @@ -555,19 +557,19 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux } @Override - public boolean isLiquidOutput(byte aSide) { - switch (aSide) { - case 0: + public boolean isLiquidOutput(ForgeDirection side) { + switch (side) { + case DOWN: return false; - case 1: + case UP: return false; - case 2: + case NORTH: return false; - case 3: + case SOUTH: return tru