diff options
| author | Alkalus <draknyte1@hotmail.com> | 2020-04-13 23:49:40 +0000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2020-04-13 23:49:40 +0000 |
| commit | 24b1356471191a10fde6e4f1baf58ae74e87cfba (patch) | |
| tree | 4a15a8e73a9b97f4b77d6c894f293f4cb6653c9d /src/Java/gtPlusPlus/xmod/gregtech/api | |
| parent | d53cc950a01765cb8bc422c6f79661dd05c760ef (diff) | |
| parent | a428e29805b3bfb949cf93a1149744464ba16334 (diff) | |
| download | GT5-Unofficial-24b1356471191a10fde6e4f1baf58ae74e87cfba.tar.gz GT5-Unofficial-24b1356471191a10fde6e4f1baf58ae74e87cfba.tar.bz2 GT5-Unofficial-24b1356471191a10fde6e4f1baf58ae74e87cfba.zip | |
Merged in develop (pull request #6)
Fix Advanced Mufflers
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api')
2 files changed, 4 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java index 721fe053ae..17226a399e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java @@ -21,7 +21,7 @@ public class CONTAINER_Hatch_Muffler_Advanced extends GT_ContainerMetaTile_Machi @Override public void addSlots(final InventoryPlayer aInventoryPlayer) { - this.addSlotToContainer(new SlotAirFilter(this.mTileEntity, 1, 80, 35)); + this.addSlotToContainer(new SlotAirFilter(this.mTileEntity, 0, 80, 35)); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java index 5fa1fc8aba..5303a42bf6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java @@ -124,7 +124,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch return false; } - public boolean polluteEnvironment() { + public boolean polluteEnvironment() { if (airCheck() && damageAirFilter()) { int aEmission = this.calculatePollutionReduction(10000); PollutionUtils.addPollution(this.getBaseMetaTileEntity(), aEmission); @@ -214,8 +214,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch //Logger.INFO("Empty - "+this.mInventory.length); } else { - //Logger.INFO("D2"); - Logger.INFO("Has Item"); + //Logger.INFO("D2"); } } //Logger.INFO("A4"); @@ -254,7 +253,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch //Remove broken Filter if ((filter.getItemDamage() == 0 && currentUse >= 50-1) || (filter.getItemDamage() == 1 && currentUse >= 2500-1)){ breakAirFilter(); - return false; + return true; } else { //Do Damage |