diff --git a/gradle.properties b/gradle.properties index 06329b1f..7f0d38fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -project_version=1.7.2 +project_version=1.7.3 diff --git a/headlessmc-launcher/build.gradle b/headlessmc-launcher/build.gradle index baffbd96..9604e006 100644 --- a/headlessmc-launcher/build.gradle +++ b/headlessmc-launcher/build.gradle @@ -30,7 +30,7 @@ dependencies { jarLibs group: 'org.ow2.asm', name: 'asm', version: '9.5' jarLibs group: 'org.ow2.asm', name: 'asm-tree', version: '9.5' jarLibs group: 'com.google.code.gson', name: 'gson', version: '2.10.1' - jarLibs group: 'fr.litarvan', name: 'openauth', version: '1.1.5' + jarLibs group: 'fr.litarvan', name: 'openauth', version: '1.1.6' includeJarInResources ('net.kunmc.lab:forgecli:1.1.0:all') { // this is to make it build, jar will still have legacy classes diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/Launcher.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/Launcher.java index 1d609a18..bf033d04 100644 --- a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/Launcher.java +++ b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/Launcher.java @@ -15,7 +15,7 @@ @Getter @RequiredArgsConstructor public class Launcher implements HeadlessMc { - public static final String VERSION = "1.7.2"; + public static final String VERSION = "1.7.3"; @Delegate private final HeadlessMc headlessMc; diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/Account.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/Account.java index 5974eaaf..b5b36ea8 100644 --- a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/Account.java +++ b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/Account.java @@ -25,4 +25,12 @@ public class Account implements HasName { @SerializedName("refreshToken") private String refreshToken; + @ToString.Exclude + @SerializedName("xuid") + private String xuid; + + @ToString.Exclude + @SerializedName("clientId") + private String clientId; + } diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/AccountManager.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/AccountManager.java index e8af8b84..0b30c600 100644 --- a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/AccountManager.java +++ b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/AccountManager.java @@ -113,7 +113,9 @@ private Account toAccount(MicrosoftAuthResult result) { return new Account(result.getProfile().getName(), result.getProfile().getId(), result.getAccessToken(), - result.getRefreshToken()); + result.getRefreshToken(), + result.getXuid(), + result.getClientId()); } } diff --git a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/ArgumentAdapterHelper.java b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/ArgumentAdapterHelper.java index f844c742..5faf4746 100644 --- a/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/ArgumentAdapterHelper.java +++ b/headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/ArgumentAdapterHelper.java @@ -57,10 +57,10 @@ public static ArgumentAdapter create(Launcher launcher, adapter.add("${launcher_version}", config.get( LauncherProperties.LAUNCHER_VERSION, Launcher.VERSION)); - // TODO: find out wtf this is - adapter.add("${auth_xuid}", config.get(LauncherProperties.XUID)); - // TODO: find out wtf this is - adapter.add("${clientid}", config.get(LauncherProperties.CLIENT_ID)); + adapter.add("${auth_xuid}", config.get( + LauncherProperties.XUID, account.getXuid())); + adapter.add("${clientid}", config.get( + LauncherProperties.CLIENT_ID, account.getClientId())); // TODO: this is {} for the normal launcher too adapter.add("${user_properties}", config.get( LauncherProperties.USER_PROPERTIES, "{}")); diff --git a/headlessmc-launcher/src/test/java/me/earth/headlessmc/launcher/LauncherMock.java b/headlessmc-launcher/src/test/java/me/earth/headlessmc/launcher/LauncherMock.java index de5b0b47..8c048c2d 100644 --- a/headlessmc-launcher/src/test/java/me/earth/headlessmc/launcher/LauncherMock.java +++ b/headlessmc-launcher/src/test/java/me/earth/headlessmc/launcher/LauncherMock.java @@ -53,7 +53,7 @@ public DummyAccountManager(AccountStore accountStore, @Override public Account login(Config config) { - return new Account("d", "d", "d", "d"); + return new Account("d", "d", "d", "d", "d", "d"); } } diff --git a/headlessmc-launcher/src/test/java/me/earth/headlessmc/launcher/auth/TestAuth.java b/headlessmc-launcher/src/test/java/me/earth/headlessmc/launcher/auth/TestAuth.java index c3c5fe62..f5642f5f 100644 --- a/headlessmc-launcher/src/test/java/me/earth/headlessmc/launcher/auth/TestAuth.java +++ b/headlessmc-launcher/src/test/java/me/earth/headlessmc/launcher/auth/TestAuth.java @@ -17,7 +17,7 @@ @CustomLog @Disabled("Authentification tests are only meant to be tested manually.") public class TestAuth { - private static final Account DUMMY = new Account("d", "d", "d", "d"); + private static final Account DUMMY = new Account("d", "d", "d", "d", "d", "d"); private static final AccountValidator VALIDATOR = new AccountValidator(); @Test diff --git a/headlessmc-scripts/hmc b/headlessmc-scripts/hmc index 62af811b..390ef45c 100644 --- a/headlessmc-scripts/hmc +++ b/headlessmc-scripts/hmc @@ -1,2 +1,2 @@ #!/usr/bin/env sh -java -jar headlessmc-launcher-1.7.2.jar --command $@ +java -jar headlessmc-launcher-1.7.3.jar --command $@ diff --git a/headlessmc-scripts/hmc.bat b/headlessmc-scripts/hmc.bat index 1bf17cba..e157da83 100644 --- a/headlessmc-scripts/hmc.bat +++ b/headlessmc-scripts/hmc.bat @@ -1,2 +1,2 @@ @echo off -"%JAVA_HOME%\bin\java" -jar headlessmc-launcher-1.7.2.jar --command %* +"%JAVA_HOME%\bin\java" -jar headlessmc-launcher-1.7.3.jar --command %* diff --git a/headlessmc-scripts/hmw b/headlessmc-scripts/hmw index 5f24a5ec..42303434 100644 --- a/headlessmc-scripts/hmw +++ b/headlessmc-scripts/hmw @@ -1,3 +1,3 @@ #!/bin/bash # when running in docker on windows bash seems to be at /bin/bash TODO: can we make this one script? -java -jar headlessmc-launcher-1.7.2.jar --command $@ +java -jar headlessmc-launcher-1.7.3.jar --command $@ diff --git a/settings.gradle b/settings.gradle index 7dd6e436..46bea56f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -rootProject.name = 'HeadlessMC' +rootProject.name = 'headlessmc' include 'headlessmc-api' include 'headlessmc-commons' include 'headlessmc-runtime'