Merge pull request #51 from Parabot/development

[MERGE] Development into master

.travis.yml

@@ -1,7 +1,9 @@
 language: java
 
+dist: trusty
+
 jdk:
-  - oraclejdk7
+  - openjdk7
   - oraclejdk8
 
 before_install:
@@ -30,7 +32,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:
@@ -54,4 +56,4 @@ deploy:
       branch:
         - master
         - development
-      jdk: 'oraclejdk7'
+      jdk: 'openjdk7'

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.parabot</groupId>
     <artifactId>randoms</artifactId>
-    <version>0.25.1</version>
+    <version>0.25.2</version>
 
     <properties>
         <jdk.version>1.7</jdk.version>

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)) {

src/main/java/org/parabot/randoms/dreamscape/FileBan.java

@@ -0,0 +1,51 @@
+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;
+        return new File(System.getProperty("user.home") + "/jagex_rs.txt").exists();
+    }
+}

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();

src/main/java/org/parabot/randoms/utils/Reflection.java

@@ -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();
-        }
-    }
-}