Skip to content

Commit a5d94e5

Browse files
committed
Updated to latest ViaProxy version (MinecraftAuth 5)
1 parent 03aa77a commit a5d94e5

File tree

1 file changed

+6
-3
lines changed
  • src/main/java/net/lenni0451/miniconnect/server/states/play/screen/impl

1 file changed

+6
-3
lines changed

src/main/java/net/lenni0451/miniconnect/server/states/play/screen/impl/MainScreen.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,16 @@
2828
import net.lenni0451.miniconnect.utils.GeyserAPI;
2929
import net.lenni0451.miniconnect.utils.InetUtils;
3030
import net.raphimc.minecraftauth.MinecraftAuth;
31-
import net.raphimc.minecraftauth.step.msa.StepMsaDeviceCode;
31+
import net.raphimc.minecraftauth.java.JavaAuthManager;
32+
import net.raphimc.minecraftauth.msa.model.MsaDeviceCode;
33+
import net.raphimc.minecraftauth.msa.service.impl.DeviceCodeMsaAuthService;
3234
import net.raphimc.netminecraft.packet.impl.play.S2CPlayDisconnectPacket;
3335
import net.raphimc.viaproxy.saves.impl.accounts.MicrosoftAccount;
3436
import net.raphimc.viaproxy.util.logging.Logger;
3537

3638
import java.net.InetAddress;
3739
import java.util.concurrent.TimeoutException;
40+
import java.util.function.Consumer;
3841

3942
import static net.lenni0451.miniconnect.server.states.play.screen.ItemBuilder.item;
4043

@@ -114,13 +117,13 @@ public void init(ScreenHandler screenHandler, ItemList itemList) {
114117
screenHandler.getStateHandler().send(new S2CSystemChatPacket(new StringComponent("§aLoading, please wait..."), false));
115118
PlatformTask<?> task = Via.getPlatform().runAsync(() -> {
116119
try {
117-
playerConfig.account = new MicrosoftAccount(MicrosoftAccount.DEVICE_CODE_LOGIN.getFromInput(MinecraftAuth.createHttpClient(), new StepMsaDeviceCode.MsaDeviceCodeCallback(code -> {
120+
playerConfig.account = new MicrosoftAccount(JavaAuthManager.create(MinecraftAuth.createHttpClient()).login(DeviceCodeMsaAuthService::new, (Consumer<MsaDeviceCode>) code -> {
118121
TextComponent component = new StringComponent("Please open your browser and visit ").styled(style -> style.setFormatting(TextFormatting.YELLOW));
119122
component.append(new StringComponent(code.getDirectVerificationUri()).styled(style -> style.setFormatting(TextFormatting.BLUE).setClickEvent(new OpenUrlClickEvent(code.getDirectVerificationUri()))));
120123
component.append(new StringComponent(" and login with your Microsoft account"));
121124
screenHandler.getStateHandler().send(new S2CSystemChatPacket(component, false));
122125
screenHandler.getStateHandler().send(new S2CSystemChatPacket(new StringComponent("§bIf the code is not inserted automatically, please enter the code: §a" + code.getUserCode()), false));
123-
})));
126+
}));
124127
screenHandler.getStateHandler().send(new S2CSystemChatPacket(new StringComponent("§aSuccessfully logged in"), false));
125128
} catch (InterruptedException e) {
126129
return;

0 commit comments

Comments
 (0)