From 1cd392f256a001389bcb70b5eaec02e8da9871ab Mon Sep 17 00:00:00 2001 From: Brettflan Date: Thu, 2 Feb 2012 07:29:00 -0600 Subject: [PATCH] Workaround fix for EssentialsChat integration not working on Essentials 2.8+. "chatTagReplaceString" setting now defaults to "[FACTION]" instead of "{FACTION}" since Essentials now converts curly-braces to square-braces for any tags specified in their chat format setting which Essentials doesn't recognize. For those using Essentials 2.8.x, this should hopefully be handled automatically. --- lib/EssentialsChat.jar | Bin 6612 -> 0 bytes lib/EssentialsChat_2.8.1.jar | Bin 0 -> 11432 bytes src/com/massivecraft/factions/Conf.java | 2 +- .../integration/EssentialsFeatures.java | 10 +++++++++- 4 files changed, 10 insertions(+), 2 deletions(-) delete mode 100644 lib/EssentialsChat.jar create mode 100644 lib/EssentialsChat_2.8.1.jar diff --git a/lib/EssentialsChat.jar b/lib/EssentialsChat.jar deleted file mode 100644 index 6cbffac41c00f730e4269178eef601427b7a3b80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6612 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 diff --git a/lib/EssentialsChat_2.8.1.jar b/lib/EssentialsChat_2.8.1.jar new file mode 100644 index 0000000000000000000000000000000000000000..88246d6e0fa1f1e0566909123743c0a8706d67c6 GIT binary patch literal 11432 zcmbt)1ymecwl?nWPH=aELvVKw-azAxHLigG!QCOa6Wk>s&`5BHpuycC0Rn-ayv&_@ zZ{C}k_5OFNs%5Rc_g8hQw$whKx)LlL3KSF)6qI|ds5sPL1~L>Jl!}bD1e=1YEXTtT z6qNcuM3JD}oO<vpX5a8-&!wmxd8&RU)MS);2(9z8n-~j$NTIBym%fbfW z_D@x$|GFck-7`H~Fi=nq2vAV0|4CKqNngv&$rZ?M;Q#=GW3-o4aW(LaOIvK;1WC#` z4(YHRi|za~PJe8c!8cvrpL;&bfUDx5Kzj~*&$zi-+GNHgpE)LI zo%?>y#P?V=@W;bBt~koL&J`8DB!}bKW=XIib5)DZjq@8CPn~6mBvuqks&<(?yi4vp zFhFE2`V9&NlRoyD4oe9QXX;?ex1^Hw*3g*`8N4j`(;jSv`U;LyKd86cD2GeLX&bCN z`4eRzV+;+|77O0(s9PvuNu^8YS}*y?Eatbg4XW&9#NSN=2J6{8U#_VfX|F9N%>|r0 z#4x1vwa9z6H!2PF5D)X2>Rx*)TSGoG4XG*$7PbNf2y(L|at&+cm-k)EwD>bh zl!WlI<9Jn6u|yU*Hbftv*-q3(mTE`(6A(E#nHSsPdoGB*V4&p{fnc1DYDFca{SsW6Y;u?YyWwrbfV{S=~Vew!16ATLy)N8thr$s>KUn_XqQz-xV*w zuV~VQDERo_?FD|6<4c-sjH;b?rNg!TT1(u>d_~?(hh$W;f_Q@r8-0j~_1yuTLR90m z-ir_?!y3p7@GEijA$|o;#c^nuSCO}6M&X})%RUpOkQA1!<`s;?J@ZUTFOclC(4c6u zcxe)8(mh)ePFt0|J>LbnY|>$V_F5{@z@C=3e1Ao<5mw(8G0p={jb;w|2!yES4mV)9 z){;Exsev$$eIH^*dqoU+quzo!fj@b$=V;_UKM6TnwK$p{_*|&sVLUc~yQoqqV2Z1U_fQ>#h74Pe6sd$?HB?Zt zILEAxhb4g?C9Ba`g#kdLS;$td^{4?If2djPo16cjUCFpT|L}e0&4b!;&6l^x$UzaP zSKF&uJi7tA%crc@JEwtxcd#EZjIJ$kG4ATHWPU=rA7QocPU=q|vnW9UNFC)YgsaY#{#V;^1J?$@T20Y8=%ZHyz#YUILO$f)1 zgA2}fZ_p7(kF(XCkbmi8#1Ef3Hg!CmsC^b1EpOB?Rl?4h{n#{mOFWB2RIj|zi~xzy z7oS(QcaT%Y+$&F}XhCDkM3LtSf?atjG0)mib=ep9qNJ(5 zF14U(_tqwj(A30N4r$tpw<5Xll-0M4A!Z7yy5`GuddsJTbAHnLT0J$oWKcPmV4gZL z{JU9CG@R_z=4Kea^9OhY>q_U2HwbWi1iV6rt%>scQlAv%snh5R7iCtmsh*{`=9RJr z#lATYoPaNIr*I4GiME}Tkr2iTsUCcD@|@bDdFd_cz?d0UC*O-|!X%zL@{BCE2AD!M zEWx!_eCPP$7)PcLYV01P(vYza_3_1_1ISLKI%hCZ8B|KW*ThT%F+w1>8Bu?DjOX{J zDbKXN92R9MfAuaKS+JQq8Vg;((gz*X^@f=22_PEBPPeKX(t*}(O6q^)OE01w-k}d# zyFbK&rV1jfK9_9BbQY}v@oUy}9EbL~SeZ>AhcKiRd0W~>J)|hB+UEr9EMA6v!d`lP zR=kW}YJGP%uh7)?tcK)!@1nJp8+t6rHBuF2PR?LycCR?I4&N|~^$ehhX`C~OX`Ksx zP(P>pfMYX6XDxt@S*oICWvS;uOv0a-h+dK!Da(tjz2k9ZSI!lH^||3wds?smd!qCV zzBh_e&q> zJEkkqNbqLdUR~FccZk{*B|134cR;=wUukC(d_I;uU?Ox{j%_TM z07r7bptxd#UB>8=k8Z?hwmYR{k9RSd&Pv@_SeWeun3}>!jc`tbC@8@c?%)8$BUi1s zPnkT&l}U9Avz(7PqaI&-78vS=F4o{9AsRxTlIW&W(M95Rd~tKJxm>dCmCTY1H(HP5 z-Fb0IuZ5Uzcx6SuY-HW6nfA2sbD&qV4C;w%YP#KJsEiHv24x>z-MCHSBKTe9fuEKw+e%)mO6c#&yqYF>AYI`kU#Kol`( zcKY?M$jmIp_sC5ZBbUNMr{?>#%w_6K&iEhb$7w4Zc~uI1ZZJ|;WJh`J+6-1-#Nb1w z`cq2`%NBeP-PvTO^)na@W;I1(X1xoZv#sv57nCrGY)F8O&qsO=S+@XDM-Y#KU<>lC z#}tEi)N=L{u}ynaSrYH$Ci)uXE=t+Cwa&cuq+x;uq=$aTH`{9*oo3EGN11D8j{$&k%7U^!n`bXxQjZxaGs*$jzpiSir>)+aYwa12 z$e2hvOl!$Q(=_&avrXh2jPO=(zg603m(dz)yMhqWfdwcKE;VBn8?TPonbfuY;7aO; z@|D|Z?va}TRT#8oAjcDBlq10|5tth0V@P?X18R+u3zXSM7Y2aUXUPy9Zn__T%OF{R z`S$gvf;fX13X1=KmqFAW0Ny~?UwNcS-`h`n7XQJ~%DbUc!R%Q&G!BmTC&~1B`R5VZ zXwT}X$|SHF4=i^Q(3GuuvJ|jdn&%Acn><`zS2Q*ARh6)XOIxrk8dt3lg6!>&tqkq2 z4HWUezvbshQb_MzQ+rImJLwn}{35z5yt~Y=MiFoW^{TI8=#Ah_JR$l`EiYxlPT|z@ z7G$)wFV4^I%<1$!qwVWgKP!mSmkQ~jlEO|?i!7+nis zbvP$)O1qpD!O+7^pym-~SS46}LBFvdoxrQC$UbP;$~Q&RaC|;yNjq&%f|4aW&IdHb z#a6T*PsdvnV6U~&qfLsd&N!`VUhUrwehy0a4|X@OA38$wymDM37!O&hl2E;q5%;AB z$_gPDS+K@;vdL2Fg!tklybU838}_-vct-;Jz;VYX8g;gyb5YBlyAsjN~=8}Sh-mq}uG*91&jQz-IB_(>Xej65Rm5-Mr zL~JhBqnxT`=7!cfZC9>IUiN+%t<;*^j6CvF)xk$jmD>9mQ$jePF(OSS+^WElg zj!d*D&mA`bzqDI&x}9zIB1H0zD;-dOQk;0jNO#CkV_7d00<*do9(iB^MaYBWy|!#* z7TKmsYTDnnA7SqLo;U)CE$BPl6CW7?&ottV{u1SbPMUN~jcRs5*0X;6x9p8;cr-?5 z2Xmw=fDbQ`=^J>mhYQBSZMnm(-o98b2uawYo;9CsvQ#b-!hxA=q5;yI>-tbGe9-9k z>a^y)*M^Mq8db0FlH@d1JaBkf1FraGa6JTFwWA9CkIPMX?B2yHAzi~ zE|lq95j$NgIiUD%s*Z$(QGbBrJUh&E-;1Ja?u?YYtM8QPMkpX|*RAu_3r1Fd(G1xE z%DSK%_j_cHi;?|mZ4Tq@g;o2aK01_%bL-CDY;M8&y&KericKdk1;`h7w{=RPhls%a z8-A12`PQC$g?jmcKxcJGpgUR5qg!XNo;&NnQu+~&WW_8~gQ3lHAgxQ);b%K(o~zhc zh(OsU(sdG#VmY;npxd@KyK!5J?C$dYJ+q|butIxu?bsUbR&t@0bEQE`Z=f9K4uv*&5m<&sc)%c}iEJ0rW2at>l9$t2Zm#D@+0nSztYxcQ!XuV*ciiU8mG6%0} zzyLTkoy!hvk}}&)z0bFa6YN4?HE?xsPm;NvSr(tJ&^src$hA7_bvSG#T&evoer1;J z`KSo2{eJq8Llh(9>?Dngmut{=65bkL%!xK7kLqp6wiMvxrubbSvqU0D!_i{!j&SD&{;#TW4cQ;@gGcVH=*^6Y2rAjZ~#sxBgh25~dswxejvM`z&^9 z^mo=BDTkLaZ6Ah}kK<8wEP{ro5$q5094d;|*ODyxZ0v3y&{V$b&r34uy^Ju`(L zq=_zEPko59s5Zrk-6Q|!=( z9B18pXmH*H5@B_!FWRdG&AQu8g=*ex;kQ4ic`x6#klOpXuig-!HFP1c9pw%tEZw@D z3pRX{C|iWT)6h2TqKsW^|KU6rmVLLrIQ$ZEmEC^L$`G1?%S$7|TpK{LLmjd?Ih0ZS zQb9k8@8bb74Dc(QeZnkmGDamsYqtKtL-eu{*zp8y49Jx$Lu|cC)*O68YmcVxTNMih zHdNd(d{$qejRDtHUYk?Z)Ardcsx{6&+mCM+z2`kD`>yygtTS2=e+HFTt7kV>CrSrr z7I|)u#aYYjJh}u&a8vu^r_0zNF01m_VLq93BdgTGMv{7L4Op|9dgP~Gq%IVm$&+ST zwF{C9$x;iJg(A5>pt4u>)ZeWKM@ku$oM9N*z>c38^Uci&B4D?UFB$-sq;eW=aM`ut zqOReTzQL6q4d$a6FgO-1rA`}{0w`jH&1*8r5=o3gqCm9l0?bix5^&^v!P6kPzQ*(@ z`V0f4c?Cvcv{tc{bW+xn#&9Ic5waj=SWa0JAW}< zYkQVIgPdgQeNoIc`-h0M13N-AbA-SF^n!Pk+n`=kTB)xNRu}*R5*`Sp+Uq=#(IBFH6Isb=u< zyD2ZCVkKryBwxL6Uva*+_()=0OIj%zFj@M>?EtmyBw>(Ls=ch{1)VxU-uKY?6(5En zsRuJJET@IO&D-E82c6gY%WE{>=oTO$et7N4uW1;B$|We@@{+*hzk18ZT%0yair$yM z(H_rVgbB#NMfZ73u$BtwzM88Pt$37QkoQ;_l7^Y;l?lF)kH0OF5fyF3TgnigMq3gK z+o3aR!4-BUu7=>ZLZ9}sdGVio)Y-F^X(gODqpa?O9utc_JV$fvmsl=fcFsbvXfX&A zo9)f!AS3#yePUmVE;ifl9-_vusCK|m>@>Jc~p`VII=Y`oP3q{MKpH4foS(|h_s8UG&s6;ZP zAtdYRr0Lz9Jqtjex4jW}>}nzwc@y=yx|FR!LLXR1d4`}CfK+-Ub!$=?8NC&y*-Y7J z{@DKr`$q@$SCkTnW4f z1Vtq!YdT6^RG8J=04BrzfVgf z1({Pb;1l{_Pd zhMOkf)FS#xIF+Mw&}mT^4SC7FqTY*bl1zSR?R7ti5h) z_+cSaDO#K(A%{XLaxwzD+IJ|^*a6m?Q>Gl=icv$eJ5ITdGKwW5Y)!ag?5wp%Vic2z z^eC5y&^)B_rvkQ=gR63Y7iNTJ)g99cyXhF|J=tg49Xcz>F0}J3Tsrt)j;9lN!2beL+j%Lt; z;^#{D9`(&gcxXkCCx8L}T!Q%J9**Lc)I3jZN#N7!g3SNLJ(Qh1|MU*sJ3UeztOs^l z)|bs}{!j&<3GA1kf||4|`I_*t7j5#Ilx$y*tF)pUCa$#lN-0&%$@zDEDgB0dw(BEO zK3f?0Dlool-{r*d861v$96rYIavKkL_s+xW6K|C-r{vt&aoT5iw9s1KQT z@eD0TCq6j}xsAWP0G^@Ptpb0%TmW6F4{uEVwJp=zly>k%f*k}cCk@-g1`_3^&^^p- z5=1OPLd-N;u_nMF+JLfyr;o-a$GU_gN31znv}yI#%_U$Jr@eax{-i&Nn4tzdjSq%+ zSA)kln`=k1OBwo8x4kZc+sqDR0NYo{4YfWC{G(VT?pA`3)FR;Jpt;!S3KP#;n$hN> zBrfoDiT$AaOJW>w>Hw$a_1Q=^)0HAjVWUV24`EwYqewUC`>D}ZPB^a6_&|5wzlDD(y>joapV!L8T z($7!mdd~}!C4JnF@Y8Q$y!YXA=|#U!^RU<0bhdiYXBT}kp&EgUe+rj<6Z#@a;Zb{CTfiu>dBgO?vd~d z@%F25AQQLcWmX8iRCp3p{>%Pp5(b4Db$StM$Prui62OFvcxRBz8FNjZT$ zoiloS+e~0I?7~*}skS5byu3d2Xm@L{!J;4UwVi+rKV*PyLF+ z7Y~rOR;;Tqy{9YejPb-Xnm(&G>U?vJ@0YhO<<~o5;*HNRP3R@dc%u(txY6#mCJ`GT zB>B**hw@?W4E@9G8F@7~*e0x6I3LhRghNf+diE`swe zqN3FB($rk3;$gHbYgFGai( z5D0@~6HM_Yzt1MZO1+3OqCNw4ufb3&@UQMu)*O^V{xl z&xgz(dNjHriqFnuIsCb<#UFTs2D{ZBJtq%Pdah8*e!$jspG>gTW;NRNJC@Us=D}jS zCB8UwHj6;49f&L1kT@!~(JVmiZPCS+p}bWp&n?12kUue6jbb}RpIVL2jZ@{K=m~m8 zzfQq1aH8T~c)_V3OtLhm8|*=D zh`2S!@mafPhqA7%b5XKVANlx=)YY;N=@Jpf8$`>prO&E_{C!_0LsGv?CfJ=|5SOca zewGjIfQ;tj2n9;&Azu^GxurQfg%$v8u8#7PJ#kdt?@_y&OOJC(#Nd8{lgOra=7Eb# z`i4k$RW3pzZd7uCa7<21((W8%6A)4s-rY?lqPRO^1{b&PQV^B2!>Is>M0bz`Z#j`^ zIZJorGKVHJw_og?DyWL7C2$_#-d}b7y=c+>IA44A6qThh{*O^v)yWkEaQH{#PxlKL zR|oHbeZ?y2Shse<9M2Yu(H1sF8_xzCsVUUVpq8nR0H1#_k$vT)e?=u9=|NUTMgv<0 zTSg-{yDk3!a1@>-8r)&rM!A z$0cS6f+)*Le`Rj#XM%+?R%^v0JtU-t!J_KL z{7NmYRpQ7Y4H0sWvqe;alnn5eVI}tSfnMFwE@`kVTi56# zpVpk}%?Ak8ohv6Suem|cZ_BHR_MMmOcxjBqcG-{j+*W1!$w`?)dX(@~_9xn{s zB^}*2csUK)`3xPaFclgUW`gWXy4Q5rh8um3c%_<9$0v;Hlw56?nAns+!_8XIQ89|} zXu6779>BRBQd^goQO3=ro}guoM4DvZmUS62ESLCLF6yN;x={^x@rLIH5kz78j2M%J ztt8e-E*4)(h?rJFzgn@5Hu73$Q>n{(TT8sgJz1HY$Bob+*tD8ctXLuW;>%JUXw`TT z{HYaH2^hT@AC09O>805ZAj3XSjxIfqj^Sx?jG^Jm7EpN{mf8BoGy6=@$*=7VBmr&fVyY9zPR=lstNU z=6?4902fv=v=|4NY-*47F=(Jco_3v?i2?Ofg%#tI>AAI+>M&FbVc;ixA?n__C^gcE zS#%zBPqFF3;*Kk;sgS9JJ{bZ%}RraXRX=#(YiR@@irR*Z{nA{MD2EXV%oDMhfY@T@y%2-%tjF@|c z4|xL;yVkhnTYwNZ#(8r&M<{Qvw>7Rucaazo8*#g(sZ0$mR^Jf~#!BexE(c*by_&+! zoMWKADU6kx!_FLsM6-HjL1ma(quaz~iKF7RMW`fUhfhm?!8zz2;;_T~*y}Q4oa|Yt zRj1I#Bw$!tR7hf;mZ==4T<6X#t2yhQ<3T0Ro1``DZWMnXvuNrK(OWzng}p+j$fJDB zg6+rj_Tea80BBFYc-9o6TYZ5__>ta5H+0)bR!Cgb&qf?KW^U_w9gGB_f+UXtQcT=l zy>k=YJ4u#>OO13{n3ED0$kyV)U=yD~$3ToVI$$~K?gG2cbUi3-)dqQ+bC)+HBGpOV z9T^5fr_Dna16Pz}El-AIgI&F8OL#AdVeZ>xinO&xm%xFjAP^U2WFocMaC2e!={2GH z(#g5+f#V>+5ny}b7})eB3DQaCC>k>=!#2r5fPZk%svBOIXc>TkDjAS~7ILcoLSJSh z>_&!lWW70}GWzgdhEV6K^@sg(0;HgT5p&aLM_dPPi+Y*3Af*qNjjDQ9KGD=d0p6!d#f5 zNMZyOl@s_|p-%*NV7c*B;5$M?K?(h*LSNzU1cX0cfq&(Zn7D35h&Wc*V|mkL?j$HK~XN>d5ekw)?a5A3P&>1Baxqh+}cc z=!tMu{bw6XS~Z$EFZ68#b;`vBaxG(6yceqHg=!so5dyd>a0f7#!WTt0+`dZ-RA))P z@buhx&m5ZPS@Vbkn#jM?oN_4Ui;StK;|QK^RxS<126WmOqzyOm{a9~UYP)uc;a*bX zK7Ot5LRcr?I+B$s)22RZ2e{Q0JT-nORT8)r^zAZIppb>@fpS5R>Y)e|&%Go18WJxZ z`&#Yq$@q+Tw$b=$)|j8V2v5szP|gnS*0zr9-XI6#cr|-6F0{VWOC~s91;ANi_R#WT zA{J6({uY+Ox3#Z!9?}lBcDCQfTWUIy74}C(-dq33(LLi$=)pj@r;>%w!b(iW@kRvq zC8#=Q$7h*fn}f6{c<8iR4Zy4d%9^!rTKIR`5F7Et+zFu_brNFC=bW?}tED&cK}bZE zD*W)UAA}`cm2Nodf=|tn=wrP4+v%^#3qqRB{g79d++Jm!2^x9IEi-2{s99asnvk9g7BxN~9(|QuJXY5#USQuJ zU`BK;2IzMr=?rq3Hx{=G3C#`=La#AAyew0pSo+#TWwS@-lc;-s&2bg1|0AbQic1O8 zl#`>B;)5W>Bg>-v?%wyRA#g2~JNb?dFS z9N+U6-B?m4R~bCHnjG72QPq{8Venx8H39JHPCN}PsAGwr-~Z(J{h|Z@q53})0)Hy} z97RDaPoMu({R=(t-+}*R>irr&!DpU+{^ITZf%)ILeLtCdzs66EZ%;peYW#)A_peod zGWmXupQ=<(kKx}`|HkY4*H(Tq`~I||_iwEHgXi~$ssEYj_lL2fpv3=V>NnospY!_5 z^6#vuKP`WJn&y9XssDA7e-BZ=LeuZ&e_t~H(>x67|H}Md7tntP`MtyVCx`&S{|Cq) z!S-+c#@{i2Z`=HdsrSSV_+QN1uM7JF^RG>u-ywg0C;1cdnBxBc`PVm;-ywg`S${%` r)BOj?f1AO6$N4?N|B2&6|JQi0t_1(Yb%lb$c-oSlp3g^ypa1?J;Pf02 literal 0 HcmV?d00001 diff --git a/src/com/massivecraft/factions/Conf.java b/src/com/massivecraft/factions/Conf.java index edbcb0e6..60a68d22 100644 --- a/src/com/massivecraft/factions/Conf.java +++ b/src/com/massivecraft/factions/Conf.java @@ -67,7 +67,7 @@ public class Conf public static boolean chatTagEnabled = true; public static transient boolean chatTagHandledByAnotherPlugin = false; public static boolean chatTagRelationColored = true; - public static String chatTagReplaceString = "{FACTION}"; + public static String chatTagReplaceString = "[FACTION]"; public static String chatTagInsertAfterString = ""; public static String chatTagInsertBeforeString = ""; public static int chatTagInsertIndex = 1; diff --git a/src/com/massivecraft/factions/integration/EssentialsFeatures.java b/src/com/massivecraft/factions/integration/EssentialsFeatures.java index a0901a48..a642f8a1 100644 --- a/src/com/massivecraft/factions/integration/EssentialsFeatures.java +++ b/src/com/massivecraft/factions/integration/EssentialsFeatures.java @@ -3,6 +3,7 @@ package com.massivecraft.factions.integration; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerChatEvent; +import com.massivecraft.factions.Conf; import com.massivecraft.factions.P; import com.earth2me.essentials.chat.EssentialsChat; @@ -26,10 +27,17 @@ public class EssentialsFeatures } public String modifyMessage(PlayerChatEvent event, Player target, String message) { - return message.replace("{FACTION}", P.p.getPlayerFactionTagRelation(event.getPlayer(), target)).replace("{FACTION_TITLE}", P.p.getPlayerTitle(event.getPlayer())); + return message.replace(Conf.chatTagReplaceString, P.p.getPlayerFactionTagRelation(event.getPlayer(), target)).replace("[FACTION_TITLE]", P.p.getPlayerTitle(event.getPlayer())); } }); P.p.log("Found and will integrate chat with "+essChat.getDescription().getFullName()); + + // As of Essentials 2.8+, curly braces are not accepted and are instead replaced with square braces, so... deal with it + if (essChat.getDescription().getVersion().startsWith("2.8.") && Conf.chatTagReplaceString.contains("{")) + { + Conf.chatTagReplaceString = Conf.chatTagReplaceString.replace("{", "[").replace("}", "]"); + P.p.log("NOTE: as of Essentials 2.8+, we've had to switch the default chat replacement tag from \"{FACTION}\" to \"[FACTION]\". This has automatically been updated for you."); + } } catch (NoSuchMethodError ex) {