aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/api
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-15 01:03:55 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2020-01-15 01:03:55 +0000
commit1aa5ac9a87993829353a3ee7c62a48b398b03257 (patch)
tree684c0ee613ea936c80d63513af1d0bb472c8d45b /src/Java/gtPlusPlus/xmod/gregtech/api
parentc4da65d9055c8d82c111e7e07310a4bf446603b9 (diff)
downloadGT5-Unofficial-1aa5ac9a87993829353a3ee7c62a48b398b03257.tar.gz
GT5-Unofficial-1aa5ac9a87993829353a3ee7c62a48b398b03257.tar.bz2
GT5-Unofficial-1aa5ac9a87993829353a3ee7c62a48b398b03257.zip
$ Tried to fix NEI handling of ChemPlant recipes.
$ Fixed rushed attempt at adding TT energy hatch support. This also fixes the PSS not correctly forming.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java12
1 files changed, 9 insertions, 3 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 e15a9d5c28..e1849985d0 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
@@ -1897,6 +1897,12 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
aDidAdd = addToMachineListInternal(mDischargeHatches, aMetaTileEntity, aBaseCasingIndex);
}
+ //Handle TT Multi-A Energy Hatches
+ else if (LoadedMods.TecTech && isThisHatchMultiEnergy(aMetaTileEntity)) {
+ log("Found isThisHatchMultiEnergy");
+ aDidAdd = addToMachineListInternal(mTecTechEnergyHatches, aMetaTileEntity, aBaseCasingIndex);
+ }
+
//Handle TT Multi-A Dynamos
else if (LoadedMods.TecTech && isThisHatchMultiDynamo(aMetaTileEntity)) {
log("Found isThisHatchMultiDynamo");
@@ -2202,7 +2208,7 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
public boolean addDynamoToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
if (LoadedMods.TecTech){
if (isThisHatchMultiDynamo(aTileEntity)) {
- addMultiAmpDynamoToMachineList(aTileEntity, aBaseCasingIndex);
+ return addMultiAmpDynamoToMachineList(aTileEntity, aBaseCasingIndex);
}
}
@@ -2247,8 +2253,8 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
@Override
public boolean addEnergyInputToMachineList(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) {
if (LoadedMods.TecTech){
- if (isThisHatchMultiDynamo(aTileEntity)) {
- addMultiAmpDynamoToMachineList(aTileEntity, aBaseCasingIndex);
+ if (isThisHatchMultiEnergy(aTileEntity)) {
+ return addMultiAmpEnergyToMachineList(aTileEntity, aBaseCasingIndex);
}
}