From f119ca0235735afe03c37d57d9726bfd5280070f Mon Sep 17 00:00:00 2001 From: "Lachlan J. Napoli" <30715168+burgo7@users.noreply.github.com> Date: Sat, 14 Dec 2019 12:26:38 +1100 Subject: [PATCH 1/3] Adds a Login Handler to login after DC --- .../Strategies/LoginHandler.java | 36 +++++++++++++++++++ .../scriptfactory/Strategies/RunLoop.java | 5 +++ 2 files changed, 41 insertions(+) create mode 100644 src/main/java/scriptfactory/Strategies/LoginHandler.java diff --git a/src/main/java/scriptfactory/Strategies/LoginHandler.java b/src/main/java/scriptfactory/Strategies/LoginHandler.java new file mode 100644 index 0000000..616eb18 --- /dev/null +++ b/src/main/java/scriptfactory/Strategies/LoginHandler.java @@ -0,0 +1,36 @@ +package scriptfactory.Strategies; + +import org.parabot.environment.api.utils.Time; +import org.parabot.environment.input.Keyboard; +import org.parabot.environment.input.Mouse; +import org.parabot.environment.scripts.framework.SleepCondition; +import org.parabot.environment.scripts.framework.Strategy; +import org.rev317.min.api.methods.Game; + +import java.awt.*; +import java.awt.event.KeyEvent; + +public class LoginHandler{ + + private Point point = new Point(432, 282); + private Point point2 = new Point(328, 324); + + public void execute() { + if (Game.isLoggedIn() && Game.getOpenInterfaceId() == 15812) { + Mouse.getInstance().click(point2); + } + if (!Game.isLoggedIn()) { + Time.sleep(new SleepCondition() { + @Override + public boolean isValid() { + return Game.isLoggedIn(); + } + }, 5000); + Mouse.getInstance().click(point); + Time.sleep(1000); + Keyboard.getInstance().clickKey(KeyEvent.VK_ENTER); + Time.sleep(1000); + Keyboard.getInstance().clickKey(KeyEvent.VK_ENTER); + } + } +} \ No newline at end of file diff --git a/src/main/java/scriptfactory/Strategies/RunLoop.java b/src/main/java/scriptfactory/Strategies/RunLoop.java index b414439..80297b5 100644 --- a/src/main/java/scriptfactory/Strategies/RunLoop.java +++ b/src/main/java/scriptfactory/Strategies/RunLoop.java @@ -1,6 +1,7 @@ package scriptfactory.Strategies; +import org.rev317.min.api.methods.Game; import scriptfactory.Actions.Action; import org.parabot.environment.scripts.framework.Strategy; import scriptfactory.VarsMethods; @@ -13,6 +14,7 @@ import java.util.ArrayList; public class RunLoop implements Strategy { private ActionExecutor actionExecutor; + private LoginHandler loginHandler = new LoginHandler(); public RunLoop(ArrayList actions) { @@ -27,6 +29,9 @@ public class RunLoop implements Strategy { @Override public void execute() { VarsMethods.calculateGainedXP(); + if(!Game.isLoggedIn() || Game.getOpenBackDialogId() == 15812){ + loginHandler.execute(); + } actionExecutor.execute(); } From d3a7c356277ce132918df580f1075ef765a2551b Mon Sep 17 00:00:00 2001 From: "Lachlan J. Napoli" <30715168+burgo7@users.noreply.github.com> Date: Sat, 14 Dec 2019 12:33:47 +1100 Subject: [PATCH 2/3] Forgot to push class files --- target/classes/config.xml | 2 +- .../Strategies/LoginHandler$1.class | Bin 0 -> 761 bytes .../Strategies/LoginHandler.class | Bin 0 -> 1350 bytes .../scriptfactory/Strategies/RunLoop.class | Bin 988 -> 1285 bytes 4 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 target/classes/scriptfactory/Strategies/LoginHandler$1.class create mode 100644 target/classes/scriptfactory/Strategies/LoginHandler.class diff --git a/target/classes/config.xml b/target/classes/config.xml index 1698320..018c6da 100644 --- a/target/classes/config.xml +++ b/target/classes/config.xml @@ -1,6 +1,6 @@ - + diff --git a/target/classes/scriptfactory/Strategies/LoginHandler$1.class b/target/classes/scriptfactory/Strategies/LoginHandler$1.class new file mode 100644 index 0000000000000000000000000000000000000000..4672c1d886ab77c58a3f44b1b102639e57d38623 GIT binary patch literal 761 zcma)4O>fgc5Ph2%OpKvv_$ZW*QV606QkSR)kU+ged{hc>2+D!m#@@PH?A>U06W~8_ z;ebFK_yPPV#H%{9n@ksaOb_?77ZLSQeUMOpHCAH^EP{)t0sN_duKk#uWLzD36xeY4hD~Tr8E~a#j9GS<1dMf)}tKlq>%ZMCeaaH z75dR&?RHR4m#9H+3khY<)9H}nkV*Ovzk&6?qw%$_Ny$lEHs};)i^$XS7w#3dr~m)} literal 0 HcmV?d00001 diff --git a/target/classes/scriptfactory/Strategies/LoginHandler.class b/target/classes/scriptfactory/Strategies/LoginHandler.class new file mode 100644 index 0000000000000000000000000000000000000000..0562e7582f9ba20325a2ca6e0e2d922b6e9c1853 GIT binary patch literal 1350 zcma)6+fEcg5IwyY2gc#DfT(x@MPXT$7V(0jc;Py_iV3K}x8B)yZQ1SF%=DuEfxn$Ab)PzYs%L)u`tl9HIPSRU!f^+KE>bwriX2W_ zGvs0zd22>o6mZI#(+98yrI*LlmdyQI2M$4j9rASvX z3`F&zh?Mm=gBkNwQJvvp97L*ao`}GN(M!H$B4K1j$(R?ziqZ>0m#Z?OvW|QqgN7lz zwk0Ei)w`m;3FR(@jVO?F$`;H0y=~Nz_pl!a7}~cV#6~AP^kAQdUhH#l*~1k~dbo;f z4yHU@#|;lRaf>+aisFee3pwpz#=|V;teJPPV1ayw{ae-Ln$(8hkuPWM#KUdOGo0L2 z32H|IQx&?x7fa7%Kpo2Fec#I8A4U}($+hvZOT4Bu7j?yJ(mV~zF`pMTlEzgriBpkf zUnf0#Os%O%vsjnf*G5Lv1L>EO6fqvOcy$qpQfRo;YbpwL%~Dso-Z1=b*oX;pF9G;E zHbMvF4d+LSyVyqE%m!5ztTJ@x|Gi-LEQS0ouZ3Mav{OZ^K*OkN%$Jote>Sd4S!bBa z??`f^4KaTbkz&uoXq7M7J=38sE2Ba^>5q_VnS7%7j)gZAq867z5s{#U|H|@bEh*EI zC_@1pqffevzV{TpbWf8RUDafy8-)X4I7r?KvNQvR3!lLXUy)kLvG+OF_ZjI=$ZQ4{ za%?6EWIrSTePr8_CfkM#ItaEChsg6bpl}#R$YVIVRpuS7wq+hPvF9~*(C>SyE|OQU&^10o_EY zhfddvemdzWk(nSWQ{>HI07cSf8H0Zjey~ZnpY~>uI(UUN8=!fLR(8|q5_OA9&u>Sa BO&I_H literal 0 HcmV?d00001 diff --git a/target/classes/scriptfactory/Strategies/RunLoop.class b/target/classes/scriptfactory/Strategies/RunLoop.class index 706873f3a8a2c986118239aa39d483b68f2c6eb8..6064d5ccb61b78aa9f83e21694752508305b8447 100644 GIT binary patch delta 701 zcma)4O-~b16g_V`Ffu+s3f3)dm1=9lx%ef0Cs*Y5x-SaUIkqJsq& z7K$SnMajXUiy@SabIHXLJQtU-Y@REos$#Mg2Ui`eIJoxSyR#zOVapF5s-W4{u|T2L zZNz?*yi$!MjNf|oBvy%T`MT@XjtX}-UWn(T^+Yw^JXX;&^|Gx6+5rf^c?1STA;N?b?Y!3~L<$VuG7ZHYPLcM8_W zZGo9EZh5iZsw}U19Y63?U(l=P^J*4(v6ArB}_AtB$ zXZN7(6yG$$OWPqVhgiGS>*T{5oKEL z&xHN?AZP?NH5II4qG+JOkK8*V||Q#fb7GaSo`q_Zs`l`eH^E8_92gU k$nfU@b)+!MeX=B-BP!(onPh@yk$HZ+Pugg?NNl0-7cT~L*8l(j delta 392 zcmYk1J5Iwu5Qe|q7;j=P0YiW!I4@oXClUoU;sBf=6}gEk4q)XPG?9RyAkolq1}YAM znB7>wO0)C&|9@ugqfc}B@x6Kjt{6wu85o8Uno$G8QN%GPEXpQ`yp zr=cZPWaTXDS}dEEh}dvp$w@7Tt~)Geo%xq83PvJWN6`?|4k<%x5(`oCret>n5WZS*`_51`)d-3)ZI&@*An49iLH2FDFmiCkVMm#s6$tN zH+3T3fpqZTyKYSAD{U{ome7^Fa%WY{>xvn_u#rC!JQKQ2HGiA-WZ%9VJ4pX&#lKoT H5AXi~yAB@I From 9c2b4380d56920516f9562789d8dc217e4fe4602 Mon Sep 17 00:00:00 2001 From: Burgo <30715168+burgo7@users.noreply.github.com> Date: Sat, 14 Dec 2019 12:46:10 +1100 Subject: [PATCH 3/3] Update config.xml --- target/classes/config.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/classes/config.xml b/target/classes/config.xml index 018c6da..3dd405b 100644 --- a/target/classes/config.xml +++ b/target/classes/config.xml @@ -1,6 +1,6 @@ - + @@ -34,4 +34,4 @@ - \ No newline at end of file +