diff --git a/src/main/java/refinedstorage/gui/GuiHandler.java b/src/main/java/refinedstorage/gui/GuiHandler.java index 2745df7a4..0bb679263 100755 --- a/src/main/java/refinedstorage/gui/GuiHandler.java +++ b/src/main/java/refinedstorage/gui/GuiHandler.java @@ -121,7 +121,7 @@ public class GuiHandler implements IGuiHandler { case RefinedStorageGui.GRID_FILTER: return new GuiGridFilter(getGridFilterContainer(player, x)); case RefinedStorageGui.NETWORK_TRANSMITTER: - return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile)); + return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile), (TileNetworkTransmitter) tile); default: return null; } diff --git a/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java b/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java index ab204ebee..111343e9b 100755 --- a/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java +++ b/src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java @@ -5,8 +5,12 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.TileNetworkTransmitter; public class GuiNetworkTransmitter extends GuiBase { - public GuiNetworkTransmitter(ContainerNetworkTransmitter container) { + private TileNetworkTransmitter networkTransmitter; + + public GuiNetworkTransmitter(ContainerNetworkTransmitter container, TileNetworkTransmitter networkTransmitter) { super(container, 210, 137); + + this.networkTransmitter = networkTransmitter; } @Override @@ -29,19 +33,17 @@ public class GuiNetworkTransmitter extends GuiBase { public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:network_transmitter")); - String distance = t("gui.refinedstorage:network_transmitter.missing_card"); + String distance; - // @TODO: ... - /* if (networkTransmitter.getNetworkCard().getStackInSlot(0) == null) { distance = t("gui.refinedstorage:network_transmitter.missing_card"); } else if (!TileNetworkTransmitter.RECEIVER_DIMENSION_SUPPORTED.getValue()) { distance = t("gui.refinedstorage:network_transmitter.missing_upgrade"); - } else if (!networkTransmitter.isSameDimension()) { - distance = t("gui.refinedstorage:network_transmitter.dimension", networkTransmitter.getReceiverDimension()); + } else if (TileNetworkTransmitter.RECEIVER_DIMENSION.getValue() != networkTransmitter.getWorld().provider.getDimension()) { + distance = t("gui.refinedstorage:network_transmitter.dimension", TileNetworkTransmitter.RECEIVER_DIMENSION.getValue()); } else { - distance = t("gui.refinedstorage:network_transmitter.distance", networkTransmitter.getDistance()); - }*/ + distance = t("gui.refinedstorage:network_transmitter.distance", TileNetworkTransmitter.DISTANCE.getValue()); + } drawString(51, 24, distance); drawString(7, 42, t("container.inventory")); diff --git a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java index 348713b6f..43525596c 100755 --- a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java @@ -17,14 +17,14 @@ import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; public class TileNetworkTransmitter extends TileNode { - public static final TileDataParameter DISTANCE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter DISTANCE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { @Override public Integer getValue(TileNetworkTransmitter tile) { return (tile.receiver != null && tile.isSameDimension()) ? tile.getDistance() : -1; } }); - public static final TileDataParameter RECEIVER_DIMENSION = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { + public static final TileDataParameter RECEIVER_DIMENSION = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { @Override public Integer getValue(TileNetworkTransmitter tile) { return tile.receiverDimension;