2006-Scape/Parabot-Randoms
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot-Randoms.git synced 2026-07-02 16:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #61 from Shadowrs/master

Browse Source 
Add RuneWilld MacAddressFix Random
This commit is contained in:
Jeroen Ketelaar
2018-08-28 11:03:01 -05:00
committed by GitHub
parent 31a9c030bd 0786d43e87
commit 64d70ec505
2 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/parabot/randoms/Core.java
+12 -4
View File
@@ -7,8 +7,8 @@ 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 org.parabot.randoms.runewild.MacAddressFix;
import org.parabot.randoms.soulplay.RandomUUID;
import java.util.ArrayList;
@@ -35,7 +35,7 @@ public class Core {
randoms.add(new MouseOnScreen());
randoms.add(new AntiDetector());
// LocoPK
// RuneWild
randoms.add(new MacAddressFix());
// Dreamscape
@@ -44,12 +44,20 @@ public class Core {
// SoulPlay
randoms.add(new RandomUUID());
org.parabot.core.Core.verbose("Possible randoms:");
StringBuilder sb = new StringBuilder();
sb.append("Possible randoms:\n");
int randomCount = 0;
for (Random random : randoms) {
if (random.getServer().equalsIgnoreCase(server)) {
org.parabot.core.Core.verbose("-> " + random.getName());
sb.append("\t-> ").append(random.getName());
Context.getInstance().getRandomHandler().addRandom(random);
randomCount++;
}
}
final String toPrint = sb.append("\n").toString();
if (toPrint.contains("->")) {
org.parabot.core.Core.verbose(toPrint);
}
org.parabot.core.Core.verbose("[org.parabot.randoms.Core] A total of "+randomCount+" randoms have been loaded for server: "+server);
}
}
src/main/java/org/parabot/randoms/locopk/MacAddressFix.java → src/main/java/org/parabot/randoms/runewild/MacAddressFix.java
+30 -8
View File
@@ -1,5 +1,7 @@
package org.parabot.randoms.locopk;
package org.parabot.randoms.runewild;
import java.util.UUID;
import org.parabot.api.output.Logger;
import org.parabot.core.Context;
import org.parabot.core.asm.ASMClassLoader;
import org.parabot.core.reflect.RefClass;
@@ -7,10 +9,9 @@ import org.parabot.core.reflect.RefField;
import org.parabot.environment.randoms.Random;
import org.parabot.environment.randoms.RandomType;
import java.util.UUID;
/**
* @author EmmaStone
* @author EmmaStone - Originally for LocoPK
* @author Shadowrs - fixed for RuneWild with additions
*/
public class MacAddressFix implements Random {
@@ -18,7 +19,7 @@ public class MacAddressFix implements Random {
@Override
public boolean activate() {
return !done;
return true;
}
@Override
@@ -26,19 +27,40 @@ public class MacAddressFix implements Random {
try {
final ASMClassLoader classLoader = Context.getInstance().getASMClassLoader();
RefClass createUID = new RefClass(classLoader.loadClass("com.locopk.client.rs.CreateUID"));
RefClass createUID = new RefClass(classLoader.loadClass("com.rw.client.rs.CreateUID"));
try {
Logger.info("MacAddressFix_RW", String.format(
"Before applying MAC override : %s | %s | %s",
createUID.getField("mac").getField().get(""),
createUID.getField("firstId").getField().get(""),
createUID.getField("secondId").getField().get("")));
} catch (IllegalAccessException e) {
e.printStackTrace();
}
String s1 = UUID.randomUUID().toString();
String s2 = UUID.randomUUID().toString();
RefField mac = createUID.getField("mac");
mac.set(randomMacAddress());
mac.set("lolmkay");
RefField firstId = createUID.getField("firstId");
firstId.set(s1);
RefField secondId = createUID.getField("secondId");
secondId.set(s2);
try {
Logger.info("MacAddressFix_RW", String.format(
"Applied MAC override : %s | %s | %s",
mac.getField().get(""),
firstId.getField().get(""),
secondId.getField().get("")));
} catch (IllegalAccessException e) {
e.printStackTrace();
Logger.error("Macfix RW", e.getMessage());
}
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
@@ -53,7 +75,7 @@ public class MacAddressFix implements Random {
@Override
public String getServer() {
return "locopk";
return "RuneWild";
}
@Override