From 87dc8a9c99ecdbded94dc82a0087646e1b45f797 Mon Sep 17 00:00:00 2001 From: Zeshan Aslam Date: Thu, 12 Jul 2018 19:46:42 -0400 Subject: [PATCH] Added support for PlaceholderAPI and MVdWPlaceholderAPI --- config.yml | 1 + .../actionhealth/HealthUtil$1.class | Bin 1346 -> 1346 bytes .../zeshanaslam/actionhealth/HealthUtil.class | Bin 9188 -> 9395 bytes .../actionhealth/SettingsManager.class | Bin 6256 -> 6339 bytes plugin.yml | 3 ++- .../zeshanaslam/actionhealth/HealthUtil.java | 14 ++++++++++---- .../actionhealth/SettingsManager.java | 8 ++++++-- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/config.yml b/config.yml index 3e911d8..b06874c 100644 --- a/config.yml +++ b/config.yml @@ -4,6 +4,7 @@ # {maxhealth} shows the max health of the mob or player. # {usestyle} will use the defined chars. # {displayname} will use player/mob custom name. +# Has support for PlaceholderAPI and MVdWPlaceholderAPI. Health Message: '&7&l{name}: {usestyle}' # The message the player is sent to the player if they have actionhealth disabled. diff --git a/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil$1.class b/out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil$1.class index eb1cd4a72a475ce81116c83fcfb043a437e8270f..b90eed64b0c7e8303715a6a8fa7cd8e69c50f31c 100644 GIT binary patch delta 31 mcmX@ab%<+2H4CHVx%L6r_$YvlUgb>kSfJlIZ012BhUO*HV z5cRPI1W{Bpq6LGGML{Zcw^$d{N?lO2wzgEe*eWWW^X|(+wf(R8!MSth%$YOu&77I@ zPK|6F?Y#2i!NUOh^C1)EIBeodJnI+gh#$YibABAfuXH>gKnz|`lNS~Bl8Kk`ih);6 zq~JBh{0fvsw#y~z$t7L;ilc)&#d z79#A#&k7g=f&VB-)K+ss?T|}mYj{83JUZk^sXkW~s&JLDYsNet#voS~K zK#PMoSZB7yAcutR);s3}In?6C9AfbjUaB+4!g3BH`~`UTJERN%Ni+P-2F`vUM7N}t&3w2JiSfrFq zR?3PkUd1UEujVy6ODs-RE7!7=NSIx^s5G;pbneW|f|>=h=FYS@4NHia+PS5bWpx&( za|U75mY0=Q)Rfm*4$F8Q5vZ*!UDCwkOyx#w?TlH~^D0W0MmLtLgJ)Ts%{dk;)TGkl zTvkaE)Gn+ptFBpEq4XDV9?{`Htr)&=R>h361s3OHrNsqUVzHVv78kZx1wCJ!j^tgY~h-F-Uj??3(%`Tf> zqjQDDo48Wv%@%LLI!nAbmxy9nW+^X{;i`#ggt&K7YIN((2qv zGm7#;UnQ*Tlqj>jiqh$2roqVXE$y@oj7}=aCP{4479to zl?A!Qu1DU-1%o7kr6e>l`E{0rF0|7f<=kF)_o8<_EZek={YVWO&D^wRZhFwzi8$Lx z>Sg=FxFBcKTAl zR1s!ivY=Uvb(n(f62!+OhzC%DmvF80qiJ|oBu=6XUtlJ_mf(JmO8POENpR+~3l^{! zYM6$F94I9x2TM5`*Rv3{EW-_~L>=eB;VLX+y;RB_SiuIYkuOn!KKH}-}NWy$3 z)C!^eV(FkL^)4nv63gW6l8iS=N+xQtl58&3w~69t@#tpU0zV5GgH`n{ zIC2`d2^A~ue2LqIikCFgN}AGBD3ywmond`;)83TUn|5NA{T@0JRHe# zBa*yZ(BTKz@UY!k7>Loa+M{EQjyrX%6;18hWd4W(p(V@LC<(uk=-(nDOObzTfRu01 zPBYJ<0I}z)i3r>kdZ<%3r?qyaRh1d(MDC^WJtzkxO8WFm=#jo3*}2VG9ZVV$hEk+9i@`ILbg;9_+F^s}stR1UnlY((}oMINa=i0jHm=KJ&f z#73cfxR)k2$!d%kdJ6SI>0<6-Y3=J^h|!y{MJT_RUMKEskm^~2QP_%YQa$Hj2<{V} zJow}X#db%kcdYo+0}lu@PP|H#*TFW#^BAYNCh#~Xx+aJpQ4@HEeOwc?t~6W|#OqI7 z6U6stToVL=20SSGOu?Z}VBdg%AmJKg2_BAXO{~Bo)`&520*-4;yg=j{lOXtb@i2C( zQts*3ROp3L4;Cr(LOmkAM#G~L+w0^(<>J>M@-9{l%~&-wW7VLraw1?g2w1MavL))9 zY>E0NTcWUb*sJ7@_8!q^w}aDw=!JoKmb%&@(}Rc{^l;j5m= xkoc(wuR2xzs@)%b@cQLd6KT-05eMB4Ez3_wI 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 Xc)XSl(+INhALdH?U)H>h|KaR=Ae)t6 delta 2909 zcmY*b30&0275?6T7ykcU23U?n5RZ+D7!U!2f+&g{3UUfYR8(AGg_UKOunTIEx=m`E z)SPx(Thc3S(~zdNNlMs=v8hRVq_#Fq+q6xanqFyZk2F2gnpFGVEGCit?R@W>`R2`= zH*aQnw&eBV$eD{Lp8`-yH#*_Rgo%foFfif3AiiMYVJ8ye;mdeL1|D(X zQ9S0vS1_4`$1x>V%)%2%IDu)Ao^-O{Neic(_$r=~p08OrE#zq-&sc~&E5_F?d_(Y? z7QQ9;oP}=-p0V&9!S7l)EBHMN&kKIv!V7{wu<%0*KN5#8N>o2i!cXv1XB{h-{MvA^g9c`7x5pYId9>Qf`78`XBqs9h1X<_ zzY2NX!rx@Azo&EB{*#3N;(`-z;w`cMXX2uaU9t$QC9=riiDVOEHz~o1c1ld(iSn1p zYzLW1ta4c76it#vN-)`?6pK>DbXk;UQM#BJ7G(-vWzp4wvnbiqB05n|EZ$7Yg};fsmpVGChc4 zg4Hn)-0yA<_9)ySJW2C5zvrNLL}5g_l54$8FZ))AgrwKm?(Ju1?zXWug|P1F2#@%N z-7TIWufnMGxHgRX{qC9A8hV2Pg&QRxSG~u-_sag8q(7~0XgGZE%7L3@AW59MYX&@l zelJzQuGgTIRHmq$R&l-+RnTfhYp9aF>rDGuTO<($`Uy67rCZ?`tyQ#+s-j2CyvTa0 zR#Zc^CeC)bmSBIs->axivO6YYj%vTBchK((g%xe4c8;w&7z~HPBc9^nW^Z^P*cVDo zqz)HtVYuGKCq`ST)1+;Rw$l!ix)klCU5a*7cXW@HUAl)n1f`FtHQ;Uv1_u>xlZBGS zcGvPkoj zr-!$KI}wN`J60y%B?Gxpmt%Ic*D9Hq~O^iDQ=Bi)Ec>xHFE80 zov4o8x!f6z@6sDKNu)M;a|2WKSyKQ;4 z-M&1A>pCYcy%={}%Co0n#mNdy?D;3KGKR7k%41kHg^GNhT_NA}$m$r@*!RRxdAU1% zZ4B$~L#iIGVtX8>eFApd6xQqTs$-}bM@D=BCY-F=30{x|wOUZ81;y;ZahY@c8we+{ z5tv53!N1K7)7WI-bOeplXfn{LmCbr)b=)-*cHI&utueGsVKe(|8ArjBXy0D&1Ud>F znb;D;*5(3Upp!5KHG$*;gHgh1(N4E%r>?jkCVbM{^}r4uh`hZMW<1h00Y`rNPBye; zm!3PbS0=33trgvDXa%S4ooq1SkUf$OJEIo#yj#G81-&zZ-hxu?@b_&3&*fofWW z8d{24T7x=ThX!gwBW*_u`OwN&ely*V4myr4bP8MPY3!i0=%NeQZ6u=G$iN=MjUFQp zy%D1veMU9BMjiT%O&Bm*F=%wbZww%4@Iz!A#)xqQqsB3e84u!saU3@pCvdaz91a<0 zaf|U1ZZ*#1u<;shGcMqEn-fQDskqCQgS%~cxW`tEqqa)U$wxRJrAXkQT{wo1!p>XB zLgZuoWY{_r#aq4%<+XR@d#e7HiJt`jL{P>BI p?k*j*ic27&%K3g?s~)6LMkk0uw4cKK&i#YAX#dHYfAK-R@qZ)}blCs^ diff --git a/plugin.yml b/plugin.yml index 2e72d2c..179a928 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,7 @@ name: ActionHealth main: com.zeshanaslam.actionhealth.Main -version: 3.2.1 +version: 3.2.2 +softdepend: [PlaceholderAPI, MVdWPlaceholderAPI] commands: Actionhealth: description: Actionhealth main command. \ No newline at end of file diff --git a/src/com/zeshanaslam/actionhealth/HealthUtil.java b/src/com/zeshanaslam/actionhealth/HealthUtil.java index 8a37e26..c45d80c 100644 --- a/src/com/zeshanaslam/actionhealth/HealthUtil.java +++ b/src/com/zeshanaslam/actionhealth/HealthUtil.java @@ -3,6 +3,7 @@ package com.zeshanaslam.actionhealth; import be.maximvdw.placeholderapi.PlaceholderAPI; import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.entity.LivingEntity; @@ -103,6 +104,15 @@ public class HealthUtil { } output = output.replace("{displayname}", displayName); + + // Placeholder apis + if (plugin.settingsManager.hasMVdWPlaceholderAPI) { + output = be.maximvdw.placeholderapi.PlaceholderAPI.replacePlaceholders(player, output); + } + + if (plugin.settingsManager.hasPlaceholderAPI) { + output = me.clip.placeholderapi.PlaceholderAPI.setPlaceholders(player, output); + } } else { output = output.replace("{displayname}", name); } @@ -148,10 +158,6 @@ public class HealthUtil { output = output.replace("{usestyle}", style.toString()); } - if (plugin.settingsManager.placeholderAPI) { - output = PlaceholderAPI.replacePlaceholders(receiver, output); - } - return output; } diff --git a/src/com/zeshanaslam/actionhealth/SettingsManager.java b/src/com/zeshanaslam/actionhealth/SettingsManager.java index 0164af3..af8263a 100644 --- a/src/com/zeshanaslam/actionhealth/SettingsManager.java +++ b/src/com/zeshanaslam/actionhealth/SettingsManager.java @@ -36,7 +36,8 @@ public class SettingsManager { public String toggleMessage; public String enableMessage; public String disableMessage; - public boolean placeholderAPI; + public boolean hasMVdWPlaceholderAPI; + public boolean hasPlaceholderAPI; public int limitHealth; public SettingsManager(Main plugin) { @@ -49,7 +50,10 @@ public class SettingsManager { if (plugin.taskID != -1) Bukkit.getScheduler().cancelTask(plugin.taskID); // Check if using MVdWPlaceholderAPI - placeholderAPI = Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI"); + hasMVdWPlaceholderAPI = Bukkit.getPluginManager().isPluginEnabled("MVdWPlaceholderAPI"); + + // Check if using placeholderAPI + hasPlaceholderAPI = Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI"); // Get settings from config healthMessage = plugin.getConfig().getString("Health Message");