aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
authorShawn Buckley <shawntbuckley@gmail.com>2015-10-20 21:23:33 -0400
committerShawn Buckley <shawntbuckley@gmail.com>2015-10-21 21:31:35 -0400
commit05316f03abea0b5e2b8275d4bc1a1acc2459036b (patch)
treeb3ac53cf3e78a46ea65cd4f3ca72e201abb9cb41 /src/main/java/gregtech
parentcda516a3e3b65f3ed36b7a70a307d5ed8594b44b (diff)
downloadGT5-Unofficial-05316f03abea0b5e2b8275d4bc1a1acc2459036b.tar.gz
GT5-Unofficial-05316f03abea0b5e2b8275d4bc1a1acc2459036b.tar.bz2
GT5-Unofficial-05316f03abea0b5e2b8275d4bc1a1acc2459036b.zip
Update IC2 Nuclear control to 2.3.1a-Butt
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/common/items/GT_SensorCard_Item.java19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
index b1781cccb9..ac816acd1c 100644
--- a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
+++ b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
@@ -50,13 +50,18 @@ public class GT_SensorCard_Item
}
}
}
-
- public CardState update(TileEntity aPanel, ICardWrapper aCard, int aMaxRange)
- {
+
+ @Override
+ public CardState update(TileEntity aPanel, ICardWrapper aCard, int aMaxRange) {
+ return update(aPanel.getWorldObj(), aCard, aMaxRange);
+ }
+
+ @Override
+ public CardState update(World world, ICardWrapper aCard, int aMaxRange) {
ChunkCoordinates target = aCard.getTarget();
- TileEntity tTileEntity = aPanel.getWorldObj().getTileEntity(target.posX, target.posY, target.posZ);
- if ((tTileEntity != null) && ((tTileEntity instanceof IGregTechDeviceInformation)) && (((IGregTechDeviceInformation)tTileEntity).isGivingInformation()))
- {
+
+ TileEntity tTileEntity = world.getTileEntity(target.posX, target.posY, target.posZ);
+ if ((tTileEntity != null) && ((tTileEntity instanceof IGregTechDeviceInformation)) && (((IGregTechDeviceInformation)tTileEntity).isGivingInformation())) {
String[] tInfoData = ((IGregTechDeviceInformation)tTileEntity).getInfoData();
for (int i = 0; i < tInfoData.length; i++) {
aCard.setString("mString" + i, tInfoData[i]);
@@ -65,7 +70,7 @@ public class GT_SensorCard_Item
}
return CardState.NO_TARGET;
}
-
+
public List<PanelString> getStringData(int aSettings, ICardWrapper aCard, boolean aLabels)
{
List<PanelString> rList = new LinkedList();