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> --- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 33 ++++--- ...GT_MetaTileEntity_ElectricInventoryManager.java | 105 +++++++++++---------- .../GT_MetaTileEntity_TesseractGenerator.java | 52 +++++----- .../GT_MetaTileEntity_TesseractTerminal.java | 50 +++++----- .../generators/GT_MetaTileEntity_Boiler_Base.java | 33 ++++--- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 21 ++--- .../generators/GT_MetaTileEntity_RfConvertor.java | 51 +++++----- .../GT_MetaTileEntity_SemiFluidGenerator.java | 12 ++- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 5 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 6 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 5 +- .../GregtechMetaTileEntitySolarGenerator.java | 8 +- .../generators/GregtechMetaTileEntity_RTG.java | 8 +- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 1 + .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 1 + .../creative/GregtechMetaCreativeEnergyBuffer.java | 19 ++-- .../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 ++-- .../misc/GT_TileEntity_ComputerCube.java | 18 ++-- .../tileentities/misc/TileEntitySolarHeater.java | 32 ++++--- .../redstone/GT_MetaTileEntity_RedstoneBase.java | 17 ++-- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 78 +++++++-------- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 99 ++++++++++--------- .../redstone/GT_MetaTileEntity_RedstoneLamp.java | 5 +- .../GT_MetaTileEntity_RedstoneStrengthDisplay.java | 30 +++--- .../GT_MetaTileEntity_RedstoneStrengthScale.java | 20 ++-- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 23 +++-- .../GT_MetaTileEntity_BronzeCraftingTable.java | 6 +- .../GT_MetaTileEntity_ConnectableCrate.java | 44 ++++++--- .../storage/GT_MetaTileEntity_TieredChest.java | 32 +++++-- .../storage/GT_MetaTileEntity_TieredTank.java | 9 +- .../storage/GregtechMetaEnergyBuffer.java | 41 ++++---- .../GT_MetaTileEntity_InfiniteItemHolder.java | 8 +- .../storage/shelving/GT4Entity_Shelf.java | 35 +++---- .../shelving/GT4Entity_Shelf_Compartment.java | 5 +- .../storage/shelving/GT4Entity_Shelf_Desk.java | 4 + .../shelving/GT4Entity_Shelf_FileCabinet.java | 9 +- .../storage/shelving/GT4Entity_Shelf_Iron.java | 5 + .../storage/shelving/GT4Entity_Shelf_Large.java | 21 +++-- 108 files changed, 1064 insertions(+), 843 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java index 0fa6340fd1..c3522a1a0a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import com.gtnewhorizons.modularui.api.screen.ModularWindow; @@ -80,7 +81,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } @Override - public boolean isFacingValid(byte aFacing) { + public boolean isFacingValid(ForgeDirection facing) { return true; } @@ -95,13 +96,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } @Override - public boolean isInputFacing(byte aSide) { - return !isOutputFacing(aSide); + public boolean isInputFacing(ForgeDirection side) { + return !isOutputFacing(side); } @Override - public boolean isOutputFacing(byte aSide) { - return aSide == getBaseMetaTileEntity().getBackFacing(); + public boolean isOutputFacing(ForgeDirection side) { + return side == getBaseMetaTileEntity().getBackFacing(); } @Override @@ -195,8 +196,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } @Override - public boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack) { - return aSide != getBaseMetaTileEntity().getFrontFacing() && aSide != getBaseMetaTileEntity().getBackFacing(); + public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + return side != getBaseMetaTileEntity().getFrontFacing() && side != getBaseMetaTileEntity().getBackFacing(); } private void switchMode() { @@ -708,12 +709,14 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { return mMode == 0 ? aIndex >= 10 : aIndex >= 18; } @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { return mMode == 0 ? aIndex < 9 : aIndex < 18; } @@ -758,19 +761,15 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, - final byte aColorIndex, final boolean aActive, final boolean aRedstone) { - if (aSide == aFacing) { + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + if (side == facing) { return this.mTextures[0][aColorIndex + 1]; - } else if (GT_Utility.getOppositeSide(aSide) == aFacing) { + } else if (side.getOpposite() == facing) { return this.mTextures[1][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]; - */ } public ITexture[] getFront(final byte aColor) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java index d5336b8e3d..e797810ab8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java @@ -1,11 +1,19 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.automation; +import static net.minecraftforge.common.util.ForgeDirection.DOWN; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.UP; +import static net.minecraftforge.common.util.ForgeDirection.WEST; + import java.util.ArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import com.gtnewhorizons.modularui.api.ModularUITextures; @@ -74,7 +82,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit } @Override - public boolean isFacingValid(byte aFacing) { + public boolean isFacingValid(ForgeDirection facing) { return true; } @@ -124,14 +132,14 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit } @Override - public boolean isInputFacing(byte aSide) { - return !isOutputFacing(aSide); + public boolean isInputFacing(ForgeDirection side) { + return !isOutputFacing(side); } @Override - public boolean isOutputFacing(byte aSide) { + public boolean isOutputFacing(ForgeDirection side) { for (int i = 0; i < mSlotRange.length; i++) { - if (aSide == getRangeDirection(i) && getRangeEnergy(i)) { + if (side == getRangeDirection(i) && getRangeEnergy(i)) { return true; } } @@ -211,20 +219,20 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit mSlotRange[aIndex] = (mSlotRange[aIndex] & ~32768) | ((mSlotRange[aIndex] & 32768) > 0 ? 0 : 32768); } - public byte getRangeDirection(int aIndex) { - return (byte) (mSlotRange[aIndex] & 7); + public ForgeDirection getRangeDirection(int aIndex) { + return ForgeDirection.getOrientation(mSlotRange[aIndex] & 7); } - public byte getSlot1Direction(int aIndex) { - return (byte) ((mSlotRange[aIndex] & 112) >> 4); + public ForgeDirection getSlot1Direction(int aIndex) { + return ForgeDirection.getOrientation((mSlotRange[aIndex] & 112) >> 4); } - public byte getSlot2Direction(int aIndex) { - return (byte) ((mSlotRange[aIndex] & 896) >> 7); + public ForgeDirection getSlot2Direction(int aIndex) { + return ForgeDirection.getOrientation((mSlotRange[aIndex] & 896) >> 7); } - public byte getSlot3Direction(int aIndex) { - return (byte) ((mSlotRange[aIndex] & 7168) >> 10); + public ForgeDirection getSlot3Direction(int aIndex) { + return ForgeDirection.getOrientation((mSlotRange[aIndex] & 7168) >> 10); } public boolean getRangeEnergy(int aIndex) { @@ -253,17 +261,17 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit || getBaseMetaTileEntity().hasInventoryBeenModified())) { mWorkedLastTick = false; - IInventory[] tTileEntities = new IInventory[] { getBaseMetaTileEntity().getIInventoryAtSide((byte) 0), - getBaseMetaTileEntity().getIInventoryAtSide((byte) 1), - getBaseMetaTileEntity().getIInventoryAtSide((byte) 2), - getBaseMetaTileEntity().getIInventoryAtSide((byte) 3), - getBaseMetaTileEntity().getIInventoryAtSide((byte) 4), - getBaseMetaTileEntity().getIInventoryAtSide((byte) 5), null, null }; + IInventory[] tTileEntities = new IInventory[] { getBaseMetaTileEntity().getIInventoryAtSide(DOWN), + getBaseMetaTileEntity().getIInventoryAtSide(UP), getBaseMetaTileEntity().getIInventoryAtSide(NORTH), + getBaseMetaTileEntity().getIInventoryAtSide(SOUTH), + getBaseMetaTileEntity().getIInventoryAtSide(WEST), + getBaseMetaTileEntity().getIInventoryAtSide(EAST), null, null }; int tCost = 0; for (int i = 0; i < 4; i++) { - if (tTileEntities[getRangeDirection(i)] != null) { + final int ordinalRangeDirection = getRangeDirection(i).ordinal(); + if (tTileEntities[ordinalRangeDirection] != null) { ArrayList tList = new ArrayList(); ItemStack tStack; tList.add(null); @@ -272,7 +280,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit if (tStack == null) { if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getSlot1Direction(i), getSlot1Direction(i), null, @@ -282,7 +290,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit (byte) 64, (byte) 1); else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getBaseMetaTileEntity(), getSlot1Direction(i), getSlot1Direction(i), @@ -296,7 +304,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit tList.set(0, tStack); if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getSlot1Direction(i), getSlot1Direction(i), tList, @@ -306,7 +314,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit (byte) 64, (byte) 1); else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getBaseMetaTileEntity(), getSlot1Direction(i), getSlot1Direction(i), @@ -322,7 +330,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit if (tStack == null) { if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getSlot2Direction(i), getSlot2Direction(i), null, @@ -332,7 +340,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit (byte) 64, (byte) 1); else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getBaseMetaTileEntity(), getSlot2Direction(i), getSlot2Direction(i), @@ -346,7 +354,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit tList.set(0, tStack); if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getSlot2Direction(i), getSlot2Direction(i), tList, @@ -356,7 +364,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit (byte) 64, (byte) 1); else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getBaseMetaTileEntity(), getSlot2Direction(i), getSlot2Direction(i), @@ -372,7 +380,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit if (tStack == null) { if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getSlot3Direction(i), getSlot3Direction(i), null, @@ -382,7 +390,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit (byte) 64, (byte) 1); else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getBaseMetaTileEntity(), getSlot3Direction(i), getSlot3Direction(i), @@ -396,7 +404,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit tList.set(0, tStack); if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getSlot3Direction(i), getSlot3Direction(i), tList, @@ -406,7 +414,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit (byte) 64, (byte) 1); else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], + tTileEntities[ordinalRangeDirection], getBaseMetaTileEntity(), getSlot3Direction(i), getSlot3Direction(i), @@ -432,25 +440,20 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit return new String[] { "It's simpler than you think. I promise.", this.mDescription, CORE.GT_Tooltip.get() }; } - /* - * @Override public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { switch - * (aSide) { case 0: return 113 + (aRedstone?8:0); case 1: return 112 + (aRedstone?8:0); case 2: return 116 + - * (aRedstone?8:0); case 3: return 213 + (aRedstone?8:0); case 4: return 212 + (aRedstone?8:0); case 5: return 117 + - * (aRedstone?8:0); } return 0; } - */ - @Override - public boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { return false; } @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { return true; } @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { return true; } @@ -475,9 +478,9 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit } @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[!aRedstone ? aSide : aSide + 6][aColorIndex < 0 ? 0 : aColorIndex]; + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, + final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { + return this.mTextures[!aRedstone ? side.ordinal() : side.ordinal() + 6][aColorIndex < 0 ? 0 : aColorIndex]; } public ITexture[] getBottom(final byte aColor) { @@ -642,21 +645,21 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit for (int i = 0; i < mTargetDirections.length; i++) { final int index = i; - builder.widget(new FakeSyncWidget.ByteSyncer(() -> { + builder.widget(new FakeSyncWidget.IntegerSyncer(() -> { if (index % 3 == 0) { - return getSlot1Direction(index / 3); + return getSlot1Direction(index / 3).ordinal(); } else if (index % 3 == 1) { - return getSlot2Direction(index / 3); + return getSlot2Direction(index / 3).ordinal(); } else { - return getSlot3Direction(index / 3); + return getSlot3Direction(index / 3).ordinal(); } }, val -> mTargetDirections[index] = val)); } for (int i = 0; i < mRangeDirections.length; i++) { final int index = i; builder.widget( - new FakeSyncWidget.ByteSyncer( - () -> getRangeDirection(index), + new FakeSyncWidget.IntegerSyncer( + () -> getRangeDirection(index).ordinal(), val -> mRangeDirections[index] = val)); } for (int i = 0; i < mTargetInOut.length; i++) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index 2fc239d14b..af20b51c20 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -76,7 +76,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi } @Override - public boolean isFacingValid(final byte aFacing) { + public boolean isFacingValid(final ForgeDirection facing) { return true; } @@ -91,13 +91,13 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi } @Override - public boolean isInputFacing(final byte aSide) { + public boolean isInputFacing(final ForgeDirection side) { return true; } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getBackFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getBackFacing(); } @Override @@ -187,7 +187,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer, - final byte aSide, final float aX, final float aY, final float aZ) { + final ForgeDirection side, final float aX, final float aY, final float aZ) { if (this.mOwner == null) { if (this.getBaseMetaTileEntity().getOwnerName() != null @@ -199,9 +199,9 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi } } - if (aSide == this.getBaseMetaTileEntity().getFrontFacing()) { + if (side == this.getBaseMetaTileEntity().getFrontFacing()) { if (aPlayer.getUniqueID().compareTo(this.mOwner) == 0) { - final float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ); + 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: Logger.WARNING("Freq. -1 | " + this.mFrequency); @@ -237,11 +237,11 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi } @Override - public void onScrewdriverRightClick(final byte aSide, final EntityPlayer aPlayer, final float aX, final float aY, - final float aZ) { + public void onScrewdriverRightClick(final ForgeDirection side, final EntityPlayer aPlayer, final float aX, + final float aY, final float aZ) { if (aPlayer.getUniqueID().compareTo(this.mOwner) == 0) { - 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: try { @@ -280,8 +280,8 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi } } - 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 @@ -366,14 +366,14 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi } @Override - public int[] getAccessibleSlotsFromSide(final int aSide) { + public int[] getAccessibleSlotsFromSide(final int ordinalSide) { final IInventory tTileEntity = this.getBaseMetaTileEntity() .getIInventoryAtSide(this.getBaseMetaTileEntity().getBackFacing()); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity().isAllowedToWork())) { return new int[0]; } if ((tTileEntity instanceof ISidedInventory)) { - return ((ISidedInventory) tTileEntity).getAccessibleSlotsFromSide(aSide); + return ((ISidedInventory) tTileEntity).getAccessibleSlotsFromSide(ordinalSide); } final int[] rArray = new int[this.getSizeInventory()]; for (int i = 0; i < this.getSizeInventory(); i++) { @@ -383,27 +383,27 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi } @Override - public boolean canInsertItem(final int aIndex, final ItemStack aStack, final int aSide) { + public boolean canInsertItem(final int aIndex, final ItemStack aStack, final int ordinalSide) { final IInventory tTileEntity = this.getBaseMetaTileEntity() .getIInventoryAtSide(this.getBaseMetaTileEntity().getBackFacing()); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity().isAllowedToWork())) { return false; } if ((tTileEntity instanceof ISidedInventory)) { - return ((ISidedInventory) tTileEntity).canInsertItem(aIndex, aStack, aSide); + return ((ISidedInventory) tTileEntity).canInsertItem(aIndex, aStack, ordinalSide); } return true; } @Override - public boolean canExtractItem(final int aIndex, final ItemStack aStack, final int aSide) { + public boolean canExtractItem(final int aIndex, final ItemStack aStack, final int ordinalSide) { final IInventory tTileEntity = this.getBaseMetaTileEntity() .getIInventoryAtSide(this.getBaseMetaTileEntity().getBackFacing()); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity().isAllowedToWork())) { return false; } if ((tTileEntity instanceof ISidedInventory)) { - return ((ISidedInventory) tTileEntity).canExtractItem(aIndex, aStack, aSide); + return ((ISidedInventory) tTileEntity).canExtractItem(aIndex, aStack, ordinalSide); } return true; } @@ -628,14 +628,14 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi } @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; } @@ -645,9 +645,9 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi } @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), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java index 2cab13f04f..0ecee3b45d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java @@ -65,13 +65,13 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic } @Override - public boolean isFacingValid(final byte aFacing) { + public boolean isFacingValid(final ForgeDirection facing) { return true; } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getBackFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getBackFacing(); } @Override @@ -140,7 +140,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic @Override public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer, - final byte aSide, final float aX, final float aY, final float aZ) { + final ForgeDirection side, final float aX, final float aY, final float aZ) { if (this.mOwner == null) { if (this.getBaseMetaTileEntity().getOwnerName() != null @@ -153,8 +153,8 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic } if (aPlayer.getUniqueID().compareTo(this.mOwner) == 0) { - 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: // Utils.LOG_WARNING("Freq. -1 | " + this.mFrequency); @@ -190,11 +190,11 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic } @Override - public void onScrewdriverRightClick(final byte aSide, final EntityPlayer aPlayer, final float aX, final float aY, - final float aZ) { + public void onScrewdriverRightClick(final ForgeDirection side, final EntityPlayer aPlayer, final float aX, + final float aY, final float aZ) { if (aPlayer.getUniqueID().compareTo(this.mOwner) == 0) { - 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: try { @@ -232,8 +232,8 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic } } - 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(); } public GT_MetaTileEntity_TesseractGenerator getTesseract(final int aFrequency, final boolean aWorkIrrelevant) { @@ -324,30 +324,30 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic } @Override - public int[] getAccessibleSlotsFromSide(final int aSide) { + public int[] getAccessibleSlotsFromSide(final int ordinalSide) { final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity().isAllowedToWork())) { return new int[0]; } - return tTileEntity.getAccessibleSlotsFromSide(aSide); + return tTileEntity.getAccessibleSlotsFromSide(ordinalSide); } @Override - public boolean canInsertItem(final int aIndex, final ItemStack aStack, final int aSide) { + public boolean canInsertItem(final int aIndex, final ItemStack aStack, final int ordinalSide) { final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity().isAllowedToWork())) { return false; } - return tTileEntity.canInsertItem(aIndex, aStack, aSide); + return tTileEntity.canInsertItem(aIndex, aStack, ordinalSide); } @Override - public boolean canExtractItem(final int aIndex, final ItemStack aStack, final int aSide) { + public boolean canExtractItem(final int aIndex, final ItemStack aStack, final int ordinalSide) { final GT_MetaTileEntity_TesseractGenerator tTileEntity = this.getTesseract(this.mFrequency, false); if ((tTileEntity == null) || (!this.getBaseMetaTileEntity().isAllowedToWork())) { return false; } - return tTileEntity.canExtractItem(aIndex, aStack, aSide); + return tTileEntity.canExtractItem(aIndex, aStack, ordinalSide); } @Override @@ -492,14 +492,14 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic } @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; } @@ -509,9 +509,9 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic } @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), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index 43425ec88d..7d58df65b2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -20,7 +20,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; @@ -89,11 +88,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { } @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) { @@ -137,13 +138,13 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide != this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side != this.getBaseMetaTileEntity().getFrontFacing(); } @Override - public boolean isFacingValid(final byte aSide) { - return aSide > 1; + public boolean isFacingValid(final ForgeDirection side) { + return side.offsetY == 0; } // Please find out what I do. @@ -226,12 +227,14 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { } @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { return aIndex == 1 || aIndex == 3; } @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, + ItemStack aStack) { return aIndex == 2; } @@ -279,11 +282,11 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { } @Override - public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCover) { - if (aSide != this.getBaseMetaTileEntity().getFrontFacing()) { + public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) { + if (side != this.getBaseMetaTileEntity().getFrontFacing()) { return true; } - return super.allowCoverOnSide(aSide, aCover); + return super.allowCoverOnSide(side, aCover); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java index 1908b46d4d..9d0bcf4314 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java @@ -61,9 +61,9 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { } @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[aSide >= 2 ? ((byte) (aSide != aFacing ? 2 : 3)) : aSide][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[side.offsetY == 0 ? ((byte) (side != facing ? 2 : 3)) : side.ordinal()][aColorIndex + 1]; } @Override @@ -102,18 +102,17 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { this.mLossTimer = 0; } if (this.mSteam != null) { - final byte i = aBaseMetaTileEntity.getFrontFacing(); - final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i); + final ForgeDirection 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); } } @@ -156,7 +155,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { final boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && (aBaseMetaTileEntity.getBiome().rainfall > 0.0F); this.mProcessingEnergy += (bRain && (aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4)) - || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 + || !aBaseMetaTileEntity.getSkyAtSide(ForgeDirection.UP) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1; } if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && ((aTick % 12L) == 0L)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java index d763490539..7230008645 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java @@ -22,7 +22,6 @@ 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.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.math.MathUtils; @@ -77,9 +76,9 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl } @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, - boolean aActive, boolean aRedstone) { - return mTextures[Math.min(2, aSide) + (aSide == aFacing ? 3 : 0) + (aActive ? 0 : 6)][aColorIndex + 1]; + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, + int aColorIndex, boolean aActive, boolean aRedstone) { + return mTextures[Math.min(2, side.ordinal()) + (side == facing ? 3 : 0) + (aActive ? 0 : 6)][aColorIndex + 1]; } @Override @@ -128,13 +127,13 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl } @Override - public boolean isInputFacing(byte aSide) { - return !isOutputFacing(aSide); + public boolean isInputFacing(ForgeDirection side) { + return !isOutputFacing(side); } @Override - public boolean isOutputFacing(byte aSide) { - return aSide == getBaseMetaTileEntity().getFrontFacing(); + public boolean isOutputFacing(ForgeDirection side) { + return side == getBaseMetaTileEntity().getFrontFacing(); } @Override @@ -149,10 +148,10 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl aBaseMetaTileEntity.setActive(true); } if (this.getEUVar() < this.maxEUStore()) { - for (byte i = 0; i < 6 - && aBaseMetaTileEntity.getStoredEU() < aBaseMetaTileEntity.getEUCapacity(); i++) { - if (isInputFacing(i)) { - receiveEnergy(ForgeDirection.getOrientation(i), Integer.MAX_VALUE, false); + for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { + if (aBaseMetaTileEntity.getStoredEU() >= aBaseMetaTileEntity.getEUCapacity()) break; + if (isInputFacing(side)) { + receiveEnergy(side, Integer.MAX_VALUE, false); } } } @@ -161,14 +160,14 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl } @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; } @@ -196,7 +195,7 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl } @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 (aPlayer.isSneaking()) { byte aTest = (byte) (aCurrentOutputAmperage + 1); if (aTest > 16 || aTest <= 0) { @@ -216,7 +215,7 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl @Override public boolean canConnectEnergy(ForgeDirection from) { - if (isOutputFacing((byte) from.ordinal())) { + if (isOutputFacing(from)) { return false; } return true; @@ -226,11 +225,11 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { // Cannot accept power on the output face. - if (!canConnectEnergy(from) || isOutputFacing((byte) from.ordinal())) { + if (!canConnectEnergy(from) || isOutputFacing(from)) { return 0; } - TileEntity tTileEntity = this.getBaseMetaTileEntity().getTileEntityAtSide((byte) from.ordinal()); + TileEntity tTileEntity = this.getBaseMetaTileEntity().getTileEntityAtSide(from); if (tTileEntity == null) { return 0; } @@ -256,15 +255,13 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl long aRemainingSpace = aMaxEU - aStoredEU; if (aRemainingSpace > 0) { long tEU = 0; + final ForgeDirection toSide = from.getOpposite(); byte aSide = (byte) from.ordinal(); Logger.WARNING("Free: " + aRemainingSpace + "EU"); - if (tTileEntity instanceof IEnergyProvider && ((IEnergyProvider) tTileEntity) - .extractEnergy(ForgeDirection.getOrientation(GT_Utility.getOppositeSide(aSide)), 1, true) - == 1) { - tEU = (long) ((IEnergyProvider) tTileEntity).extractEnergy( - ForgeDirection.getOrientation(GT_Utility.getOppositeSide(aSide)), - (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU, - false); + if (tTileEntity instanceof IEnergyProvider + && ((IEnergyProvider) tTileEntity).extractEnergy(toSide, 1, true) == 1) { + tEU = (long) ((IEnergyProvider) tTileEntity) + .extractEnergy(toSide, (int) maxEUOutput() * 100 / GregTech_API.mRFtoEU, false); Logger.WARNING("Drained from IEnergyProvider Tile: " + (tEU * 100 / GregTech_API.mRFtoEU) + ""); tEU = tEU * GregTech_API.mRFtoEU / 100; } else if (tTileEntity instanceof IEnergyStorage diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java index 9bbd0bf2a0..9410486dff 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; @@ -40,6 +41,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi onConfigLoad(); } + @Override public int getPollution() { return (int) (CORE.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator * CORE.ConfigSwitches.pollutionReleasedByTierSemiFluidGenerator[this.mTier]); @@ -80,16 +82,16 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi } @Override - public boolean isOutputFacing(byte aSide) { - return (aSide == getBaseMetaTileEntity().getFrontFacing()); + public boolean isOutputFacing(ForgeDirection side) { + return (side == getBaseMetaTileEntity().getFrontFacing()); } @Override - public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCover) { - if (aSide != this.getBaseMetaTileEntity().getFrontFacing()) { + public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aCover) { + if (side != this.getBaseMetaTileEntity().getFrontFacing()) { return true; } - return super.allowCoverOnSide(aSide, aCover); + return super.allowCoverOnSide(side, aCover); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java index d183e62db6..7df64e3f3a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; @@ -46,8 +47,8 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getFrontFacing(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java index 669c7787d4..50f25951be 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java @@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; @@ -76,8 +77,8 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getFrontFacing(); } @Override @@ -156,6 +157,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity return GT_Recipe_Map.sHotFuels; } + @Override public int getPollution() { return (int) (CORE.ConfigSwitches.basePollutionPerSecondGeothermalGenerator * CORE.ConfigSwitches.pollutionReleasedByTierGeothermalGenerator[mTier]); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java index 734f2a8919..25ec3468f8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityRocketFuelGenerator.java @@ -1,6 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.generators; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; @@ -34,8 +35,8 @@ public class GregtechMetaTileEntityRocketFuelGenerator extends GregtechRocketFue } @Override - public boolean isOutputFacing(final byte aSide) { - return aSide == this.getBaseMetaTileEntity().getFrontFacing(); + public boolean isOutputFacing(final ForgeDirection side) { + return side == this.getBaseMetaTileEntity().getFrontFacing(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java index c0d0e9e2a2..8dbcc09789 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java @@ -2,6 +2,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.g