From 5ce3ecab848d584c02691c65b5e06f1b7c4ad736 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 3 Jul 2016 00:18:06 +0200 Subject: [PATCH] GUI tweaks --- CHANGELOG.md | 2 ++ .../container/ContainerSolderer.java | 4 ++-- src/main/java/refinedstorage/gui/GuiGrid.java | 2 +- .../java/refinedstorage/gui/GuiSolderer.java | 10 +++++++--- .../assets/refinedstorage/lang/en_US.lang | 1 + .../refinedstorage/textures/gui/solderer.png | Bin 2101 -> 2098 bytes 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3edf8c633..adbe854c8 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ **Features** - Added a debug storage disk +- Added tooltip to solderer progress bar that shows progress percentage +- Tweaked grid GUI ### 0.8.3 **Bugfixes** diff --git a/src/main/java/refinedstorage/container/ContainerSolderer.java b/src/main/java/refinedstorage/container/ContainerSolderer.java index ce594ce1d..78a2fcfc6 100755 --- a/src/main/java/refinedstorage/container/ContainerSolderer.java +++ b/src/main/java/refinedstorage/container/ContainerSolderer.java @@ -20,13 +20,13 @@ public class ContainerSolderer extends ContainerBase { y += 18; } - addSlotToContainer(new SlotOutput(solderer.getItems(), 3, 134, 38)); + addSlotToContainer(new SlotOutput(solderer.getItems(), 3, 127, 38)); for (int i = 0; i < 4; ++i) { addSlotToContainer(new SlotItemHandler(solderer.getUpgrades(), i, 187, 6 + (i * 18))); } - addPlayerInventory(8, 95); + addPlayerInventory(8, 89); } @Override diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index 27418046a..08029cb43 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/GuiGrid.java @@ -239,7 +239,7 @@ public class GuiGrid extends GuiBase { ty = 2; } - drawTexture(x + 64, y + 97, 195, ty * 16, 16, 16); + drawTexture(x + 152, y + 117, 195, ty * 16, 16, 16); } searchField.drawTextBox(); diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java index 3ba9386c6..8b63e7477 100755 --- a/src/main/java/refinedstorage/gui/GuiSolderer.java +++ b/src/main/java/refinedstorage/gui/GuiSolderer.java @@ -8,7 +8,7 @@ public class GuiSolderer extends GuiBase { private TileSolderer solderer; public GuiSolderer(ContainerSolderer container, TileSolderer solderer) { - super(container, 211, 177); + super(container, 211, 171); this.solderer = solderer; } @@ -29,13 +29,17 @@ public class GuiSolderer extends GuiBase { drawTexture(x, y, 0, 0, width, height); if (solderer.isWorking()) { - drawTexture(x + 83, y + 40 - 1, 212, 0, solderer.getProgressScaled(22), 15); + drawTexture(x + 83, y + 38 - 1, 212, 0, solderer.getProgressScaled(22), 15); } } @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:solderer")); - drawString(7, 82, t("container.inventory")); + drawString(7, 77, t("container.inventory")); + + if (inBounds(83, 38, 22, 15, mouseX, mouseY) && solderer.isWorking()) { + drawTooltip(mouseX, mouseY, t("gui.refinedstorage:solderer.progress", solderer.getProgressScaled(100))); + } } } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index e6e397d53..8abc95d90 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -13,6 +13,7 @@ gui.refinedstorage:importer=Importer gui.refinedstorage:exporter=Exporter gui.refinedstorage:detector=Detector gui.refinedstorage:solderer=Solderer +gui.refinedstorage:solderer.progress=%d%% gui.refinedstorage:destructor=Destructor gui.refinedstorage:constructor=Constructor gui.refinedstorage:relay=Relay diff --git a/src/main/resources/assets/refinedstorage/textures/gui/solderer.png b/src/main/resources/assets/refinedstorage/textures/gui/solderer.png index 5243c64fb281d4eaafb63dd6edd7d81c2a985077..82d661154ec247b618992dde17b6702c8a530f9c 100755 GIT binary patch literal 2098 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(0|PTd zfKP}kP~62^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;5z`qj9J$@Ie~%_C9V-A!TD(=<%vb93~dIoxyImUH< zzyf84r;B4qMcmsvjgw{>NVq1hdi~qpDEot+BS+>Hm!9u)UYlC-`9Bo1eECGOA~DHkb)lGGu5^WoJJ5e3%rDy4Mf~{q zdaW$)0`pngb*XC^7!nu@`09`E)wWx_XWsgTQtR@TPamU!iWz2nixps~T5QSi<-lzw zAb(ji8$-iu@%QW=|9*VE*0+!8+TJ>M59_X{<&`E4_cGSKn0hm~s$hC8(-RgO1|z2R z3}1@eHEaTB-;UeGbggy!&wz&5#_0@SChgqtVM`89lg6}Qt&1GPEss>j1vAeuDn!RK@V?`)-En#`(499|?{;-( ze$o4^D?U=2fgyt7Lw(D&R{Ke77)nHn69qx;KeyTfc#W?=m~^@6l!GW8LuI z-sw0fIDFV`Wk3IZ&mntX*1@Q}VKV0dfpaD5>fY^(J)&!Yc1$(9 z{voL@4_KW+z=gtaZWx1U=Tif2Wi`2(`Wn8y^%X_)1KgG@e!*4u%E8MyJMcD<@ q>)F*#f|V=&2O9z2w<^zrzOCyt(YJ>8Q96f&N!elF{r5}E*b2^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;5!Jyj5{V~zXb|Pl(rIsj|=o#o)<`~!c z0SlDbo-U3d6>)FxH0I4VkZ?_$X7c|336T@JY6-&pHx-}FTkL6HD#SGZ#kNISvG>d0 zUirUt{q~n1Q~A$U#NM~P_456nOUGpdE8cLG=+6EB_<3cW_3<_7I?`cVMYEZHWG=m( zYqfuF@-^dWy?VELOqgD5?&cgZsOxD~@gARM5O&bfEU?4h!4Im8VuO zyL|T<^8|qhTsxEwWbb~S&%EGmt{TIwo+pe8)<%di-0FD7ut4%WLxMffe+tqL_9d;y zASG&<9Zcs2HB%`c5ncl?DKr8ERbS2u;qOZ!v*QHj0@Q9#2B74-T2>k;U}o_xa{bE z{LfEor{~|91kTDnNMpLtn?CCVV}eD_+_&3axO2U`qH&<$PUn}3vb9Vi+#sVIs`C{< z)bUtwm@r+)pV{(m*22l*SK z$*a33HMa&yF6afB0JQ!eL&`|H{I_u1SL_Y6FGHDu;RBn5y>;yI z*fn|I7r)xS{u9Gt`M0}U|NX!G_`d184?lN)@%>`+Vp8ah)M&;9nbHiiwhcHHb^kxp XZQY$8&O5MQ0{Pz4)z4*}Q$iB}ezCJ8