diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-12-12 17:04:03 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-12-12 17:04:03 +0000 |
| commit | 21b8db8c06eae0da0698a317d6ec1d634e3881c5 (patch) | |
| tree | a4375cc206bf1993e3c7f24136cf6d59c9a6ab77 /src/Java | |
| parent | aa28e23e937c31b1558283f5cf6d920756c9b743 (diff) | |
| download | GT5-Unofficial-21b8db8c06eae0da0698a317d6ec1d634e3881c5.tar.gz GT5-Unofficial-21b8db8c06eae0da0698a317d6ec1d634e3881c5.tar.bz2 GT5-Unofficial-21b8db8c06eae0da0698a317d6ec1d634e3881c5.zip | |
Fixed bug in energy/dynamo handling.
Diffstat (limited to 'src/Java')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index 4d79be29b1..51a9dd717c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -1824,13 +1824,15 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En //Handle TT Multi-A Energy Hatches else if (LoadedMods.TecTech && isThisHatchMultiEnergy(aMetaTileEntity)) { log("Found isThisHatchMultiEnergy"); - aDidAdd = addEnergyInputToMachineList(aTileEntity, aBaseCasingIndex); + aDidAdd = addToMachineListInternal(mTecTechEnergyHatches, aTileEntity, aBaseCasingIndex); + updateMasterEnergyHatchList(aTileEntity); } //Handle TT Multi-A Dynamos else if (LoadedMods.TecTech && isThisHatchMultiDynamo(aMetaTileEntity)) { log("Found isThisHatchMultiDynamo"); - aDidAdd = addDynamoToMachineList(aTileEntity, aBaseCasingIndex); + aDidAdd = addToMachineListInternal(mTecTechDynamoHatches, aTileEntity, aBaseCasingIndex); + updateMasterDynamoHatchList(aTileEntity); } //Handle Fluid Hatches using seperate logic @@ -1844,10 +1846,14 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En aDidAdd = addToMachineListInternal(mInputBusses, aMetaTileEntity, aBaseCasingIndex); else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) aDidAdd = addToMachineListInternal(mOutputBusses, aMetaTileEntity, aBaseCasingIndex); - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) - aDidAdd = addEnergyInputToMachineList(aTileEntity, aBaseCasingIndex); - else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) - aDidAdd = addDynamoToMachineList(aTileEntity, aBaseCasingIndex); + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { + aDidAdd = addToMachineListInternal(mEnergyHatches, aTileEntity, aBaseCasingIndex); + updateMasterEnergyHatchList(aTileEntity); + } + else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { + aDidAdd = addToMachineListInternal(mDynamoHatches, aTileEntity, aBaseCasingIndex); + updateMasterDynamoHatchList(aTileEntity); + } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) aDidAdd = addToMachineListInternal(mMaintenanceHatches, aMetaTileEntity, aBaseCasingIndex); else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) @@ -2130,13 +2136,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En @Override public boolean addDynamoToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (LoadedMods.TecTech){ - if (isThisHatchMultiDynamo(aTileEntity)) { - return addMultiAmpDynamoToMachineList(aTileEntity, aBaseCasingIndex) && updateMasterDynamoHatchList(aTileEntity); - } - - } - return addToMachineListInternal(this.mDynamoHatches, aTileEntity, aBaseCasingIndex) && updateMasterDynamoHatchList(aTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } private boolean updateMasterDynamoHatchList(IGregTechTileEntity aTileEntity) { @@ -2202,13 +2202,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_En @Override public boolean addEnergyInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { - if (LoadedMods.TecTech){ - if (isThisHatchMultiEnergy(aTileEntity)) { - return addMultiAmpEnergyToMachineList(aTileEntity, aBaseCasingIndex) && updateMasterEnergyHatchList(aTileEntity); - } - - } - return addToMachineListInternal(this.mEnergyHatches, aTileEntity, aBaseCasingIndex) && updateMasterEnergyHatchList(aTileEntity); + return addToMachineList(aTileEntity, aBaseCasingIndex); } private boolean updateMasterEnergyHatchList(IGregTechTileEntity aTileEntity) { |