diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-09-19 20:58:08 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-09-19 20:58:08 +1000 |
| commit | 49608636d3cacf49373c91cb4fa7e5336c942100 (patch) | |
| tree | a09d0f885db05e6c02fe40f046a4dc965a7a9a7d /src/Java | |
| parent | fbf5bdd756e7004b176aac36a165c29dfe5d7739 (diff) | |
| download | GT5-Unofficial-49608636d3cacf49373c91cb4fa7e5336c942100.tar.gz GT5-Unofficial-49608636d3cacf49373c91cb4fa7e5336c942100.tar.bz2 GT5-Unofficial-49608636d3cacf49373c91cb4fa7e5336c942100.zip | |
+ Added Muffler requirements to some Multi-Blocks.
Diffstat (limited to 'src/Java')
2 files changed, 29 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java index 2ffa242fc2..dce7d91800 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java @@ -161,6 +161,17 @@ extends GregtechMeta_MultiBlockBase { } } } + if ((this.mInputBusses.size() < 1) || (this.mOutputBusses.size() < 1) + || (this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() < 1) + || (this.mMufflerHatches.size() < 1)) { + Utils.LOG_MACHINE_INFO("Returned False"); + Utils.LOG_MACHINE_INFO("Input Buses: "+this.mInputBusses.size()+" | expected: >= 1 | "+(this.mInputBusses.size() >= 1)); + Utils.LOG_MACHINE_INFO("Output Buses: "+this.mOutputBusses.size()+" | expected: >= 1 | "+(this.mOutputBusses.size() >= 1)); + Utils.LOG_MACHINE_INFO("Energy Hatches: "+this.mEnergyHatches.size()+" | expected: >= 1 | "+(this.mEnergyHatches.size() >= 1)); + Utils.LOG_MACHINE_INFO("Muffler Hatches: "+this.mMufflerHatches.size()+" | expected: >= 1 | "+(this.mMufflerHatches.size() >= 1)); + Utils.LOG_MACHINE_INFO("Maint. Hatches: "+this.mMaintenanceHatches.size()+" | expected: 1 | "+(this.mMaintenanceHatches.size() != 1)); + return false; + } Utils.LOG_WARNING("Trying to assemble structure. Completed? "+(tAmount >= 8)); return (tAmount >= 8); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java index 44cddcc309..7352b5dfca 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -63,6 +63,7 @@ extends GregtechMeta_MultiBlockBase { "1x Input Hatch (Any casing)", "1x Output Hatch (Any casing)", "1x Maintenance Hatch (Any casing)", + "1x Muffler Hatch (Any casing)", "1x Energy Hatch (Any casing)", "Wash Plant Casing (The rest)", "Causes " + (20 * getPollutionPerTick(null)) + " Pollution per second", @@ -236,6 +237,23 @@ extends GregtechMeta_MultiBlockBase { } } } + + if ((this.mInputBusses.size() < 1) || (this.mOutputBusses.size() < 1) + || (this.mInputHatches.size() < 1) || (this.mOutputHatches.size() < 1) + || (this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() < 1) + || (this.mMufflerHatches.size() < 1)) { + Utils.LOG_MACHINE_INFO("Returned False"); + Utils.LOG_MACHINE_INFO("Input Buses: "+this.mInputBusses.size()+" | expected: >= 1 | "+(this.mInputBusses.size() >= 1)); + Utils.LOG_MACHINE_INFO("Output Buses: "+this.mOutputBusses.size()+" | expected: >= 1 | "+(this.mOutputBusses.size() >= 1)); + Utils.LOG_MACHINE_INFO("Input Hatches: "+this.mInputHatches.size()+" | expected: >= 1 | "+(this.mInputHatches.size() >= 1)); + Utils.LOG_MACHINE_INFO("Output Hatches: "+this.mOutputHatches.size()+" | expected: >= 1 | "+(this.mOutputHatches.size() >= 1)); + Utils.LOG_MACHINE_INFO("Energy Hatches: "+this.mEnergyHatches.size()+" | expected: >= 1 | "+(this.mEnergyHatches.size() >= 1)); + Utils.LOG_MACHINE_INFO("Muffler Hatches: "+this.mMufflerHatches.size()+" | expected: >= 1 | "+(this.mMufflerHatches.size() >= 1)); + Utils.LOG_MACHINE_INFO("Maint. Hatches: "+this.mMaintenanceHatches.size()+" | expected: 1 | "+(this.mMaintenanceHatches.size() != 1)); + return false; + } + + if ((tAmount >= 8)){ Utils.LOG_WARNING("Made structure."); } |