From 65fabfc6ea0521a3ea2788a405f45db1729570d1 Mon Sep 17 00:00:00 2001 From: lordIcocain Date: Mon, 26 May 2025 04:43:14 +0300 Subject: [PATCH 1/2] move icons change default list mode value to blacklist --- .../github/client/gui/GuiFCImgButton.java | 8 ++++---- .../WirelessMagnetCardFilterInventory.java | 2 +- .../assets/ae2fc/textures/gui/states3.png | Bin 1808 -> 1560 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java b/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java index c10e4d83..908bc29f 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java @@ -71,10 +71,10 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { this.registerApp(30, "MAGNET_CARD", "ME", "magnet_card.me"); this.registerApp(30, "MAGNET_CARD", "FILTER", "magnet_card.filter"); this.registerApp(31, "MAGNET_CARD", "OFF", "magnet_card.off"); - this.registerApp(33, "ENABLE_12x", "ENABLE", "enable"); - this.registerApp(34, "DISABLE_12x", "DISABLE", "disable"); - this.registerApp(36, "RESTOCK", "ENABLE", "restock.on"); - this.registerApp(37, "RESTOCK", "DISABLE", "restock.off"); + this.registerApp(32, "ENABLE_12x", "ENABLE", "enable"); + this.registerApp(33, "DISABLE_12x", "DISABLE", "disable"); + this.registerApp(34, "RESTOCK", "ENABLE", "restock.on"); + this.registerApp(35, "RESTOCK", "DISABLE", "restock.off"); } } diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java index 49755be0..72bc136d 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java @@ -39,7 +39,7 @@ public class WirelessMagnetCardFilterInventory extends BaseWirelessInventory imp private boolean useOreDict; private String oreDictFilter = ""; protected Predicate filterPredicate = null; - private WirelessMagnet.ListMode listMode = WirelessMagnet.ListMode.WhiteList; + private WirelessMagnet.ListMode listMode = WirelessMagnet.ListMode.BlackList; private final AppEngInternalInventory filterInventory; private final NBTTagCompound settingCache; private final NBTTagCompound filterCache; diff --git a/src/main/resources/assets/ae2fc/textures/gui/states3.png b/src/main/resources/assets/ae2fc/textures/gui/states3.png index 800f800d7e74e3b38bd020b73cd5a1f1295fb694..b138d4686433c5912f21a9730d9ec4c17aead145 100644 GIT binary patch delta 1493 zcmV;`1uFWG4wwv(ReuGoNkl-BouyFWPY?#!N@^Ph8OcD)uQAKN*`g?}rcy}g|uw6U?l*OHC( zbv~}HuJZAz6DKGqCx<#aJHy1A{4alZg^w5BYK-P@cXV_(r~6}B7LARK@%ixZa7X|K zKYi*HH=4LVKTm(Pwo=7Wi>}@Ko!j0%a+J=eA2<5fG}RMjiNPvE*Y>FRvqkh{s?nbX zjE|3V`$2$!6o2QOc_?N((EE*RXTQzkw(RU|8uRM*#Y@YWk5 z_*aE3+@kL*ud)#9b)q*dn}(h!_4K!Gn^IF#!wjUSr?cUDXlRJr78e)!$O4dd1bTCz zm;PB>qx%bsZ1l&Ul$V=Jo12?d`%)D>cI-*|VeJ9i)PMFGKLAL7D^~=XCmO`K6~C3b z{#Rc3irV@`-^-#;^y~g83y_wUMmsw@w7a{@20>_(*9d-PWrgpRK4BSw$IT3TA{=gZ5v0RgMXG8z;M z=teLY5j24R z^Yhs-(=c_nir9rvDm<``2m){7{oqo2D1QPJL0%G@kA3FDP>1lZy(t=YL>u};$qqvX z1|gZ5neIyrC4;)}>gr;XLIKtb;Fb>>8}0IwC%M6k+v5AfYYpiBAAR0x{FKmV-odV_ zs^Ypn2un*#G(A1N_do=Jqx|U7@d{pI^1nVBT8w8atE2g|05I>7X;qvoGY}>qiGLXC zHg+K3P!A9!brM*>VZO)F#1~1z6%g^l2MNo7Db;9`<}@Xogk(Su z9>=1hq6mux^;wvCwVX^7k+2K^3?`9->lO_?c$AI4CUg-jAf7Ez-GyY`O4PwkW~yZs z>5u!=HDLk|it9~`htAB*;M5I9&LD^-P!n>7bziS`&cNj4Bwri^{A!>hXMgK3;29?2 zUhQZ&)c3d`;-Q!=(_sGvEFg3mH~&kZULK(+=TB0m}XmEo5c7=0D{{ucvBhqDg&kffj;xS=lZ?AT*L@g vFBM=C>PrD2mf%6szec;eyKQ_`#s|^A_xqhNm=Z&M00000NkvXXu0mjfwXWJT delta 1743 zcmV;=1~B=U43G|xReuJhNklv z2Xx@VAJX>LwCS|Aa+Wu~X~Qa_DSYv|ux?K9&oI%C<^K2-WI&iq6J^m+xXq*8+3|H; zR(>;8+N!Fm=zs7p$LQ|$D{^C$r4`ensBs!strGFU>wMQ&xm-C$-`4FHBS8bv8-bzT zr)yK=BOqMG1O4x|3t|A%4xvX6chJ8B19b7qRVno6Uo^F*hK7cQsCjukJu&kc`hMV+ zl>U(cxd71kpoWD`<%V*iWxvE&~K>7HS&!rsN zJu~+Vtodkzj6AVObBgFp?YV;Zj?RB5c#Wv{x!SB50Cw8we{U)!3}EyDZmI_Vfw_bM024NvMm@c~bfml6cTtJo(|;Mx0!-K-jnqWYMS*#TjOkM`U@^T3VAQmW}>)`7^hS6fA*K7ZZ#jO}yfZKXjs7jw|aLi^dlL*DfXg@dd6t ziT_Y3X=KH~_U+rlS`LCBpp(%{?f7wCc7K=>b?9%23N20cDn?8@mOhPTcY0+*n*?55o}e)p5*i8 z$&?oZm{w3xQ9+}lqck=)CIyDjrgezFapQ*c)fiy^&x%grrzR zB8AeJJ9lpM?*S5hPXrw-RQFEfCLnlxl)}DJFED_SLE4~TWKmzYZk?1#lP1ydaJUo0 z%#?y1FQbn<57Wj-%8Z+U&^X`pnSbCIA)#VqWQ2NpdT8IieNvD*NTY=d7fLyO`n06j zLm<^5hy8>@jW31bV=nwp zT3O^a0O7M|&nA>C6KN*X+Fg93t#zN7dzyhMQ=%@(#UHd&q!qf zqbgR#7c&oh0)ad7cD=xW-f$u&=FguW;9Y<%x0+D#Xu~=5iMl7S#eeH;*w`~+lQ5v- zOTjgfN4$*+^ren_4#Wn0Q;jw)QPV@gCtg9_o&_=BipO!@ym Date: Mon, 26 May 2025 04:46:30 +0300 Subject: [PATCH 2/2] use WeakHashMap for cache --- .../inventory/item/WirelessMagnetCardFilterInventory.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java index 72bc136d..d8ab3f5c 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java @@ -3,8 +3,9 @@ package com.glodblock.github.inventory.item; import static com.glodblock.github.inventory.item.WirelessMagnet.filterConfigKey; import static com.glodblock.github.inventory.item.WirelessMagnet.filterKey; -import java.util.HashMap; +import java.util.Map; import java.util.UUID; +import java.util.WeakHashMap; import java.util.function.Predicate; import net.minecraft.entity.item.EntityItem; @@ -269,7 +270,7 @@ public class WirelessMagnetCardFilterInventory extends BaseWirelessInventory imp public static class FilterCache { - private static final HashMap cache = new HashMap<>(); + private static final Map cache = new WeakHashMap<>(); public static WirelessMagnetCardFilterInventory getFilter(ItemStack is, int slot, IGridNode gridNode, EntityPlayer player) {