From f731b368c5caa95252f3a10a1c7bde12a68f1eb0 Mon Sep 17 00:00:00 2001 From: TheClashFruit Date: Tue, 20 Jun 2023 13:37:41 +0200 Subject: [PATCH] feat: type filtering for cosmetics --- .gradle/7.6.1/checksums/md5-checksums.bin | Bin 22247 -> 22347 bytes .gradle/7.6.1/checksums/sha1-checksums.bin | Bin 31079 -> 31403 bytes .../executionHistory/executionHistory.bin | Bin 332873 -> 332873 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/7.6.1/fileHashes/fileHashes.bin | Bin 25747 -> 25747 bytes .gradle/7.6.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../7.6.1/fileHashes/resourceHashesCache.bin | Bin 26147 -> 26215 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../theclashfruit/hubbit/utils/GuiUtil.java | 13 +++++++++++-- 9 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gradle/7.6.1/checksums/md5-checksums.bin b/.gradle/7.6.1/checksums/md5-checksums.bin index 335c5a65bc176fd682d1ba071647892081f008aa..1b5df5cc5d1b64cfb43ec015caa6226b3404f10b 100644 GIT binary patch delta 178 zcmaF9mhtpD#tkMCjJ}&qB`z>&JYCeA-Q5wemjMjIp8tn}S1xKcJ4L7YK*Yl(H~*FL zW?}T)sQ5#CqrnA%&5j<+_)?64vYJ4w2*LvI*In#6pkA3GDD|$DPhpcA0|R5n4a?a( pAV!E=0%<)|9cnw0i~k=!zpX64ZJ~sD^e%{w8B-uSgztiM003`RILQD2 delta 35 rcmX@Tj`8_g#tkMCjNY3~B`z>+HkEc}VU*mc_(Oc5f#7CGk7axS>#z(# diff --git a/.gradle/7.6.1/checksums/sha1-checksums.bin b/.gradle/7.6.1/checksums/sha1-checksums.bin index 39278ec07af73f2bfcd97041501253646d81b1e4..4b489ab2e8ef161aa5c321d456f0123b8a9477d5 100644 GIT binary patch delta 485 zcmaFKspCCV;oQx-atD|Mo-XRm?(PWK3l+UQ`KdxCzl)m9PSI&TQ0<(XT@`<_ z@!RvBx|V%%5mc~rv#G`-Rwl8^jfy|SHySKp-0bL~W>{|wl-31eRS*_2vUIrSQMsVf z>(M7Wq3ID@k9xmwVPIhFxM4YC3d9^?kQFXB<3hqlRmh}OK7GsCo4a<3=cgnxKmf~R!MVPh1?J9U z;xaR^w6FvMpJkH|E>PWkcYZu`%AHTv*{b)&H6tF1+Qm%YyY;}7dq;W=7c((42+VKs zS2}62EOEV~?$3wG9zj5%=eO>7vD{mCRjTH)WsF=!7*J?QalifcO>WDUeDP$Pm|JKM z6#6;uN`Iu#Gl_*#wIB8SHXYi$VDZ)KgkAb)dPWUn#P;{qjGkgb>G>z8YdT7c&RA}7 za;fD5A;wjc4ev>8&s)Pdi&5a1|2MPucbTL@*X=XDxMk6{$&E3}(>H{%@NBo9!pO-k zAeqY;&Get|Uyi+Y1g8|E{Pd0N%uq^A3Qo_pvQG9rjp2zs zp?v0>+Um&*Q?<6gUBDR5O+)K%GYOzuyghpdV+6CrtjN2sxmUblJiF{+oaB{f84`jr-0eg5|HwP}``_lb=-b=UX2RT^+1TLH`*G=*;nWD0-ZI088oYV9}QT z1Y#PV;|C_4IFI(O3L=A`eclHrW7n%ckEk$7Pu2p3F0}YF_9Zc z+4&RqzHfJuShch;dDg7mn;51$GOzoFHF_i{&oRlI5+KVzs)3oZtwQ&9gGpo66}%w)!Qn~SQ~U34RqR{Oga7- z6cGzgw%^{(2*gZ4%sl<}Zk8_u1Cmi``^P;jR^CE9pLSpVaxJx!eIxh1eyNmcjH{;u zLr-oxFcdhp-`>D-mq|cvv*xXPD`pxWJ!*QpR6>68^n;u%0Row7nK9kFpWoZ`<@S0b zN6l~36}ea(FrsyPAs34ovj}=jO?>p`&~z_;RtwfCEqf33PXE81MM4xk##(@idZ+8` zV9}P|0a9gnjvttC=ExRam;3p==)vc2%PwZ?G)&)r1n67|0agK)UZ95UIs&XIj1p+E zd-*chfU|+q6?U;~PyhH36mC-$fW~b-qV`kVw_hge>HUt3jw7}}p|sUK;-4Q|IVg)T zdk7u*dJ!m;AUiL2jZm*)2I+LKv|&FNrCI kQGSNwO)vTBHj|Q~XJli?%T^Fm~LS-d!+xvZs&4W;4rR`>$=H zulVys9-Lln0+rmb`Mc+R7Ut>Qm78z+@iBSLioE-pd&L{Zv&$alIfQRJ22s|tn*juv zRU3e$o-vTn1Y$)H7P#}tI$QO=xMsvdQM;Jwd$&S#bU92m43v^c&p$a`(@|P<#&V03 zOD!J=L2d2WoE-RD0BCFc=ENisMul+o2@RY4PHJsXVT`pEkz5W@*4YoV00?C6OrDyo z4pbdEd4IA#kS?11F82c-Sa*RbF?Av=9_+eOkV7f{?*$m%~%_B8x3^YpG<+8ahw4Jm{k@6 zNj+mAp$Wu_AS@s*ASHB~M2A-#>-@ zeFim7aC36tZvp0LgO8gNlSCL5p4up{SrhWG&wJy!4&QVwcCfNg&GkSFfIzx(^3-H? zW`8G<$@`P_fwaZskI7OBiF@C-J4visT9`a**6vLVm%*C+oq{2nG|oV!Z literal 17 UcmZRc?%-)%Z}_B{0Sq|o04h-fyZ`_I diff --git a/.gradle/7.6.1/fileHashes/resourceHashesCache.bin b/.gradle/7.6.1/fileHashes/resourceHashesCache.bin index e46c8972eb9af728d2afea1077b5bb3cf576eda4..b783d7d90ef5637ef67c3affb55251bb2626f4dc 100644 GIT binary patch delta 143 zcmZ2{hVl6s#tkMCjE^^)N+h!J2hUo5;_mqg3}BGvy17^G0Ed8C;%*l~^d|$f1&wJ?xQUL&N$0 diff --git a/src/main/java/me/theclashfruit/hubbit/utils/GuiUtil.java b/src/main/java/me/theclashfruit/hubbit/utils/GuiUtil.java index f8f45ac..eabccfe 100644 --- a/src/main/java/me/theclashfruit/hubbit/utils/GuiUtil.java +++ b/src/main/java/me/theclashfruit/hubbit/utils/GuiUtil.java @@ -15,6 +15,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -152,12 +153,20 @@ public class GuiUtil { } public static ItemStack getCosmeticMaterial(String type, int position, List cosmeticList) throws ParseException { + List processedList = new ArrayList<>(); + switch (type.toLowerCase()) { case "cosmetic_pet" -> { - ItemStack cosmeticItem = new ItemStack(Material.valueOf(cosmeticList.get(position).getString("menu.material"))); + cosmeticList.forEach(cosmetic -> { + if(Objects.requireNonNull(cosmetic.getString("type")).equalsIgnoreCase("pet")) { + processedList.add(cosmetic); + } + }); + + ItemStack cosmeticItem = new ItemStack(Material.valueOf(processedList.get(position).getString("menu.material"))); NBTItem cosmeticNBT = new NBTItem(cosmeticItem); - cosmeticNBT.setObject("", new JSONParser().parse(cosmeticList.get(position).getString("menu.data"))); + cosmeticNBT.setObject("", new JSONParser().parse(processedList.get(position).getString("menu.data"))); cosmeticNBT.applyNBT(cosmeticItem); return cosmeticItem;