dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix network transmitter gui

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-05 16:05:48 +02:00
parent 5b5e2239a8
commit 759361b35b
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/gui/GuiHandler.java
View File

@@ -121,7 +121,7 @@ public class GuiHandler implements IGuiHandler {
case RefinedStorageGui.GRID_FILTER: case RefinedStorageGui.GRID_FILTER:
return new GuiGridFilter(getGridFilterContainer(player, x)); return new GuiGridFilter(getGridFilterContainer(player, x));
case RefinedStorageGui.NETWORK_TRANSMITTER: case RefinedStorageGui.NETWORK_TRANSMITTER:
return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile)); return new GuiNetworkTransmitter((ContainerNetworkTransmitter) getContainer(ID, player, tile), (TileNetworkTransmitter) tile);
default: default:
return null; return null;
} }

18
src/main/java/refinedstorage/gui/GuiNetworkTransmitter.java
View File

@@ -5,8 +5,12 @@ import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;
import refinedstorage.tile.TileNetworkTransmitter; import refinedstorage.tile.TileNetworkTransmitter;
public class GuiNetworkTransmitter extends GuiBase { public class GuiNetworkTransmitter extends GuiBase {
public GuiNetworkTransmitter(ContainerNetworkTransmitter container) { private TileNetworkTransmitter networkTransmitter;
public GuiNetworkTransmitter(ContainerNetworkTransmitter container, TileNetworkTransmitter networkTransmitter) {
super(container, 210, 137); super(container, 210, 137);
this.networkTransmitter = networkTransmitter;
} }
@Override @Override
@@ -29,19 +33,17 @@ public class GuiNetworkTransmitter extends GuiBase {
public void drawForeground(int mouseX, int mouseY) { public void drawForeground(int mouseX, int mouseY) {
drawString(7, 7, t("gui.refinedstorage:network_transmitter")); 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) { if (networkTransmitter.getNetworkCard().getStackInSlot(0) == null) {
distance = t("gui.refinedstorage:network_transmitter.missing_card"); distance = t("gui.refinedstorage:network_transmitter.missing_card");
} else if (!TileNetworkTransmitter.RECEIVER_DIMENSION_SUPPORTED.getValue()) { } else if (!TileNetworkTransmitter.RECEIVER_DIMENSION_SUPPORTED.getValue()) {
distance = t("gui.refinedstorage:network_transmitter.missing_upgrade"); distance = t("gui.refinedstorage:network_transmitter.missing_upgrade");
} else if (!networkTransmitter.isSameDimension()) { } else if (TileNetworkTransmitter.RECEIVER_DIMENSION.getValue() != networkTransmitter.getWorld().provider.getDimension()) {
distance = t("gui.refinedstorage:network_transmitter.dimension", networkTransmitter.getReceiverDimension()); distance = t("gui.refinedstorage:network_transmitter.dimension", TileNetworkTransmitter.RECEIVER_DIMENSION.getValue());
} else { } 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(51, 24, distance);
drawString(7, 42, t("container.inventory")); drawString(7, 42, t("container.inventory"));

4
src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
View File

@@ -17,14 +17,14 @@ import refinedstorage.tile.data.TileDataManager;
import refinedstorage.tile.data.TileDataParameter; import refinedstorage.tile.data.TileDataParameter;
public class TileNetworkTransmitter extends TileNode { public class TileNetworkTransmitter extends TileNode {
public static final TileDataParameter DISTANCE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileNetworkTransmitter>() { public static final TileDataParameter<Integer> DISTANCE = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileNetworkTransmitter>() {
@Override @Override
public Integer getValue(TileNetworkTransmitter tile) { public Integer getValue(TileNetworkTransmitter tile) {
return (tile.receiver != null && tile.isSameDimension()) ? tile.getDistance() : -1; return (tile.receiver != null && tile.isSameDimension()) ? tile.getDistance() : -1;
} }
}); });
public static final TileDataParameter RECEIVER_DIMENSION = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileNetworkTransmitter>() { public static final TileDataParameter<Integer> RECEIVER_DIMENSION = TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer<Integer, TileNetworkTransmitter>() {
@Override @Override
public Integer getValue(TileNetworkTransmitter tile) { public Integer getValue(TileNetworkTransmitter tile) {
return tile.receiverDimension; return tile.receiverDimension;