From 20dbc407f703b962e6566680dab5a1aa31b9fe85 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Thu, 31 Aug 2017 23:16:28 +0100 Subject: [PATCH 1/5] [BUGFIX] Added secondId --- src/main/java/org/parabot/randoms/locopk/MacAddressFix.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/parabot/randoms/locopk/MacAddressFix.java b/src/main/java/org/parabot/randoms/locopk/MacAddressFix.java index 2108c07..2d95da6 100644 --- a/src/main/java/org/parabot/randoms/locopk/MacAddressFix.java +++ b/src/main/java/org/parabot/randoms/locopk/MacAddressFix.java @@ -33,9 +33,11 @@ public class MacAddressFix implements Random { Field mac = createUID.getDeclaredField("mac"); mac.set(null, randomMacAddress()); } else { - Field firstID = createUID.getDeclaredField("firstId"); + Field firstId = createUID.getDeclaredField("firstId"); + firstId.set(null, UUID.randomUUID().toString()); - firstID.set(null, UUID.randomUUID().toString()); + Field secondId = createUID.getDeclaredField("secondId"); + secondId.set(null, UUID.randomUUID().toString()); } } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) { e.printStackTrace(); From a16b0d83effdcd0355485e3da5d2f94447b260f4 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Fri, 1 Sep 2017 15:43:03 +0100 Subject: [PATCH 2/5] [FEATURE] File Ban Random --- .travis.yml | 2 +- pom.xml | 2 +- src/main/java/org/parabot/randoms/Core.java | 4 ++ .../parabot/randoms/dreamscape/FileBan.java | 53 +++++++++++++++++++ .../org/parabot/randoms/utils/Reflection.java | 23 -------- 5 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 src/main/java/org/parabot/randoms/dreamscape/FileBan.java delete mode 100644 src/main/java/org/parabot/randoms/utils/Reflection.java diff --git a/.travis.yml b/.travis.yml index 5274128..18e0a8c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ env: - secure: UG+b1tEgc8xv9x4r//2OAIK1RrYv6n209KTTFMMwcnAa7DI8HaP8nljRa5/VhDhuKHdlVrYH/tI90v7UVBs0GDVNwK5V17Io0fMm3FUGZekSthTCqqno5wAGa9r6a6mMLtSaSmIFeIKi0+0d2ZwplRuhj/dtEYjjBBj+kK8g4nE= - secure: St/fecUDInFBCRriYqgp2F8PU9/SooorgxD9Mrs+b0EsC7AbtSsQXvdIv2Lp6xzdQ0VSXPcLIhULPOYrmBKnGQ/NjXTIZXxnroyQxxnI6xyEWIZwiHRY/bKRJDRbQTxD9NL32szKiDSwnw7pu6llF4D64UqQvziq4Gm6VohU75M= - secure: bD15GVZWowiknbfLavh8CxSh0GsnF5kT4kZ6ggCuUDGyj0mzqf7dNRnchQIKkCG0WRYyTrFN4pEiygeywWsipEeAVv9Xhx3cuUZmzeQaR5KCWabSwJ8gK6jZd1YhcWmM9vrdPHobZr65MP0y/8mu/Fovgky9dY7KDf4G3SebNrM= - - RANDOMS_VERSION=0.25.1 + - RANDOMS_VERSION=0.25.2 cache: directories: diff --git a/pom.xml b/pom.xml index 78a11d4..c57a222 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot randoms - 0.25.1 + 0.25.2 1.7 diff --git a/src/main/java/org/parabot/randoms/Core.java b/src/main/java/org/parabot/randoms/Core.java index 9571b7a..08f1842 100755 --- a/src/main/java/org/parabot/randoms/Core.java +++ b/src/main/java/org/parabot/randoms/Core.java @@ -2,6 +2,7 @@ package org.parabot.randoms; import org.parabot.core.Context; import org.parabot.environment.randoms.Random; +import org.parabot.randoms.dreamscape.FileBan; import org.parabot.randoms.elkoy.AntiDetector; import org.parabot.randoms.elkoy.LogoutDisabler; import org.parabot.randoms.elkoy.MouseOnScreen; @@ -36,6 +37,9 @@ public class Core { // LocoPK randoms.add(new MacAddressFix()); + // Dreamscape + randoms.add(new FileBan()); + 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/dreamscape/FileBan.java b/src/main/java/org/parabot/randoms/dreamscape/FileBan.java new file mode 100644 index 0000000..08f08b7 --- /dev/null +++ b/src/main/java/org/parabot/randoms/dreamscape/FileBan.java @@ -0,0 +1,53 @@ +package org.parabot.randoms.dreamscape; + +import org.parabot.environment.randoms.Random; +import org.parabot.environment.randoms.RandomType; + +import java.io.File; + +/** + * @author EmmaStone + */ +public class FileBan implements Random { + + private boolean checked = false; + + @Override + public boolean activate() { + if (!checked) { + if (doesFileExist()) { + return true; + } + } + + return false; + } + + @Override + public void execute() { + File file = new File(System.getProperty("user.home") + "/jagex_rs.txt"); + file.delete(); + } + + @Override + public String getName() { + return "File Ban"; + } + + @Override + public String getServer() { + return "dreamscape"; + } + + @Override + public RandomType getRandomType() { + return RandomType.ON_SERVER_START; + } + + private boolean doesFileExist() { + checked = true; + + File file = new File(System.getProperty("user.home") + "/jagex_rs.txt"); + return file.exists() && file.exists(); + } +} diff --git a/src/main/java/org/parabot/randoms/utils/Reflection.java b/src/main/java/org/parabot/randoms/utils/Reflection.java deleted file mode 100644 index 799f791..0000000 --- a/src/main/java/org/parabot/randoms/utils/Reflection.java +++ /dev/null @@ -1,23 +0,0 @@ -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 913ecdb89d6fad3eb0a42de5641d03ef015d6576 Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Fri, 1 Sep 2017 16:52:17 +0200 Subject: [PATCH 3/5] [BUGFIX] Set correct development env for Travis --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 18e0a8c..916a729 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,9 @@ language: java +dist: trusty + jdk: - - oraclejdk7 + - openjdk7 - oraclejdk8 before_install: From 1f931e5b1653ed121df6002d710ec555f9abd9cc Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Fri, 1 Sep 2017 17:03:05 +0200 Subject: [PATCH 4/5] [BUGFIX] Set JDK correctly for deployment --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 916a729..9f78ef2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,4 +56,4 @@ deploy: branch: - master - development - jdk: 'oraclejdk7' + jdk: 'openjdk7' From fa020571fc5572742b969ea65d7b31379c3a027f Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Thu, 7 Sep 2017 13:53:20 +0100 Subject: [PATCH 5/5] [CLEANUP] Removed extra #exists --- src/main/java/org/parabot/randoms/dreamscape/FileBan.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/parabot/randoms/dreamscape/FileBan.java b/src/main/java/org/parabot/randoms/dreamscape/FileBan.java index 08f08b7..8431bed 100644 --- a/src/main/java/org/parabot/randoms/dreamscape/FileBan.java +++ b/src/main/java/org/parabot/randoms/dreamscape/FileBan.java @@ -46,8 +46,6 @@ public class FileBan implements Random { private boolean doesFileExist() { checked = true; - - File file = new File(System.getProperty("user.home") + "/jagex_rs.txt"); - return file.exists() && file.exists(); + return new File(System.getProperty("user.home") + "/jagex_rs.txt").exists(); } }