From 04188bcefa7b6ba9bcaab22668562bb9f05b6da1 Mon Sep 17 00:00:00 2001 From: illumineawake Date: Thu, 2 Jul 2020 00:04:58 +1000 Subject: [PATCH] tickeat: changed title to QuickEater rooftopagility: changed log.info to log.debug --- plugins.json | 2 +- .../quickeater.gradle.kts | 6 ++--- .../quickeater/QuickEaterConfiguration.java | 10 +++----- .../plugins/quickeater/QuickEaterPlugin.java | 22 ++++++++---------- release/quickeater-1.2.0.jar | Bin 0 -> 3563 bytes ...ity-1.3.0.jar => rooftopagility-1.3.1.jar} | Bin 38830 -> 39011 bytes release/tickeat-1.1.0.jar | Bin 3591 -> 0 bytes rooftopagility/rooftopagility.gradle.kts | 2 +- .../rooftopagility/RooftopAgilityOverlay.java | 3 +++ .../rooftopagility/RooftopAgilityPlugin.java | 14 +++++------ settings.gradle.kts | 2 +- 11 files changed, 29 insertions(+), 32 deletions(-) rename tickeat/tickeat.gradle.kts => quickeater/quickeater.gradle.kts (93%) rename tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatConfiguration.java => quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterConfiguration.java (87%) rename tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatPlugin.java => quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java (85%) create mode 100644 release/quickeater-1.2.0.jar rename release/{rooftopagility-1.3.0.jar => rooftopagility-1.3.1.jar} (74%) delete mode 100644 release/tickeat-1.1.0.jar diff --git a/plugins.json b/plugins.json index 7b22ec40..9e00c0f8 100644 --- a/plugins.json +++ b/plugins.json @@ -1 +1 @@ -[{"projectUrl":"","provider":"illumine","name":"BotUtils","description":"Illumine - Utils required for plugins to function with added automation","id":"botutils-plugin","releases":[{"date":"2020-07-01","sha512sum":"7B59FDB7A5D65500F34305ADC25CD21B575B3496AD51C43F90729A5D80641D49F0DF0F5B1DF11DFB7C94B5BDAAD5F0634459433B3831B0283BF971DFA119A112","version":"1.2.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/botutils-1.2.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"","provider":"illumine","name":"Rooftop Agility","description":"Illumine automated rooftop agility plugin","id":"rooftopagility-plugin","releases":[{"date":"2020-07-01","sha512sum":"703A8875EE78AB024CEFE1B03A4FDB111B93F703C393D0F74E6ED25A4A0D5F01884AD39900B64C2F4D64E117FB40F70630A1F1D95D516DCD1AAB29833900219A","version":"1.3.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/rooftopagility-1.3.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"","provider":"illumine","name":"Tick Eat","description":"Illumine auto eat food below given HP on tick","id":"tickeat-plugin","releases":[{"date":"2020-07-01","sha512sum":"E18B44DBB8D0ABFFD0CD81C5B6A96E0FCCD858FF92DC82903F8661D5011E67BC2599A10623E5E3C99DABAA83E3E02A74C3E71956492695A906F8A52F28D07558","version":"1.1.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/tickeat-1.1.0.jar?raw=true","requires":"0.0.1"}]}] +[{"projectUrl":"","provider":"illumine","name":"BotUtils","description":"Illumine - Utils required for plugins to function with added automation","id":"botutils-plugin","releases":[{"date":"2020-07-02","sha512sum":"7B59FDB7A5D65500F34305ADC25CD21B575B3496AD51C43F90729A5D80641D49F0DF0F5B1DF11DFB7C94B5BDAAD5F0634459433B3831B0283BF971DFA119A112","version":"1.2.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/botutils-1.2.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"","provider":"illumine","name":"Quick Eater","description":"Illumine - auto eat food below configured HP","id":"quickeater-plugin","releases":[{"date":"2020-07-02","sha512sum":"02F7CAC41B34ED1C16F859E8D117AB3A74B42C7DB597AF4E5A4E8BC606399E6A7E03206F5A7856BECBEC415B2185C921C9DD676AF739FC2FDCA356DB17DAD21F","version":"1.2.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/quickeater-1.2.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"","provider":"illumine","name":"Rooftop Agility","description":"Illumine automated rooftop agility plugin","id":"rooftopagility-plugin","releases":[{"date":"2020-07-02","sha512sum":"72363EE1978716017FC5D735738E990D36C39D60E855CFA7676C0997E70B6AC8918DB2D87A67FDEC4D9F8BE0225EA23F892AA6A440CFD3B14B95192C9C1F4219","version":"1.3.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/rooftopagility-1.3.1.jar?raw=true","requires":"0.0.1"}]}] diff --git a/tickeat/tickeat.gradle.kts b/quickeater/quickeater.gradle.kts similarity index 93% rename from tickeat/tickeat.gradle.kts rename to quickeater/quickeater.gradle.kts index b23d1a9b..b37a4f09 100644 --- a/tickeat/tickeat.gradle.kts +++ b/quickeater/quickeater.gradle.kts @@ -23,10 +23,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "1.1.0" +version = "1.2.0" -project.extra["PluginName"] = "Tick Eat" -project.extra["PluginDescription"] = "Illumine auto eat food below given HP on tick" +project.extra["PluginName"] = "Quick Eater" +project.extra["PluginDescription"] = "Illumine - auto eat food below configured HP" dependencies { compileOnly(project(":botutils")) diff --git a/tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatConfiguration.java b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterConfiguration.java similarity index 87% rename from tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatConfiguration.java rename to quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterConfiguration.java index 2513e281..d8427546 100644 --- a/tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatConfiguration.java +++ b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterConfiguration.java @@ -23,18 +23,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.tickeat; +package net.runelite.client.plugins.quickeater; -import javax.swing.JButton; -import javax.swing.JPanel; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; -import net.runelite.client.config.Range; -import net.runelite.client.config.Units; -@ConfigGroup("TickEat") -public interface TickEatConfiguration extends Config +@ConfigGroup("QuickEater") +public interface QuickEaterConfiguration extends Config { @ConfigItem( diff --git a/tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatPlugin.java b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java similarity index 85% rename from tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatPlugin.java rename to quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java index 7c7d9c42..cc52d5b9 100644 --- a/tickeat/src/main/java/net/runelite/client/plugins/tickeat/TickEatPlugin.java +++ b/quickeater/src/main/java/net/runelite/client/plugins/quickeater/QuickEaterPlugin.java @@ -23,17 +23,15 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package net.runelite.client.plugins.tickeat; +package net.runelite.client.plugins.quickeater; import com.google.inject.Provides; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.*; -import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.*; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; -import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; @@ -46,20 +44,20 @@ import org.pf4j.Extension; @Extension @PluginDependency(BotUtils.class) @PluginDescriptor( - name = "Tick Eater", + name = "Quick Eater", enabledByDefault = false, - description = "Illumine tick eater", - tags = {"tick"}, + description = "Illumine - auto eat food below configured HP", + tags = {"illumine","auto","bot","eat","food"}, type = PluginType.UTILITY ) @Slf4j -public class TickEatPlugin extends Plugin +public class QuickEaterPlugin extends Plugin { @Inject private Client client; @Inject - private TickEatConfiguration config; + private QuickEaterConfiguration config; @Inject private BotUtils utils; @@ -73,9 +71,9 @@ public class TickEatPlugin extends Plugin MenuEntry targetMenu; @Provides - TickEatConfiguration provideConfig(ConfigManager configManager) + QuickEaterConfiguration provideConfig(ConfigManager configManager) { - return configManager.getConfig(TickEatConfiguration.class); + return configManager.getConfig(QuickEaterConfiguration.class); } @Override @@ -87,7 +85,7 @@ public class TickEatPlugin extends Plugin @Override protected void shutDown() { - configManager.setConfiguration("TickEat", "startBot", false); + } @@ -118,7 +116,7 @@ public class TickEatPlugin extends Plugin } if (utils.getRandomEvent()) //for random events { - log.info("Powerskiller not overriding due to random event"); + log.debug("Quick Eater not overriding due to random event"); return; } else diff --git a/release/quickeater-1.2.0.jar b/release/quickeater-1.2.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..2203d9ebed8641686ff04acc8925e2fccf017080 GIT binary patch literal 3563 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 literal 0 HcmV?d00001 diff --git a/release/rooftopagility-1.3.0.jar b/release/rooftopagility-1.3.1.jar similarity index 74% rename from release/rooftopagility-1.3.0.jar rename to release/rooftopagility-1.3.1.jar index 2968a830b2f5892033417315f4f2bea02fcd55ba..3ffa9bd7e09d608e66df6f445c13222da62445bd 100644 GIT binary patch delta 8908 zcmY*7?6&2*q7S(eQa!=Rj>AtlA_{=c&Hs5#{8c^2EtYGmO z4#I~bUrAK;`^eJBTZV}dMF#3lmGAEPP35UX#Xz{*l{TVpGMnd`tKths-!m-7n`boIp20g5=r1OB6mvLw7 zS^y^JSIo#tG)t0Cf=1ZLftJu;U%8>^(IvvmS&pG&6XkVv)VG?3KbmfNM(2u=@) zn6We~7RW0anmTwI{tGGM;uqk$j9(UVOo9-h^ZWDb4zZ{0^*a>dFhS*|V}BYbCWexC<2aM<6Q`WMP699%MH#0H;xo|H*}(#c4*{$-fu96dQK?LiR0h90VLQ%sVx0e24hg}c8Dby zc35g26(uD?)Nn2)F&~5;-Ebs0cH9FJcdmh*^gB`J;8$gHe^~Tt|F##vJN*3XPfzLu zUQTkxpg{)dXJv9^uGc@nvHRKlQX7llz6Q&bB&sS39!^KF%>dZE*fI0_ zGRV07$i?etIOuKZr#pCO>1UdH@rIc8?@ri#JcNz}8<#^Gv);h#U8dlJ&N+UQK?KCQ z>OJWo7}uDO=950G^rM-mg?;Fmt(ib!7~@$yk`f>d;!J$Rf@0;?w>;~y)L1Stq*RKP zrFIwARy*2yQag+O?W2KpPIfAJO}KJU#6KGGQUQH0O;1Qr+q}5_lKQx8^JY=V^ z<1y+0tghq7`RL;Yvz6Zc3`LFo1GDHPBaG!a_J9 z|43ri#@!rkV>uSDbf?4>N|@FPv}yI=IJ_EHjS#6DU^gmxH{KckqW{IHiicY7$sf@j#2J zkQ45L{Spf%6jbF=frKAI3pH&JSbT??zT~f37d*UARIl+Drs%JI?%3HwIM^or8bLg1 zYE*HO%21EF+z?ERPJkqCnfoX3dhoz+bvjkr#v{ATU2a zH|Of+&L?r|Tv1WwQlgQY7soN}5mg}zBQub(abFgz@i^831RbkqYkssZz)Fg)=J!}j z{&lREFQJ{2i>YHU2~OayJP(%_UGZuV6qNh;#k7=Dt@prOCvzdwVpnG`moZVlexxK?C}*C7W-6Ys6|0IlV_RSI1FbeY=c(oAcrdT>UULp zg(l<6FuRii@Whlbl7fYGqdnwz%gDnHtE5wNM~>z4 zQ%24SaLVdX##F?C{{*TdNbZy1W7XxdB@19$Un&iy8um|#6`QVp~f2~s^ zzY4l+Ydj-5XUx;nX?W*64C?#1@t2`iO~O1l;9HeP2W1U0(+2-?V=RY8olL^^)`3=j9ZsI{QI9t`1=w->1<@w0^{kR%hGH z1X!#or&|d#`WP6PADrXf=p^2=o5a$NuND(mSXznEQM~AQ1Z!O zXPS|A;fZT&S*|&CNZH4e@yo?kQ)8_?W%eJb9%&zrH*l&?W_z{4zt~~;pDK+42<4Jw zF6iXlCg~Hqqr1n<5~+JR3B1Rp+dZEgI zeBdY%`*-7i_QoS4Sy;>BXDXjff2P71ZD_%Y?e;#FEjX2s{>O{*iguhU<5Yh%t7ZMI z?}-=X2*Q0r{9H>ychqZqI4J?*wvY7`F!eM{^0}aov~ZB-Yy#M-Lo`?jKU7w3x=6FyAfI-<={#Jg}B2!L05{ zrs+QUV`1pHs_{-+1wzn{BKlsZqG>Ec;e+>=T+Ye-4;4p55cKUOjq#=F$hB!!kZBqZ z9mo{lZI5!htgYs)YiTTPB|ub66s*u-k9k1d{oLLnSnZ6~Afv~#A6AoRBS^cwX_hGp ziCOLdi34A8Ev^ZV`X>mF6bP~Sar1bmcHg-GKDi5qe>>17(LrgIlX4j+Fy7BX3CKor z@dvn?I=47dIyJSW(dXal#46>6T6i%l?6Yf`;Tdi_@>_5XZHt`j>$Sf<2D{-+41kux zSE~U8xwLWgK||9&52imCE`5^bpMC3C$epR6SRWsZ--?pu!8K8wF)bI2C^C~hq;>rL z=;M#JdZ=-dJLHNi9zpy4EyWC9djPqpIC}H&m!K$dcee-|WG`Rxt5)ii?>gTG!*N$q zW1gpRxAjq;GXXGh69i{X7}!oS5Sg-khtZOLe^z5Ls6;Xb)K35l?58z9FL}Vc3$muQL=HBip_d}JwA3c=`33oqiVj5z zYVZJFf5u?B-sVI;nprR?Y^;1XNHU13m|wBSu|?5Ksa%?OURW`1Tj^*pFsylap7eJ~ zwqzkvzD#*MYdc?apX^+_JgyRdq9n@tEzoxOmV3Ts4D>dIVs>6kBUBLx&Sa1Y!G&50 ze+gB}DsCR>`ywtDQ#|?yH_N8A6w+}8R6bbV8Gg~#A9HV3I%sh&+tL(Dy7ogZ^>W8s z{8O$PiVn=&+YdQ`!X15$nflBD$%yv3@ll_a_DsgU7TWYa4of|@K6Zf4sB3n{;)Mb7 z$IXGi&L%^6w9dOM`X)SJq;a6*uO6O0c>uSoTU16scLlJ1WQx0wMcO?tOtg8n&$xXV z)V0M0bo9KIYX@C8rz}QA{p0eB$h^?W@@~F&qQ!S@!j+D<`HV3OI`%E5KXJ1_kRhs1 zR+;P8X=8_DF}=1LCi^seV`}&I13I-rQ=@hUGPeqla4}=WuUf&nh|Tv}?dvi;f%2Wv zJShaa!>)z6=Y;qh`eWzYu(c=WP6LlyS_)G};Yu>cN2^u%dj;+j?Mid@Wm;R`eG_-?R1*}XHazQM(rg$<9v73_(?;E zZnw?yJ~d2o!W(@2geA1ucX#xpn00Oee3~u+IE15ZyYWqE5!QT9{bN|J7so@p+~Sc^ zHE?vuYXM7*42rJ?fIet9%8o;LlB3h(U3+iPANo2m{$fcb(Tv!>TeES-8tPjos*`xz zKpZH$6p3;N;A%rb4eaQ2^+*Az+&>)!iti*uxT0x;!wueg;B6Y@bg=0?BDjHEdgfI11ynSdQjucQQ@I2;VdNu!7}FABnE)+! z*RH;7Sn0=~A$d)Xwuz<@C!vPLkd!0ykz<`G=VX}TE*&C0tb{osVXyz|tv~BZ2@cl2 znWpOwC<0%<{;uU^8oQ;M6#x-<>`eV;0{eFHQ*4w!|Dg9B z2FZP@B}qbl=$A0_7ygu1Ud%(dy53p$ksNcozqDm=oh&x>1+x5RDS=Z@-#R^$j<)(t zmVUv4#bDev!Onm?)z3DP#r)mXwzGRN8J}S}{THw{x9wD|d7iKlFJ-u6ZEvKb@ltid zg~Dy$(?fao#7lR!ZEzAP9aqnfV6uqrzRVTY~;pmq`<@{I*_^Td6EoazTTZD(GN3 zGvu7$Hbc~BB`XmyHf=Q@HC}_a%$Br9{(DOdJ{R|I#tqZB20<>}j^|!itB`EUH7=Zy zu{Ec0{P4N~3(xaE-D;Dlbcj*vt=gH~nBsUOYNktV5%Am341=no*i|qIyvNT2aN?ml zpkqr#N%b`PI`4SJgw;%CumkWyR2;tM0vzNHc?r63iZMVUL~xQU{ZWC;gJyqL%6C;*v_5j3Y3ALH>^y zwqBt2(i?`aOekh-+CPZq_S)qva)iDGi+I5^R#ABL@L)9-ooytFK-)@PyDp%qr3tIF zTu_wOZ0u#E)!z}iXE6(TdS@qtWX_xrSNVGt58Epgx}njgC&AmsufJN?#W-$qDi7~XdX?fgG?49VWO zw;mM!W4VThg2B$ks3MZq7dubB!CgNCC8X~tZ`@i}bKe{?6g3p5U3$Lc_n2<;P`$NiZa()!u@iv;mzgeT#>RSzTrqLjMdgI#Mcw*+rPsWD-s0+BZfk5mCoa z1-3h@BH*E|^Q$}D7YRwL3j(zD*`VDppcrFc972(FJprwqfeo3O+C)Es>dE3IqDL~x zUvejh>IvteQu_S&-SJa-&*UYK=Sxyg*ZwBuli^EN&m@jhR|@#|EB(RC^p@mhj^|5M z4|uN&@Z=p3X!i#ZB1&@jL=bFB+H0~6e*08A_7Z~J`mag)ZstAS1BXk5^SGM z_g)cC={;2r1rCn3={mU%A)$i!ZT0Wq&YBrX7oop5v~=z;zEZXpQKd)Wzcr}Y7epAM zoW|>-j@j=tV6}pE%xwz|((;lyBA2;aAtn^1W=&KQZ*82LN{%Q`b~r$+w1hT(GV~R3wos5THng&ZHC)SwHnp1( zulL%~>Vg|E*FQT~M5UkI9Lvsi6|2k9>&C8V$jJG2?e%3E4$;f#JU%BZcqXx}dgmLI z+%E3g@ezrJHRP+Lqa(_WqUwHTeQ#wcF6JuNDOQ=JYh+j)FCmnYv-u+PBcpzRPvMY_ zMm={8=Z{b)@?2?s-#;@E6?i}Has=AL24Q&UyBY9-lcH7ci85imqJ{%OqJ}Z_E_AnC z$dduxF_3W1B&CaRc)h92TGZe;bvev4k)U`*AfE`rP|#|8LjVAk9gk@Xw6uosmZ^S& z0nQFXe*RJ?K_DeGs^#jhadS0D)kofaob5K@cT;^MLg+<3+{t;U=`Hp<+;$G8d=e|o zr~}TK9cV3Udc0I?CzJppZmSvMl9ZeB z^#~s~N=`)Abq^@w;$JEu(7)^`>}p-sSfxxIslnES*ke6F|XccgctS@T$?Y z^0(I(pqG~pR_aaXLCzMUbv9iC!kgXtd$2r88?laqFmb$S+8ShjYt2&)Y1*r$bcS?x zF218$YL!lRPbP6i7hBe_LXU}Q$q_y_8uo|Hjm-9_Y%;hbt(NYn5wnJc-moX9>VmuOz?f34x>spz4_M?5XSu}He)biOsI@~L?K<{>8w~zI z_2v3Cx*fYk)t*mddVu7pY}iZTawY27cZ^}ubEaGfEyzYW5_egrcCTo4H-*R67!aQEMHc6@ zrD<3mm4=I9I$lu@2``cW*H)bHV{Oj2O$MtPn?xlwge zRtM|MLq8w*>-3`2T>HWNr_Xd2V-Db7i5l26sp@%j#dvLIV{L7&xoYF;Z3n312n{`~hgqq!Y>u#DtDM_Kjp=TAg0WfS6X+3F^NDbtX?GR-jUW$Q0{ zsi1k+y3#)mf-3_7iupC_!r-^zOJ=eFANkYa>{7H3r6Oui-VP4+4XjNw{b7zYX^+hf}`CH?$Uh6IIf|YN9;5H zgExLU34iNyrB?iv_iTS{UkCAc>SnADYUv)}Ncr+O4}9WQ`J{9-=mb7vGtPf!*_CFf z)`n25Dw-MopuXfTAs^QBa|K`_L$8K@O82g?FK7Tnt3O{!fOZ;nYEI^U@=3_0H0N59 z6S4B|8}HOlZXQ&cSbV)U&`^Nmtb6Q~09s@|`KTttS>p*~Cg`>>cwKP-<~S@C;Zh${ zhBS;$*MU4PKTQ}eD*|Saac!VQ5oTVYf2o1nk{g2-38zV)?o3+o`9R#G;fLSHqAuE{ zE7m^??Uk>qG)3z%J|I1tPOQ8+l==9>rEvAz)_+FdM+dqhQPL*`gzDcH4Uv*;@9Ckr z>m84#?*Tz)8k0W`p+~-S{z~GKpgY(B>clnQ#C6@o^{;C&6$S9zwe)vPixwmF;LzVk zCl>djsszQGl3`s62#qo2>RU?j*vo5KBW2pL@a$6YND3(@4pw0$^k6N$D6>plIUu58 zg}%j7$H-9Z^Vy2#j>eTE2Wv*t2_+zF6?>F?73yXcb)u+|=2DuDu(ILNAkkf3j+!s1 zFDdtG5uY6`(*-Z_>FUSuac~>9PGz@@CX2de*S-zerHr8~z@o3WG=yug(-Z*5Mw`gU zRr4bh5Ya1PB`5A$HK(i~2_+kR%{{Y$XNnKpXvMM=>I|nvz({rUztdWg2`QZE%FkNL zDG71gzrLd+D9=zJJ1y1b@l2;&au!q-?8+YpYIlOl#KH1kFzndzvqQTMW%w-|_Q$Z8 zy0nbsMT}KR?7-v`iguarXM_pNQ=aHt8vvGkO$%4_zE-Ksy*XTUrRXr6iP;5GPM)z$ zEoJBEMbt;UtuuL7Z<6LVz}ot!Iy1O-^`&q1(ObP5^_n?}kvwz3mc#}IM0f1K2EP;q zdlW}EEm%iT7jyVM0(Q?bSK0HWZ`N2>!X~^-Ld_k&u#`o6mbGq{|lw-TkL_s;{aanzSE9z{@c5zDA1 zbT6{<85UCRUep^(2KsVNXU23l{jC|ym?_Cv{}-QZv^24^Vy^F7+v!vt0X3!;%>?oW z+Yn+cxs}1d?Pt+fxi0djD(Zag#nVdYbSqq(fK(FcB8c;rpyxfl#S6WMSgNOMmV5P^ zTky5`g9N@GwhQ;RZmE1R9n$_`VkiGJE9F+9u*Y9FkvO=x10}Mplkz%NCDN+!>yw2R zICH@c;@d}L-yS9+8yOPU+(b5faLZtCZ|oYR)0eU6!r{X0V&a-9NM8qsQy@F5fVic6 z>;VM}D-8A|q=nvzp`j(u)iFL_X!|Ml!SrX*k;V(ss3gHL%}teEEKeWMQ} z;6L(WX=*QpJ3zZM!t`ODHgrWg;GnQrb%eUXgu}1b@PH`FYq9c20xd=GC-F<0;m4}_ z5hypnZ#`XhJROnWcLe_7eK=*LnDP63b-=E-wl#dnwl}sTmQ*#v zK72q{#)`UIg;@0Jm)-T^Xi+8IS9O(6A0oM_6<1&mfOu`lOzwEzp59Q?f=NP^&BMQI zVIGndf(VtdSCg6Ymm5rH>L?984+|JpxE$i8k6`1yfwY(-&zSmp$5i<*AztG(ai1^W zX_yuL!G-vJ=2vgSi{!+WMuhFvE6>~69rG9>c(N=V7%Imk9VF76Wav1;5W2>t~q z_;7$QnB_1pxP{xPIuG->!L({A-SyvFAP+6kmD}H1b0%{cQtve+pq<@GHx#K4IATdJ zeX|IG?4GxiyC~TMa$;egmHWU-__xYYw2#@TN{Xq^7%cHXmqo=R5kL!FI@nN?!TcNPX5TSR;_n^P zyQ50c0))a+7;?B23_gZU?77#yyN>jrHAX&u{w>2#+=KR38j4Pf?gllK7pmI#lua zRf}Ps4`Hf2M>h$ouS|oz$3KVv<(dVWA{X`zJOZCbYf#xLz&KhxSDO)cG!^;@Tofan zv&rS8{)|oqB)u!RX2xh{PQ@$%I1Sg#gbVo0lvSY52Gki0v0x5275Dzj#IkPeWcq?} zv^d7p?;)xpDyMH)YMQL*FN_OQsF?_cz3kpNB~+nQ3>~hgCkj`#l^P|&qQ0F9GRWMJ z(!a;o0G!Ld1s@i+v`6{1Q{moN0shwV_l!ziz+yGxeg^^j_Z_i~Z*n}cgp~(4^0%*G zannC&3+nJW$bowY@?U*G+WJ)-Oi?9L$pCFq2kF)bIGGXUftyi14MQ*4fw`Bd3bhRZ z6-(R!mQlW6l$p*W86SG8Vzg`E#kbu#^9mD(xdjbo9B_AK9Ay?0_~I40PD$BM{{O#s zKu6AvWGFN}K?J2685*BN4n0X=N4fbgN(&W)vLk9+f5Lz1{vZ3oMNj|$ delta 8712 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 diff --git a/release/tickeat-1.1.0.jar b/release/tickeat-1.1.0.jar deleted file mode 100644 index 45c181d12f47968952904ad8a6ce521760831429..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3591 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 diff --git a/rooftopagility/rooftopagility.gradle.kts b/rooftopagility/rooftopagility.gradle.kts index d1a4732d..f1e1338b 100644 --- a/rooftopagility/rooftopagility.gradle.kts +++ b/rooftopagility/rooftopagility.gradle.kts @@ -23,7 +23,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -version = "1.3.0" +version = "1.3.1" project.extra["PluginName"] = "Rooftop Agility" project.extra["PluginDescription"] = "Illumine automated rooftop agility plugin" diff --git a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityOverlay.java b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityOverlay.java index 8fb5aebf..5b99d62d 100644 --- a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityOverlay.java +++ b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityOverlay.java @@ -7,6 +7,7 @@ import java.time.Duration; import java.time.Instant; import javax.inject.Inject; import javax.inject.Singleton; +import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG; import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE; @@ -19,6 +20,7 @@ import net.runelite.client.ui.overlay.components.table.TableComponent; import net.runelite.client.util.ColorUtil; import static org.apache.commons.lang3.time.DurationFormatUtils.formatDuration; +@Slf4j @Singleton class RooftopAgilityOverlay extends OverlayPanel { @@ -45,6 +47,7 @@ class RooftopAgilityOverlay extends OverlayPanel { if (plugin.botTimer == null || !plugin.startAgility || !config.enableUI()) { + log.debug("Overlay conditions not met, not starting overlay"); return null; } TableComponent tableComponent = new TableComponent(); diff --git a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityPlugin.java b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityPlugin.java index 7b18a7c4..d2cf58d6 100644 --- a/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityPlugin.java +++ b/rooftopagility/src/main/java/net/runelite/client/plugins/rooftopagility/RooftopAgilityPlugin.java @@ -186,7 +186,7 @@ public class RooftopAgilityPlugin extends Plugin RooftopAgilityObstacles obstacle = RooftopAgilityObstacles.getObstacle(client.getLocalPlayer().getWorldLocation()); if (obstacle != null) { - log.info(String.valueOf(obstacle.getObstacleId())); + log.debug(String.valueOf(obstacle.getObstacleId())); if (obstacle.getObstacleType() == RooftopAgilityObstacleType.DECORATION) { @@ -221,7 +221,7 @@ public class RooftopAgilityPlugin extends Plugin } else { - log.info("Not in obstacle area"); + log.debug("Not in obstacle area"); } } @@ -263,7 +263,7 @@ public class RooftopAgilityPlugin extends Plugin { if (!REGION_IDS.contains(client.getLocalPlayer().getWorldLocation().getRegionID())) { - log.info("not in agility course region"); + log.debug("not in agility course region"); return; } marksPerHour = (int) getMarksPH(); @@ -277,7 +277,7 @@ public class RooftopAgilityPlugin extends Plugin timeout--; return; case MARK_OF_GRACE: - log.info("Picking up mark of grace"); + log.debug("Picking up mark of grace"); targetMenu = new MenuEntry("", "", ItemID.MARK_OF_GRACE, 20, markOfGraceTile.getSceneLocation().getX(), markOfGraceTile.getSceneLocation().getY(), false); sleepDelay(); utils.clickRandomPointCenter(-100, 100); @@ -293,7 +293,7 @@ public class RooftopAgilityPlugin extends Plugin } else { - //log.info("client/ player is null or bot isn't started"); + log.debug("client/ player is null or bot isn't started"); return; } } @@ -324,7 +324,7 @@ public class RooftopAgilityPlugin extends Plugin if (item.getId() == ItemID.MARK_OF_GRACE) { - log.info("Mark of grace spawned"); + log.debug("Mark of grace spawned"); markOfGrace = item; markOfGraceTile = tile; WidgetItem mogInventory = utils.getInventoryWidgetItem(ItemID.MARK_OF_GRACE); @@ -345,7 +345,7 @@ public class RooftopAgilityPlugin extends Plugin if (item.getId() == ItemID.MARK_OF_GRACE) { - log.info("Mark of grace despawned"); + log.debug("Mark of grace despawned"); markOfGrace = null; } } diff --git a/settings.gradle.kts b/settings.gradle.kts index fc0e17d9..7825f07d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,7 @@ rootProject.name = "Illumine Plugins" include(":botutils") include(":rooftopagility") -include(":tickeat") +include(":quickeater") for (project in rootProject.children) { project.apply {