Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #258 from ShawnBuckley/ic2nc_update

Browse source 
Update IC2 Nuclear control to 2.3.1a-Butt
This commit is contained in:
ShawnBuckley 2015-10-21 21:30:58 -04:00
commit 43ddecc7b9
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/gregtech/common/items/GT_SensorCard_Item.java
View file

@ -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(); 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(); String[] tInfoData = ((IGregTechDeviceInformation)tTileEntity).getInfoData();
for (int i = 0; i < tInfoData.length; i++) { for (int i = 0; i < tInfoData.length; i++) {
aCard.setString("mString" + i, tInfoData[i]); aCard.setString("mString" + i, tInfoData[i]);
@ -65,7 +70,7 @@ public class GT_SensorCard_Item
} }
return CardState.NO_TARGET; return CardState.NO_TARGET;
} }
public List<PanelString> getStringData(int aSettings, ICardWrapper aCard, boolean aLabels) public List<PanelString> getStringData(int aSettings, ICardWrapper aCard, boolean aLabels)
{ {
List<PanelString> rList = new LinkedList(); List<PanelString> rList = new LinkedList();