mirror of
https://github.com/2006-Scape/Parabot-Randoms.git
synced 2026-07-02 16:49:09 +00:00
Remove LocoPK MacAddressFix since server is discontinued + proper name for RW Random without the suffix
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
package org.parabot.randoms;
|
||||
|
||||
import org.parabot.api.output.Logger;
|
||||
import org.parabot.core.Context;
|
||||
import org.parabot.environment.randoms.Random;
|
||||
import org.parabot.randoms.dreamscape.FileBan;
|
||||
@@ -8,9 +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_Runewild;
|
||||
import org.parabot.randoms.runewild.MacAddressFix;
|
||||
import org.parabot.randoms.soulplay.RandomUUID;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -37,9 +35,8 @@ public class Core {
|
||||
randoms.add(new MouseOnScreen());
|
||||
randoms.add(new AntiDetector());
|
||||
|
||||
// LocoPK - rebranded to RuneWild
|
||||
// RuneWild
|
||||
randoms.add(new MacAddressFix());
|
||||
randoms.add(new MacAddressFix_Runewild());
|
||||
|
||||
// Dreamscape
|
||||
randoms.add(new FileBan());
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
package org.parabot.randoms.locopk;
|
||||
|
||||
import org.parabot.core.Context;
|
||||
import org.parabot.core.asm.ASMClassLoader;
|
||||
import org.parabot.core.reflect.RefClass;
|
||||
import org.parabot.core.reflect.RefField;
|
||||
import org.parabot.environment.randoms.Random;
|
||||
import org.parabot.environment.randoms.RandomType;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* @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();
|
||||
|
||||
RefClass createUID = new RefClass(classLoader.loadClass("com.locopk.client.rs.CreateUID"));
|
||||
|
||||
String s1 = UUID.randomUUID().toString();
|
||||
String s2 = UUID.randomUUID().toString();
|
||||
|
||||
RefField mac = createUID.getField("mac");
|
||||
mac.set(randomMacAddress());
|
||||
|
||||
RefField firstId = createUID.getField("firstId");
|
||||
firstId.set(s1);
|
||||
|
||||
RefField secondId = createUID.getField("secondId");
|
||||
secondId.set(s2);
|
||||
} catch (ClassNotFoundException 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();
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -10,9 +10,10 @@ import org.parabot.environment.randoms.Random;
|
||||
import org.parabot.environment.randoms.RandomType;
|
||||
|
||||
/**
|
||||
* @author EmmaStone
|
||||
* @author EmmaStone - Originally for LocoPK
|
||||
* @author Shadowrs - fixed for RuneWild with additions
|
||||
*/
|
||||
public class MacAddressFix_Runewild implements Random {
|
||||
public class MacAddressFix implements Random {
|
||||
|
||||
private boolean done;
|
||||
|
||||
Reference in New Issue
Block a user