aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common
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/common
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/common')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java3
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
index 1cb5b72161..ebae66fe72 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
@@ -57,7 +57,10 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase {
private int mPipeCasingTier = 0;
private int mCoilTier = 0;
-
+ public static GT_Recipe_Map getGeneratedRecipeMap() {
+ return mFluidChemicalReactorRecipes;
+ }
+
/**
* Internal Recipe Map which holds the actual recipes, backed by the real map, shown by NEI.
*/
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 666b7980ec..9b898e34af 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -10,7 +10,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
@@ -264,9 +263,11 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
/**
* TecTech Support, this allows adding Multi-Amp dynamos.
*/
+ mAllEnergyHatches.addAll(this.mEnergyHatches);
mAllDynamoHatches.addAll(this.mDynamoHatches);
if (LoadedMods.TecTech) {
+ mAllDynamoHatches.addAll(this.mTecTechEnergyHatches);
mAllDynamoHatches.addAll(this.mTecTechDynamoHatches);
}