Skip to content

Commit 8f41b55

Browse files
committed
Fixed superconductor waila name & creative pick
Closes #167
1 parent fc810f6 commit 8f41b55

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/main/java/gregtechmod/common/blocks/GT_BlockMetaID_Machine.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -687,11 +687,12 @@ public void onBlockClicked(World aWorld, int aX, int aY, int aZ, EntityPlayer aP
687687
public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
688688
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
689689

690-
if (tTileEntity != null && tTileEntity instanceof IGregTechTileEntity) {
691-
return ((IGregTechTileEntity)tTileEntity).getMetaTileID();
690+
if (tTileEntity instanceof IGregTechTileEntity) {
691+
return ((IGregTechTileEntity) tTileEntity).getMetaTileID();
692692
}
693-
694-
return 0;
693+
694+
final int meta = aWorld.getBlockMetadata(aX, aY, aZ);
695+
return meta > 0 && meta < 16 ? meta : 0;
695696
}
696697

697698
@Override

src/main/java/gregtechmod/common/items/GT_MetaMachine_Item.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, b
5252
mString4[tDamage] = "";
5353
mString5[tDamage] = "";
5454
mString6[tDamage] = "";
55-
if (tDamage == 0) {
56-
57-
} else {
55+
if (tDamage != 0) {
5856
TileEntity temp = GregTech_API.sBlockList[1].createTileEntity(aPlayer.worldObj, tDamage > 15 ? GregTech_API.mMetaTileList[tDamage] == null ? 0 : GregTech_API.mMetaTileList[tDamage].getTileEntityBaseType() : tDamage);
5957
if (temp != null) {
6058
temp.setWorldObj(aPlayer.worldObj); temp.xCoord = 0; temp.yCoord = 0; temp.zCoord = 0;
@@ -72,7 +70,7 @@ public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, b
7270
if (tTileEntity.getEUCapacity() > 10000) mString4[tDamage] = I18n.format("metatileentity.TileEntity_EUp_STORE.tooltip",tTileEntity.getEUCapacity()); else mString4[tDamage] = "";
7371
mString5[tDamage] = (tTileEntity.isOverclockerUpgradable()?"O ":"") + (tTileEntity.isTransformerUpgradable()?"T ":"") + (tTileEntity.isBatteryUpgradable(0, (byte)0)?"B ":"") + (tTileEntity.isRFConverterUpgradable()?"M ":"") + (tTileEntity.isSteamEngineUpgradable()?"S ":"");
7472
if (!mString5[tDamage].equals(""))
75-
mString5[tDamage] = I18n.format("metatileentity.TileEntity_UPGRADES.tooltip") + " " + (tTileEntity.isOverclockerUpgradable()?"O ":"") + (tTileEntity.isTransformerUpgradable()?"T ":"") + (tTileEntity.isBatteryUpgradable(0, (byte)0)?"B ":"") + (tTileEntity.isRFConverterUpgradable()?"M ":"") + (tTileEntity.isSteamEngineUpgradable()?"S ":"");
73+
mString5[tDamage] = I18n.format("metatileentity.TileEntity_UPGRADES.tooltip") + " " + (tTileEntity.isOverclockerUpgradable()?"O ":"") + (tTileEntity.isTransformerUpgradable()?"T ":"") + (tTileEntity.isBatteryUpgradable(0, (byte)0)?"B ":"") + (tTileEntity.isRFConverterUpgradable()?"M ":"") + (tTileEntity.isSteamEngineUpgradable()?"S ":"");
7674
mString6[tDamage] = "";
7775
}
7876
}

0 commit comments

Comments
 (0)