From 7e64c6afba27949afa0739f4b1f99773cedc2b39 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Fri, 3 Feb 2017 16:03:34 +0000 Subject: [PATCH 01/13] [BUGFIX] Added BanFile add --- src/main/java/org/parabot/randoms/Core.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/parabot/randoms/Core.java b/src/main/java/org/parabot/randoms/Core.java index 8ebfbe6..cff5449 100755 --- a/src/main/java/org/parabot/randoms/Core.java +++ b/src/main/java/org/parabot/randoms/Core.java @@ -24,6 +24,7 @@ public class Core { randoms.add(new SandwichLady()); randoms.add(new MysteriousOldMan()); randoms.add(new BobsIsland()); + randoms.add(new BanFile()); // Dreamscape randoms.add(new SerialBanAvoider()); From 5779b6132e2b63434d0c241a2b22c28692326630 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Sat, 22 Apr 2017 13:17:12 +0100 Subject: [PATCH 02/13] [FEATURE] Fix for mac address for Dreamscape --- src/main/java/org/parabot/randoms/Core.java | 4 +- .../randoms/dreamscape/MacAddressAvoider.java | 42 +++++++++++++++++++ .../randoms/dreamscape/SerialBanAvoider.java | 20 +-------- .../parabot/randoms/elkoy/AntiDetector.java | 4 +- .../parabot/randoms/elkoy/LogoutDisabler.java | 4 +- .../org/parabot/randoms/pkhonor/BanFile.java | 4 +- .../parabot/randoms/pkhonor/BobsIsland.java | 4 +- .../org/parabot/randoms/pkhonor/Jail.java | 4 +- .../org/parabot/randoms/utils/Reflection.java | 23 ++++++++++ 9 files changed, 80 insertions(+), 29 deletions(-) create mode 100644 src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java create mode 100644 src/main/java/org/parabot/randoms/utils/Reflection.java diff --git a/src/main/java/org/parabot/randoms/Core.java b/src/main/java/org/parabot/randoms/Core.java index cff5449..705c2c6 100755 --- a/src/main/java/org/parabot/randoms/Core.java +++ b/src/main/java/org/parabot/randoms/Core.java @@ -2,11 +2,12 @@ package org.parabot.randoms; import org.parabot.core.Context; import org.parabot.environment.randoms.Random; +import org.parabot.randoms.dreamscape.MacAddressAvoider; import org.parabot.randoms.dreamscape.SerialBanAvoider; import org.parabot.randoms.elkoy.AntiDetector; import org.parabot.randoms.elkoy.LogoutDisabler; -import org.parabot.randoms.elkoy.QuestionSolver; import org.parabot.randoms.elkoy.MouseOnScreen; +import org.parabot.randoms.elkoy.QuestionSolver; import org.parabot.randoms.pkhonor.*; import java.util.ArrayList; @@ -28,6 +29,7 @@ public class Core { // Dreamscape randoms.add(new SerialBanAvoider()); + randoms.add(new MacAddressAvoider()); // Elkoy randoms.add(new QuestionSolver()); diff --git a/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java b/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java new file mode 100644 index 0000000..bd1ee83 --- /dev/null +++ b/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java @@ -0,0 +1,42 @@ +package org.parabot.randoms.dreamscape; + +import org.parabot.core.Context; +import org.parabot.environment.randoms.RandomType; +import org.parabot.randoms.utils.Reflection; + +/** + * @author EmmaStone + */ +public class MacAddressAvoider implements org.parabot.environment.randoms.Random { + + private static final String MAC_ADDRESS_FIELD = "MAC_ADDRESS"; + private static final String MAC_ADDRESS_VALUE = "empty_mac"; + + private boolean done; + + @Override + public boolean activate() { + return !done; + } + + @Override + public void execute() { + Reflection.workAroundStaticValues(Context.getInstance().getClient().getClass(), MAC_ADDRESS_FIELD, MAC_ADDRESS_VALUE); + done = true; + } + + @Override + public String getName() { + return "Mac address avoider"; + } + + @Override + public String getServer() { + return "dreamscape"; + } + + @Override + public RandomType getRandomType() { + return RandomType.ON_SERVER_START; + } +} diff --git a/src/main/java/org/parabot/randoms/dreamscape/SerialBanAvoider.java b/src/main/java/org/parabot/randoms/dreamscape/SerialBanAvoider.java index e2214d6..78b1c55 100644 --- a/src/main/java/org/parabot/randoms/dreamscape/SerialBanAvoider.java +++ b/src/main/java/org/parabot/randoms/dreamscape/SerialBanAvoider.java @@ -3,9 +3,7 @@ package org.parabot.randoms.dreamscape; import org.parabot.core.Context; import org.parabot.environment.randoms.Random; import org.parabot.environment.randoms.RandomType; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; +import org.parabot.randoms.utils.Reflection; /** * @author JKetelaar @@ -24,24 +22,10 @@ public class SerialBanAvoider implements Random { @Override public void execute() { - try { - workAroundStaticValues(Context.getInstance().getClient().getClass(), serialAddressField, serialAddressValue); - } catch (NoSuchFieldException | IllegalAccessException e) { - e.printStackTrace(); - } - + Reflection.workAroundStaticValues(Context.getInstance().getClient().getClass(), serialAddressField, serialAddressValue); done = true; } - private void workAroundStaticValues(Class clazz, String fieldName, Object newValue) throws NoSuchFieldException, IllegalAccessException { - Field field = clazz.getDeclaredField(fieldName); - field.setAccessible(true); - Field modifiers = field.getClass().getDeclaredField("modifiers"); - modifiers.setAccessible(true); - modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL); - field.set(null, newValue); - } - @Override public String getName() { return "Serial ban avoider"; diff --git a/src/main/java/org/parabot/randoms/elkoy/AntiDetector.java b/src/main/java/org/parabot/randoms/elkoy/AntiDetector.java index b1d76ab..089aad8 100644 --- a/src/main/java/org/parabot/randoms/elkoy/AntiDetector.java +++ b/src/main/java/org/parabot/randoms/elkoy/AntiDetector.java @@ -14,8 +14,8 @@ public class AntiDetector implements Random, Runnable { private boolean activated; - private final String[] toBeNull = {"P", "Q", "N"}; - private final String className = "cb"; + private final String[] toBeNull = { "P", "Q", "N" }; + private final String className = "cb"; @Override public boolean activate() { diff --git a/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java b/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java index 8fb3681..bf43d67 100644 --- a/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java +++ b/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java @@ -13,9 +13,9 @@ import java.util.Random; */ public class LogoutDisabler implements org.parabot.environment.randoms.Random { - private final int[] KEYS = {KeyEvent.VK_UP, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT, KeyEvent.VK_RIGHT}; + private final int[] KEYS = { KeyEvent.VK_UP, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT, KeyEvent.VK_RIGHT }; private final Random random = new Random(); - private long ms = System.currentTimeMillis(); + private long ms = System.currentTimeMillis(); @Override public boolean activate() { diff --git a/src/main/java/org/parabot/randoms/pkhonor/BanFile.java b/src/main/java/org/parabot/randoms/pkhonor/BanFile.java index 56470af..a1bc76a 100644 --- a/src/main/java/org/parabot/randoms/pkhonor/BanFile.java +++ b/src/main/java/org/parabot/randoms/pkhonor/BanFile.java @@ -10,8 +10,8 @@ import java.io.File; */ public class BanFile implements Random { - private static final File[] locations = {new File("C:/PkHonor/", ".jagex_cache_58993.dat"), new File(System.getProperty("user.home"), ".app_info_3541"), new File(System.getProperty("user.home"), "AppData/Applications")}; - private boolean checked = false; + private static final File[] locations = { new File("C:/PkHonor/", ".jagex_cache_58993.dat"), new File(System.getProperty("user.home"), ".app_info_3541"), new File(System.getProperty("user.home"), "AppData/Applications") }; + private boolean checked = false; @Override public boolean activate() { diff --git a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java index 5fd4c90..d3286cd 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java +++ b/src/main/java/org/parabot/randoms/pkhonor/BobsIsland.java @@ -13,8 +13,8 @@ import org.rev317.min.api.wrappers.Tile; */ public class BobsIsland implements Random { - private static final Tile center = new Tile(2525, 4777); - private static final int portalId = 8987; + private static final Tile center = new Tile(2525, 4777); + private static final int portalId = 8987; @Override public boolean activate() { diff --git a/src/main/java/org/parabot/randoms/pkhonor/Jail.java b/src/main/java/org/parabot/randoms/pkhonor/Jail.java index ca7c8a1..5176480 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/Jail.java +++ b/src/main/java/org/parabot/randoms/pkhonor/Jail.java @@ -17,8 +17,8 @@ import org.rev317.min.api.wrappers.SceneObject; public class Jail implements Random { private Npc jailer; - private final int[] rocks = {2093, 2092}; - private final int[] pickAxes = {1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608}; + private final int[] rocks = { 2093, 2092 }; + private final int[] pickAxes = { 1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608 }; @Override public boolean activate() { diff --git a/src/main/java/org/parabot/randoms/utils/Reflection.java b/src/main/java/org/parabot/randoms/utils/Reflection.java new file mode 100644 index 0000000..799f791 --- /dev/null +++ b/src/main/java/org/parabot/randoms/utils/Reflection.java @@ -0,0 +1,23 @@ +package org.parabot.randoms.utils; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; + +/** + * @author EmmaStone + */ +public class Reflection { + + public static void workAroundStaticValues(Class clazz, String fieldName, Object newValue) { + try { + Field field = clazz.getDeclaredField(fieldName); + field.setAccessible(true); + Field modifiers = field.getClass().getDeclaredField("modifiers"); + modifiers.setAccessible(true); + modifiers.setInt(field, field.getModifiers() & ~Modifier.FINAL); + field.set(null, newValue); + } catch (NoSuchFieldException | IllegalAccessException e) { + e.printStackTrace(); + } + } +} From 1b344c98e4bc8b4821a93a97ab1ec756077d4fcc Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Sat, 22 Apr 2017 13:54:37 +0100 Subject: [PATCH 03/13] [BUGFIX] Generating a new mac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They block the login with `empty_mac` so I’m generating a new mac. --- .../org/parabot/randoms/dreamscape/MacAddressAvoider.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java b/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java index bd1ee83..265131e 100644 --- a/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java +++ b/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java @@ -1,6 +1,7 @@ package org.parabot.randoms.dreamscape; import org.parabot.core.Context; +import org.parabot.core.network.NetworkInterface; import org.parabot.environment.randoms.RandomType; import org.parabot.randoms.utils.Reflection; @@ -9,9 +10,6 @@ import org.parabot.randoms.utils.Reflection; */ public class MacAddressAvoider implements org.parabot.environment.randoms.Random { - private static final String MAC_ADDRESS_FIELD = "MAC_ADDRESS"; - private static final String MAC_ADDRESS_VALUE = "empty_mac"; - private boolean done; @Override @@ -21,7 +19,9 @@ public class MacAddressAvoider implements org.parabot.environment.randoms.Random @Override public void execute() { - Reflection.workAroundStaticValues(Context.getInstance().getClient().getClass(), MAC_ADDRESS_FIELD, MAC_ADDRESS_VALUE); + byte[] mac = new byte[6]; + new java.util.Random().nextBytes(mac); + Reflection.workAroundStaticValues(Context.getInstance().getClient().getClass(), "MAC_ADDRESS", NetworkInterface.formatMac(mac)); done = true; } From 02681872043881de6aa68a0ac264c6ad9da9263b Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Sat, 22 Apr 2017 14:07:13 +0100 Subject: [PATCH 04/13] [TASK] Renamed KEYS to keys --- src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java b/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java index bf43d67..751700b 100644 --- a/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java +++ b/src/main/java/org/parabot/randoms/elkoy/LogoutDisabler.java @@ -13,7 +13,7 @@ import java.util.Random; */ public class LogoutDisabler implements org.parabot.environment.randoms.Random { - private final int[] KEYS = { KeyEvent.VK_UP, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT, KeyEvent.VK_RIGHT }; + private final int[] keys = { KeyEvent.VK_UP, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT, KeyEvent.VK_RIGHT }; private final Random random = new Random(); private long ms = System.currentTimeMillis(); @@ -24,7 +24,7 @@ public class LogoutDisabler implements org.parabot.environment.randoms.Random { @Override public void execute() { - int keyCode = KEYS[random.nextInt(KEYS.length)]; + int keyCode = keys[random.nextInt(keys.length)]; Keyboard.getInstance().pressKey(keyCode); Time.sleep(random.nextInt((20 - 5) + 1) + 5); Keyboard.getInstance().releaseKey(keyCode); From a510178462f6afc41cd7eff22e556df284bd3708 Mon Sep 17 00:00:00 2001 From: PBLord Date: Fri, 25 Aug 2017 12:28:43 +0100 Subject: [PATCH 05/13] bugfix/npcids --- src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java index 009371f..3ac8300 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java +++ b/src/main/java/org/parabot/randoms/pkhonor/SandwichLady.java @@ -14,7 +14,7 @@ import org.rev317.min.api.wrappers.Npc; public class SandwichLady implements Random { private Npc lady; - private final int id = 3117; + private final int id = 5510; @Override public boolean activate() { From 6d438c4224c8a793b3645491f8b556b083560584 Mon Sep 17 00:00:00 2001 From: PBLord Date: Fri, 25 Aug 2017 12:32:16 +0100 Subject: [PATCH 06/13] bugfix/npcids --- src/main/java/org/parabot/randoms/pkhonor/Jail.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/Jail.java b/src/main/java/org/parabot/randoms/pkhonor/Jail.java index ca7c8a1..64975a6 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/Jail.java +++ b/src/main/java/org/parabot/randoms/pkhonor/Jail.java @@ -17,7 +17,7 @@ import org.rev317.min.api.wrappers.SceneObject; public class Jail implements Random { private Npc jailer; - private final int[] rocks = {2093, 2092}; + private final int[] rocks = {7456, 7455, 7488}; private final int[] pickAxes = {1266, 1268, 1270, 1272, 1274, 1276, 14605, 14608}; @Override @@ -87,7 +87,7 @@ public class Jail implements Random { } private Npc getJailer() { - for (Npc jailer : Npcs.getNearest(201)) { + for (Npc jailer : Npcs.getNearest(300)) { if (jailer != null && jailer.getDef() != null) { return jailer; } From e2f4c30c529273fe41a054d003c62c805d585282 Mon Sep 17 00:00:00 2001 From: PBLord Date: Fri, 25 Aug 2017 12:35:34 +0100 Subject: [PATCH 07/13] bugfix/npcids --- src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java index 2f4445a..58217ef 100755 --- a/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java +++ b/src/main/java/org/parabot/randoms/pkhonor/MysteriousOldMan.java @@ -14,7 +14,7 @@ import org.rev317.min.api.wrappers.Npc; public class MysteriousOldMan implements Random { private Npc man; - private final int id = 410; + private final int id = 513; @Override public boolean activate() { From f471ceee071a7efe056d2e6a6b2e8e261520a49f Mon Sep 17 00:00:00 2001 From: PBLord Date: Fri, 25 Aug 2017 12:38:46 +0100 Subject: [PATCH 08/13] Combat Stone Random --- .../org/parabot/randoms/pkhonor/CombatStone | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 src/main/java/org/parabot/randoms/pkhonor/CombatStone diff --git a/src/main/java/org/parabot/randoms/pkhonor/CombatStone b/src/main/java/org/parabot/randoms/pkhonor/CombatStone new file mode 100644 index 0000000..0fbabc1 --- /dev/null +++ b/src/main/java/org/parabot/randoms/pkhonor/CombatStone @@ -0,0 +1,63 @@ +package org.parabot.randoms.pkhonor; + +import org.parabot.environment.api.utils.Time; +import org.parabot.environment.randoms.Random; +import org.parabot.environment.randoms.RandomType; +import org.parabot.environment.scripts.framework.SleepCondition; +import org.rev317.min.api.methods.Npcs; +import org.rev317.min.api.methods.Players; +import org.rev317.min.api.wrappers.Npc; + +/** + * @author Updated Lord + */ +public class CombatStone implements Random { + + private Npc combat; + private final int id = 17025; + + @Override + public boolean activate() { + this.combat = getLady(); + return this.combat != null; + } + + @Override + public void execute() { + System.out.println("Running CombatStone"); + if (this.combat != null) { + combat.interact(Npcs.Option.TALK_TO); + Time.sleep(new SleepCondition() { + @Override + public boolean isValid() { + return combat.distanceTo() > 0 || !combat.getInteractingCharacter().equals(Players.getMyPlayer()); + } + }, 1500); + } + } + + private Npc getLady() { + for (Npc lady : Npcs.getNearest(id)) { + if (lady != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) { + return lady; + } + } + + return null; + } + + @Override + public String getName() { + return "CombatStone Solver"; + } + + @Override + public String getServer() { + return "pkhonor"; + } + + @Override + public RandomType getRandomType() { + return RandomType.SCRIPT; + } +} From 78be0eefb9cd25547353180aabad3a5c1ea12879 Mon Sep 17 00:00:00 2001 From: PBLord Date: Fri, 25 Aug 2017 13:04:58 +0100 Subject: [PATCH 09/13] NameFix --- .../java/org/parabot/randoms/pkhonor/CombatStone | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/CombatStone b/src/main/java/org/parabot/randoms/pkhonor/CombatStone index 0fbabc1..0d34029 100644 --- a/src/main/java/org/parabot/randoms/pkhonor/CombatStone +++ b/src/main/java/org/parabot/randoms/pkhonor/CombatStone @@ -9,7 +9,7 @@ import org.rev317.min.api.methods.Players; import org.rev317.min.api.wrappers.Npc; /** - * @author Updated Lord + * @author Lord */ public class CombatStone implements Random { @@ -18,7 +18,7 @@ public class CombatStone implements Random { @Override public boolean activate() { - this.combat = getLady(); + this.combat = getCombat(); return this.combat != null; } @@ -36,10 +36,10 @@ public class CombatStone implements Random { } } - private Npc getLady() { - for (Npc lady : Npcs.getNearest(id)) { - if (lady != null && lady.getInteractingCharacter().equals(Players.getMyPlayer())) { - return lady; + private Npc getCombat() { + for (Npc combat : Npcs.getNearest(id)) { + if (combat != null && combat.getInteractingCharacter().equals(Players.getMyPlayer())) { + return combat; } } From 8e6723b407e44e84dfa51762e4a5b08746eac25e Mon Sep 17 00:00:00 2001 From: PBLord Date: Fri, 25 Aug 2017 14:19:36 +0100 Subject: [PATCH 10/13] Update CombatStone --- src/main/java/org/parabot/randoms/pkhonor/CombatStone | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/CombatStone b/src/main/java/org/parabot/randoms/pkhonor/CombatStone index 0d34029..73191bc 100644 --- a/src/main/java/org/parabot/randoms/pkhonor/CombatStone +++ b/src/main/java/org/parabot/randoms/pkhonor/CombatStone @@ -18,8 +18,7 @@ public class CombatStone implements Random { @Override public boolean activate() { - this.combat = getCombat(); - return this.combat != null; + return (this.combat = getCombat) != null; } @Override From 25d8db5c94117316bd79a14aabaf8ee7d071253d Mon Sep 17 00:00:00 2001 From: PBLord Date: Fri, 25 Aug 2017 15:07:27 +0100 Subject: [PATCH 11/13] [FIX] Logger --- src/main/java/org/parabot/randoms/pkhonor/CombatStone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/parabot/randoms/pkhonor/CombatStone b/src/main/java/org/parabot/randoms/pkhonor/CombatStone index 73191bc..ed4232c 100644 --- a/src/main/java/org/parabot/randoms/pkhonor/CombatStone +++ b/src/main/java/org/parabot/randoms/pkhonor/CombatStone @@ -23,7 +23,7 @@ public class CombatStone implements Random { @Override public void execute() { - System.out.println("Running CombatStone"); + Logger.addMessage("CombatStone Random Running",true); if (this.combat != null) { combat.interact(Npcs.Option.TALK_TO); Time.sleep(new SleepCondition() { From c4452e0c8557e520027d00b90f8c2c0e9572b770 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Thu, 31 Aug 2017 16:12:26 +0100 Subject: [PATCH 12/13] [FEATURE] Added LocoPK Random --- src/main/java/org/parabot/randoms/Core.java | 5 ++ .../parabot/randoms/locopk/MacAddressFix.java | 77 +++++++++++++++++++ .../pkhonor/{CombatStone => CombatStone.java} | 3 +- 3 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/parabot/randoms/locopk/MacAddressFix.java rename src/main/java/org/parabot/randoms/pkhonor/{CombatStone => CombatStone.java} (93%) diff --git a/src/main/java/org/parabot/randoms/Core.java b/src/main/java/org/parabot/randoms/Core.java index 705c2c6..812d078 100755 --- a/src/main/java/org/parabot/randoms/Core.java +++ b/src/main/java/org/parabot/randoms/Core.java @@ -8,6 +8,7 @@ import org.parabot.randoms.elkoy.AntiDetector; import org.parabot.randoms.elkoy.LogoutDisabler; import org.parabot.randoms.elkoy.MouseOnScreen; import org.parabot.randoms.elkoy.QuestionSolver; +import org.parabot.randoms.locopk.MacAddressFix; import org.parabot.randoms.pkhonor.*; import java.util.ArrayList; @@ -26,6 +27,7 @@ public class Core { randoms.add(new MysteriousOldMan()); randoms.add(new BobsIsland()); randoms.add(new BanFile()); + randoms.add(new CombatStone()); // Dreamscape randoms.add(new SerialBanAvoider()); @@ -37,6 +39,9 @@ public class Core { randoms.add(new MouseOnScreen()); randoms.add(new AntiDetector()); + // LocoPK + randoms.add(new MacAddressFix()); + org.parabot.core.Core.verbose("Possible randoms:"); for (Random random : randoms) { if (random.getServer().equalsIgnoreCase(server)) { diff --git a/src/main/java/org/parabot/randoms/locopk/MacAddressFix.java b/src/main/java/org/parabot/randoms/locopk/MacAddressFix.java new file mode 100644 index 0000000..d26683f --- /dev/null +++ b/src/main/java/org/parabot/randoms/locopk/MacAddressFix.java @@ -0,0 +1,77 @@ +package org.parabot.randoms.locopk; + +import org.parabot.core.Context; +import org.parabot.core.asm.ASMClassLoader; +import org.parabot.environment.randoms.Random; +import org.parabot.environment.randoms.RandomType; + +import java.lang.reflect.Field; + +/** + * @author EmmaStone + */ +public class MacAddressFix implements Random { + + private boolean done; + + @Override + public boolean activate() { + return !done; + } + + @Override + public void execute() { + try { + final ASMClassLoader classLoader = Context.getInstance().getASMClassLoader(); + + Class createUID = classLoader.loadClass("com.locopk.client.rs.CreateUID"); + + Field mac = createUID.getDeclaredField("mac"); + + String randomMac = randomMacAddress(); + + System.out.println(randomMac); + + mac.set(null, randomMac); + } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) { + e.printStackTrace(); + } + + done = true; + } + + @Override + public String getName() { + return "Mac Address Fix"; + } + + @Override + public String getServer() { + return "locopk"; + } + + @Override + public RandomType getRandomType() { + return RandomType.ON_SERVER_START; + } + + private String randomMacAddress(){ + java.util.Random rand = new java.util.Random(); + byte[] macAddr = new byte[6]; + rand.nextBytes(macAddr); + + macAddr[0] = (byte)(macAddr[0] & (byte)254); //zeroing last 2 bytes to make it unicast and locally adminstrated + + StringBuilder sb = new StringBuilder(18); + for(byte b : macAddr){ + + if(sb.length() > 0) + sb.append(""); + + sb.append(String.format("%02x", b)); + } + + + return sb.toString().toUpperCase(); + } +} diff --git a/src/main/java/org/parabot/randoms/pkhonor/CombatStone b/src/main/java/org/parabot/randoms/pkhonor/CombatStone.java similarity index 93% rename from src/main/java/org/parabot/randoms/pkhonor/CombatStone rename to src/main/java/org/parabot/randoms/pkhonor/CombatStone.java index ed4232c..74dd586 100644 --- a/src/main/java/org/parabot/randoms/pkhonor/CombatStone +++ b/src/main/java/org/parabot/randoms/pkhonor/CombatStone.java @@ -18,12 +18,11 @@ public class CombatStone implements Random { @Override public boolean activate() { - return (this.combat = getCombat) != null; + return (this.combat = getCombat()) != null; } @Override public void execute() { - Logger.addMessage("CombatStone Random Running",true); if (this.combat != null) { combat.interact(Npcs.Option.TALK_TO); Time.sleep(new SleepCondition() { From b0f22fff21e62771ec2eaf797fcee14ea32d36ff Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Thu, 31 Aug 2017 16:15:42 +0100 Subject: [PATCH 13/13] [CLEANUP] Removed unused randoms --- src/main/java/org/parabot/randoms/Core.java | 6 --- .../randoms/dreamscape/MacAddressAvoider.java | 42 ------------------ .../randoms/dreamscape/SerialBanAvoider.java | 43 ------------------- 3 files changed, 91 deletions(-) delete mode 100644 src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java delete mode 100644 src/main/java/org/parabot/randoms/dreamscape/SerialBanAvoider.java diff --git a/src/main/java/org/parabot/randoms/Core.java b/src/main/java/org/parabot/randoms/Core.java index 812d078..9571b7a 100755 --- a/src/main/java/org/parabot/randoms/Core.java +++ b/src/main/java/org/parabot/randoms/Core.java @@ -2,8 +2,6 @@ package org.parabot.randoms; import org.parabot.core.Context; import org.parabot.environment.randoms.Random; -import org.parabot.randoms.dreamscape.MacAddressAvoider; -import org.parabot.randoms.dreamscape.SerialBanAvoider; import org.parabot.randoms.elkoy.AntiDetector; import org.parabot.randoms.elkoy.LogoutDisabler; import org.parabot.randoms.elkoy.MouseOnScreen; @@ -29,10 +27,6 @@ public class Core { randoms.add(new BanFile()); randoms.add(new CombatStone()); - // Dreamscape - randoms.add(new SerialBanAvoider()); - randoms.add(new MacAddressAvoider()); - // Elkoy randoms.add(new QuestionSolver()); randoms.add(new LogoutDisabler()); diff --git a/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java b/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java deleted file mode 100644 index 265131e..0000000 --- a/src/main/java/org/parabot/randoms/dreamscape/MacAddressAvoider.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.parabot.randoms.dreamscape; - -import org.parabot.core.Context; -import org.parabot.core.network.NetworkInterface; -import org.parabot.environment.randoms.RandomType; -import org.parabot.randoms.utils.Reflection; - -/** - * @author EmmaStone - */ -public class MacAddressAvoider implements org.parabot.environment.randoms.Random { - - private boolean done; - - @Override - public boolean activate() { - return !done; - } - - @Override - public void execute() { - byte[] mac = new byte[6]; - new java.util.Random().nextBytes(mac); - Reflection.workAroundStaticValues(Context.getInstance().getClient().getClass(), "MAC_ADDRESS", NetworkInterface.formatMac(mac)); - done = true; - } - - @Override - public String getName() { - return "Mac address avoider"; - } - - @Override - public String getServer() { - return "dreamscape"; - } - - @Override - public RandomType getRandomType() { - return RandomType.ON_SERVER_START; - } -} diff --git a/src/main/java/org/parabot/randoms/dreamscape/SerialBanAvoider.java b/src/main/java/org/parabot/randoms/dreamscape/SerialBanAvoider.java deleted file mode 100644 index 78b1c55..0000000 --- a/src/main/java/org/parabot/randoms/dreamscape/SerialBanAvoider.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.parabot.randoms.dreamscape; - -import org.parabot.core.Context; -import org.parabot.environment.randoms.Random; -import org.parabot.environment.randoms.RandomType; -import org.parabot.randoms.utils.Reflection; - -/** - * @author JKetelaar - */ -public class SerialBanAvoider implements Random { - - private static final String serialAddressField = "SERIAL_ADDRESS"; - private static final String serialAddressValue = "empty_or_unknown"; - - private boolean done; - - @Override - public boolean activate() { - return !done; - } - - @Override - public void execute() { - Reflection.workAroundStaticValues(Context.getInstance().getClient().getClass(), serialAddressField, serialAddressValue); - done = true; - } - - @Override - public String getName() { - return "Serial ban avoider"; - } - - @Override - public String getServer() { - return "dreamscape"; - } - - @Override - public RandomType getRandomType() { - return RandomType.ON_SERVER_START; - } -}