From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 295 +++--- ...GT_MetaTileEntity_ElectricInventoryManager.java | 640 ++++++------ .../GT_MetaTileEntity_TesseractGenerator.java | 179 ++-- .../GT_MetaTileEntity_TesseractTerminal.java | 161 ++- .../generators/GT_MetaTileEntity_Boiler_Base.java | 55 +- .../generators/GT_MetaTileEntity_Boiler_HV.java | 19 +- .../generators/GT_MetaTileEntity_Boiler_LV.java | 19 +- .../generators/GT_MetaTileEntity_Boiler_MV.java | 19 +- .../generators/GT_MetaTileEntity_Boiler_Solar.java | 78 +- .../generators/GT_MetaTileEntity_RfConvertor.java | 192 ++-- .../GT_MetaTileEntity_SemiFluidGenerator.java | 79 +- ...gtechMetaTileEntityDoubleFuelGeneratorBase.java | 92 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 88 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 75 +- .../GregtechMetaTileEntitySolarGenerator.java | 175 ++-- .../generators/GregtechMetaTileEntity_RTG.java | 141 ++- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 17 +- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 19 +- .../ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 19 +- .../creative/GregtechMetaCreativeEnergyBuffer.java | 86 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 237 ++--- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 95 +- .../GregtechMetaAtmosphericReconditioner.java | 315 +++--- .../machines/basic/GregtechMetaCondensor.java | 171 ++-- .../basic/GregtechMetaGarbageCollector.java | 113 +-- .../basic/GregtechMetaPollutionCreator.java | 133 +-- .../basic/GregtechMetaPollutionDetector.java | 159 ++- .../basic/GregtechMetaTileEntityChunkLoader.java | 179 ++-- ...GregtechMetaTileEntityThaumcraftResearcher.java | 86 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 72 +- .../basic/GregtechMetaTileEntity_BasicWasher.java | 44 +- .../GregtechMetaTileEntity_ChemicalReactor.java | 186 ++-- ...regtechMetaTileEntity_CompactFusionReactor.java | 187 ++-- .../basic/GregtechMetaTileEntity_PocketFusion.java | 188 ++-- .../GregtechMetaTileEntity_ReactorColdTrap.java | 47 +- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 36 +- .../basic/GregtechMetaWirelessCharger.java | 202 ++-- .../machines/multi/misc/GMTE_AmazonPackager.java | 89 +- .../multi/misc/GregtechMTE_TeslaTower.java | 118 ++- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 111 +-- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 113 ++- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 54 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 81 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 67 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 55 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 103 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 49 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 52 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 66 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 63 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 89 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 58 +- ...aTileEntity_IndustrialMolecularTransformer.java | 70 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 125 +-- ...regtechMetaTileEntity_IndustrialPlatePress.java | 55 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 73 +- .../GregtechMetaTileEntity_IndustrialSinter.java | 329 ++----- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 38 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 86 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 88 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 81 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 280 +++--- .../processing/GregtechMetaTileEntity_IsaMill.java | 113 +-- .../GregtechMetaTileEntity_SpargeTower.java | 115 ++- .../GregtechMetaTileEntity_Adv_AssemblyLine.java | 201 ++-- ...egtechMetaTileEntity_Adv_DistillationTower.java | 137 ++- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 130 +-- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 70 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 228 +++-- .../GregtechMetaTileEntity_Adv_Implosion.java | 31 +- .../GregtechMetaTileEntity_SteamCompressor.java | 41 +- .../GregtechMetaTileEntity_SteamMacerator.java | 41 +- .../multi/production/GT4Entity_AutoCrafter.java | 265 ++--- .../multi/production/GT4Entity_ThermalBoiler.java | 63 +- .../GregtechMTE_ElementalDuplicator.java | 301 ++---- .../production/GregtechMTE_FastNeutronReactor.java | 254 +---- .../production/GregtechMTE_FrothFlotationCell.java | 87 +- .../production/GregtechMTE_LargeNaqReactor.java | 623 +++--------- .../production/GregtechMTE_MiniFusionPlant.java | 444 ++------- .../production/GregtechMTE_NuclearReactor.java | 201 ++-- .../GregtechMetaTileEntityGeneratorArray.java | 205 ++-- .../production/GregtechMetaTileEntityTreeFarm.java | 198 ++-- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 76 +- .../GregtechMetaTileEntity_Cyclotron.java | 164 ++-- ...egtechMetaTileEntity_IndustrialFishingPond.java | 226 ++--- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 111 +-- .../GregtechMetaTileEntity_LargeRocketEngine.java | 112 +-- ...techMetaTileEntity_LargeSemifluidGenerator.java | 74 +- .../GregtechMetaTileEntity_MassFabricator.java | 189 ++-- ...techMetaTileEntity_QuantumForceTransformer.java | 719 +++++--------- .../GregtechMetaTileEntity_Refinery.java | 61 +- .../GregtechMetaTileEntity_SolarTower.java | 597 +++++------ .../algae/GregtechMTE_AlgaePondBase.java | 126 +-- ...gtechMetaTileEntity_BedrockMiningPlatform1.java | 51 +- ...gtechMetaTileEntity_BedrockMiningPlatform2.java | 51 +- ...chMetaTileEntity_BedrockMiningPlatformBase.java | 68 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 202 ++-- ...egTechMetaTileEntity_MegaAlloyBlastSmelter.java | 517 ++++------ .../turbines/GT_MTE_LargeTurbine_Gas.java | 25 +- .../turbines/GT_MTE_LargeTurbine_Plasma.java | 63 +- .../turbines/GT_MTE_LargeTurbine_SCSteam.java | 14 +- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 35 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 33 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 333 ++++--- .../storage/GregtechMetaTileEntity_MultiTank.java | 850 +++++----------- ...chMetaTileEntity_PowerSubStationController.java | 306 +++--- .../misc/GT_TileEntity_ComputerCube.java | 1035 +++++++++----------- .../tileentities/misc/TileEntitySolarHeater.java | 126 +-- .../redstone/GT_MetaTileEntity_RedstoneBase.java | 37 +- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 109 +-- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 360 +++---- .../redstone/GT_MetaTileEntity_RedstoneLamp.java | 16 +- .../GT_MetaTileEntity_RedstoneStrengthDisplay.java | 93 +- .../GT_MetaTileEntity_RedstoneStrengthScale.java | 33 +- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 480 ++++----- .../GT_MetaTileEntity_BronzeCraftingTable.java | 12 +- .../GT_MetaTileEntity_ConnectableCrate.java | 155 ++- .../storage/GT_MetaTileEntity_TieredChest.java | 119 +-- .../storage/GT_MetaTileEntity_TieredTank.java | 63 +- .../storage/GregtechMetaEnergyBuffer.java | 229 ++--- .../storage/GregtechMetaSafeBlock.java | 46 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 17 +- .../storage/shelving/GT4Entity_Shelf.java | 98 +- .../shelving/GT4Entity_Shelf_Compartment.java | 9 +- .../storage/shelving/GT4Entity_Shelf_Desk.java | 14 +- .../shelving/GT4Entity_Shelf_FileCabinet.java | 17 +- .../storage/shelving/GT4Entity_Shelf_Iron.java | 14 +- .../storage/shelving/GT4Entity_Shelf_Large.java | 99 +- 128 files changed, 7558 insertions(+), 11665 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 bf56872d52..f02bf0193e 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 @@ -1,11 +1,19 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.automation; +import java.util.ArrayList; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.oredict.OreDictionary; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.SlotGroup; import com.gtnewhorizons.modularui.common.widget.SlotWidget; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.Textures; @@ -25,11 +33,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -import java.util.ArrayList; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.oredict.OreDictionary; public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_BasicTank implements IAddGregtechLogo { @@ -51,8 +54,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")"; } - public GT_MetaTileEntity_ElectricAutoWorkbench( - final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) { + public GT_MetaTileEntity_ElectricAutoWorkbench(final String aName, final int aTier, final String aDescription, + final ITexture[][][] aTextures) { super(aName, aTier, 30, aDescription, aTextures); } @@ -193,8 +196,7 @@ 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(); + return aSide != getBaseMetaTileEntity().getFrontFacing() && aSide != getBaseMetaTileEntity().getBackFacing(); } private void switchMode() { @@ -204,15 +206,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); - if (getBaseMetaTileEntity().isAllowedToWork() - && getBaseMetaTileEntity().isServerSide() + if (getBaseMetaTileEntity().isAllowedToWork() && getBaseMetaTileEntity().isServerSide() && getBaseMetaTileEntity().getUniversalEnergyStored() >= (mMode == 5 || mMode == 6 ? 128 : 2048) && (getBaseMetaTileEntity().hasWorkJustBeenEnabled() || --mTicksUntilNextUpdate < 1)) { mTicksUntilNextUpdate = 32; for (byte i = 19; i < 28; i++) { - if (mInventory[i] != null - && mInventory[i].isItemStackDamageable() + if (mInventory[i] != null && mInventory[i].isItemStackDamageable() && mInventory[i].getItem().hasContainerItem()) { mInventory[i].setItemDamage(OreDictionary.WILDCARD_VALUE); } @@ -223,12 +223,10 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B ItemStack tOutput = GT_Utility.fillFluidContainer(mFluid, mInventory[i], false, true); if (tOutput != null) { for (byte j = 0; j < 9; j++) { - if (mInventory[j] == null - || (GT_Utility.areStacksEqual(tOutput, mInventory[j]) - && mInventory[j].stackSize + tOutput.stackSize - <= tOutput.getMaxStackSize())) { - mFluid.amount -= - GT_Utility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize; + if (mInventory[j] == null || (GT_Utility.areStacksEqual(tOutput, mInventory[j]) + && mInventory[j].stackSize + tOutput.stackSize <= tOutput.getMaxStackSize())) { + mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount + * tOutput.stackSize; getBaseMetaTileEntity().decrStackSize(i, 1); if (mInventory[j] == null) { mInventory[j] = tOutput; @@ -287,25 +285,19 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) - == null) { + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { tRecipe[1] = tTempStack; tRecipe[3] = tTempStack; tRecipe[4] = tTempStack; } else break; - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) - == null) { + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { tRecipe[2] = tTempStack; tRecipe[5] = tTempStack; tRecipe[6] = tTempStack; tRecipe[7] = tTempStack; tRecipe[8] = tTempStack; } else break; - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) - == null) { + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -326,9 +318,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) - == null) { + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -352,9 +342,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[1] = tTempStack; tRecipe[3] = tTempStack; tRecipe[4] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) - == null) { + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -383,9 +371,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[6] = tTempStack; tRecipe[7] = tTempStack; tRecipe[8] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) - == null) { + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -435,8 +421,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[1] = tTempStack; tRecipe[3] = tTempStack; tRecipe[4] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; @@ -457,8 +442,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[6] = tTempStack; tRecipe[7] = tTempStack; tRecipe[8] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; @@ -497,9 +481,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[6] = tTempStack; tRecipe[7] = tTempStack; tRecipe[8] = tTempStack; - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) - == null) { + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; @@ -522,14 +504,12 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; for (int i = mCurrentSlot + 1; i < 18; i++) { - if (mInventory[i] != null - && mInventory[i].getItem() == tTempStack.getItem() + if (mInventory[i] != null && mInventory[i].getItem() == tTempStack.getItem() && mInventory[mCurrentSlot].getItemDamage() + mInventory[i].getItemDamage() > tTempStack.getMaxDamage()) { tRecipe[0] = tTempStack; tRecipe[1] = GT_Utility.copy(mInventory[i]); - if (GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe) + if (GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) == null) { if (mInventory[18] == null) { mInventory[18] = mInventory[mCurrentSlot]; @@ -550,16 +530,10 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } break; } - for (byte i = 0, j = 0; - i < 18 - && j < 9 - && (j < 2 - || GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity() - .getWorld(), - tRecipe) - == null); - i++) { + for (byte i = 0, j = 0; i < 18 && j < 9 + && (j < 2 || GT_ModHandler + .getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe) + == null); i++) { tRecipe[j] = mInventory[(mCurrentSlot + i) % 18]; if (tRecipe[j] != null) { tRecipe[j] = GT_Utility.copy(tRecipe[j]); @@ -573,8 +547,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } if (tOutput == null) - tOutput = GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), tRecipe); + tOutput = GT_ModHandler.getAllRecipeOutput(getBaseMetaTileEntity().getWorld(), tRecipe); if (tOutput != null || mMode == 0) mInventory[28] = tOutput; @@ -621,9 +594,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } else if (GT_Utility.areStacksEqual(mInventory[k], tStack) && mInventory[k].stackSize + tStack.stackSize <= tStack.getMaxStackSize()) { - mInventory[k].stackSize += tStack.stackSize; - break; - } + mInventory[k].stackSize += tStack.stackSize; + break; + } } } } else { @@ -636,9 +609,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } mInventory[18] = GT_Utility.copy(tOutput); - getBaseMetaTileEntity() - .decreaseStoredEnergyUnits( - mMode == 5 || mMode == 6 || mMode == 7 ? 128 : 2048, true); + getBaseMetaTileEntity().decreaseStoredEnergyUnits( + mMode == 5 || mMode == 6 || mMode == 7 ? 128 : 2048, + true); mTicksUntilNextUpdate = 1; } else { mLastCraftSuccessful = false; @@ -652,7 +625,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B if (mInventory[18] == null && mThroughPut < 2) { for (byte i = 0; i < 8; i++) { - for (byte j = i; ++j < 9; ) { + for (byte j = i; ++j < 9;) { if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j]) && mInventory[i].getMaxStackSize() > 8) { mInventory[18] = mInventory[j]; @@ -670,19 +643,17 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B getBaseMetaTileEntity() .decreaseStoredEnergyUnits( GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - getBaseMetaTileEntity() - .getIInventoryAtSide(getBaseMetaTileEntity() - .getBackFacing()), - getBaseMetaTileEntity().getBackFacing(), - getBaseMetaTileEntity().getFrontFacing(), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1) - * 10, + getBaseMetaTileEntity(), + getBaseMetaTileEntity() + .getIInventoryAtSide(getBaseMetaTileEntity().getBackFacing()), + getBaseMetaTileEntity().getBackFacing(), + getBaseMetaTileEntity().getFrontFacing(), + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1) * 10, true); } } @@ -746,14 +717,10 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B return mMode == 0 ? aIndex < 9 : aIndex < 18; } - /*@Override - public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { - if (aSide == aFacing) - return 112; - if (GT_Utility.getOppositeSide(aSide) == aFacing) - return 113; - return 114; - }*/ + /* + * @Override public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone) { if (aSide == + * aFacing) return 112; if (GT_Utility.getOppositeSide(aSide) == aFacing) return 113; return 114; } + */ @Override public int getCapacity() { @@ -767,11 +734,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B @Override public String[] getDescription() { - return new String[] { - "Automatic Crafting Table Mk III", - // this.mDescription, - CORE.GT_Tooltip - }; + return new String[] { "Automatic Crafting Table Mk III", + // this.mDescription, + CORE.GT_Tooltip }; } @Override @@ -793,13 +758,8 @@ 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) { + public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, + final byte aColorIndex, final boolean aActive, final boolean aRedstone) { if (aSide == aFacing) { return this.mTextures[0][aColorIndex + 1]; } else if (GT_Utility.getOppositeSide(aSide) == aFacing) { @@ -807,41 +767,34 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } 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) + (aSide == aFacing ? 0 : aSide == + * GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1]; + */ } public ITexture[] getFront(final byte aColor) { - return new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) - }; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], + new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; } public ITexture[] getBack(final byte aColor) { - return new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE) - }; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], + new GT_RenderedTexture(BlockIcons.OVERLAY_PIPE) }; } public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - }; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], }; } public ITexture[] getTop(final byte aColor) { - return new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) - }; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], + new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; } public ITexture[] getSides(final byte aColor) { - return new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) - }; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], + new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; } @Override @@ -851,78 +804,50 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B @Override public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget(new DrawableWidget() - .setDrawable(getGUITextureSet().getGregTechLogo()) - .setSize(17, 17) - .setPos(118, 22)); + builder.widget( + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(118, 22)); } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 3) - .endAtSlot(8) - .build() - .setPos(7, 4)) - .widget(SlotGroup.ofItemHandler(inventoryHandler, 9) - .startFromSlot(9) - .endAtSlot(17) - .canInsert(false) - .background(GT_UITextures.SLOT_DARK_GRAY) - .applyForWidget(SlotWidget::disableShiftInsert) - .build() - .setPos(7, 59)) - .widget(new SlotWidget(inventoryHandler, 18) - .setAccess(true, false) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT) - .setPos(151, 40)) - .widget(new DrawableWidget() - .setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3) - .setPos(62, 4) - .setSize(54, 54)) - .widget(SlotGroup.ofItemHandler(inventoryHandler, 3) - .startFromSlot(19) - .endAtSlot(27) - .phantom(true) - .background(GT_UITextures.TRANSPARENT) - .build() - .setPos(62, 4)) - .widget(SlotWidget.phantom(inventoryHandler, 28) - .disableInteraction() - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ARROW_4) - .setPos(151, 4)); - builder.widget(new CycleButtonWidget() - .setGetter(() -> mThroughPut) - .setSetter(val -> mThroughPut = val) - .setLength(MAX_THROUGHPUT) - .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_THROUGHPUT[i]) - .setBackground(GT_UITextures.BUTTON_STANDARD) - .setPos(120, 4) - .setSize(18, 18)); - String[] mModeText = new String[] { - "Normal Crafting Table", "???", "1x1", "2x2", "3x3", "Unifier", "Dust", "???", "Hammer?", "Circle" - }; - CycleButtonWidget modeButton = new CycleButtonWidget() - .setGetter(() -> mMode) - .setSetter(val -> { - mMode = val; - switchMode(); - }) - .setLength(MAX_MODES) - .setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_MODE[i]); + builder.widget(SlotGroup.ofItemHandler(inventoryHandler, 3).endAtSlot(8).build().setPos(7, 4)) + .widget( + SlotGroup.ofItemHandler(inventoryHandler, 9).startFromSlot(9).endAtSlot(17).canInsert(false) + .background(GT_UITextures.SLOT_DARK_GRAY).applyForWidget(SlotWidget::disableShiftInsert) + .build().setPos(7, 59)) + .widget( + new SlotWidget(inventoryHandler, 18).setAccess(true, false) + .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT) + .setPos(151, 40)) + .widget( + new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SLOTS_HOLO_3BY3).setPos(62, 4) + .setSize(54, 54)) + .widget( + SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(19).endAtSlot(27).phantom(true) + .background(GT_UITextures.TRANSPARENT).build().setPos(62, 4)) + .widget( + SlotWidget.phantom(inventoryHandler, 28).disableInteraction() + .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ARROW_4) + .setPos(151, 4)); + builder.widget( + new CycleButtonWidget().setGetter(() -> mThroughPut).setSetter(val -> mThroughPut = val) + .setLength(MAX_THROUGHPUT).setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_THROUGHPUT[i]) + .setBackground(GT_UITextures.BUTTON_STANDARD).setPos(120, 4).setSize(18, 18)); + String[] mModeText = new String[] { "Normal Crafting Table", "???", "1x1", "2x2", "3x3", "Unifier", "Dust", + "???", "Hammer?", "Circle" }; + CycleButtonWidget modeButton = new CycleButtonWidget().setGetter(() -> mMode).setSetter(val -> { + mMode = val; + switchMode(); + }).setLength(MAX_MODES).setTextureGetter(i -> GTPP_UITextures.OVERLAY_BUTTON_MODE[i]); for (int i = 0; i < MAX_MODES; i++) { modeButton.addTooltip(i, "Mode: " + mModeText[i]); } - builder.widget(modeButton - .setBackground(GT_UITextures.BUTTON_STANDARD) - .setPos(120, 40) - .setSize(18, 18)); - builder.widget(new DrawableWidget() - .setDrawable(GTPP_UITextures.PICTURE_WORKBENCH_CIRCLE) - .setPos(136, 23) + builder.widget(modeButton.setBackground(GT_UITextures.BUTTON_STANDARD).setPos(120, 40).setSize(18, 18)); + builder.widget( + new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_WORKBENCH_CIRCLE).setPos(136, 23) .setSize(16, 16)) - .widget(new DrawableWidget() - .setDrawable(GTPP_UITextures.PICTURE_ARROW_WHITE_DOWN) - .setPos(155, 23) - .setSize(10, 16)); + .widget( + new DrawableWidget().setDrawable(GTPP_UITextures.PICTURE_ARROW_WHITE_DOWN).setPos(155, 23) + .setSize(10, 16)); } } 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 1a15c563ef..b7ff49716b 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,5 +1,13 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.automation; +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.oredict.OreDictionary; + import com.gtnewhorizons.modularui.api.ModularUITextures; import com.gtnewhorizons.modularui.api.drawable.IDrawable; import com.gtnewhorizons.modularui.api.screen.ModularWindow; @@ -9,6 +17,7 @@ import com.gtnewhorizons.modularui.common.widget.ButtonWidget; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.Textures; import gregtech.api.gui.modularui.GT_UIInfos; @@ -25,12 +34,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; -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.oredict.OreDictionary; public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntity_TieredMachineBlock implements IAddGregtechLogo, IAddUIWidgets { @@ -50,8 +53,8 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")"; } - public GT_MetaTileEntity_ElectricInventoryManager( - final String aName, final int aTier, final String aDescription, final ITexture[][][] aTextures) { + public GT_MetaTileEntity_ElectricInventoryManager(final String aName, final int aTier, final String aDescription, + final ITexture[][][] aTextures) { super(aName, aTier, 16, aDescription, aTextures); } @@ -154,7 +157,10 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_ElectricInventoryManager( - this.mName, this.mTier, this.mDescription, this.mTextures); + this.mName, + this.mTier, + this.mDescription, + this.mTextures); } @Override @@ -240,25 +246,19 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); - if (getBaseMetaTileEntity().isAllowedToWork() - && getBaseMetaTileEntity().isServerSide() + if (getBaseMetaTileEntity().isAllowedToWork() && getBaseMetaTileEntity().isServerSide() && getBaseMetaTileEntity().getUniversalEnergyStored() >= 5000 - && (getBaseMetaTileEntity().hasWorkJustBeenEnabled() - || getBaseMetaTileEntity().getTimer() % 100 == 0 + && (getBaseMetaTileEntity().hasWorkJustBeenEnabled() || getBaseMetaTileEntity().getTimer() % 100 == 0 || mWorkedLastTick || 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((byte) 0), + getBaseMetaTileEntity().getIInventoryAtSide((byte) 1), + getBaseMetaTileEntity().getIInventoryAtSide((byte) 2), + getBaseMetaTileEntity().getIInventoryAtSide((byte) 3), + getBaseMetaTileEntity().getIInventoryAtSide((byte) 4), + getBaseMetaTileEntity().getIInventoryAtSide((byte) 5), null, null }; int tCost = 0; @@ -270,176 +270,152 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit tStack = mInventory[3 + i * 3 + 0]; if (tStack == null) { - if (getSlot1InOut(i)) - tCost += 5 - * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], - getSlot1Direction(i), - getSlot1Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - else - tCost += 5 - * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], - getBaseMetaTileEntity(), - getSlot1Direction(i), - getSlot1Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); + if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( + getBaseMetaTileEntity(), + tTileEntities[getRangeDirection(i)], + getSlot1Direction(i), + getSlot1Direction(i), + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); + else tCost += 5 * GT_Utility.moveOneItemStack( + tTileEntities[getRangeDirection(i)], + getBaseMetaTileEntity(), + getSlot1Direction(i), + getSlot1Direction(i), + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); } else { tList.set(0, tStack); - if (getSlot1InOut(i)) - tCost += 5 - * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], - getSlot1Direction(i), - getSlot1Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - else - tCost += 5 - * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], - getBaseMetaTileEntity(), - getSlot1Direction(i), - getSlot1Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); + if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( + getBaseMetaTileEntity(), + tTileEntities[getRangeDirection(i)], + getSlot1Direction(i), + getSlot1Direction(i), + tList, + false, + (byte) tStack.stackSize, + (byte) 1, + (byte) 64, + (byte) 1); + else tCost += 5 * GT_Utility.moveOneItemStack( + tTileEntities[getRangeDirection(i)], + getBaseMetaTileEntity(), + getSlot1Direction(i), + getSlot1Direction(i), + tList, + false, + (byte) tStack.stackSize, + (byte) 1, + (byte) 64, + (byte) 1); } tStack = mInventory[3 + i * 3 + 1]; if (tStack == null) { - if (getSlot2InOut(i)) - tCost += 5 - * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], - getSlot2Direction(i), - getSlot2Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - else - tCost += 5 - * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], - getBaseMetaTileEntity(), - getSlot2Direction(i), - getSlot2Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); + if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( + getBaseMetaTileEntity(), + tTileEntities[getRangeDirection(i)], + getSlot2Direction(i), + getSlot2Direction(i), + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); + else tCost += 5 * GT_Utility.moveOneItemStack( + tTileEntities[getRangeDirection(i)], + getBaseMetaTileEntity(), + getSlot2Direction(i), + getSlot2Direction(i), + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); } else { tList.set(0, tStack); - if (getSlot2InOut(i)) - tCost += 5 - * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], - getSlot2Direction(i), - getSlot2Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - else - tCost += 5 - * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], - getBaseMetaTileEntity(), - getSlot2Direction(i), - getSlot2Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); + if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( + getBaseMetaTileEntity(), + tTileEntities[getRangeDirection(i)], + getSlot2Direction(i), + getSlot2Direction(i), + tList, + false, + (byte) tStack.stackSize, + (byte) 1, + (byte) 64, + (byte) 1); + else tCost += 5 * GT_Utility.moveOneItemStack( + tTileEntities[getRangeDirection(i)], + getBaseMetaTileEntity(), + getSlot2Direction(i), + getSlot2Direction(i), + tList, + false, + (byte) tStack.stackSize, + (byte) 1, + (byte) 64, + (byte) 1); } tStack = mInventory[3 + i * 3 + 2]; if (tStack == null) { - if (getSlot3InOut(i)) - tCost += 5 - * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], - getSlot3Direction(i), - getSlot3Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - else - tCost += 5 - * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], - getBaseMetaTileEntity(), - getSlot3Direction(i), - getSlot3Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); + if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( + getBaseMetaTileEntity(), + tTileEntities[getRangeDirection(i)], + getSlot3Direction(i), + getSlot3Direction(i), + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); + else tCost += 5 * GT_Utility.moveOneItemStack( + tTileEntities[getRangeDirection(i)], + getBaseMetaTileEntity(), + getSlot3Direction(i), + getSlot3Direction(i), + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); } else { tList.set(0, tStack); - if (getSlot3InOut(i)) - tCost += 5 - * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[getRangeDirection(i)], - getSlot3Direction(i), - getSlot3Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - else - tCost += 5 - * GT_Utility.moveOneItemStack( - tTileEntities[getRangeDirection(i)], - getBaseMetaTileEntity(), - getSlot3Direction(i), - getSlot3Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); + if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( + getBaseMetaTileEntity(), + tTileEntities[getRangeDirection(i)], + getSlot3Direction(i), + getSlot3Direction(i), + tList, + false, + (byte) tStack.stackSize, + (byte) 1, + (byte) 64, + (byte) 1); + else tCost += 5 * GT_Utility.moveOneItemStack( + tTileEntities[getRangeDirection(i)], + getBaseMetaTileEntity(), + getSlot3Direction(i), + getSlot3Direction(i), + tList, + false, + (byte) tStack.stackSize, + (byte) 1, + (byte) 64, + (byte) 1); } } } @@ -453,21 +429,15 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit @Override public String[] getDescription() { - return new String[] {"It's simpler than you think. I promise.", this.mDescription, CORE.GT_Tooltip}; - } - - /*@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; - }*/ + return new String[] { "It's simpler than you think. I promise.", this.mDescription, CORE.GT_Tooltip }; + } + + /* + * @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) { @@ -505,98 +475,69 @@ 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) { + 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[] getBottom(final byte aColor) { - return new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) - }; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) }; } public ITexture[] getTop(final byte aColor) { - return new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green) - }; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], + new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green) }; } public ITexture[] getNegativeZ(final byte aColor) { - return new ITexture[] { - Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue) - }; + return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], + new GT_RenderedTexture(TexturesGtBlock.Casing_