#853 Incorrect icons for reservoir

This commit is contained in:
tterrag1098 committed 2014-08-05 01:56:26 -04:00
1 parent a0f9d70bef
commit 29d689a487
2 files changed
+18 -7

No files matched your search

@@ -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()];
}
}
@@ -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);