mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-11-15 11:39:11 +03:00
Merge branch 'hotfix/5.0.11' of github.com:GravitLauncher/Launcher into hotfix/5.0.11
This commit is contained in:
commit
dcd2888f91
4 changed files with 46 additions and 5 deletions
|
@ -55,12 +55,15 @@ public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
|
||||||
} else {
|
} else {
|
||||||
pair = client.auth;
|
pair = client.auth;
|
||||||
}
|
}
|
||||||
if(pair == null)
|
if (pair == null) {
|
||||||
{
|
|
||||||
sendError("ProfileByUUIDResponse: AuthProviderPair is null");
|
sendError("ProfileByUUIDResponse: AuthProviderPair is null");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
username = pair.handler.uuidToUsername(uuid);
|
username = pair.handler.uuidToUsername(uuid);
|
||||||
|
if (username == null) {
|
||||||
|
sendError(String.format("ProfileByUUIDResponse: User with uuid %s not found or AuthProvider#uuidToUsername returned null", uuid));
|
||||||
|
return;
|
||||||
|
}
|
||||||
sendResult(new ProfileByUUIDRequestEvent(getProfile(uuid, username, this.client, client.auth.textureProvider)));
|
sendResult(new ProfileByUUIDRequestEvent(getProfile(uuid, username, this.client, client.auth.textureProvider)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,8 +23,6 @@
|
||||||
"useWhitelist": false,
|
"useWhitelist": false,
|
||||||
"mainClass": "net.minecraft.client.main.Main",
|
"mainClass": "net.minecraft.client.main.Main",
|
||||||
"jvmArgs": [
|
"jvmArgs": [
|
||||||
"-Dfml.ignorePatchDiscrepancies=true",
|
|
||||||
"-Dfml.ignoreInvalidMinecraftCertificates=rue",
|
|
||||||
"-XX:+UseConcMarkSweepGC",
|
"-XX:+UseConcMarkSweepGC",
|
||||||
"-XX:+CMSIncrementalMode",
|
"-XX:+CMSIncrementalMode",
|
||||||
"-XX:-UseAdaptiveSizePolicy",
|
"-XX:-UseAdaptiveSizePolicy",
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
{
|
||||||
|
"version": "1.15.1",
|
||||||
|
"assetIndex": "1.15.1",
|
||||||
|
"assetDir": "asset1.15.1",
|
||||||
|
"dir": "HiTech",
|
||||||
|
"info": "Информация о сервере",
|
||||||
|
"sortIndex": 0,
|
||||||
|
"title": "xxxxxxxx",
|
||||||
|
"serverAddress": "localhost",
|
||||||
|
"serverPort": 25565,
|
||||||
|
"update": [
|
||||||
|
"servers.dat"
|
||||||
|
],
|
||||||
|
"updateExclusions": [],
|
||||||
|
"updateShared": [],
|
||||||
|
"updateVerify": [
|
||||||
|
"libraries",
|
||||||
|
"natives",
|
||||||
|
"minecraft.jar"
|
||||||
|
],
|
||||||
|
"updateOptional": [],
|
||||||
|
"updateFastCheck": true,
|
||||||
|
"useWhitelist": false,
|
||||||
|
"mainClass": "net.minecraft.client.main.Main",
|
||||||
|
"jvmArgs": [
|
||||||
|
"-XX:+UseConcMarkSweepGC",
|
||||||
|
"-XX:+CMSIncrementalMode",
|
||||||
|
"-XX:-UseAdaptiveSizePolicy",
|
||||||
|
"-Xmn128M",
|
||||||
|
"-XX:+DisableAttachMechanism"
|
||||||
|
],
|
||||||
|
"classPath": [
|
||||||
|
"minecraft.jar",
|
||||||
|
"libraries"
|
||||||
|
],
|
||||||
|
"clientArgs": [],
|
||||||
|
"whitelist": []
|
||||||
|
}
|
|
@ -46,7 +46,9 @@ public enum Version {
|
||||||
MC1141("1.14.1", 480),
|
MC1141("1.14.1", 480),
|
||||||
MC1142("1.14.2", 485),
|
MC1142("1.14.2", 485),
|
||||||
MC1143("1.14.3", 490),
|
MC1143("1.14.3", 490),
|
||||||
MC1144("1.14.4", 498);
|
MC1144("1.14.4", 498),
|
||||||
|
MC115("1.15", 573),
|
||||||
|
MC1151("1.15.1", 575);
|
||||||
private static final Map<String, Version> VERSIONS;
|
private static final Map<String, Version> VERSIONS;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
|
Loading…
Reference in a new issue