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

Fix for #907

Browse source
This commit is contained in:
MauveCloud 2017-03-12 15:23:12 -07:00
parent fd54912c67
commit b439073dfa
1 changed files with 48 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
View file

@ -730,20 +730,54 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public TextureAtlasSprite getIcon(ItemStack stack, int pass) { public TextureAtlasSprite getIcon(ItemStack stack, int pass) {
IToolStats toolStats = getToolStats(stack); IToolStats toolStats = getToolStats(stack);
IIconContainer head = toolStats.getIcon(true, stack); IIconContainer icon = null;
IIconContainer handle = toolStats.getIcon(false, stack); switch (pass) {
if(handle != null) { case 0:
if(pass == 0) { case 1:
return handle.getIcon(); // Handle
} else if(pass == 1) { icon = toolStats.getIcon(false, stack);
return handle.getOverlayIcon(); break;
} case 2:
case 3:
// Head
icon = toolStats.getIcon(true, stack);
break;
case 4:
case 5:
// Durability Bar
long tDamage = getToolDamage(stack);
long tMaxDamage = getToolMaxDamage(stack);
if (tDamage <= 0L) {
icon = gregtech.api.enums.Textures.ItemIcons.DURABILITY_BAR[8];
} else if (tDamage >= tMaxDamage) {
icon = gregtech.api.enums.Textures.ItemIcons.DURABILITY_BAR[0];
} else {
icon = gregtech.api.enums.Textures.ItemIcons.DURABILITY_BAR[((int) java.lang.Math.max(0L, java.lang.Math.min(7L, (tMaxDamage - tDamage) * 8L / tMaxDamage)))];
}
break;
case 6:
case 7:
// Energy Bar
Long[] tStats = getElectricStats(stack);
if ((tStats != null) && (tStats[3].longValue() < 0L)) {
long tCharge = getRealCharge(stack);
if (tCharge <= 0L) {
icon = gregtech.api.enums.Textures.ItemIcons.ENERGY_BAR[0];
} else if (tCharge >= tStats[0].longValue()) {
icon = gregtech.api.enums.Textures.ItemIcons.ENERGY_BAR[8];
} else {
icon = gregtech.api.enums.Textures.ItemIcons.ENERGY_BAR[(7 - (int) java.lang.Math.max(0L, java.lang.Math.min(6L, (tStats[0].longValue() - tCharge) * 7L / tStats[0].longValue())))];
}
}
break;
default:
break;
} }
if(head != null) { if (icon != null) {
if(pass == 2) { if ((pass & 1) == 0) {
return head.getIcon(); return icon.getIcon();
} else if(pass == 3) { } else {
return head.getOverlayIcon(); return icon.getOverlayIcon();
} }
} }
return null; return null;
@ -752,7 +786,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public int getRenderPasses(ItemStack stack) { public int getRenderPasses(ItemStack stack) {
return 4; return 8;
} }
@Override @Override