From a294ab4f7ea37a41e860daeb862ee966437fa545 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 1 Nov 2016 19:02:23 +0100 Subject: [PATCH] clippy --- .../mod/booklet/GuiBooklet.java | 15 +++++++++------ .../textures/gui/booklet/guiBookletAddon.png | Bin 1249 -> 1895 bytes 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java index 12eb19440..763fe8c4d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java @@ -140,9 +140,17 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{ //Draws Achievement Info BookletUtils.drawAchievementInfo(this, true, x, y); - //Draws the title this.fontRendererObj.setUnicodeFlag(false); + //Draws the title BookletUtils.drawTitle(this); + + if(this.buttonIntroduction.visible){ + StringUtil.drawSplitString(this.fontRendererObj, TextFormatting.GREEN+"Hi! It looks like you're using this manual! Would you like help? "+TextFormatting.RESET+"\nClick the button below to save a couple of "+TextFormatting.GOLD+"useful chapters as bookmarks"+TextFormatting.RESET+" on the bottom of the GUI! \nIf you don't want this, shift-click the button instead.", this.guiLeft+150, this.guiTop+10, 100, 0xFFFFFF, true); + + this.mc.getTextureManager().bindTexture(RES_LOC_ADDON); + this.drawTexturedModalRect(this.guiLeft+240, this.guiTop-10, 226, 0, 30, 55); + this.mc.getTextureManager().bindTexture(RES_LOC); + } this.fontRendererObj.setUnicodeFlag(true); //Pre-Renders the current page's content etc. @@ -165,14 +173,9 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{ } this.fontRendererObj.setUnicodeFlag(false); - if(this.buttonIntroduction.visible){ - StringUtil.drawSplitString(this.fontRendererObj, TextFormatting.GREEN+"Hi! It looks like this is the first time you are using this manual! "+TextFormatting.RESET+"\nClick the button below to save a couple of "+TextFormatting.GOLD+"useful chapters as bookmarks"+TextFormatting.RESET+" on the bottom of the GUI! \nIf you don't want this, shift-click the button instead.", this.guiLeft+150, this.guiTop+10, 100, 0xFFFFFF, true); - } - //Draws hovering texts for buttons BookletUtils.doHoverTexts(this, x, y); BookletUtils.drawAchievementInfo(this, false, x, y); - this.fontRendererObj.setUnicodeFlag(unicodeBefore); //Resets mouse diff --git a/src/main/resources/assets/actuallyadditions/textures/gui/booklet/guiBookletAddon.png b/src/main/resources/assets/actuallyadditions/textures/gui/booklet/guiBookletAddon.png index 551768e3111542b007ad029e2536f249de8be31e..5873c000968093ca648d2b261f20d6bc21d6b45e 100644 GIT binary patch literal 1895 zcmeH|TTqin6vsC=5+MkVGuogC*6BklfhbZdi9l3DT18uxOXEaQB(%_gCXmYqNf0Gk zZE44Luono{VrbJqEsjx0kO(7=3SYedBJh0~tprR+qLGAZ9zxq}J7rMfUrJ|W;QDBG6D z17P9BV8h7Aeklz=B0qCSIuRwUShQiy^ySsI0HW~IbNRbV3;BZlqlZCR{wG|1Johj^ zc3nIzehp0>8rls&$i2)h%soQ(^jJQ3G&}Ody^`eBx8K1Q5JtXP*8JTjiEiE7A6As0 zs|-yO&c>4-8~O21ll4laQa@gK=H!37>y9P zys8y*#Iv>jgY!HWFdjb3dG+`etHEWV(`tM(rr}8>J@P4K35Ymb>p+<7>rVZWV}vxh zPG9*DI~zNs-w*fcPRHI%j02XVuDy)4KSP3vjV9d%*gg)ynnr5@#&)eazvEpa=_mXE-tfkB|oLsQH0{%+-s)04&XdJ#Gka&NzAh)n2>%`&?PbjjM zmN2e+R$>)>1{sIpDa#jeG8;GL(w(*^U+YCv15^$K7mw1fOR@x|1(@T4-3GDneyncY zKGVnt*7soul}>q@E9B*vO4kf>dIq_THSn%^K4<^Xb=YLNXLMQA#zQJJxLs{d`}%zu zME9gFJaJMrgM4bq17&r(m2}#1xy5{r$yPhFc`#N6nZrk_S2FmV9rA@J^37p^MUd12r?7C^ z?;*KWN%BPJ)VR$&VUvH1Ug>`cn>k+Bs1HrpZq$hToeke2QdNdeG`qYt#Np&LYUZBx z6`ORflJS@be|?43TgB07QX>>S$=!DCU_vUJW$ovfe7^&3;02`1AT0f0fn>^PR<`8klZ0x3FwCxaIUs%9S>ENK%_&oz!5M7J_YQ2)B4PVLs?&2bd5IC{c)u z!Lxd#`54=h!ZgkSWgCv+MR;MckD`2GVKNO3myDxVMH{99sv5_VuGIQ(U=7r}O#_B3 zH0m#%UCqUe-TF^5;}drcQs>ihg7T0uHpQyZBKu*@T#r9S@^5M%ke`z+*{HbDeaPe) zdCO3Bj@h6ef6jt=(vpVMPP{fEu_f^;WVCCMQM%M&Bh^c{rkG%~u+O=vTgZBs@+rB>F0!xXzj|3c@_n~BjZZ~SkA_05T(7sS^}u!V1S>6S6!${J;><6%7zaGeCn}5ap}&W zCT(-~ZTo+7I_BrbWXz)@y~3M=K;i9m;_4Q!`g7&hrp;&4BIJsB9zrWXCUia_M&(|yLA@2X0 z|DX2+m;Ot){q*-hXZ!z)?^e$*f3KfgD4I|1bW2=Vdsb zlE?7xsQdK)QyCx3lxX;H@o9Z3LxmcfLQTofc!(A9vH!x^8q$+cZT_JGG^O&#{|~=k zJ)iq4>pi<)3X2&C*?jyZ`}4}}<8N#RBp87qIf_O@fGQzy@bvco3@YdK-kva-^cz_A OFnGH9xvX