From 05316f03abea0b5e2b8275d4bc1a1acc2459036b Mon Sep 17 00:00:00 2001 From: Shawn Buckley Date: Tue, 20 Oct 2015 21:23:33 -0400 Subject: [PATCH] Update IC2 Nuclear control to 2.3.1a-Butt --- .../common/items/GT_SensorCard_Item.java | 19 ++++++++++++------- 1 file 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 b1781ccc..ac816acd 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 getStringData(int aSettings, ICardWrapper aCard, boolean aLabels) { List rList = new LinkedList();