From 21ff4d5666c9a8d321f75bfdc9a835987662c264 Mon Sep 17 00:00:00 2001 From: Zeshan Aslam Date: Tue, 24 Jul 2018 18:22:26 -0400 Subject: [PATCH] Added 1.13 support and non player health message --- config.yml | 5 +++++ .../zeshanaslam/actionhealth/HealthUtil.class | Bin 9395 -> 9516 bytes .../actionhealth/SettingsManager.class | Bin 6339 -> 6454 bytes plugin.yml | 2 +- .../zeshanaslam/actionhealth/HealthUtil.java | 13 +++++++++---- .../actionhealth/SettingsManager.java | 7 +++++++ 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/config.yml b/config.yml index b06874c..acaf4ee 100644 --- a/config.yml +++ b/config.yml @@ -7,6 +7,11 @@ # Has support for PlaceholderAPI and MVdWPlaceholderAPI. Health Message: '&7&l{name}: {usestyle}' +# If set empty it will default to the one above. +# This message is sent to all non player entities. +# All the placeholders from above work here also. +Non Player Message: '' + # The message the player is sent to the player if they have actionhealth disabled. # {name} shows the name of the player. Toggle Message: '' diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil.class index 80230ccc51068eddee8ac12b6b2af8f9607f89bf..13d95b1b54cb63e09e916a3a9181aeaf70acef21 100644 GIT binary patch delta 4188 zcmcInX?Rpc7CrZMr{C+>m8~(54rV~aM3O*2l%+ud0Rl00RV{wakJs@=0B_q zWooAUft*V>3-@YKcUz9b0SlWg>0!z7mh`mb1XHqXOqFbIiJWLlFUhebSMqG>Eqwx# zFMR{jPfpTJe^XA@KA&P^mJBduVDqc8(nuW0Ei`2ixg-nCv%CvMvLYWReB>Q$N;tCD zx2yXST%#~ghA32Gt|>#6oGPc8GEB*E86ilIOh`>1tvjbH87U)_jFQo&oT0E(&J_3y zCyX9hG@__rl9DkpR>@g1!j!X>oFn77u9ERmpk#u!)GLytG9%ymY^P^Gz2ZbAlcZ4L z7OYiLBCAZ2#x z!qWUXrE_QI7uHl&%$=!Z7HXALXeSeEr&msq-^$ugN4dD_2l^!2j*H+&S7%`Tr- zW6BC8H^@p;Zd7s;*6BEIRCR&G_YPS%@JA93vAgBq9>vO#V$<#r`^ z$epHaRC1TxZOSGk_sG4b3|6vP8ktH;?$euhzdRrq7)k2fJ<=r*3Op#2m2A;lklnWV z&1Hcry-7(k%WFotdosSXGV*?MQFB>JAIS{5l#VN}t}dNfUQjcuyo&KwRFAHlU$ZFE zJEdpys?^#9=MvT`Kw#*cCGru^!+f?2*gJ!AgI_zR1x8Npqws8F&p;L1BzV}S!HdrD zqYJ9p>+EWy2A8tOc`>U(YYTCiYg6VSfvW&pbGE}1S* zt>MUwqfL}?>nY>BcI#VlCG{jGtHV{XwYS2-)%0vJr6v-x284PX!vP*mcX{s{bU4Tu zt_XQ|AWbmXmz}hJ0}>;_&>F|P7ruI26!PwYFKmbG9q1w02RoDy_BTSs1z~^43LYQw zN6|BE=_t0tyB#OgYlV>2imbz=+3nI3!&W15+SPkSk<)*|pe>Dx8UJ6LOFb?tVdRxe(fDvgJ}po96E zf^gictt8wNON@`GT-i0(xe)hZDjr5DcAyMqqe8S7@E2i5ItX;qY;XLVt zYUzfBl7mHZ3a*fmJj;_%CsS~hl*5q);1S1SS&k*Lk`;3ku9Zh|ojieM@+_9i+gKs* zQuZ-c$pNgE9~`WaUl1`^7L8-E*64hFWb_aNT)IhBGQS@<3^+t-HR|oa2@m;3vd(l zeAp=O#SV!TOa9v&r2m2tJd$<@7JMdd_Lx{@Vzr4iG?msV|5xM^^O&sC8vfsEa3uC` z70~@hq#0f9L!=?`ca$RH@p$OwK@7?~?q>#j5XTxnBXUEgat>cpucb>3Zz=aICbV$b zRHn_Sl&ri~3>nv+t3!jQMxh#zc9`TeO6rla6T?b!^I9;xxY5&*+(UySqBy-lY7Uz) zG76_}gOtS&MsO69w_}){;Al3?;8vV5zISdEXNJ9Px?_&e9ow!O_8nd8tPU-cT8=)E z!6S{G-Jxb3-Pk!DTC6zUT^Lv533e}xVmxs{i6@V60?U*yAvP597nXP*!9=Y<2^B() zO;JKCCdD)pdIt+VRE?r2%qu12Wv3vDbHgg6qBt*D9L4$J#89H{m4uT*Nm_V;yKcy& ziK1|FC^?kmt{zID;K?p^4!1V^KQkPhau~-&B-XF%xf^X; zj2F^y9{&d~a#zqC=*$WH?k+g)HUy5g3nac{7s!13E|7fPE761>xeFoNk4?CT1$PZOxtFpeMwQCCe;1Nvzf5*rkONZWy1+Q%E*Oc@$92Kz zFP7^9qyE%&fw4dCxTxU|q zj~DmT6eoB_wcQ9r`eDRUOY|VCv4Jhz+8KOix%@Rz-{q>w<;tO_P3>egwUgCEvfOw% zB_126#AD-(cx;>zkBu{8*Ge*cx#}lb@{>5Hn|R1eZyshcxzEKn=#hS+o$r>}(tQpR zJX_)&7TB^Vrtvd;8H|v!1 delta 4007 zcmcInd3+RA68^rPqkDRKa*RaMut-1*k^=}Lfx&~rizrAELWm#`Gy;+kgb=|H8xh3= zP#Hi1o`6PUR4_OY6hv7?!Nv7Jcg0olT6c9_-NRi)W$R5(68y>Tf16+Ox~g8idR5=6 zSM}0d&@#%||I^Oh00#0Q6Em>e#3gtxAk>}!p2rIT?8UEjycmQZFDYi9qFy%f3icZ~ zU?KyrD)DauIEdGR_$^*n>>E1XG?9w8)Nn`{ep}7GqlVw9;rD8IS5zGw4&puhL9Ke< z#0U6LQAbRCgpbwmiH=W|iE_~KNZqm{L4Q~B2_<%`?r#R=P2@fH5^s^56Xof75kHcV>)5tEYhGR#^^EV zHRvQtIz?7mqB2ysg)@|(Eis4t(%&eX*$Y2$ri^5=;w^+wT(anK~QP1lwIuh$= zfm+XE-VmK)rsXcNcq5nUyvgFtSgoR5X7Lu@s`ECBw{yA06TI+46d7ozIyewFDqEm0&{og|0-E zjI)KiK;)Wy&8+Rvva+9sXRB};s%1=qN5(XGakAXi&X^_ zHdzgy>;i1b+6GVbKbUmYvVH0{T;0LdH5S3CicJ|F>SLIy@`D=ZC@nN2rD6o1jNee zb|7v-MY|2&ZRpdW6l`M$vLZ&iG+Rjv;^Lf$(TJq@(so~RW9Zw!Q=UP;vhC;}3AC@v z8)T;YJGf=lLxSnSP8bl~-zA%Q(QmtS_YREV%&6V9n@dEx_V5l;k||v?F3uOCbZIIZ zkA2pNQ$2%H(^AvSjj-*G4b2 z(mkf(9bAbcsKDo#j&CFzen1rin9VS*VRy{s>8N2g=5vr-zF}C%QMisJsAB~du?qE^ z1Bc77m<>|VHem^yu#`J-6L*PhFK*`nEazdY;1R6k*ADKGY`s(SV6`-ZHCiXE)q2S{ z7Y$lI)@v8acQo$PCgQ<(y6(YA=qn-I5Kpa7g<2w1Kpf3aQ175Ho`NQC!w}qvrAXC6 zl9n#jzm4K33Fsy`HzU9j`mszDO^M-K+#=Z+lt{k9twMz)o-c5lP{}F<+cH@wm9>(| zLaCgVn+N*N~a`?+PH}JEUpmF%%PEun#BlC<)*QEBm}LEW zPD^Bcc(|lu);1?`k0Qc_N5~)vxdS7|4J5ROAPp#!>~1MIXF(i0#YE;|n6 zLIF0QDy zzdVH$JH<}^`6<8{BUS$Lt#XfaPajVXCduVjjdndUWqe33?;~={A9aLnLV;A;YBWo& zcmns}NxXoqQe&TD5?a^?+gOAcCu2Kjp_SKSCl}*cuE8!ojNN<`&+#Dk@DN_$QS8-v z;6*8oFKJcSr#X08YsM?uAso<-;8pD_9MrzYYaS0?_oU+uPaimMi*Ijva&gF$C*@t* zHV30Ss+o@{R!ixsWq+)}T6o2YakyJ3AMT-vbu#N0M?XP>P`bFgTVh)cL!4fR4MGLP z^?C_strXA6@))=m_et@bg`v1#Wb#&%*Z%{K6z`D4lZlNYOp>Tlu}Kt@d5{xb7kG%{ zTo)vcgbO^%zOD;e4;rou67@%}3ljUYt_y-d6E=%IQ*fvk*w-Q`NVv{ef`{XJ6B1a& z8*wH{z;T^P7KmJDQUo6_9!8@o<(>g;gP3u-^Hq_ z9jm5xteO;7P8_Tz0n3e7mLy`6C5hN%Ng_5`l88-K#Jfe3yo!!;$x%8ZbUfx2XPWW2 zTfFgxIHcZK6Wk&^c^`b9<^(O}bxI6Vvz-{qN9VL+8Zjof6<1KO%o0Lg^?Ohe@wV6R zt88x!(_7I+6AhoYx$)SWo@O!bJ{fvSp8(#K$Pdfo?tRIi4-mnJ(r=GQ_xTv(@oBtA zXQ>t_dH;kYxmURsX#*1zeZ!0T`Bd-g&dW7bE*y0f15iJZ`OdkU*f%3WINqnEYvgcUaU!$NNdI}%#^PwR;1Ob GpZ@@TFJ<%q diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/SettingsManager.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/SettingsManager.class index 652e97a00d3d6999af141c4b11c5b380389771d8..17b99483e18b31916bf245eed116105463545de9 100644 GIT binary patch delta 3025 zcmY*b3w)DT75|?vNxv`2g{I+I7$po!p#@5L!+4aIM+b77Jec4OAEge{I!Kkg0EZnjfLNezc(b> z-?{O7yeW@AnE0cGKe;dqmnDV7pDp~w!e1ryzsU}~<-*(ey9@uoKgH9(Ec{!<@5tjn z7Ty*7uZ91~HOEE+1BVHOP+%(iHRMI&W+i$$X>%8}t{i+qA(EV@;2tVQF* zeXfx4GRkw&1e$14zDWhi*C}t1HyH4T
6EaqkW@q9QzD z(lkZWX@*HN70sgAissPVVwz9LToViUsso+vp;#;wjl>j{$U@uDMX+jv z(e1v<=oW?T!rhv)n*{q&xKnHcmIT=CO{dr)MpsRsg`N4TyQ&p-YD;arGt}X$^0x;R zc8SHaY+E?&>x;g;DH>7OBcXcA{Nd&g+xLn+YiWB&d`Eg>ebASFW1q~p#jCG0=#R7n z2zI>&mC_PLOKBNbM$vLAQ&dhX*t@Ptn5BghQKW@n^DXcxJVh%NRZwN}0W&XAMXMB5 z(`u7y6xC9lNoy3XrFw;r$bvLQ(K>2Sw4OE)%&wxwIgK?%if)$;bugXXsPLd9nOPHP z543OLU9XF_w1heLyTt4)3HzJc!l77P(MHk5skJfJR}PZkg;zGFXWFj z1r$Xns_;=9BIG4~j#0_;mYRJ8-HJNs4wE_+#VF1_l@9j(qCO&7JK6Qph<}S@@hD=+ z0nS+&Ntwt^dYmJYP0nHUyJbyJd88{83$e~u9gTAvDBLaffwdihrno;I)`kx~RdV?TYTC9VcFOPB)wu_ek6yio{MBD$7Xb49qik(k{aI z3CT+;*Wu!md)JAsfg26?Zbf&~K7}vhndBwUOgfMpoOPM*NnX#YNObUJ1&jj80pStJ z0nx}UuaR3_Be%Ck?r4qN#~QhNHF702a?%<(NsXMAM($>f+`SsPSHU?G_;TRqJ!~{^ zkVkwc+~oK3h_8p6T;{pwv;*!aja*rcTt|(3lYB_e)zWq@l146)M!q~SQ8MP+LmPOX z84b2@5AgFS;K)S=-|w)sB}0QAPI$9>F`^)aA>NTG+|mtCem@z;6KOIkg`8fDP7|Ld zW76bSO~$6lI8AcXWV|MMX)-~RiD{Cb0=q6qlf)#=Ca2jHO$v1cQ~8~46zg$O3e!$w zI-zpXY5qm#R3`9XCgCN_s+#Pbox+@X_Wb8zX4`GkvhDV1Da@_!xp5)wbsoRn3oA`- z)5M;C3iDG~kV;@-3X6JCoX@Wp%h$U&g%bPb6iWN8-X$q4J&H^{yNt)(Fzr3C+j_BF zhgYU|ZcuswCcIhYJ-i?b%C%sH7EEOa&VJ7MtR$RCpaT30TWR1Fs!n5-!6{Xr#%crg zT3MstEJ?d&!mex6q%MUuy;#dWYr9c!7WEAUC$X-;IT#HoY^W^Y4Z5B9w^#LGK!L$1 z;nZrU8{en#bX8PQl~qMSD+wld?6!{5ZF` z4Iksa&%tsYPlBC~eR!liG3z-RDTzB@k0WCgNs@Xi?~dQ5yCxQgZ1aLB|Lu3+-JSjXm4{@!3^zeJF7 z>~pSSg>(2w2Y>AH@hOi>ZtwJ+#3hkC3NSt6`D8|)s}c`VQogIi-mC*xX^jq7O8%@? aeTnumx+!ko8&1FWQL6AlrMi>zT#? delta 2896 zcmY*b33yaj75>kgN#32wC7A?h5+E=sg+RiVK-kxiga8=`36!mnPLd%Rm}I6iLugn! zh*GQFd960pYSn6_Dz=483DsIft75fvXGo^#K+ zcV4>cbY<$y+ozrdFpE-N^x$zDpYy`P;~sS5^ESTVMOKC!6U`Up^+XPy#8Wcxln2Lg z!izzqbMQ1yiZrBfDhJQtOJe$Eg=Yo7;$_3<6u#=k*Kk@iUsw2skks?SzNzpn!EY;^ z5&VwA3xeNO_@3a43NHzMU*QLWKUDaU;L8fH2>w{%Ckj6mhd-0(&gS4%oRinjZTv#v zmtIuiH3|7w3cptPjYRreNjUX8FJ8y*y?6uX#nT@Y{wT(OlGmRV{v!BSg}=$*-xdBL zYy4BlzZCv0Yh5Vd?fYL2-o_;_frurtY;y4!xfNxxEoCdRc_Jwx9-F*gtf!nTp4i3@ zMhMk8G>mc;<%x|?QNCb-qTz~0h&WQwb&3i_EK*b~I7-oI!7++T#Qj(y<3#d%sg$m_ zX}nE0IOnPC_(W@s%VsvgrisqJtnID`sLXjat7vr!2MPH*gT2A&yOZI_^oC%fD-eun zych4&xE%*I?!rNvCTW^XW$ZvxIUJiRG)+pj4WVEp+2s#}5{Y1E$fmiP=3zi1iWnhpLn7pF3dOs_i9|Tslh8C@ z+}wgVLA7*6_xJUT#X{>!ngY>)P6?3aLi4Z+BcYxM_2pI_GZj$JYN^h7!7fYH(+W)uw9=+knpRVzO#w}7XsyQk zWd+&OCR(SdnOX>TZ)NM;*5*o0>#3TM#dJ=q#vKxSUUR5B)ZG?}``1T1J0l@Y8)VaN zl`&6EB-p+y5>6yF-AEfbp_*tknMlTiGh%^IvMbt=$jhcpKHAK%#m9x9t#p%3+ca&b zR-10t6r?sy?bP8sqKapQXa_-?onPDIZ;VEFX?#Ey8YZ&8mKO^4v~viZ)TQx3+({^N z^1UU?Wq5s8JQVEEcmNM-3e!%Tc4>-GH+MxQ@^>qDw`_rjm#FIrwsA_hhc|bXXLk0z zGBCjjct$yodI~r8$=be^J-y*XnC<*c(Il5zW3T9QTVkR1WH1?xbK7*VlYOGqjp6Qa z@^a}k^~hcwfuku(>uic?x`pD$bGob|on39L}xqb<=LH zLNFGK^by8Qn(RL(68l}I9m&*q`LXa z0mgu&=~*IaaD&{~2DzIJaswOWt~JQLYLIJdkkdEF=^Eq&4RY@qiV)HJ3IVLBl&We76}{g}i; zCE+<#t(jUdGmTmE-Q_1>7rR|m#cp?18r2&IF1?&_JDX<@LS@JtL)_&jF*l8QY0OV! z!5|iv^X!H46f8<(vHRvUmWVcGR7=xX_Av5{T*GodZ1(`%u0bp};nk*5*N@?u1(@(= z)erE3Y*23uRv3dB?7(w{b3P4(Q&lGSUrSBi!%xgVU2~2#xS+k%&f_{X2PzU zGGtvE&4XxRpH2O!cn0e?S3Hdk6`m2eF^x@u3f`d2#Q&{&0K+OQMhU0Mc->;0`Z9i) za5=V`ft#*Qgh}DZL2MglG<+-AaRmyF$mXg6jZS9@Z@afdD& zgp9$Cs|}d2LFZ+IPGitz3?^KW!~L9r&pU{n1CYp5+?Q;!ixp3D54-STZs-EkvRnZ- zpX)r7U=+q;0>)zoreYqZp$5~jnprb{N$fy1|6k4J1GoV9Vj(_?ML3GZ;L77Pmf|HW z!#SRD9?Nk7wd6(}`A|<)SV8mAkfK#sNdW|C3)WI6nrRPO=x%JFW7tTiu!+uK3%!W# zbQZ0aLYp-L?N%u|tZCR`Rio3YN0-%vu+@TH)+R)(ZHQW7#H?N3Mgg)yr z?6po{zjX>J>ve+E>{umah2eH*JK=VRl{*D#)Gca zc!+=eQHd;$+Q%p7VYoSmB7B4|1s4b5<;)-9JAh9-K8BC8tw@jJ6MP?hlF14bUE c1 = Class.forName("org.bukkit.craftbukkit." + plugin.settingsManager.mcVersion + ".entity.CraftPlayer"); diff --git a/src/com/zeshanaslam/actionhealth/SettingsManager.java b/src/com/zeshanaslam/actionhealth/SettingsManager.java index af8263a..c93836f 100644 --- a/src/com/zeshanaslam/actionhealth/SettingsManager.java +++ b/src/com/zeshanaslam/actionhealth/SettingsManager.java @@ -12,6 +12,7 @@ import java.util.stream.Collectors; public class SettingsManager { public String healthMessage; + public String healthMessageOther; public boolean usePerms; public boolean showMobs; public boolean showPlayers; @@ -57,6 +58,12 @@ public class SettingsManager { // Get settings from config healthMessage = plugin.getConfig().getString("Health Message"); + + healthMessageOther = ""; + if (plugin.getConfig().contains("Non Player Message")) { + healthMessageOther = plugin.getConfig().getString("Non Player Message"); + } + usePerms = plugin.getConfig().getBoolean("Use Permissions"); showMobs = plugin.getConfig().getBoolean("Show Mob"); showPlayers = plugin.getConfig().getBoolean("Show Player");