From 67693961acae22527ee692ff2ccb5e182f956c60 Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 6 Nov 2016 16:42:25 -0800 Subject: [PATCH] Change address texture back to 32x32 to avoid breaking texture packs --- .../java/forestry/api/mail/IPostalCarrier.java | 2 +- .../mail/gui/widgets/AddresseeSlot.java | 2 +- .../textures/gui/mail/carrier.player.png | Bin 175 -> 179 bytes .../textures/gui/mail/carrier.trader.png | Bin 159 -> 163 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/forestry/api/mail/IPostalCarrier.java b/src/main/java/forestry/api/mail/IPostalCarrier.java index b027c8b1d..33ac38a2e 100644 --- a/src/main/java/forestry/api/mail/IPostalCarrier.java +++ b/src/main/java/forestry/api/mail/IPostalCarrier.java @@ -33,7 +33,7 @@ public interface IPostalCarrier { /** * Sprite registered to the Gui Texture Map at {@link ITextureManager}. - * Must be 26 pixels wide and 15 pixels tall. The texture itself must be 26x26 square to be accepted by the texture map. + * Must be 26 pixels wide and 15 pixels tall. The texture itself must be 32x32 square. */ @SideOnly(Side.CLIENT) TextureAtlasSprite getSprite(); diff --git a/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java b/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java index da209a596..f7219ec34 100644 --- a/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java +++ b/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java @@ -38,7 +38,7 @@ public class AddresseeSlot extends Widget { if (carrier != null) { GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0F); Proxies.render.bindTexture(TextureManager.getInstance().getGuiTextureMap()); - manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, carrier.getSprite(), 26, 26); + manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, carrier.getSprite(), 32, 32); } } diff --git a/src/main/resources/assets/forestry/textures/gui/mail/carrier.player.png b/src/main/resources/assets/forestry/textures/gui/mail/carrier.player.png index 2e2d9f8b6274dd68d6bf7b97a82fab04e8220edc..68a129e2ea81701e2f2384646dd6c6758d465101 100644 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4*Z=?jJD8X>q$|y=);z!5 z!p*061yG8yB*-tA!Qt7BG$1F))5S5QBJOS9ZO#S<9+u08^votqDUg-9Rqxw1z14w5 zddE*0HU8aP%WcnaI_`Va@IiG!i^swvsz!<`MunVfS~QvjAHGn|&9uKQ_q(pv4|_Uv4q8TGPSA zq$|y=);z!5 z!p*061yG8yB*-tA!Qt7BG$6;x)5S5QBJOSfK~4q*9_HOmk67{o%r$oX_xUz`noU>z z`^uJ<6P!7PYa00$&N}j8hiapX<_>1<{wC`~T=kL03aazDZ?=hltP7aT0yK@m)78&q Iol`;+0Bb`wqW}N^ literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^QXtI23?!pd0{;Rj{s5m4*Z=?jpI>g#kghbdTGPSA zWP7UZTA&nTNswPKgTu2MX+Vyhr;B4qMcmoGjhqY$JS_FBhQbz3Cz!f^pI_2iurjFn z?!-TzvpV%|ZhL2te$d!BQ@56~nAPgg&ebxsLQ E0LFkf761SM