diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index b1f9a504..8c9b6e4f 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -246,9 +246,9 @@ public class BlockReservoir extends BlockContainer implements IResourceTooltipPr boolean isRight; if(tr.isVertical()) { // to to flip right and left for back faces of // vertical multiblocks - isRight = !pos.isRight; + isRight = !pos.isRight(side); } else { - isRight = pos.isRight; + isRight = pos.isRight(side); } if(pos.isTop) { return isRight ? mbIcons[MbFace.TR.ordinal()] : mbIcons[MbFace.TL.ordinal()]; @@ -276,11 +276,7 @@ public class BlockReservoir extends BlockContainer implements IResourceTooltipPr if(tr.isVertical()) { return pos.isTop ? mbIcons[MbFace.T.ordinal()] : mbIcons[MbFace.B.ordinal()]; } else { - if(tr.right == side || tr.right.getOpposite() == side) { - return pos.isTop ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; - } else { - return pos.isTop ? mbIcons[MbFace.R.ordinal()] : mbIcons[MbFace.L.ordinal()]; - } + return pos.isTop(side) ? mbIcons[MbFace.L.ordinal()] : mbIcons[MbFace.R.ordinal()]; } } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java index 21969dcf..fbf8a629 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/TileReservoir.java @@ -35,6 +35,21 @@ public class TileReservoir extends TileEntityEio implements IFluidHandler { this.isTop = isTop; this.isRight = isRight; } + + // These are necessary to get around texture mirroring, don't ask me + public boolean isRight(ForgeDirection side) { + if (side == ForgeDirection.EAST || side == ForgeDirection.NORTH) { + return !isRight; + } + return isRight; + } + + public boolean isTop(ForgeDirection side) { + if (side == ForgeDirection.EAST) { + return !isTop; + } + return isTop; + } } static final FluidStack WATER_BUCKET = FluidRegistry.getFluidStack("water", BUCKET_VOLUME);