Revert "Merge branch 'master' into master"

This reverts commit 43520c1958, reversing
changes made to 2e7aea3c62.
This commit is contained in:
zeruth
2019-06-22 02:38:35 -04:00
parent 43520c1958
commit c655c9f542
224 changed files with 16901 additions and 17108 deletions

View File

@@ -136,50 +136,6 @@ public class ClientParameter {
@Export("id")
public final String id;
ClientParameter(String var1, String var2) {
this.id = var2;
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "-1723515140"
)
@Export("loadWorlds")
static boolean loadWorlds() {
try {
if(FriendLoginUpdate.__kn_x == null) {
FriendLoginUpdate.__kn_x = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl));
} else if(FriendLoginUpdate.__kn_x.isDone()) {
byte[] var0 = FriendLoginUpdate.__kn_x.getResponse();
Buffer var1 = new Buffer(var0);
var1.readInt();
World.worldsCount = var1.__ag_302();
ItemContainer.worlds = new World[World.worldsCount];
World var2;
for(int var3 = 0; var3 < World.worldsCount; var2.index = var3++) {
var2 = ItemContainer.worlds[var3] = new World();
var2.id = var1.__ag_302();
var2.properties = var1.readInt();
var2.host = var1.readStringCp1252NullTerminated();
var2.activity = var1.readStringCp1252NullTerminated();
var2.location = var1.readUnsignedByte();
var2.population = var1.__aq_303();
}
MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.__bt_e, World.__bt_l);
FriendLoginUpdate.__kn_x = null;
return true;
}
} catch (Exception var4) {
var4.printStackTrace();
FriendLoginUpdate.__kn_x = null;
}
return false;
}
static {
__ji_m = new ClientParameter("8", "8");
__ji_f = new ClientParameter("15", "15");
@@ -201,4 +157,48 @@ public class ClientParameter {
__ji_s = new ClientParameter("2", "2");
__ji_t = new ClientParameter("19", "19");
}
ClientParameter(String var1, String var2) {
this.id = var2;
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "-1723515140"
)
@Export("loadWorlds")
static boolean loadWorlds() {
try {
if(FriendLoginUpdate.__kn_x == null) {
FriendLoginUpdate.__kn_x = TriBool.urlRequester.request(new URL(ServerBuild.worldsUrl));
} else if(FriendLoginUpdate.__kn_x.isDone()) {
byte[] var0 = FriendLoginUpdate.__kn_x.getResponse();
Buffer var1 = new Buffer(var0);
var1.readInt();
World.worldsCount = var1.__ag_302();
ItemContainer.worlds = new World[World.worldsCount];
World var3;
for(int var2 = 0; var2 < World.worldsCount; var3.index = var2++) {
var3 = ItemContainer.worlds[var2] = new World();
var3.id = var1.__ag_302();
var3.properties = var1.readInt();
var3.host = var1.readStringCp1252NullTerminated();
var3.activity = var1.readStringCp1252NullTerminated();
var3.location = var1.readUnsignedByte();
var3.population = var1.__aq_303();
}
MilliClock.method3400(ItemContainer.worlds, 0, ItemContainer.worlds.length - 1, World.__bt_e, World.__bt_l);
FriendLoginUpdate.__kn_x = null;
return true;
}
} catch (Exception var4) {
var4.printStackTrace();
FriendLoginUpdate.__kn_x = null;
}
return false;
}
}