From 454b4f7e1dab14eb75037d926406583545d6b4dd Mon Sep 17 00:00:00 2001 From: timb8g <96289918+timb8g@users.noreply.github.com> Date: Sun, 28 Dec 2025 15:40:21 +0100 Subject: [PATCH] Added Transparency Border to recipe-background and catalyst-tab (#822) Co-authored-by: Martin Robertz Co-authored-by: slprime <31038811+slprime@users.noreply.github.com> --- .../codechicken/nei/recipe/GuiRecipe.java | 25 +++++++++++------- .../nei/recipe/GuiRecipeCatalyst.java | 16 ++++++++--- .../assets/nei/textures/catalyst_tab.png | Bin 1213 -> 4520 bytes .../assets/nei/textures/gui/recipebg.png | Bin 3680 -> 4765 bytes 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java index 29bd1247..55808b38 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java @@ -58,8 +58,13 @@ public abstract class GuiRecipe extends GuiContainer i IGuiClientSide, IGuiHandleMouseWheel, IContainerTooltipHandler, INEIGuiHandler { private static final int BORDER_PADDING = 5; - private final DrawableResource BG_TEXTURE = new DrawableBuilder("nei:textures/gui/recipebg.png", 0, 0, 176, 166) - .build(); + private static final int TRANSPARENCY_BORDER = 4; + private final DrawableResource BG_TEXTURE = new DrawableBuilder( + "nei:textures/gui/recipebg.png", + 0, + 0, + 176 + TRANSPARENCY_BORDER * 2, + 166 + TRANSPARENCY_BORDER * 2).build(); private static final int BUTTON_WIDTH = 13; private static final int BUTTON_HEIGHT = 12; @@ -789,14 +794,14 @@ public abstract class GuiRecipe extends GuiContainer i @Override public void drawGuiContainerBackgroundLayer(float f, int mouseX, int mouseY) { BG_TEXTURE.draw( - this.guiLeft, - this.guiTop, - this.xSize, - this.ySize, - BORDER_PADDING, - BORDER_PADDING, - BORDER_PADDING, - BORDER_PADDING); + this.guiLeft - TRANSPARENCY_BORDER, + this.guiTop - TRANSPARENCY_BORDER, + this.xSize + TRANSPARENCY_BORDER * 2, + this.ySize + TRANSPARENCY_BORDER * 2, + BORDER_PADDING + TRANSPARENCY_BORDER, + BORDER_PADDING + TRANSPARENCY_BORDER, + BORDER_PADDING + TRANSPARENCY_BORDER, + BORDER_PADDING + TRANSPARENCY_BORDER); drawJEITabs(mouseX, mouseY); } diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java b/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java index ca542059..a7ef0e55 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java @@ -49,12 +49,14 @@ public class GuiRecipeCatalyst extends ScrollContainer { private static final int SLOT_SIZE = 16; private static final int BORDER_PADDING = 6; + private static final int TRANSPARENCY_BORDER = 4; private static final DrawableResource BG_TEXTURE = new DrawableBuilder( "nei:textures/catalyst_tab.png", 0, 0, - 28, - 28).setTextureSize(28, 28).build(); + 28 + TRANSPARENCY_BORDER * 2, + 28 + TRANSPARENCY_BORDER * 2).setTextureSize(28 + TRANSPARENCY_BORDER * 2, 28 + TRANSPARENCY_BORDER * 2) + .build(); private static final DrawableResource FG_TEXTURE = new DrawableBuilder("nei:textures/slot.png", 0, 0, 18, 18) .setTextureSize(18, 18).build(); @@ -149,7 +151,15 @@ public class GuiRecipeCatalyst extends ScrollContainer { if (!this.showWidget) return; GL11.glColor4f(1, 1, 1, 1); - BG_TEXTURE.draw(this.x, this.y, this.w, this.h, BORDER_PADDING, BORDER_PADDING, BORDER_PADDING, BORDER_PADDING); + BG_TEXTURE.draw( + this.x - TRANSPARENCY_BORDER, + this.y - TRANSPARENCY_BORDER, + this.w + TRANSPARENCY_BORDER * 2, + this.h + TRANSPARENCY_BORDER * 2, + BORDER_PADDING + TRANSPARENCY_BORDER, + BORDER_PADDING + TRANSPARENCY_BORDER, + BORDER_PADDING + TRANSPARENCY_BORDER, + BORDER_PADDING + TRANSPARENCY_BORDER); FG_TEXTURE.draw( this.x + this.paddingInlineStart - 1, this.y + this.paddingBlockStart - 1, diff --git a/src/main/resources/assets/nei/textures/catalyst_tab.png b/src/main/resources/assets/nei/textures/catalyst_tab.png index ef3cf0642c2196958edac80a9f0d6eb30c7819f8..d13c3b49c85564a8bdc9a92f5ded24472bb6eb61 100644 GIT binary patch literal 4520 zcmeHKdvMeC9T(-1;6g6B!gz&46SQ3lvL3N)S+hyvM-q29xJd>ftQTZSb~G%@la<&> z8c0*xCA z`d@q}$@)G%zwh_+{eFL^U!$)eZ>nLo0fL~Zo_tp!crMVcUR2F z7#vaLfEW^BwJIXOLR<_$Q2dhQYoB@?o^m_5esf*zU#QLRwG>*eeL>B9spa}NZ!_w} zls7x>7=D!U(Bx+yJ%x6ZZ+U3bx%%02nMLkdm34xm{_=<0RxLbcv%Oq(q^yFO_~Bl6 zCsMp?+r@6zj(L$gY5v%?xu3^(IV8iAKWoltUcBrNFF)Uv+@5xG&l;zt<^7YJe|70d zM`5U@=D^yvC+bp9-S@$q?4udko35}M>^JhZE-Feszvs0rYimlA%Vr-~@npu~L+2o9 z+&a{`<0(yOHS=?_W>zdkQLh#&?$N^Q|+yxUBr#u}{uo z<8O01UOK*J=PWbXS#=fP@4K<;^`}<6 zgrx_n)_adB3wt5?<&szVB44w02&5 z<);&pZR3}hwwFoJ{-tNTBvhI3nLK{R1<8APyfIey@xzak3-SzSKAT}^yEUt}C}rm1 ziPaZAyj*&Vu7$|=zk7WWO;0$vq3L(sz1=%cU%qR9@A}Q82fLK+=7Zl>At)tJ1RYl5 zUBYm(WMp~SFBs!e1hgIm*|OphmRl{TuwMv@VLNj3&`|^yc{{S4^5WizQz#ens}-TB zx}cb=Ud>r~Bx|w37H0r}B&aMLmqOtv6SpHeE(88+Vhn+G6Lqy6De?MXr>qFD$!Id- zs5>rJlE`8MY*Y9EQ|QX=g8*-Kq+C@a42H#GF=H&#C@VpXuv)DcPGTg90t+-+6;|0e z8jjA_AQBiZA<8LYL>1*QtYNZ#xk9xg2++g*@ktS{cK|*d?PCG(fyLPfMi_BSlCYs3 zQPo`uK>7k2(IZ+61{Et5qH=}83GPZEtj-?}Q78=N^gloV^I-ryHxNLiLJ8@7@Ej(D z1PQDa1z{7zV$Sn;eFGjEhe1(_=w6^&!z@)XaF56|jn2o=Oo00U?udEl#=y$!Wn3~> zp@rvh*%2Ty@*>Ze9d3uicNaBx z+)9{D786QaSphZCnH1_b`zvfjBSk`F(i}<9G-|ToIBKH& zJW8`>4kam)HUSu%w2(R!&oQ~OBC((cM2QUwSR@?O6&lG*j?ZI9NFzQd@r775037Uy zm*wE4MT44RQ4)$&R-=%xm?S7zOKB>7v9O770H{yd_>kqCS8ytdA1Ia)}h8Y^A{KaRRJ_ ziYsTsK>_SJeLdPQ7f0#^+DiIy+=80@1gIiG;V4a81e79ZE0FU6i#3te0D4pos4-R% za)N+Iz!jJYoh$fTiArS*4<=SFXk`G5p#+J3l`*U@V@%s>`ct-HUnQlFCzqgzAmdy` zmUKR%Dj0KyzxR~5{^OJY$~6BGsYy(k^Pc{C=r%p@A$umsCm{oSG1%I%fxW%2n1INy z^VioTU*{4qJhsTF_#LBbjIL2JFe>A*?i!9oP zU)bGxI=kW%(J{d{en&;I$QTs?v^t5p| z|M$qo{audKw4x=+FV;M|<5VZtaFtm(>sIsJn%C!S`_%RGAA?vRkGsJ2iepv%zX8b0 BOW6Pb delta 637 zcmZ3XyqB}SGr-TCmrII^fq{Y7)59eQNXvjQ2OE$q;=MlwNHG=%xjQkeJ16rJ$YDu$ z^mSxl*x1kgCy^D%=PdAuEM{QfI{?CrS=Tx_fr64Ht`Q}{`DrEPiAAXljw$&`sS2LC ziRr09sfj6-g(p*O7#NsWWQIgc?qc#`=Rri#1Sd~q(XO|%DalMrv+^&>OwB7v1gkZ)(Z>+OG!Y^a zuFv%kCwoU{uh^=WZ68v4%0y)1(Yp6~`waWE(;ftB?=`#tEjOVRmOHyOY^5D}?NtEM()dyMzQ&$n4CU&5-?- znStFT0uhilq(s6m6)jR*DLph*L2MwWkb(wFRSJq&IVcU4YC!^m{E)Wv&2ADB>p7kr z@xRPDd*;o1_kP~J-*?|TJJaYWDIA@Uo`4|8Xj_rRi6C*X8HZ>_!dr#3U4XaO>)d6E zlMSOGDJY0OfGV{ifP#n!2O}T)9gij*L=$iR^WFz%OiX#R=F`K!K2>>WLDjL}x_7PQ zh_s^g=dWd(Gd1$z7pd8I6a3pVPg#Z+PD{Ig(qqF`JoV+3_58-xo#X9Y@9k-xl~|cO zN1OloxX#zoH~-PuKH?2)-U3VJRn0MtM;e~7_2wU@zk2*!>T7Y?o1Zk;QWmbf@%NK? zbI*M=|NO+v^q(hozSUJ9X+;-C8%JDJ{AA=A{cCow+apeeW;D zyBJTywv)n-?@rD6+niUmw_4J*5^?=5V2DLi}2C(AAzIlANQ)RA{t zy3%rrpN*`D2=7vK_dP!?pIzE`r16k_FM28C#F!^Prc*1%MuZQFe{;6+;Om}WuGvTl zR#(QB%;xQzOK!~Qus$7Z`Xg3x=Q-$FnL03Mjy9M&0nq=F=vBg)tanUX3ALS ztCOx>N^W1;Sdp-2X5~N1rjJPHPbB|0et-M!FI?;AJF}9Mee^qrvi`bzlwo1>07%*eq?fWrQuxeRQp-8u}7nkdy~tjz8}3xX0r4O)Yi zz^xH+F^N5tfaXcOz&I@r_aNYt8LLv15TnzD!(nYWM;ny9I=#tc(h;PNBynhg%e4W8 zjo<+}Lq)_G79ewy7*fPw09Bc+C%8y4V;CGqd*kzm?DjrYPR%5{((UEKJEbP-rS?c(8_LSEJ1FO8lKH! z#?<*4KFEnY6KfI%fdm|ddyE{58w8I5_Xs9E&KW5qMdlc314;Bl*#fe{1~{OiAY3a# zj)$iS0^|amV@(hN0D;pK&ElNLK$1L5(1M5Thj>I1VO6re{!ytY9-;tkqDevEa9|WD z++d_RoTh;R2LwSIBek)>qdg8E zs|e7+jM-TZeZ+O!)-C#hOJP+x^|_SMM9>B!K~Xs*N!>Oo1(FO)QHAOWZBA@NT^9ys z1C?dfLWO{+2TX=3kN~R$C3i6BGh=E5sOs4_Y=`@aXBF1MDgZ(W(#YsZMo+o*CWgpm zNK-bUXNZ3GL0%MUzs*|RJ!oER&5J}C&R-ktift(usEIwr9(`hTFQI63S1>FWOF?EA z13nrjWW|QKDmLH+@c8Jd*WP~d8)|_Tas|r33V4o*GUA3@1B;uWmbj6~)$1vqN&%Qd0&76Rra4GC;*}J&E@zmP7O?rt8UAr=A+UDd*|_ zPn5il0|{;SpWEV47xXDznOb$TP^)3lW-^`mt1?^npCq*b6$~el>emr zRMVFosU0q)Gp)4irQ`E5uorfpeIV2^s^gRRIOHxQ1(~jXnfT6)?+o~QAaO*T20;-h z&oJapHSQd#FQRWj{=2O8xMo4y{_C5bG1Yf>KGC!f*}1_pVbjrhO+PD|<-07tEMg_n gCiU~s9lt7Tl6}6(_IbaUyG3Q&tR literal 3680 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⪻0%1bJsIzzWSn(X8a+)O+`w z`IvOR7q>AA16s&GpfErkqG+h+|E>UvHKbk`Ix0)*81S0{9iTz;pBch;AOKJ(v|#vi W!4F3{XcF}a17m#)y;_7z%s&B7>XG6A