From 7642c42ea8514c84af9e1dde11899f719e65b7c1 Mon Sep 17 00:00:00 2001
From: Brianna O'Keefe <bri@songoda.com>
Date: Sun, 29 Apr 2018 22:08:37 -0400
Subject: [PATCH] Fixed issue with naming in the kits gui. Added the ability to
 sort kits while in the kits gui. Made it so the reload command reloads all
 yaml configurations. Fixed an issue with EssentialsX compatibility.

---
 src/com/songoda/ultimatekits/Lang.java        | Bin 11938 -> 11908 bytes
 .../songoda/ultimatekits/UltimateKits.java    | Bin 29572 -> 30258 bytes
 .../ultimatekits/conversion/Convert.java      | Bin 3924 -> 3954 bytes
 .../conversion/hooks/EssentialsHook.java      | Bin 4278 -> 4332 bytes
 .../events/InventoryListeners.java            | Bin 34672 -> 37400 bytes
 .../ultimatekits/handlers/CommandHandler.java | Bin 33386 -> 33360 bytes
 .../songoda/ultimatekits/key/KeyManager.java  | Bin 1376 -> 1506 bytes
 src/com/songoda/ultimatekits/kit/KitsGUI.java | Bin 20206 -> 22204 bytes
 .../ultimatekits/kit/object/KitManager.java   | Bin 4846 -> 5642 bytes
 9 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/com/songoda/ultimatekits/Lang.java b/src/com/songoda/ultimatekits/Lang.java
index 36531568261cd95d40bda97bc6ff63ae7435ed77..6d89deab102e2bb6827cc38f9e63dfb37686ba5f 100644
GIT binary patch
delta 24
gcmZ1!+Y-CsDCg#@oHIlii#O-U?PuI<t&q+K0ES2jkN^Mx

delta 58
wcmZpPT@<_FC?~%^Lm5LVLlKb71k&Z3k8sWunfzE#Xmg?58b%CR8HEf!03==!MF0Q*

diff --git a/src/com/songoda/ultimatekits/UltimateKits.java b/src/com/songoda/ultimatekits/UltimateKits.java
index 80845715733b753fac7e760d393f0ba3398fd55e..7ff38ad8548c8f512a9fd2619c3467f4813b0d68 100644
GIT binary patch
delta 437
zcmZp9&ba9f<A%*bljC{#Tzwca8HyQ77;G3qfzXq|g~5(Nfgu|xS^^aJWyohpVMqmv
z*aC4LkW~((9T|#%Fp;5>0jhiR93gvl{v4p<M4)mvpkzKn?&NQx%9~4#&Pj6nKqV9y
zk|#g#l~h(>NCTRm12nA|Xj&%F+!CM)1%_OpNG_07#85f;pN;(F+$0GML-+Y;>bn9}
z6#(^A0`<UL3NjOHE!dnypqYsb=|J;}81yC=B#2JdR}z`L+D>ZnUtOoo+)}56HT4<v
zfgULU!W^(cAaAAtHI)MSC18V7f#StL?F|m1ldtPq8R|2jS`3lLZ?WWLP9p)J#axqX
z?KmdC=H!~ZKSX7-ww?vc<n_87lXu%FZFcstkr77=J75@s18DMubj8h^GcIxg047Ol
A&Hw-a

delta 63
zcmV-F0KosU>;Z)50kE?YvmFyC2eW@Q`V*72Nj#IyKQ6PMN+bl6FKh~vuT}`NcN)$a
Vv+Yhi9FrGjB$MwQ5VK)x(F#&s8S4N5

diff --git a/src/com/songoda/ultimatekits/conversion/Convert.java b/src/com/songoda/ultimatekits/conversion/Convert.java
index 302150ab95badae23818bc51b8c5994a4682b6ad..1c67089e51bb1d8012bc6d3d5ea93dd6298f1d36 100644
GIT binary patch
delta 82
zcmca2_epMpAe(M3Ln=cFLlHwJLo!1#gC2t~3f~7PUJR5^Wyk~KqR9$u_LF7VEhf)p
XYnU9*W;gjYpU~u54!+H$?DyFLSA!Mh

delta 52
zcmew)cSUZ4ARE6YLl8qMLjgk$LnT89L;hqtHv7q@>~@p4vNcSuWwV&f$uBf{HV5D4
I$?W&p0gGM_WB>pF

diff --git a/src/com/songoda/ultimatekits/conversion/hooks/EssentialsHook.java b/src/com/songoda/ultimatekits/conversion/hooks/EssentialsHook.java
index 33a1b396bf93bbb41968bb37b16b5efd6e3bb03d..8d68cf260da4cb1440dd7c0004dfabbba77aab34 100644
GIT binary patch
delta 40
ycmV+@0N4MvA?zWr=M9q|1|*a34I-1{2o#g&3rLem4<eH-4;+)N1{kxc4h;fF5)MQF

delta 84
zcmaE(xJ_}xb6)mLhBO8R293#Fe9EE<47Nb1z>vpK%8&zu3Jf(2HIqN^sY>cG6f<Np
gR57G7XfS93#Ubhp7&Ir>@T*Q<%BHaSJ|8a=05c;Jg8%>k

diff --git a/src/com/songoda/ultimatekits/events/InventoryListeners.java b/src/com/songoda/ultimatekits/events/InventoryListeners.java
index 534483157bc5d481166a3705e63ba52954c4a51e..3b0fcf7c53a7cb8b6bcbad7fd5813cefd71e01fb 100644
GIT binary patch
delta 3583
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

delta 2478
zcmc&$YfO_@82&!Wr7gWMz}Zj=rC_aG9JC*VI|>~ph}c%B4x`}e3`84Nhf~Ccxws6k
zr95skySXh(mMt-a@W;6fbr-ikM)yaT5krhw_RF|sf7Fby_nhzR1vPHjpXK{;&Uw#!
zeV+H6^PTxL<@Zx56PrXWD#caN!yZ(Ltym`J(b$E<VkeCqIGbX?%9L_tUZae;Vgnhq
zVN_LspHy~ztFTYlP2Zp}EHvP{s)0%2O3mhDFg2f#i>W$%otmf2xh0s)n`Yv&XqtnP
znN16_l+syZ<LN_qknYxN1*`If1uZ-oEAZYSJ3h#8n-e=RjbUN0Fhbg+lj;#f$0SUt
zJrFg$IGkUJlbR1vlv9d9mjN$n9jLPPB2-+CA-xYprV<SG=`huz#<hWLG-;mAs1{Z+
zSE#hrL9hGyG5x5q8`G{<EQJ3;*q9Br7B!_Pe8Ww;wTNV$r*$JDrR@ln?Lm__7aOuo
zG(S&y)bg03#)i*w{G?Zc;@q7ydNL#>uGO?6meb6fB~`@jf`KK8&RMQwlT{-5c1;DP
zT1AEpNH!}gA~RNJa(&<1zM#4%ITpoE3C87Wd~T94y5;PL*Vl#3C3ajkJ271%A!;X#
z4jTA+&}HT0)bbiGXMPETnT2qcsA6DE7<*zM@U=Ck4CdD!D#iXgFs3aJu~;DyY29gw
znwa$NIw@WbTL-FY<u%b->>TGbvl3*Qtt{%yv@1oVlx(;u^(v`lW2pKHSL$;(sntBb
zb(pU?z$J{0P_YxwRb0od+DcySVx|FwdK;HdZM5Nsx>|_!v$$NpQ$~Tpk2Ofx5olIb
z3H6ip4QSb_MN=b*n%YU+O6v7o*4C7-$eLBvvZ`^t2`$Y(axud?!PPIZ9QhcFP??A@
z=horYT3g(s^O3FAlK7UibZfq?G`>}nyj2s=!|Q9uwdXHz1kN5Yu<B<P+il_!NLa#b
zW8;3lA)%$?G%wb;{svPN!<evF@R~xM4>=E!4Zb)Jg<Z3pG~>oS3c6Rwig{_oZ=Scg
zC*ml{lh^kyNt;o&X${9erv0VQna0m6L!UwQac`%pPN+w}zX#~C;*ZUKl69#FK9cQ=
zuL(1*b91vPE^{fe!d@K~wj^u`M6O%d>rixk*x~nM{ni6~O)OKvm&`7uY_HEvS4pl$
z66%ygeaT#n$g*^7+tvv0_I6zL6<~3jhvo<QI;T%QcztFAM*BLbL<#5oYN-16#t$63
zsO|;7!8<#0pV%Nu3mW%i;lYaq3e9p0&Iiilv@7j5AIQe9JLRrSZohlM?-1OjeOiR6
zTsJQ6))54)V9{O}aB#)~<}GpA;Glg;2FxaNP^;`W<8HH7Mb{Q%Enx0Sa@YB2qU=aj
z1oOCfX`(ltkfdBM%PQyPCmuOtXfH=RQ<sN3p$mL&(aQ%W=DujykA+ukC>p*`A!;#g
z>Bg#c_ml3RZj9`|PgmvuA`@Ed4;%330XMa42d=f`<Lt;MiR)8g@~ea6aVDo-`6?~F
zYO|wl5Y>6G99muU_^U?mp7H`(g~S`U>uK*Ftl_s9C^NUit3^CBR>|G7lN24>#ZMt!
z%Iv}Y4}tBlyzcq`f**bJA6|YlGRC)v+DWw;W8<f(NNacnnvR~~Wj{FjDniEw_<Z4*
zgC4JZSv7F{h&;(S@ev2>+Y=|at%ZIN90*3Nil;j#`#GT85))(9xO%FC{Lv4DJ_{Qn
sYh*X)A}mNL)=s=n?NW}+XbGyK4qP0i&XlQMnV>cH1M>*gjBY{uH-xVh*Z=?k

diff --git a/src/com/songoda/ultimatekits/handlers/CommandHandler.java b/src/com/songoda/ultimatekits/handlers/CommandHandler.java
index 34a1300960ab8811a7756f179267094308bc0e58..86793435e3e4e38ca32b6ef0b154d0adb142f89c 100644
GIT binary patch
delta 20
ccmaFW!gQg9X+yd<qxs|vZ`sZBy-%9~09x1xVgLXD

delta 24
gcmcc6!t|<zX+yd<qs8P5Z`sNFc~v&|dml6d0DY<n%m4rY

diff --git a/src/com/songoda/ultimatekits/key/KeyManager.java b/src/com/songoda/ultimatekits/key/KeyManager.java
index 39b930397b807b7fcb56797efba5e28bba8eba99..fec81518614a2fdc1f00521ecb8e1844ab7f32e4 100644
GIT binary patch
delta 63
zcmaFB^@w{zEbHWjOiG-|3^@#`42cXylh3ipPfll&QiO{zXfS9pSTk@jC_rH?kPXBD
D8D|YR

delta 11
ScmaFF{eWvjEGu&@0~Y`r0|Rsb

diff --git a/src/com/songoda/ultimatekits/kit/KitsGUI.java b/src/com/songoda/ultimatekits/kit/KitsGUI.java
index 6b7fd53c12284805dee8d2b3a34bf2d005cd5f82..57005458056df6f4d6a63a34edc0ed408306f2a4 100644
GIT binary patch
delta 1062
zcmb7@&ubG=5XUF}Slg!6B$N`{#x9}RBv!M@Zkn`4D4_{ny0HpgT2UJlW2niNS_Hiq
zEF$8;!yJlG^)5(-Jqebg2>uT}R4*R%VE+Sk-g}$vrYPts^WM&U=QHzt`SINI?zQJl
zx72+L7T_*aVHvxmx?hGmG~qU^&}|d0Llv9893G6E!1-tfpGy6%{FV{2wxo|oyp9CK
zaj6)=t9?G}?a^`&^J5xX$}m1UrciwaHzF}q&kR_{V;>IX_cek9EK>6oYHolD6+%i7
zfJqn(Mr6le37l@&GDdJ!oxpj$7oVLbywn`7=1x(356??oxT^<nWBerJ!Nyq)A15^X
zzJR|HNglr(9mUUq0bI+-?$K18-+oOFx^B1Cb9Q|R&Ey=9H`BfNt>1^8nLm@$RPW<t
zms0Ca)s(jG*3+gO1~VAIt#l7w&|lcuubgjemd$j=QOS>Awqr4$n6-q_O!+Ufh>TgB
z%wFM@ZE7p~z*d^YhZAC=`$2`Vd)=G9rjB^RxZ@e}E|4<~?nW3}w59!f-qj067!=5m
zi*?GakY81hVVZvH<mV#A3S`MslcFkpXP(RCt4YqYxXwLie%I&)gz<}(Lgo@<ejiZm
zj)jouqL6OUQE9&%VjCLkU=y5$yr`O?&Nq19KXWyR;ST2(Z&Kz{unNILQx=8NMdGc&
z&HvI`c52#c%*P&#`v>`3CH36D@36)<S*HI8+b-LfZ#d32W*wf~KCt)Ptesq+fA5Ij
RXVzS&mhq(H6vAlf({EKtBuoGR

delta 366
zcmdn9mhs(O#tocolZDwbCi8pAO_pXC*=))FfSplu@&|p>&5`^`5|iJm%S=wyQkkr;
zks_(bP{NSU-~+_v45<u749*OR48=f}#$*K<?aAleL^hw-IKnbnS8vkf*X%r#O`R1c
zo9mfP*3@^IeBVxJ@@jjo$?irPlVx3uCV$p90*bjz-sx&E*<Mv;a=bXlWPd}B$xjXB
zCV$km0<sk*R~ov3)#zJrO%^qZnta+)Wpb>c(B$n#PC)fsKzq0*vzwSr_BKv~t7A8r
z!>q}mIXS?rc(SqSJh-^0sm^43BZyt6EqNw;yXH*>nd@vG15^WXo4T|DRDBMbdmwHF
zso!tKGdbTf1n3ro+54?xCd*5zZC>qgi)nMeGmqfpr6JQMTe8bc-Yg?Gxjr;t^3Bl4
E09&Vj@&Et;

diff --git a/src/com/songoda/ultimatekits/kit/object/KitManager.java b/src/com/songoda/ultimatekits/kit/object/KitManager.java
index edf9e38c73094decd379029bb4cf56ae48a84973..54a6b74ecce9bfe7132e262ae5201f52ac3ae108 100644
GIT binary patch
delta 405
zcmZut!AiqW5S;W8OwyPh)V3mN<Dt@!L~U<cD+nG1@7}6-h=m$VOHt?#cvAKQ`~{&u
zqF>=n1TP*PlOQUx?Bl)NnVs49+PV!NT}?kij8sBxr*eQR#sJsIYV$;Uv5WSJGcmIw
z#%Rl~=FZ=p4<*Nob=gvu^i@Odjb$}KB8k2#v(lzKTh*l)BN99+c<3{?(UU_v(7H0R
zTaxMxBC88S_Q&YTo$X3fH_E4UaZVpYq8;6>1PIWBMSd3YX4d@TPG+t!z!_)6xa2$6
ziV>m12^XccCVjzY{XbNIjyzd4Ix(W({r$qThYiMG_MRkay_{0>hHl&N>3>BYoVuA}
aN~I+Ks3;^e#@G3Cx}R<Iy%T2KkNF8pqfin6

delta 81
zcmeCud8fKTmQgy5A(J7GA(0`6L4hHdA(f$o!G^&bC|1H?H~9jS{A6E7K5h@7d@(}?
dNPcq`<8vNnAY*bEUnz**e1T7rg}Ii23jiXa6OaG^