From 4e0de0e280e43fedad141df8dc190c7bae53134d Mon Sep 17 00:00:00 2001 From: newt_00 Date: Sun, 16 Feb 2025 23:35:12 -0500 Subject: [PATCH] need to fixed the issues with duplicated pricing across repeating items in blockshop --- .../8.8/executionHistory/executionHistory.bin | Bin 342277 -> 342277 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.8/fileHashes/fileHashes.bin | Bin 22097 -> 22097 bytes .gradle/8.8/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.8/fileHashes/resourceHashesCache.bin | Bin 26793 -> 26861 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../java/main/CoswayUtil/BlockShop.class | Bin 12473 -> 12700 bytes build/libs/CoswayUtil-1.12-RELEASE.jar | Bin 61133 -> 61252 bytes .../stash-dir/BlockShop.class.uniqueId3 | Bin 0 -> 12635 bytes ...uniqueId3 => CoswayUtil$2.class.uniqueId4} | Bin ...CoswayUtil$AnchorShield$3.class.uniqueId6} | Bin ...CoswayUtil$AnchorShield$4.class.uniqueId5} | Bin .../IlluminationWand.class.uniqueId6 | Bin 6383 -> 0 bytes .../compileJava/previous-compilation-data.bin | Bin 60609 -> 60609 bytes src/main/java/CoswayUtil/BlockShop.java | 22 ++++++++++++++---- 15 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 build/tmp/compileJava/compileTransaction/stash-dir/BlockShop.class.uniqueId3 rename build/tmp/compileJava/compileTransaction/stash-dir/{CoswayUtil$2.class.uniqueId3 => CoswayUtil$2.class.uniqueId4} (100%) rename build/tmp/compileJava/compileTransaction/stash-dir/{CoswayUtil$AnchorShield$3.class.uniqueId5 => CoswayUtil$AnchorShield$3.class.uniqueId6} (100%) rename build/tmp/compileJava/compileTransaction/stash-dir/{CoswayUtil$AnchorShield$4.class.uniqueId4 => CoswayUtil$AnchorShield$4.class.uniqueId5} (100%) delete mode 100644 build/tmp/compileJava/compileTransaction/stash-dir/IlluminationWand.class.uniqueId6 diff --git a/.gradle/8.8/executionHistory/executionHistory.bin b/.gradle/8.8/executionHistory/executionHistory.bin index c6dd9c45621ecede45cbfa3a180bca8ec6622ba5..d348faa3382249da6eba2337168dba87696a708e 100644 GIT binary patch delta 559 zcmZquB+~jxWP`tlePv!*YGO)$YEfExVqSKVaand*Zem47X+@<#y8@@z{}KhRq#Gw( z*_4hq31EmYteMVe!X&zRvBv`zp+JGf+s#-F?QfO_zX`NW{KhzY`hklqqMKLwe&ZKd zDU>y>=h5GNd=qzH3+%~`-n=1pA*1}3!=iIEgs%M!zcwi+Xku2``EN5PUNky#kC}y$ zfk9k*^2Rf=n;Z81G-_^})ZR9U5r~<9n0b5KB$n$wc6gj#Y0$UEU&)j6gs0&&mUvTx z{j37$LemAWGrMkoaG&L~mymmRgK_Qp3+!*M2K4RD^qS2$3*>ak>HL)}A=`trS?$;a zgj0|DNR_Y7`FCf+x;0I9w$lx(n9HWmu4fUFK==4UurKB$Pv3ZtQEYmc5vu@815jvs zmJzEKMWNRWR(B*WR;Kt^> zU#tS?LemAWGrMkoaG&L~*Yw*LS?ae3X|vj~37l<~w(;BIpX+@@D@b>X9P4z$D(153 zv+G%erZ2g{V#jjt=-Ie)*Tr12|80F|G2EN}b{v$-uxk zRY5A<TEg|L=90FPf1P0H?7S vfWUCh#9!46m-Dy6XHu;?5Op=*D`uT9DcnwV7vRqPK@{N82q%g_t}3@b%4 delta 236 zcmcb(hVkMW#tqXvxCI|QV*mpK#>s)c!s4aeAD4P+*caNBp1(X%@HGPi<5VHR$AX(r zdqgub3qE=>S<_1&NI#q$4WT#pdigU01s+Yl@0$pu?@f001JRE*FZVmb8uaB(-_IjK z$&-2%e>mP2Z^#0fCwO6IBg9UfIv}lQ3?wvxSP_H;etMR0^o2%*1|FVNS0KO*6a?v* zzY8b{1O_`N?+tkmH2=Zm^`TM<-@bfZ7&(b1~3qq1pqtf1x)|| literal 17 VcmZR6<8?PB>7&(b1~3q)002A21uFmm diff --git a/.gradle/8.8/fileHashes/resourceHashesCache.bin b/.gradle/8.8/fileHashes/resourceHashesCache.bin index 96d6097d646818cd3686aec5d288abef1cc8e86d..62df894c2bee0bbf6b487d3c6be294f17cdbd4c0 100644 GIT binary patch delta 143 zcmZ2^k@4+C#tkMCjNdk!N-W?IxMe5KP`00?nE?zkR&GA4V9CsH@~)eiQO+7FczW|+ zWhHJVam9^_Kg1^*{MhX1k)hyX43w1wVnGlVsLnh2Dk}J`exOa*(+>-?egOsLP*u2h VHyGEhzrg6#zhpDsTV* delta 42 zcmV+_0M-BP(E+K^0kAX}0rayq7@!EV?I1A&vo<6d3j!ALu_5>uu`nnBvq4B`AaNrP Au>b%7 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 6342fb190e23993df67f408757464140aa810e3d..50fef769fb39de953fed34017d49d34cb36dc9fb 100644 GIT binary patch literal 17 VcmZR6x9FvZZO0RF1~A~z1^_#*1h@bI literal 17 VcmZR6x9FvZZO0RF1~A}|1^_#r1gHQ2 diff --git a/build/classes/java/main/CoswayUtil/BlockShop.class b/build/classes/java/main/CoswayUtil/BlockShop.class index 81c0991f3981991bcd8cc33f841d4035449163d5..8f20ed86d96370951bff73ef85a2d5934b1f5571 100644 GIT binary patch delta 3060 zcmZuzd3aRS761M2OlEoW5(wECOvsRgER%!?YLJLv5|AJPlvp?PEez zUfW`A|F-8D0JZAsjnEdkFyB( z{CK==08%l|LONS*&c)qC>g-5IeLOa+b#`NGEMlRQQJeFaMWnPu7`sZ%Efn2uc*{q5}Va)Hf-dPPP-){P?98e15Nb;R2i&6u?y8ujre zy)~oCbBoO%@<;mXjOMyqZQh0+!Y|%y=fxMqIxLLgVw+2FfCzNN8{;=b+UlFzBR(!A zIK#)~@(3BJ6*hmuJN4?!rqnd9v@xDPBSw`@)PuA0^t>Tnz1Ei@n56UPHdo<7!dD-U z#@i-E7I`TN=lm}^bqiXfGb3#lHGg3v1&zkZy*6sO+TdCLfABQ2zp}X&>j-aaY-Z%f zsk6-4Z*2b7q~%FOBeB^XbIjR&Ht**Ha@I1ZxvjQC>QFkdtlr!_Wb{8EGn}6nWdS~{~ z3{UNj9TDj>Sjgv#Hecdj^oi`^z{`Ba%N;g%@>M-7XKLWDe9g<*YD~-LDft z{cKKfQ`W#e9uC)^56!R_N>q1R);`4oKq#m7L#8J9Azu12sp-7)P zU*DCV>mExK=u1L_^!9wqU3>B+ZC-Onq^-3%>QnVZzPS&~Z)k3A4ufC}uzv@jvCc+j^;}Rt)e-iuyCl+%$BmZ6hh z3+Kg3Jj(wF=i?EvY4YiFdsN)^seXeL9@B@0PLgcK7KcqXb4%h*HY<^a-7;#&B}yA_ zViZsCTiH<`$iC?{d0`zo6a*X#>oLy(CxE-KL=jc+qY*DDC2}da8ePiegcijk$}MMJ z+=6>mit@mR(Rjnb$t_t2l~-;tLLyFg;4uKWl~0mYr*m+EQho`lPwJ@D;+S4hdPllI z2&Dqzyj^fGy--v(ByX>rra4`()Ip~omV?SxsbX`FzP4iGpVT&nYSU?4uPIpU_ zN>lx$3@K7pQyPVI)Hwxq@t8>3P$$sf#jReH`c;295x**3o>T)=hVdXF^~!0g97Xix za5c}=OTwX4rUgAoPV3}l57DJJhO=wW?!;$ZI9%fo`UiTGytc-w=)}!kI6s`hNYLux zY#_-wJy->FBcZU-Sh!B)`wYeOq42qh>lJFOpp|6X8svXx;D!t?`o3~_GX_-*^mg-R zH!eTvIuH!>xwb39#%dzyml!34B!8U2+cUT<$vc8}4}WSxxvMV9I}NsIsL${o*33 za@0UsI>T|6qZ|}v@;HuBUbgpQg5Fh;llWe{m=B_9 zS;6r$@!*wbL;vFQ)3JWclhjw1Z{a;P?w~uji@!{AO?8T^+LPr8x|96%{m2cvv!q(< za@QeX*t{ekT;k#S-u*`4ktf8K%c)SYU;(@?_TPYat}Lr`8SGr_LmA%2+1M|`xDR#m z@iJI9ND%obR3T?{<^2>iXi!6BOeto@s{&OhQ{k0go+9B~VsWGzs)_}gTvVtM(KQ=p zS7la0Q_7qx8%NTVADolPJ}5e7=Bm4JeJ8S$7+hYF@f}aWaW3M4R#>=P^=x0MSD@Em2|N`o`M_9!H56V`Px0OCvh<;X(=6;J8&H8?YparLJz=qol*{BPLgLLw+1q z;{jnFC!WO^lS*X|QnyOTSZa#64U6>`!v=D$_E&`x7fPPfg5D(F@4~@{G176Y63;MR9z>vJ4@JU{@8X2c#b7ofC&I#a zbC*ljhU`qIUoBAsZDcal3C+xxD4lfVQk6zh4O3O}ycYe{#p2{lhmLUQ*+QpNRXZ=| sI<&^2qa8ZNp%*x`&Y|NRdZ9xb9D0#M8yz}DT_%n!adNr3QcXwjzs--qI{*Lx delta 2871 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

Kjb2_y*gakSIJu7gg`6xT<>0{%OYU0sXDF6e^=R z-|tEJyw58@Wx!aWN{u@{DLGN*wVlbp%V5SvH-5<9@9oUFeMbx(S$-^CQP`a8I=zlA z59cRt4xt&Z+RbXv0U2SpQNLlzsILT$PLj|^L3QvPmp}pMWAm`@{?1iJ%SCZ(Rn+HF zAiEud6um(8+NIC9j z*Id-6Hxk`TTW?dKA@e9jeYJX_m4)t)KSE=dBJ_i(=sjqfdg)mTvMyIljYICQ#CsY) zWi_Oq`OAt1QAR|LMf8G5*OcF3$=VIL9RtKa3Le^VTG_okUT&^%bGKctQ%Zv;uUaQo zXdB~yn!J0KL{csnx%q_wxjfAPAMn_s7w!c$PArSE4sfw)9`!)G)!IQ3!eP;GyPXeN zG};`R%2RSvc3Y__j&wVeCF)@i@;Xb3IxjqBl66Pf8B3aC_;#zr2gl75rz3qdRy zfOqrSIJ~nBeCiqkSwJ!;@SE+}0;8u1Us2wQ54GEIlqhYalO$ zRA{VBgl3LekW?v&XA}{=Fs0JDAYc)S%g2VagoeROyBU!smM(iEHgB)vf%*I>eVmKu zVpeHQR^!3yMVHJ8IaN^|o(3%UIZ>lYk~J5Bu@|_jdvSxQffOU$N?99#7E?XvBUiy?I&nOM}<&)ttttr;&e^ zy%ulLt0{^8TxIw0;iM^qBw$1})-+AxlTzrT3)WfjLO3$&Og?e4hd=welgQ_{Jea5U zZSmwvTDii&Wb^i2xjn@=T*%n#AznK8sP*&SMT~PM%hC@qn;$y(fy+xGQ$WKD|D^LH zV6;u(XcK3Lo;OEL_kUgiC*0RxQCFpaAS^9bHj#xz#6+kV@j#KbZeJN~i|$ zJi`7PCREGvAF}-;ziu<}Kki$|lKvyugO%VPwFA%p2}!lSo&{&h5LGhn3Y!ew&|$oW!1;Fm6AgD5Fd&wHMRs`Rjv&UoEj+}Q z8Gf`w^sn>&ulU8|@2;Bh6aaHE6&MmroZU~o13 swMqleIuJm=h7TX8W9a>cj~p<-B@e~Wci^6X?_qfHAtMg{=D&ge4_f-yWB>pF delta 6627 zcmY*;WmME()HNk7NH>VYASK-)NC*SNNH@~mB{@n;#}AN{24?{2F6ol)?(P93l~@03 zJ?nX&`(>ZI&bj;Sd)K;O&hB18A6`bshl0^DNKsI*u~8%%67W6HBpND%u84>=zC-mt zvJHOlqd-Av))7yQj_Pw9Wlg@;dX>e|PB~IYoojj-RtKcNG3ff`lIL_6&wws+A%@*`n67;w9u5Lx3_pi2m@>6RLCU85ZIuv=t!lvYrL&#fXgxi zj|aVn)k;4#l(?f5QxZ173Q=!Wh*=$2e}XCq22W5G@C7xNHIkNTbPZR!pamJOK`k0y z(UNfvqU_@Tul0Mu`~oy?ILEk z=c%u>Kfc542?nRZ zWgSRr8O2nqW}4^H+xN=H;Tf7)gws)Z&0Mp$>Vq(KjOH!AQSfuqa0!@}y&uVu%rP8y z1l5NCzgxh}$2NStrWGFXDo(gLR9vhh)fEI~K|PA~u&5lib!M8bh}_Su20i$#0@H>W z$-fu4N_BcKGMn3KD=C8%q{YT;&GJK4=YD=~%Fhe3qvq^nA%SSN^K{6(fbfw!J_Ysj zg54JtytUPRd7W!rQ0pd2H50jWz4*bP!DL76L<+qRG%FC|=ORKP=NPLltubB`MO1*7 z$iY}EtT?)F5UT%u5k4{=-r$4fK(ff`k*^5#Qdt&0q0d9CjKt7!9q;0@$2zJ{myBSU z^#Rd@;;5HQ4ra}vs5~j!wAmY5&I>9PwF1H%^x^s%H{d>tDOvpVh-z~;pZ&@Zi+OG7 zTXrYLT#a{25#2}h@<-e>Wc*r0@5L)7ySedT&8|2Ac&5VsGVZ;;_Y&i~ngVMg!&LLT z=(p~i6K_`QRLC@)S2QmA3&~dsH=dX0N0`Qk_o8t3`KcJ1uD7zERFSYYhXTzd!aOZW z8aBl?YBWIJ^6t%9qZ8bCOWH>&H9_0ikv%<#ti1f0Y-QcL>M3T zX5Sswsp7%cNkX8AoZ+ngLbv-@7s)nsDaH{4zXq#mz~P(JGjjetN&8> zFu7AlSrB4VJ;6c-@7c;$*2YBHe9go@bK^%f>>a}SpY=_%kurWdI;rt09=sS$H=Xae z8Mpt(nf7;YR_)orO0RtdKQ~ZlBp_KK; z1^G!2#kVsHqVL74kQ(vk#3trNgs=a2=kGZ%py+u~I#D%n4mY#U4#hfumaLOdxWQd1 zL{H=3(oyG!Mi_UkC`1_dzC8k+T){Q|*6hJPH0+EecBV`|B5=T~@Dw45LF^4rT+9xRiB zp#s+(hdPqqj=!K;c~K1dH$;IjmHzIqOq-cC`?y{s#lmmHrqlGR_nWn zAJD5p`y?~cwL7z$X_htI--Dgy=P&SlamyllUc}N3qu!Sx2z&=RozKPj^!e&+Kj%)q z2W3V;RXoqCwI6~*r8m?JPjj-4P8c|dhGG?z(_V~)w^!sXk;d?aUxg&WLh;UY9)`PD zxgO9TRlb;W^O-Mug&a_3h*4>lk(fa9b(qPO;j0Vm<{^ZlJ4ajfc@r(-sK%zG{q)y6;MoU{2^EmAK*8&y>-0FC2o7C-uJ6 znXu7=FMkcYxfg+h19^L3*2{3 zOVZak;M8NWR^{1bwk5^_=}LbMb3bA4n{;?RlH#rcueXR1*jjLjIg~ASt&6G5Egf*n z7a`#r3{y=h)vErfN%qw~I{Kq}!F(clPrsC)j0lw}W3~PaOm70g)^lhm;h;!tmubf; zp;vq&r0doe`QwG)hKs~VrRIlk@%uFv`3`PTFTKV2i#_a&xnGAmRBn|WP(F`)uK9ey zZXnbxp=2=ZgKolZqG5z1r48%^cSUNI+0M`K&PaObfaZf1<7LBND6 zB|(pwYc@1$0)}VSmHSoK!-sFm`P4-gA|SLh%Rn71pS7H8!CB*&D*b!C8@D!63Vf%< zXps66ZXjA$HR1)vOj<`aGabP>d2Ez4^>S>C?(ewDRAY99_TLby)3qIbiDGe5?o2E& z%cTO?(b7dTZK!FLPks#$#3ocibWUBEHvpsW8|Tm+m^@o1HrzW(mL_a-x!@IO%HExS ztXg*dj2OJ~@{3ze*182uZD}Q~=vRuc;0$l3oo75rW1+V|S=(abkfzc%QHYKvuIp*# zR-~rs81>>lIi^&j`g0?x#z<*KmMc`S6dS`v=O)2LBHCMXuO|Dw`pvA6(iihhhQ}I3 z6SBA1uxke7yX3f{xivwEUiQ!UI6b!*_5}aCg775gLC@|7xp~1Z(^}8Vp<1_K_IC!; z`c75QR}4Bh&8CR)mwr(!^@!sTs@Pv5%`?}CIyGISlBJ|`cf>E2d#%Z0&c-)VWg{mI zKkqaH7IIendlN?ojhxOG;(gOh7AA7$uJq^4VFQw4NPyQ{ea0Q>qjkBQbJF&HAOKNy z;n`e_ZU?-)HlU1eRg_E^UO0Z06p$kE?SKFlR0$x&D&El7S;+lr7O{!Bx+;wN%$un= zH~6V!x&Bg}$Q~lf7MF@-0n<-s>=;he$cik`XoyK$4QwLGyz_eJ&V;l!RJG29Qv}&z zp6ylxv)eTAs@aHBsCjaU5E0}gl1}4m75W8o&6!KN?b(j{!3Lh1fmbAk4=I_W1 zc(R)e84uXNxv8Y}{Nh*yP@745^a;S^6Py@Z#%BoFXOfXt83RG1aD})RdY&U<(;b0y zWoz^Y9z`S9WSEy~dp1fTiNSaHcKemIGVsqTFe$dL(M)0Z)m8}Qc=A7Z{709zsHnWI z`9BXpp0R+K(iK6WjknXuoe~R3%s4CIR~!efTbY0c@v|cHK83WdxPwiJv2j>z)Gx%T zNLoh{MPGJ$h2_{vq1rRubEh%f`$n$F>OY{|aR{UaO-izh_nL;>aV6!dnW^QNLXaF{BX;;^LYC5L&pMwsZ|u9hIY0`v$YE zw{O0CCBrV#&8zHW zI1$uBaIX6SjWh5`Szhdwe_z?plGqZ^z_(yQ*$-p$w2%e?V9!W?Bd0S~-5x~h`7ay7vzR~cd$(=1 zhcUumWjzsv6`$nCHo>S6Y0Q>sLt;;r6i4qq+l~Zk?5nxO%xy*Z6J9dSIf)Na3tl|6V<3_AgfK z*{(tq@dgl$)X{IdvBLGx$knE)fsE1TXenDM!xh=1HhHIV{C18uFTVtE3+h>wJe?D& z-B%7vaRkPy_$|^@?R(w~*(E&#j`C_DRn6Hcs%a7eYe(OoD(y{->04^9KrW~c9~4T) zt*DPVf5luy=fQZ-h{h^WL7_6&?g#pb@v(6k)l>p3duV;zX&CvuLOc=zJ>ijtbf7>6 zaD>UtPBu*Ajlf*OTaaThS_{h{qLk4LL=5Q^5W@h`0f?f?gdc(K?=UktqUBRj(O-;q zqPO1#W25vOoYLGJ>cB*EvaNGN+EIC=wy~1_FlKwX!kU4;Rm<&r#_hNtEjbN2A{7jw zgyz1tDUn#b%`HgNpJkLCL0FZSsLIqxCga`Cp+kugVG4dxwP$!YtFoCP@eiravM1k= znGYBTu%R05ywfCOOx&$v^~8yd>Z#7PQv-(eln)Hwh6WA?6?L!g<|M3y(V3$aN1>2 ziZcL>W&8dNvV7-M_+W`i|K9IBnW+I`wCo=O6R!P=06`OoTEtlT!{RC#_r}X+3!8Pe zV>T4fYi|+vj!ZWeG1qcxY7zDAy_~$@meX(NPc9TY%B&n^D&CX&VbrgQd3tBBxt4yv z!upMM_S!M0yR=fdlz26(p`jZWQ{lW~4Iy+KnDnr83x7c_H6;W2KUB z*zD!XSU9x(1&J0pXC3>X95`I>k>AoU9<_Orvf2+0=?-Wx3P#etNrN^2kc=DI)4Vl zvmZE~y!M{a5h+=`SjAs>JX^N=K$t(+&0lU_8)=&m|>nr`$zEFB-^2DjcAMKXRkHe_mUbj}K@by(V z0>4NCp*H3ozhhCJZRc>XyE_fzCrS_e6MDa*BK@c?*$&<0IA0FR2)Ye-apZwvw2OXR z<+!BpB#XogdQyNEYLF=7_?%KCVe&l^<7vQ z&zBXr4_TppIDJwzc?=YcD({{83Pbk%K6sO1x<1VfU@~h!e=`>xb^fILoRs)R%IJ>& z=m&T%VzvT|+&e(wPSCqtr!~w)^%aa{(|J`+{DHhsXArh6D0{`CIrK=XDQc%qK++Z% zEBTFz{RdTf(kzw2lc{|rm`||V?bOjn+HsetHG0+v3ha8YYc*q7$8>3@JM|s?6Lh9H z@8{UoHa|Gt`r#9<+grScd-5US0LK;XEwlrv{K2FzqMK^no07cJJH)=;@W}STYP;W1&hm;k{v`vTlM<)l@fbBEVHzl;MSJGD(>yq zCM&lzn^p3CL(gP_e%l+A?lY<tY!kw5n-o}5``Gllr7o@q@|vN0D_rd~p~+v-)s5Gw63CQ4wUicI@`@c&vmy`s z17_W8h2#62S1f21xE7d+2mU8;$vL=C@z7| z@4k^cl2T2or{KSoirDFf;2Lyz=HIU`+f4-Mz(y(T6s}Wtd6DL_zY7_Sg5ZgNqVL z#=84f?Z~t$$D+&Vx6azV8j_t`=-%=DM!NKzP|ep0A|WKff#WjeFfDuvwmizEji#5$ zpK!$#S$YfLZ{@;zhlM3HykfIouJ%wB2Gc2QA=8j6X~;GrpGTY>ncE7! z&S|H1d^JN^YZzMgdy9ZXve{#c7`00BCIEiKA6?tLKOt$;w_8bcofjVc%v9Y6)b=^U zMOq4C*OpaqBg#78s`8pp1Fq;APw9`L1~`~7^FQL4kiBZ_&G``Ie_rsjPq;9wz2v+m zY~a~)BgI9`{ua8lB1}7$k{`Q#(KY;?iVLYr5?)MNFO0Ko`Li@Ni^BywO2H=SAsm?3xZ9LKeWBd8r)Kyn$m@5ANCNN51NMUDgl~v0%|5+Gx$e(zdsxL z$@By^w!vmdE`N$Y7mn>87QFQlTp@Ojf8Kfw`HAPNyf?bIyZq^6QhF5MT%@t^}aCYJr*HM?j?r(@&xV;x9HYgiuf?n)KnU^`;9M* z%~PZ99FpN*jIyTzVn0HEg9z`YF@46id3O}>~tqrS7ECnOWj=3nEo%PtL_#SqY2&=%h|l(M#R|}Mf$p> z6TzRsg$w7s&egQR$4}QA*%rGxlogNbOXV;-l1kRi=0dUc^dt$@V$E0g3%zbezqu4u zKsw1bPD80kq2XC4w5+&?uGAitUziYnjlyNg$2UVIJeu>Y3bw5If-aPnkHp7I<*|c| z@5ICA^O46A(T?K}zThj&`T)h6l$6Dnf_`7$6#bhac!ovd0L_C#+yF^E6E)fK z*~!aV1(VUKS^WT`!t#=q82n!l1y**kswdbtF#b;atLt8!F#p3M&E}{7(A-R#@E;bqGU5Ki0l%yN@JE;% z@4vl3!#dYr1SodA|3UoD2*Lj~3jl{*F(B^v2~e_2h4!2sAljq++mM7oq5-NOI7;f2 zO^$-{KC_0I&9G(U>&=GXe<*%4qu^faL?ue_VKnv}g)`|8c1v@}UX? z9}jt+|GP~(G0W{BItq%~UmEuRLm?UVU-{+Vay0;Sq=qU8cps^t$)o{nNA$qv5g(d< z&R;c*K-$qWprr5_{{NgV_{3TWG!`-d!N=^V?!fnBo_`9~j%m><>;Fmn^+{x@7%_#3|b`(W&-ZovMDFsd%VcuI$vxc!gt{{bJf%h&(_ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/BlockShop.class.uniqueId3 b/build/tmp/compileJava/compileTransaction/stash-dir/BlockShop.class.uniqueId3 new file mode 100644 index 0000000000000000000000000000000000000000..fc5153d682c3c3db22a47dda3d1dffe2972215e8 GIT binary patch literal 12635 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 HMHKiyoCCw0 literal 0 HcmV?d00001 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$2.class.uniqueId3 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$2.class.uniqueId4 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$2.class.uniqueId3 rename to build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$2.class.uniqueId4 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId5 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId6 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId5 rename to build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$3.class.uniqueId6 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$4.class.uniqueId4 b/build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$4.class.uniqueId5 similarity index 100% rename from build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$4.class.uniqueId4 rename to build/tmp/compileJava/compileTransaction/stash-dir/CoswayUtil$AnchorShield$4.class.uniqueId5 diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/IlluminationWand.class.uniqueId6 b/build/tmp/compileJava/compileTransaction/stash-dir/IlluminationWand.class.uniqueId6 deleted file mode 100644 index 69708f3ea3924c810ec11b660262bed2eb260075..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6383 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 LdRk^AkH-H824M(@ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index bb4b1c2c08d1e2bd48ccb4f4d44cce7628ade388..ce09fd0873bd762764b24aed251d64d9b9d00994 100644 GIT binary patch delta 31 ncmX?jllkCH<_%Mr1Of#XZ#QE#w7*#z{3g&g@!RGlOtP;4+VBm@ delta 31 ncmX?jllkCH<_%Mr1b%v!aP);nga#g-R97Itt+;s!lk6)1-!=^o diff --git a/src/main/java/CoswayUtil/BlockShop.java b/src/main/java/CoswayUtil/BlockShop.java index 086172d..80b43c6 100644 --- a/src/main/java/CoswayUtil/BlockShop.java +++ b/src/main/java/CoswayUtil/BlockShop.java @@ -171,7 +171,10 @@ public class BlockShop implements Listener { if (clickedItem != null && clickedItem.getType() != Material.AIR) { double price = getPrice(clickedItem); if (!economy.has(player, price)) { - player.sendMessage(ChatColor.RED + getConfigLine("poor", "You don't have enough money to buy this.")); + // Format price with commas + NumberFormat formatter = NumberFormat.getInstance(Locale.US); + String formattedPrice = formatter.format(price); + player.sendMessage(ChatColor.RED + getConfigLine("poor", "You don't have enough money to buy this. for "+formattedPrice)); return; } @@ -197,9 +200,12 @@ public class BlockShop implements Listener { // Finalize the purchase economy.withdrawPlayer(player, price); + // Format price with commas + NumberFormat formatter = NumberFormat.getInstance(Locale.US); + String formattedPrice = formatter.format(price); player.sendMessage(ColorKey("&aYou bought &b" + clickedItem.getAmount() + " &7" + String.valueOf(sold.getType()).toLowerCase().replace("_", " ") + - "&a for &6$" + price)); + "&a for &6$" + formattedPrice)); } } } @@ -238,17 +244,25 @@ public class BlockShop implements Listener { ConfigurationSection itemsSection = config.getConfigurationSection("shop.categories." + category + ".items"); if (itemsSection != null) { for (String itemKey : itemsSection.getKeys(false)) { + // Retrieve the material from the config String materialName = config.getString("shop.categories." + category + ".items." + itemKey + ".material"); if (materialName != null && item.getType() == Material.matchMaterial(materialName.toUpperCase())) { - return config.getDouble("shop.categories." + category + ".items." + itemKey + ".price", 0); + // Retrieve the display name from the config + String displayName = config.getString("shop.categories." + category + ".items." + itemKey + ".display_name"); + + // Compare the display name in the config with the one on the item + if (displayName != null && displayName != null && displayName.equals(displayName)) { + return config.getDouble("shop.categories." + category + ".items." + itemKey + ".price", 0); + } } } } } - return 0; // Default to 0 if no price is found + return 1000000000; // Default to 1t if no price is found } + // Register the block shop commands and events public void register() { plugin.getServer().getPluginManager().registerEvents(this, plugin);