diff options
| author | Alkalus <Draknyte1@hotmail.com> | 2020-08-18 18:35:49 +0100 |
|---|---|---|
| committer | Alkalus <Draknyte1@hotmail.com> | 2020-08-18 18:35:49 +0100 |
| commit | 8ee7350f7e52b898126331aea6e673c70942e42a (patch) | |
| tree | d73409d578a9f0730dfa7aa54dd2042a5aa80941 /src/Java/gtPlusPlus/core/tileentities | |
| parent | 174d2abf005402d46b3ebd3cfbc8c84ccfe95928 (diff) | |
| download | GT5-Unofficial-8ee7350f7e52b898126331aea6e673c70942e42a.tar.gz GT5-Unofficial-8ee7350f7e52b898126331aea6e673c70942e42a.tar.bz2 GT5-Unofficial-8ee7350f7e52b898126331aea6e673c70942e42a.zip | |
+ Added Spice of Life support.
+ Added new Food Crate.
$ Fixed bug in Fish Catcher, where side by side traps didn't count properly as water.
$ Fixed bug in Air Intake Hatch.
Diffstat (limited to 'src/Java/gtPlusPlus/core/tileentities')
| -rw-r--r-- | src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java index e7c37f7994..beff269428 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java +++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java @@ -79,7 +79,8 @@ public class TileEntityFishTrap extends TileEntity implements ISidedInventory { } } if ((waterCount >= 2) && (trapCount <= 4)) { - this.waterSides = waterCount; + int aCheck = trapCount + waterCount; + this.waterSides = MathUtils.balance(aCheck, 0, 6); Logger.MACHINE_INFO("Valid Trap. "+waterCount+" | "+(this.tickCount/20)+"/"+(this.baseTickRate/20)); return true; } diff --git a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java index 316d271961..5b837397b1 100644 --- a/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java +++ b/src/Java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java @@ -340,12 +340,12 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide @Override public boolean canInsertItem(final int aSlot, final ItemStack p_102007_2_, final int p_102007_3_) { - return aSlot >= 0 && aSlot <= 24; + return aSlot == aCurrentMode; } @Override - public boolean canExtractItem(final int p_102008_1_, final ItemStack p_102008_2_, final int p_102008_3_) { - return p_102008_1_ == 25; + public boolean canExtractItem(final int aSlot, final ItemStack p_102008_2_, final int p_102008_3_) { + return aSlot == Container_VolumetricFlaskSetter.SLOT_OUTPUT; } public String getCustomName() { |