From ccc15b4bec711e7596ce8958ac4e4642d6a90934 Mon Sep 17 00:00:00 2001 From: hhui64 <907322015@qq.com> Date: Sun, 18 Jul 2021 17:25:15 +0800 Subject: [PATCH] chore: update ui textures --- .../statspanel/StatsPanelGuiContainer.java | 31 ++++++++++-------- .../pixelmoninfoplus/textures/gui/ivevgui.png | Bin 865 -> 0 bytes .../textures/gui/statspanel_background.png | Bin 905 -> 905 bytes src/main/resources/pack.mcmeta | 2 +- 4 files changed, 19 insertions(+), 14 deletions(-) delete mode 100644 src/main/resources/assets/pixelmoninfoplus/textures/gui/ivevgui.png diff --git a/src/main/java/io/github/hhui64/pixelmoninfoplus/gui/statspanel/StatsPanelGuiContainer.java b/src/main/java/io/github/hhui64/pixelmoninfoplus/gui/statspanel/StatsPanelGuiContainer.java index ef719cb..9605a8a 100644 --- a/src/main/java/io/github/hhui64/pixelmoninfoplus/gui/statspanel/StatsPanelGuiContainer.java +++ b/src/main/java/io/github/hhui64/pixelmoninfoplus/gui/statspanel/StatsPanelGuiContainer.java @@ -189,8 +189,8 @@ public void drawProgress() { double evsPercentage = Arrays.stream(evs.getArray()).sum() / 510.0 * 100.0; int evsProgressWidth = Math.toIntExact(Math.round(115 * evsPercentage / 100)); - this.drawTexturedModalRect(offsetX + 126, offsetY + 153, 126, 243, ivsProgressWidth, 12); - this.drawTexturedModalRect(offsetX + 126, offsetY + 170, 126, 243, evsProgressWidth, 12); + this.drawTexturedModalRect(offsetX + 126, offsetY + 152, 126, 243, ivsProgressWidth, 12); + this.drawTexturedModalRect(offsetX + 126, offsetY + 169, 126, 243, evsProgressWidth, 12); } /** @@ -248,7 +248,7 @@ public void drawPokemonIcon() { if (type2 != EnumType.Mystery && type2 != null) { // 双属性 GuiHelper.drawImageQuad(offsetX + 44 - 18, offsetY + 26, 21.0D, 21.0F, (double) (x1 / 1792.0F), (double) (y1 / 768.0F), (double) ((x1 + 240.0F) / 1792.0F), (double) ((y1 + 240.0F) / 768.0F), this.zLevel); - GuiHelper.drawImageQuad(offsetX + 44 + 4, offsetY + 26, 21.0D, 21.0F, (double) (x / 1792.0F), (double) (y / 768.0F), (double) ((x + 240.0F) / 1792.0F), (double) ((y + 240.0F) / 768.0F), this.zLevel); + GuiHelper.drawImageQuad(offsetX + 44 + 5, offsetY + 26, 21.0D, 21.0F, (double) (x / 1792.0F), (double) (y / 768.0F), (double) ((x + 240.0F) / 1792.0F), (double) ((y + 240.0F) / 768.0F), this.zLevel); } else { // 单(主)属性 GuiHelper.drawImageQuad(offsetX + 44 - 7.0D, offsetY + 26, 21.0D, 21.0F, (double) (x / 1792.0F), (double) (y / 768.0F), (double) ((x + 240.0F) / 1792.0F), (double) ((y + 240.0F) / 768.0F), this.zLevel); @@ -265,15 +265,17 @@ public void drawPokemonIcon() { */ public void drawPokemonPokedexNumberAndLevel() { int offsetX = this.getOffsetXY()[0], offsetY = this.getOffsetXY()[1]; - int y = offsetY + 11; + int x1 = offsetX + 8; + int x2 = offsetX + 68; + int y = offsetY + 10; if (this.pokemon != null) { if (this.pokemon.isEgg()) { - drawString(this.mc.fontRenderer, I18n.format("gui.statspanel.number") + " ???", offsetX - 47 + 47 + 8, y, 0xFFFFFF); - drawCenteredString(this.mc.fontRenderer, I18n.format("gui.statspanel.lvl") + " ???", offsetX + 19 + 47, y, 0xFFFFFF); + drawString(this.mc.fontRenderer, I18n.format("gui.statspanel.number") + " ???", x1, y, 0xFFFFFF); + drawCenteredString(this.mc.fontRenderer, I18n.format("gui.statspanel.lvl") + " ???", x2, y, 0xFFFFFF); } else { - drawString(this.mc.fontRenderer, I18n.format("gui.statspanel.number") + " " + this.pokemon.getSpecies().getNationalPokedexNumber(), offsetX - 47 + 47 + 8, y, 0xFFFFFF); - drawCenteredString(this.mc.fontRenderer, I18n.format("gui.statspanel.lvl") + " " + this.pokemon.getLevel(), offsetX + 47 + 19, y, 0xFFFFFF); + drawString(this.mc.fontRenderer, I18n.format("gui.statspanel.number") + " " + this.pokemon.getSpecies().getNationalPokedexNumber(), x1, y, 0xFFFFFF); + drawCenteredString(this.mc.fontRenderer, I18n.format("gui.statspanel.lvl") + " " + this.pokemon.getLevel(), x2, y, 0xFFFFFF); } } } @@ -283,21 +285,24 @@ public void drawPokemonPokedexNumberAndLevel() { */ public void drawPokemonName() { int offsetX = this.getOffsetXY()[0], offsetY = this.getOffsetXY()[1]; - int x = 11; + int x = offsetX + 48; + int y = offsetY + 116; + int y1 = offsetY + 112; + int y2 = offsetY + 121; if (this.pokemon != null) { String pokemonNickname = this.pokemon.getNickname(); if (this.pokemon.isEgg()) { - drawCenteredString(this.mc.fontRenderer, Entity1Base.getLocalizedName("Egg"), offsetX + 47, offsetY + 99 + 17, 0xFFFFFF); + drawCenteredString(this.mc.fontRenderer, Entity1Base.getLocalizedName("Egg"), x, y, 0xFFFFFF); } else { // int offset = pokemon.hasGigantamaxFactor() ? 9 : 0; if (pokemonNickname != null && !pokemonNickname.equals("")) { String ogName = "(" + this.pokemon.getSpecies().getLocalizedName() + ")"; - this.drawCenteredString(this.mc.fontRenderer, pokemonNickname, offsetX + 47, offsetY + 95 + 17, 0xFFFFFF); - this.drawCenteredString(this.mc.fontRenderer, ogName, offsetX + 47, offsetY + 104 + 17, 0xFFFFFF); + this.drawCenteredString(this.mc.fontRenderer, pokemonNickname, x, y1, 0xFFFFFF); + this.drawCenteredString(this.mc.fontRenderer, ogName, x, y2, 0xFFFFFF); } else { - this.drawCenteredString(this.mc.fontRenderer, this.pokemon.getDisplayName(), offsetX + 47, offsetY + 99 + 17, 0xFFFFFF); + this.drawCenteredString(this.mc.fontRenderer, this.pokemon.getDisplayName(), x, y, 0xFFFFFF); } } } diff --git a/src/main/resources/assets/pixelmoninfoplus/textures/gui/ivevgui.png b/src/main/resources/assets/pixelmoninfoplus/textures/gui/ivevgui.png deleted file mode 100644 index c6a34aaf85f4b603f1ab5618e6ba9057f431a0c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 865 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fo{p?&#~tz_78O`%fY(NVYi0 z-HBn{IhmJ0j&Xobh%1o3ef#$0$&)=jJts|?Wc=S4D6(qRsue3%96x^C!^1;gU;pOK zn-LKa{}~v%ySvrr^V_UA7!NY5B*-tA!Qt7BGzJEy{hlt4Ar-gY-s#O-9>8x%5h#uhivzExyt>U>(>iAFemsntUAe>rt@37;jsR5DFyMF(G7Yb#Ajs#S+XF{B7lbU zgYVIdT3`XUhIJPZGDs|kU=bu9oM{UTA#C7+C>vOKH`9mumN!huN-l`7GAKwmEM>a( zhT|qEU{Qd$S5`ML5)uO2m_y%v%KUYI>awl7-rdw%aGIOp)1j&R)_m4s@ZR>;U;F90 z+xiZ18!p||s_aWX(3HEoWU2a^hPivVO^)`}Yd0*r@-d$+AO~pn1|x@?fgm3jsJ+ICzb|ZFPHlheM)}Q(bxB? z4W2)~c5)$Z~(~+!&Dtj}JCW6oW(>+B$?4c_&&hXjV9< ztZF#GJ8>nGiHnKL9$qE}flZ1*;+F*~uUvn;v_?C2`j@XeJbwJSX?5{<{48(?*hnS( zVSQ;bcY65dZF_6$rZc>(Zn%9Mm@0C2{h3s;&zSkl_is^*^QC|8=9k diff --git a/src/main/resources/assets/pixelmoninfoplus/textures/gui/statspanel_background.png b/src/main/resources/assets/pixelmoninfoplus/textures/gui/statspanel_background.png index c9bb99c24638d98e9853c5f8be506802d19e64b3..4506d6f638c67a6018587bfde85fb19f52abb26b 100644 GIT binary patch delta 675 zcmeBV?_{4at-iZxk%0u;g@79_S()Ge&My<(b7f`O+=~eY&!yScoDC`dv(u+R%86s+ ztrpFXYi}Jn_51&|BRl{5uFbr?gE?cCUT{))*}ePe4SWvUD=YdKR-T!|oMRTrlC<;h ze3m|j*}ig(5e5ItnHZ2kfTcsBbe{Wb%j|c#Cfi^AUcLMn*In)}FWDMOk{8dBQb5WT~`v9xZdWH+4cmAg`>?-=bU%=rY;{@3SZ-AzMW9nm; z;ba23Q);pS6IcBTCWXhm!moF@X*||7UcJL>&B;>Pdr|9z&v0ItGH2Uao(ofXFT7)L zx}%$Y_QwCf1)u))GhJ0XG2?tD*Zld9OJ-bUFPPQ(ca2iRU-xxP-?+BsF)vG5JeM&m=QK`P|%u8i2ms}AG5zE~D!@F+jq-))8h2uUm*B_W{#N#Y+?C86L z0jaD!zcW{qiduZx_l`?~kN@=@HXqyd+nC<4F*5up)cCWt=6|=9h~LZPmrE8gxM-aZ zW^?IcGEjKraH7G(mSN#1#)&(bwB!V4Y9DCmU=-Z#$iT2lMj*3WQlRqM%a1|lytb>( zl@niSS3k|~?O%OgaKy|DGsH;=lknD8wz9}{P}r(ZG!|~xzPMN3&uHh zRadzz>P}qOdcgAKm*|Juul9M&ehz%C@p}Im?q;k!UMHTs)z4*}Q$iB};u#=> delta 679 zcmeBV?_{4at-dj6m4gV|1JxaCQbOMU-y-gKdD*NvCyyTe{P%FfEx&E^*^jUqEuHdf zgJ7^jfcb&9?MxvI3>-kwGYrm487C_;i7+=f27>7xP9`8N z%G?l`2%_sHL|7RTb~E^1tY5PR)gT6j1}(;}y0`Dt7`*B}eqwWLoqfCh@2^kV<}3jU z(o8S9U0MIICfo{mswlr~zgbii@8N4@g4NOs zY#EmP+t4#><^RbJAO86>B~DH`_1b3X_3N2dXCE=nNq=d<%~DWvGW0;8;w!U+xVAM6 zfB)d+X=Ux!rY2>3w+psqHbBt2XXGT)dB=en;@JLZ8Q5 zEbd4+haISxb8N-x11rC8)K0Lu+q08*Mz!2Frain&3?EX%f8_rC7rs?{&gav&PKGje zu$+%&b6Le?ppfK#qQOI^L8QhZWo5$wW+iV{2?0ZeN4WwF4HKA^a!r|)zFXPEoeq4t zZQ0?+N)JEhzjb+Ep9_wag8YVnpInzxt@QNMYXARy&d)iaj_t>vACJQv=KF;U&3`|K z@!WU0txR@tPv&bq;Q8`Hv|#72`W)tS4rQ(KdjA