diff options
| author | Doug Gabehart <dgabehar@gmail.com> | 2016-12-14 11:12:07 -0600 |
|---|---|---|
| committer | Doug Gabehart <dgabehar@gmail.com> | 2016-12-14 11:12:07 -0600 |
| commit | df00993c0df8efd4162d6b80a1662a213ff5910f (patch) | |
| tree | 1c72824e757f02edc62c28780b435876a40d709d /src/main/java/gregtech/common/items/armor/gui | |
| parent | 248b88e8bc415f92c01382eb09be4b45d5db1d72 (diff) | |
| download | GT5-Unofficial-df00993c0df8efd4162d6b80a1662a213ff5910f.tar.gz GT5-Unofficial-df00993c0df8efd4162d6b80a1662a213ff5910f.tar.bz2 GT5-Unofficial-df00993c0df8efd4162d6b80a1662a213ff5910f.zip | |
Added updateArmorStats method which includes additional checks to ensure that values are not null and the key in question exists in mStats
Removed player.closeScreen call in mouseClicked to prevent display glitch when switching armor gui tabs; (mouse focus from returning to 2x2 crafting grid)
Diffstat (limited to 'src/main/java/gregtech/common/items/armor/gui')
| -rw-r--r-- | src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java b/src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java index 3ea092a2ab..071bbbc414 100644 --- a/src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java +++ b/src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java @@ -151,10 +151,15 @@ public class GuiElectricArmor1 extends GuiContainer { if(tab>2){tab=0;} if(tab<0){tab=2;} if(xStart>72&&xStart<112){ - if(xStart>72&&xStart<81&&cont.mInvArmor.data.helmet!=null){cont.mInvArmor.data.helmet.openGui=true;player.closeScreen();} - if(xStart>82&&xStart<91&&cont.mInvArmor.data.chestplate!=null){cont.mInvArmor.data.chestplate.openGui=true;player.closeScreen();} - if(xStart>92&&xStart<101&&cont.mInvArmor.data.leggings!=null){cont.mInvArmor.data.leggings.openGui=true;player.closeScreen();} - if(xStart>102&&xStart<112&&cont.mInvArmor.data.boots!=null){cont.mInvArmor.data.boots.openGui=true;player.closeScreen();} + if(xStart>72&&xStart<81&&cont.mInvArmor.data.helmet!=null){cont.mInvArmor.data.helmet.openGui=true;} + if(xStart>82&&xStart<91&&cont.mInvArmor.data.chestplate!=null){cont.mInvArmor.data.chestplate.openGui=true;} + if(xStart>92&&xStart<101&&cont.mInvArmor.data.leggings!=null){cont.mInvArmor.data.leggings.openGui=true;} + if(xStart>102&&xStart<112&&cont.mInvArmor.data.boots!=null){cont.mInvArmor.data.boots.openGui=true;} + +// if(xStart>72&&xStart<81&&cont.mInvArmor.data.helmet!=null){cont.mInvArmor.data.helmet.openGui=true;player.closeScreen();} +// if(xStart>82&&xStart<91&&cont.mInvArmor.data.chestplate!=null){cont.mInvArmor.data.chestplate.openGui=true;player.closeScreen();} +// if(xStart>92&&xStart<101&&cont.mInvArmor.data.leggings!=null){cont.mInvArmor.data.leggings.openGui=true;player.closeScreen();} +// if(xStart>102&&xStart<112&&cont.mInvArmor.data.boots!=null){cont.mInvArmor.data.boots.openGui=true;player.closeScreen();} } } // Slot slot = getSlotAtPosition(mouseX, mouseY); |