From 0d101699329c9bb6ea8e0e425e9ba5ef072f78ae Mon Sep 17 00:00:00 2001 From: Mithi83 <28407460+Mithi83@users.noreply.github.com> Date: Wed, 2 Sep 2026 12:43:49 +0200 Subject: [PATCH 1/3] add ae2wtlib icon --- .../compat/wtlib/WirelessTerminalCompat.java | 4 +++- .../assets/merequester/textures/wtlib/icon.png | Bin 0 -> 4324 bytes 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/merequester/textures/wtlib/icon.png diff --git a/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java b/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java index d784cc5..20b2df5 100644 --- a/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java +++ b/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java @@ -73,6 +73,8 @@ private static final class Guard { @Nullable private static ReqWirelessTerminalItem WIRELESS_REQUESTER_TERMINAL; + private static final Icon.Texture iconTexture = new Icon.Texture(Utils.getRL("textures/wtlib/icon.png"), 16, 16); + private static final Icon icon = new Icon(0, 0, 16, 16, iconTexture); private static void init(DeferredRegister> menuRegistry) { menuRegistry.register(TERMINAL_ID, () -> ReqWirelessTerminalMenu.TYPE); @@ -89,7 +91,7 @@ private static void registerWirelessTerminal(Registry registry) { ReqWirelessTerminalMenuHost::new, ReqWirelessTerminalMenu.TYPE, terminalItem, - Icon.PATTERN_ACCESS // TODO: replace this with a custom icon + icon ) .addTerminal()); diff --git a/src/main/resources/assets/merequester/textures/wtlib/icon.png b/src/main/resources/assets/merequester/textures/wtlib/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..db216279ccea04a979c261dc68caa49f9f842bd5 GIT binary patch literal 4324 zcmeHLeNYtV8DF$iJp-a7Mhzv)LZX%I?Z@5T-R^K4aEEY#gUj8i#9(E=?%2wGxVLZz zOjcm=trWu5q_>pSISksO+*LUyuINHo~ zm}&lF=k|8r=i~Q2&+mEOckaCoXH{96W`zcVpfr2A%>|wr>OFrh_+EuBa)ZY}i>F3$ zu@N{V2fb2*2rJDY5f-D87lNW^{mye~gZTX0zNdaZke{A?Tynj3k8*po?e%{27oB6h zI_UV7f3`hhygzm0y8PeXshsZH@j~X{n@vdX?&ng{$qVP*b=4iM9j6|=*;#P@72C;S zdGY?%r3Vf=slWfVV%wm7&)zT1Kl!0%L0P-&rDGdv`ra72>%d&!Z=$D){n@ux{@`CN zw?yb`&K~T!$lGW<8 zTdfnhfDC#b-F~=Yuqf-;CiklwR;M?0jdt}i!=3w?N=`5?}>GIsUi^&yxd(#&Z8z@($AXzS*?=*dV z$3a0pGjM|FOxxR)W%m3W4*pQ@7gT3t(T$rouRUM&W6R(%`S?DM@pI5~O%mv>8b>9=2mM-B z2y&t}>JNdYgP;OSG{o|oMFr+WpA;}7*M4^xfhEC=tfw5fBV-lprScY8bhlJ__?FE) zEg+UcO+l0a0De(n;i$hM5N4ugB#z5~cU6obaNI=MY({DvPS_fhMOd%ZYjLzRDm9Tv zp$0CH1ux^Wtr>>^BQsL3C?N*JB9VwTqSFRtA4bqLjo~Clk|?l1!_5JOjiP~Yt_qRB zu!&(_mO_dY48STT%LN-1GlBp;JQ1HiiQJAViwi zQz*?DX@KL!QI;mXC~KgMtf;39US3FosFo$rm25+DR4SAJpg7#f>nPrUQY2wO^@M>! zO$JUtSxU$01lnlQbGkT`z%y%tvY!Rzl>Dqu#6kgIT%i)q6g%x^gw*0w5@!Rec!2|0 z15!W;M#57nkK`BK3aj!-7)>Ufo+2onfzknHri|8!av1cYib~*GohhzS3&VhP0JW^z zsQ@4@2iY)IS!9)<>MrS zC)o!D$=m$DtkvZM7bJ>aE``DT&2dp;O}WJ_iBV$MAjKCG49AxR!}5s~!fcb6C>Ov= zsQ7v|;1j|AG2XBfa_JkIK}S$Vk>ps^KyjdgI?z;{SC6Bdf$$PWk)kMpkFzj|9u9hy z2rG-lKENa33N&b(D|pp-slGqmK2k5LbpVv1IE^MzhG65#V(N}Dk!=C?UwjnA4U)DP z;Fpkrtqbgg*yL6?&KHRF+q}l>@NG^3!?Tmjh~HVdX6c#{12Zz7?XFq6X2igZjAy&+ z|3;T)>M$h+z%QT(I4V`ltDOUmSyj$TPbql*T0L|9=S8o(P}CMHws;&4UsdOt&`%Gw zyt}DA-}q$btGo8R)pI)5my`d-n@5k7RJ{MeABPG{&c8OxVF+57sop8juAXH;I8U)VO6Of(Fh>LD%&+fw7KjMD zt=O~dG+zg&moHh;_4pjqo_jQT=U234R1T!}FYj;P*1l_XKYMlL3Hm#qrH|fT038`h W?f%u-U%m^RA$w_+ZC^><)_((l$q9S_ literal 0 HcmV?d00001 From 62c150684ae30293beb255a1f5d14af6c57f6c09 Mon Sep 17 00:00:00 2001 From: rlnt <16513358+rlnt@users.noreply.github.com> Date: Thu, 3 Sep 2026 18:31:47 +0200 Subject: [PATCH 2/3] change formatting --- .../merequester/compat/wtlib/WirelessTerminalCompat.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java b/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java index 20b2df5..f2bad39 100644 --- a/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java +++ b/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java @@ -71,10 +71,11 @@ private WirelessTerminalCompat() {} @SuppressWarnings("StaticVariableUsedBeforeInitialization") private static final class Guard { + private static final Icon.Texture ICON_TEXTURE = new Icon.Texture(Utils.getRL("textures/wtlib/icon.png"), 16, 16); + private static final Icon ICON = new Icon(0, 0, 16, 16, ICON_TEXTURE); + @Nullable private static ReqWirelessTerminalItem WIRELESS_REQUESTER_TERMINAL; - private static final Icon.Texture iconTexture = new Icon.Texture(Utils.getRL("textures/wtlib/icon.png"), 16, 16); - private static final Icon icon = new Icon(0, 0, 16, 16, iconTexture); private static void init(DeferredRegister> menuRegistry) { menuRegistry.register(TERMINAL_ID, () -> ReqWirelessTerminalMenu.TYPE); @@ -91,7 +92,7 @@ private static void registerWirelessTerminal(Registry registry) { ReqWirelessTerminalMenuHost::new, ReqWirelessTerminalMenu.TYPE, terminalItem, - icon + ICON ) .addTerminal()); From e64cc26c8370c92fb4dbf3358febc3c69b38320c Mon Sep 17 00:00:00 2001 From: rlnt <16513358+rlnt@users.noreply.github.com> Date: Thu, 3 Sep 2026 18:32:37 +0200 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6801c0..cd49dca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file. ## Unreleased -- / + +- added custom icon for Wireless Terminal integration ([#72](https://github.com/AlmostReliable/merequester/pull/72)) ## [1.5.0] - 2026-09-01