Parker2991/ViaProxy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaProxy.git synced 2024-11-15 03:25:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improved code

Browse source
This commit is contained in:
Lenni0451 2023-02-01 22:26:34 +01:00
parent d3494b452b
commit 86228db43f
2 changed files with 66 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
src/main/java/net/raphimc/viaproxy/ui/impl/AccountsTab.java
View file

@ -18,14 +18,14 @@
package net.raphimc.viaproxy.ui.impl;
import net.raphimc.mcauth.MinecraftAuth;
import net.raphimc.mcauth.step.bedrock.StepMCChain;
import net.raphimc.mcauth.step.java.StepMCProfile;
import net.raphimc.mcauth.step.msa.StepMsaDeviceCode;
import net.raphimc.viaproxy.ViaProxy;
import net.raphimc.viaproxy.cli.options.Options;
import net.raphimc.viaproxy.saves.impl.accounts.Account;
import net.raphimc.viaproxy.ui.AUITab;
import net.raphimc.viaproxy.ui.ViaProxyUI;
import net.raphimc.viaproxy.ui.popups.AddAccountPopup;
import net.raphimc.viaproxy.util.TFunction;
import javax.swing.*;
import java.awt.event.KeyAdapter;
@ -33,6 +33,8 @@ import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.concurrent.TimeoutException;
import java.util.function.Consumer;
import java.util.function.Function;
public class AccountsTab extends AUITab {
@ -178,38 +180,7 @@ public class AccountsTab extends AUITab {
this.addMicrosoftAccountButton.setBounds(168, 300, 153, 20);
this.addMicrosoftAccountButton.addActionListener(event -> {
this.addMicrosoftAccountButton.setEnabled(false);
this.addThread = new Thread(() -> {
try {
StepMCProfile.MCProfile profile = MinecraftAuth.requestJavaLogin(msaDeviceCode -> {
SwingUtilities.invokeLater(() -> {
new AddAccountPopup(this.frame, msaDeviceCode, popup -> this.addAccountPopup = popup, () -> {
this.closePopup();
this.addThread.interrupt();
});
});
});
SwingUtilities.invokeLater(() -> {
this.closePopup();
Account account = ViaProxy.saveManager.accountsSave.addAccount(profile);
ViaProxy.saveManager.save();
this.addAccount(account);
this.frame.showInfo("The account " + profile.name() + " was added successfully.");
});
} catch (InterruptedException ignored) {
} catch (TimeoutException e) {
SwingUtilities.invokeLater(() -> {
this.closePopup();
this.frame.showError("The login request timed out.\nPlease login within 60 seconds.");
});
} catch (Throwable t) {
SwingUtilities.invokeLater(() -> {
this.closePopup();
this.frame.showException(t);
});
}
}, "Add Account Thread");
this.addThread.setDaemon(true);
this.addThread.start();
this.handleLogin(MinecraftAuth::requestJavaLogin, profile -> ViaProxy.saveManager.accountsSave.addAccount(profile));
});
contentPane.add(this.addMicrosoftAccountButton);
}
@ -218,38 +189,7 @@ public class AccountsTab extends AUITab {
this.addBedrockAccountButton.setBounds(326, 300, 149, 20);
this.addBedrockAccountButton.addActionListener(event -> {
this.addBedrockAccountButton.setEnabled(false);
this.addThread = new Thread(() -> {
try {
StepMCChain.MCChain chain = MinecraftAuth.requestBedrockLogin(msaDeviceCode -> {
SwingUtilities.invokeLater(() -> {
new AddAccountPopup(this.frame, msaDeviceCode, popup -> this.addAccountPopup = popup, () -> {
this.closePopup();
this.addThread.interrupt();
});
});
});
SwingUtilities.invokeLater(() -> {
this.closePopup();
Account account = ViaProxy.saveManager.accountsSave.addAccount(chain);
ViaProxy.saveManager.save();
this.addAccount(account);
this.frame.showInfo("The account " + chain.displayName() + " was added successfully.");
});
} catch (InterruptedException ignored) {
} catch (TimeoutException e) {
SwingUtilities.invokeLater(() -> {
this.closePopup();
this.frame.showError("The login request timed out.\nPlease login within 60 seconds.");
});
} catch (Throwable t) {
SwingUtilities.invokeLater(() -> {
this.closePopup();
this.frame.showException(t);
});
}
}, "Add Account Thread");
this.addThread.setDaemon(true);
this.addThread.start();
this.handleLogin(MinecraftAuth::requestBedrockLogin, chain -> ViaProxy.saveManager.accountsSave.addAccount(chain));
});
contentPane.add(this.addBedrockAccountButton);
}
@ -325,4 +265,39 @@ public class AccountsTab extends AUITab {
}
}
private <T> void handleLogin(final TFunction<Consumer<StepMsaDeviceCode.MsaDeviceCode>, T> requestHandler, final Function<T, Account> addHandler) {
this.addThread = new Thread(() -> {
try {
T profile = requestHandler.apply(msaDeviceCode -> {
SwingUtilities.invokeLater(() -> {
new AddAccountPopup(this.frame, msaDeviceCode, popup -> this.addAccountPopup = popup, () -> {
this.closePopup();
this.addThread.interrupt();
});
});
});
SwingUtilities.invokeLater(() -> {
this.closePopup();
Account account = addHandler.apply(profile);
ViaProxy.saveManager.save();
this.addAccount(account);
this.frame.showInfo("The account " + account.getName() + " was added successfully.");
});
} catch (InterruptedException ignored) {
} catch (TimeoutException e) {
SwingUtilities.invokeLater(() -> {
this.closePopup();
this.frame.showError("The login request timed out.\nPlease login within 60 seconds.");
});
} catch (Throwable t) {
SwingUtilities.invokeLater(() -> {
this.closePopup();
this.frame.showException(t);
});
}
}, "Add Account Thread");
this.addThread.setDaemon(true);
this.addThread.start();
}
}

25
src/main/java/net/raphimc/viaproxy/util/TFunction.java Normal file
View file

@ -0,0 +1,25 @@
/*
* This file is part of ViaProxy - https://github.com/RaphiMC/ViaProxy
* Copyright (C) 2023 RK_01/RaphiMC and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package net.raphimc.viaproxy.util;
@FunctionalInterface
public interface TFunction<T, R> {
R apply(T t) throws Throwable;
}