Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set Offline username #167

Merged
merged 3 commits into from
Jul 28, 2024
Merged

Set Offline username #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04b601f
feat: offline user name config
TheNuclearNexus Jul 20, 2024
4d0e39a
Merge pull request #165 from TheNuclearNexus/main
3arthqu4ke Jul 26, 2024
c5118c7
[1.11] Revert setting config properties
3arthqu4ke Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/LauncherProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,16 @@ public interface LauncherProperties extends HmcProperties {
Property<String> PROFILE_PROPERTIES = string("hmc.profileproperties");

Property<String> FABRIC_URL = string("hmc.fabric.url");
Property<Boolean> OFFLINE = bool("hmc.offline");
Property<Boolean> RE_THROW_LAUNCH_EXCEPTIONS = bool("hmc.rethrow.launch.exceptions");

Property<Boolean> OFFLINE = bool("hmc.offline");
Property<String> OFFLINE_USERNAME = string("hmc.offline.username");
Property<String> OFFLINE_UUID = string("hmc.offline.uuid");
Property<String> OFFLINE_TOKEN = string("hmc.offline.token");
Property<String> OFFLINE_REFRESH_TOKEN = string("hmc.offline.refresh.token");
Property<String> OFFLINE_XUID = string("hmc.offline.xuid");
Property<String> OFFLINE_CLIENT_ID = string("hmc.offline.client.id");

// TODO: also check hashes for the libraries?
Property<Long> ASSETS_DELAY = number("hmc.assets.delay");
Property<Long> ASSETS_RETRIES = number("hmc.assets.retries");
Expand Down
8 changes: 7 additions & 1 deletion headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/auth/AccountManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,13 @@ public Account login(Config config) throws AuthException {
}

if (offlineChecker.isOffline()) {
return new Account("Offline", OFFLINE_UUID, "", "", "", "");
return new Account(
config.get(LauncherProperties.OFFLINE_USERNAME, "Offline"),
config.get(LauncherProperties.OFFLINE_UUID, OFFLINE_UUID),
config.get(LauncherProperties.OFFLINE_TOKEN, ""),
config.get(LauncherProperties.OFFLINE_REFRESH_TOKEN, ""),
config.get(LauncherProperties.OFFLINE_XUID, ""),
config.get(LauncherProperties.OFFLINE_CLIENT_ID, ""));
}

log.warning("No valid account found!");
Expand Down
1 change: 0 additions & 1 deletion ...smc-launcher/src/main/java/me/earth/headlessmc/launcher/command/forge/ForgeInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.var;
import me.earth.headlessmc.api.command.CommandException;
import me.earth.headlessmc.launcher.Launcher;
import me.earth.headlessmc.launcher.files.FileManager;
import me.earth.headlessmc.launcher.instrumentation.ResourceExtractor;
Expand Down
1 change: 0 additions & 1 deletion headlessmc-launcher/src/main/java/me/earth/headlessmc/launcher/launch/InMemoryLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import lombok.CustomLog;
import lombok.RequiredArgsConstructor;
import me.earth.headlessmc.api.config.HasConfig;
import me.earth.headlessmc.launcher.Main;
import me.earth.headlessmc.launcher.auth.AuthException;
import me.earth.headlessmc.launcher.files.FileManager;
import me.earth.headlessmc.launcher.os.OS;
Expand Down
Loading