From 9438410181b3ac211ea60cd24303fba9a5085a33 Mon Sep 17 00:00:00 2001 From: Jonathan Hiles Date: Sun, 15 Oct 2023 20:08:20 +1000 Subject: [PATCH] feat: upgrade to Minecraft 1.20.2 BREAKING CHANGE: Mojang (or legacy) authentication is no longer available, see https://aka.ms/MinecraftPostMigrationFAQ --- build.gradle | 4 +- gradle.properties | 20 +- gradle/wrapper/gradle-wrapper.jar | Bin 62076 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 22 +- .../api/gui/widget/AuthButtonWidget.java | 16 +- .../mcmod/authme/api/util/MicrosoftUtils.java | 10 +- .../mcmod/authme/api/util/MojangUtils.java | 67 ------ .../mcmod/authme/api/util/SessionUtils.java | 52 +--- .../me/axieum/mcmod/authme/impl/AuthMe.java | 4 +- .../authme/impl/config/AuthMeConfig.java | 13 - .../authme/impl/gui/AuthMethodScreen.java | 39 ++- .../authme/impl/gui/MicrosoftAuthScreen.java | 2 +- .../authme/impl/gui/MojangAuthScreen.java | 224 ------------------ .../authme/impl/gui/OfflineAuthScreen.java | 2 +- .../mixin/AbuseReportContextAccessor.java | 4 +- .../authme/mixin/MinecraftClientAccessor.java | 15 +- .../mixin/RealmsAvailabilityAccessor.java | 25 ++ .../mixin/RealmsMainScreenAccessor.java | 33 --- .../SplashTextResourceSupplierAccessor.java | 2 +- ...ggdrasilAuthenticationServiceAccessor.java | 32 --- .../resources/assets/authme/atlases/gui.json | 16 ++ .../resources/assets/authme/lang/de_de.json | 7 - .../resources/assets/authme/lang/en_us.json | 8 +- .../resources/assets/authme/lang/fi_fi.json | 9 +- .../resources/assets/authme/lang/fr_fr.json | 7 - .../resources/assets/authme/lang/pl_pl.json | 103 ++++---- .../resources/assets/authme/lang/zh_cn.json | 9 +- .../resources/assets/authme/lang/zh_tw.json | 7 - .../authme/textures/gui/session_status.png | Bin 0 -> 1045 bytes .../gui/sprites/widget/blank_button.png | Bin 0 -> 1153 bytes .../sprites/widget/blank_button_disabled.png | Bin 0 -> 1079 bytes .../sprites/widget/blank_button_focused.png | Bin 0 -> 1153 bytes .../gui/sprites/widget/microsoft_button.png | Bin 0 -> 1182 bytes .../widget/microsoft_button_disabled.png | Bin 0 -> 1121 bytes .../widget/microsoft_button_focused.png | Bin 0 -> 1287 bytes .../gui/sprites/widget/mojang_button.png | Bin 0 -> 1199 bytes .../sprites/widget/mojang_button_disabled.png | Bin 0 -> 1140 bytes .../sprites/widget/mojang_button_focused.png | Bin 0 -> 1190 bytes .../gui/sprites/widget/offline_button.png | Bin 0 -> 1185 bytes .../widget/offline_button_disabled.png | Bin 0 -> 1127 bytes .../sprites/widget/offline_button_focused.png | Bin 0 -> 1215 bytes .../assets/authme/textures/gui/widgets.png | Bin 1927 -> 0 bytes src/main/resources/authme.mixins.json | 5 +- src/main/resources/fabric.mod.json | 2 +- 45 files changed, 207 insertions(+), 555 deletions(-) delete mode 100644 src/main/java/me/axieum/mcmod/authme/api/util/MojangUtils.java delete mode 100644 src/main/java/me/axieum/mcmod/authme/impl/gui/MojangAuthScreen.java create mode 100644 src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java delete mode 100644 src/main/java/me/axieum/mcmod/authme/mixin/RealmsMainScreenAccessor.java delete mode 100644 src/main/java/me/axieum/mcmod/authme/mixin/YggdrasilAuthenticationServiceAccessor.java create mode 100644 src/main/resources/assets/authme/atlases/gui.json create mode 100644 src/main/resources/assets/authme/textures/gui/session_status.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_disabled.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_focused.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_disabled.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_focused.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_disabled.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_focused.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_disabled.png create mode 100644 src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_focused.png delete mode 100644 src/main/resources/assets/authme/textures/gui/widgets.png diff --git a/build.gradle b/build.gradle index 4da0a8d..1c5e5d6 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ plugins { id 'java' id 'checkstyle' id 'maven-publish' - id 'com.modrinth.minotaur' version '2.7.5' + id 'com.modrinth.minotaur' version '2.8.4' id 'com.matthewprenger.cursegradle' version '1.4.0' - id 'fabric-loom' version '1.2-SNAPSHOT' + id 'fabric-loom' version '1.4-SNAPSHOT' } allprojects { diff --git a/gradle.properties b/gradle.properties index 185a21e..1c6a0a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,22 +7,22 @@ mod_version = 7.0.2+1.20 ## {x-release-please-end} # Fabric -minecraft_version = 1.20 -loader_version = 0.14.21 -yarn_mappings = 1.20+build.1 -fabric_version = 0.83.0+1.20 +minecraft_version = 1.20.2 +loader_version = 0.14.23 +yarn_mappings = 1.20.2+build.4 +fabric_version = 0.90.0+1.20.2 # Dependencies -cloth_config_version = 11.0.98 -mod_menu_version = 7.0.0 +cloth_config_version = 12.0.109 +mod_menu_version = 8.0.0 -checkstyle_version = 10.9.3 +checkstyle_version = 10.12.4 jetbrains_annotations_version = 24.0.1 -junit_jupiter_version = 5.9.2 +junit_jupiter_version = 5.10.0 # CurseForge cf_project_id = 356643 -cf_game_versions = Fabric, Java 17, 1.20 +cf_game_versions = Fabric, Java 17, 1.20.2 cf_relations_required = fabric-api cf_relations_optional = modmenu cf_relations_embedded = cloth-config @@ -31,7 +31,7 @@ cf_relations_incompatible = # Modrinth mr_project_id = yjgIrBjZ -mr_game_versions = 1.20 +mr_game_versions = 1.20.2 mr_relations_required = P7dR8mSH mr_relations_optional = mOgUt4GM mr_relations_incompatible = diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a79e29d3e0ab67b14947c167a862655af9b..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644 GIT binary patch delta 37652 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 delta 36122 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 Ac-xW1# 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 Q>rd#Eb%7 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..3fa8f86 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java b/src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java index 173027b..c91b146 100644 --- a/src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java +++ b/src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java @@ -3,15 +3,16 @@ import org.jetbrains.annotations.Nullable; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.ButtonTextures; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.TexturedButtonWidget; import net.minecraft.text.Text; +import net.minecraft.util.Identifier; import me.axieum.mcmod.authme.api.util.SessionUtils; import me.axieum.mcmod.authme.api.util.SessionUtils.SessionStatus; -import me.axieum.mcmod.authme.impl.AuthMe; /** * The textured button widget for opening the authentication screens. @@ -27,6 +28,15 @@ public class AuthButtonWidget extends TexturedButtonWidget // The last known status of the Minecraft session private SessionStatus sessionStatus = SessionStatus.UNKNOWN; + // The authentication button textures + public static final ButtonTextures BUTTON_TEXTURES = new ButtonTextures( + new Identifier("widget/locked_button"), + new Identifier("widget/locked_button_disabled"), + new Identifier("widget/locked_button_highlighted") + ); + // The session status icon texture + public static final Identifier SESSION_STATUS_TEXTURE = new Identifier("authme", "textures/gui/session_status.png"); + /** * Constructs a fixed (no drag) authentication button. * @@ -132,7 +142,7 @@ public AuthButtonWidget( Text message ) { - super(x, y, 20, 20, 0, 146, 20, ButtonWidget.WIDGETS_TEXTURE, 256, 256, pressAction, message); + super(x, y, 20, 20, BUTTON_TEXTURES, pressAction, message); this.screen = screen; this.moveAction = moveAction; this.setTooltip(tooltip); @@ -243,7 +253,7 @@ public void renderButton(DrawContext context, int mouseX, int mouseY, float delt case OFFLINE -> u = 8; default -> u = 16; } - context.drawTexture(AuthMe.WIDGETS_TEXTURE, getX() + width - 6, getY() - 1, u, 60, 8, 8, 128, 128); + context.drawTexture(SESSION_STATUS_TEXTURE, getX() + width - 6, getY() - 1, u, 0, 8, 8, 24, 8); } /** diff --git a/src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java b/src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java index f52f7e3..7114c8f 100644 --- a/src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java +++ b/src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.UUID; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; @@ -37,7 +38,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.minecraft.client.util.Session; +import net.minecraft.client.session.Session; import net.minecraft.util.JsonHelper; import net.minecraft.util.Util; @@ -562,6 +563,13 @@ public static CompletableFuture login(final String mcToken, final Execu return Optional.ofNullable(json.get("id")) .map(JsonElement::getAsString) .filter(uuid -> !uuid.isBlank()) + // Parse the UUID (without hyphens) + .map(uuid -> UUID.fromString( + uuid.replaceFirst( + "([0-9a-fA-F]{8})([0-9a-fA-F]{4})([0-9a-fA-F]{4})([0-9a-fA-F]{4})([0-9a-fA-F]+)", + "$1-$2-$3-$4-$5" + ) + )) // If present, log success, build a new session and return .map(uuid -> { LOGGER.info("Fetched Minecraft profile! (name={}, uuid={})", diff --git a/src/main/java/me/axieum/mcmod/authme/api/util/MojangUtils.java b/src/main/java/me/axieum/mcmod/authme/api/util/MojangUtils.java deleted file mode 100644 index 11bb76a..0000000 --- a/src/main/java/me/axieum/mcmod/authme/api/util/MojangUtils.java +++ /dev/null @@ -1,67 +0,0 @@ -package me.axieum.mcmod.authme.api.util; - -import java.util.Optional; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.CompletionException; -import java.util.concurrent.Executor; - -import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication; -import com.mojang.util.UUIDTypeAdapter; - -import net.minecraft.client.util.Session; - -import static me.axieum.mcmod.authme.impl.AuthMe.LOGGER; - -/** - * Utility methods for authenticating via Mojang (or legacy). - */ -public final class MojangUtils -{ - private MojangUtils() {} - - /** - * Logs into Mojang and returns a new Minecraft session. - * - *

NB: You must manually interrupt the executor thread if the - * completable future is cancelled! - * - * @param username Mojang username/email - * @param password Mojang password - * @param executor executor to run the login task on - * @return completable future for the new Minecraft session - * @see SessionUtils#setSession(Session) to apply the new session - */ - public static CompletableFuture login( - final String username, final String password, final Executor executor - ) - { - return CompletableFuture.supplyAsync(() -> { - LOGGER.info("Logging into Minecraft with Mojang (or legacy) credentials..."); - try { - // Fetch the Yggdrasil User Authentication provider - final YggdrasilUserAuthentication yua = SessionUtils.getAuthProvider(); - - // Update the credentials and login - yua.setUsername(username); - yua.setPassword(password); - yua.logIn(); - - // Pluck all useful session data - final String name = yua.getSelectedProfile().getName(); - final String uuid = UUIDTypeAdapter.fromUUID(yua.getSelectedProfile().getId()); - final String token = yua.getAuthenticatedToken(); - final Session.AccountType type = Session.AccountType.byName(yua.getUserType().getName()); - - // Logout after fetching what is needed - yua.logOut(); - - // Finally, log success and return - LOGGER.info("Successfully logged into Minecraft via Mojang (or legacy)! ({})", name); - return new Session(name, uuid, token, Optional.empty(), Optional.empty(), type); - } catch (Exception e) { - LOGGER.error("Unable to login to Minecraft via Mojang (or legacy)!", e); - throw new CompletionException(e); - } - }, executor); - } -} diff --git a/src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java b/src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java index 6f20e1a..eb36239 100644 --- a/src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java +++ b/src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java @@ -4,27 +4,23 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; -import com.mojang.authlib.Agent; -import com.mojang.authlib.GameProfile; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.UserApiService; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; -import com.mojang.authlib.yggdrasil.YggdrasilUserAuthentication; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.SocialInteractionsManager; import net.minecraft.client.realms.RealmsClient; import net.minecraft.client.realms.RealmsPeriodicCheckers; -import net.minecraft.client.report.AbuseReportContext; -import net.minecraft.client.util.ProfileKeys; -import net.minecraft.client.util.Session; +import net.minecraft.client.session.ProfileKeys; +import net.minecraft.client.session.Session; +import net.minecraft.client.session.report.AbuseReportContext; import me.axieum.mcmod.authme.mixin.AbuseReportContextAccessor; import me.axieum.mcmod.authme.mixin.MinecraftClientAccessor; -import me.axieum.mcmod.authme.mixin.RealmsMainScreenAccessor; +import me.axieum.mcmod.authme.mixin.RealmsAvailabilityAccessor; import me.axieum.mcmod.authme.mixin.SplashTextResourceSupplierAccessor; -import me.axieum.mcmod.authme.mixin.YggdrasilAuthenticationServiceAccessor; import static me.axieum.mcmod.authme.impl.AuthMe.LOGGER; /** @@ -66,10 +62,6 @@ public static void setSession(Session session) ((MinecraftClientAccessor) client).setSession(session); ((SplashTextResourceSupplierAccessor) client.getSplashTextLoader()).setSession(session); - // Refresh the session properties - client.getSessionProperties().clear(); - client.getSessionProperties(); - // Re-create the user API service (ignore offline session) UserApiService userApiService = UserApiService.OFFLINE; if (!OFFLINE_TOKEN.equals(session.getAccessToken())) { @@ -102,14 +94,15 @@ public static void setSession(Session session) // Necessary for Realms to re-check for a valid session RealmsClient realmsClient = RealmsClient.createRealmsClient(client); ((MinecraftClientAccessor) client).setRealmsPeriodicCheckers(new RealmsPeriodicCheckers(realmsClient)); - RealmsMainScreenAccessor.setCheckedClientCompatibility(false); - RealmsMainScreenAccessor.setRealmsGenericErrorScreen(null); + RealmsAvailabilityAccessor.setCurrentFuture(null); // The cached status is now stale lastStatus = SessionStatus.UNKNOWN; lastStatusCheck = 0; - LOGGER.info("Minecraft session for {} (uuid={}) has been applied", session.getUsername(), session.getUuid()); + LOGGER.info( + "Minecraft session for {} (uuid={}) has been applied", session.getUsername(), session.getUuidOrNull() + ); } /** @@ -123,7 +116,7 @@ public static Session offline(String username) { return new Session( username, - UUID.nameUUIDFromBytes(("offline:" + username).getBytes()).toString(), + UUID.nameUUIDFromBytes(("offline:" + username).getBytes()), OFFLINE_TOKEN, Optional.empty(), Optional.empty(), @@ -152,16 +145,14 @@ public static CompletableFuture getStatus() return CompletableFuture.supplyAsync(() -> { // Fetch the current session final Session session = getSession(); - final GameProfile profile = session.getProfile(); - final String token = session.getAccessToken(); - final String id = UUID.randomUUID().toString(); + final String serverId = UUID.randomUUID().toString(); // Attempt to join the Minecraft Session Service server final YggdrasilMinecraftSessionService sessionService = getSessionService(); try { LOGGER.info("Verifying Minecraft session..."); - sessionService.joinServer(profile, token, id); - if (sessionService.hasJoinedServer(profile, id, null).isComplete()) { + sessionService.joinServer(session.getUuidOrNull(), session.getAccessToken(), serverId); + if (sessionService.hasJoinedServer(session.getUsername(), serverId, null) != null) { LOGGER.info("The Minecraft session is valid"); lastStatus = SessionStatus.VALID; } else { @@ -196,24 +187,7 @@ public static YggdrasilMinecraftSessionService getSessionService() */ public static YggdrasilAuthenticationService getAuthService() { - final YggdrasilAuthenticationService authService = getSessionService().getAuthenticationService(); - - // Provide a random client token if not set - if (((YggdrasilAuthenticationServiceAccessor) authService).getClientToken() == null) { - ((YggdrasilAuthenticationServiceAccessor) authService).setClientToken(UUID.randomUUID().toString()); - } - - return authService; - } - - /** - * Returns the Yggdrasil User Authentication provider. - * - * @return Yggdrasil User Authentication instance - */ - public static YggdrasilUserAuthentication getAuthProvider() - { - return (YggdrasilUserAuthentication) getAuthService().createUserAuthentication(Agent.MINECRAFT); + return ((MinecraftClientAccessor) MinecraftClient.getInstance()).getAuthenticationService(); } /** diff --git a/src/main/java/me/axieum/mcmod/authme/impl/AuthMe.java b/src/main/java/me/axieum/mcmod/authme/impl/AuthMe.java index aee6ec1..b5464b1 100644 --- a/src/main/java/me/axieum/mcmod/authme/impl/AuthMe.java +++ b/src/main/java/me/axieum/mcmod/authme/impl/AuthMe.java @@ -4,8 +4,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import net.minecraft.util.Identifier; - import net.fabricmc.api.ClientModInitializer; import me.axieum.mcmod.authme.impl.config.AuthMeConfig; @@ -17,7 +15,7 @@ public final class AuthMe implements ClientModInitializer { public static final Logger LOGGER = LogManager.getLogger(); public static final ConfigHolder CONFIG = AuthMeConfig.init(); - public static final Identifier WIDGETS_TEXTURE = new Identifier("authme", "textures/gui/widgets.png"); + public static final String MOJANG_ACCOUNT_MIGRATION_FAQ_URL = "https://aka.ms/MinecraftPostMigrationFAQ"; @Override public void onInitializeClient() {} diff --git a/src/main/java/me/axieum/mcmod/authme/impl/config/AuthMeConfig.java b/src/main/java/me/axieum/mcmod/authme/impl/config/AuthMeConfig.java index 08b239b..9c1598a 100644 --- a/src/main/java/me/axieum/mcmod/authme/impl/config/AuthMeConfig.java +++ b/src/main/java/me/axieum/mcmod/authme/impl/config/AuthMeConfig.java @@ -96,19 +96,6 @@ public boolean isDefaults() } } - @Comment("Login via Mojang (or legacy)") - @ConfigEntry.Gui.CollapsibleObject - public MojangLoginSchema mojang = new MojangLoginSchema(); - - /** - * Login via Mojang (or legacy) configuration schema. - */ - public static class MojangLoginSchema - { - @Comment("Last used username") - public @Nullable String lastUsername = ""; - } - @Comment("Login Offline") @ConfigEntry.Gui.CollapsibleObject public OfflineLoginSchema offline = new OfflineLoginSchema(); diff --git a/src/main/java/me/axieum/mcmod/authme/impl/gui/AuthMethodScreen.java b/src/main/java/me/axieum/mcmod/authme/impl/gui/AuthMethodScreen.java index de41356..c525806 100644 --- a/src/main/java/me/axieum/mcmod/authme/impl/gui/AuthMethodScreen.java +++ b/src/main/java/me/axieum/mcmod/authme/impl/gui/AuthMethodScreen.java @@ -1,6 +1,8 @@ package me.axieum.mcmod.authme.impl.gui; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.screen.ButtonTextures; +import net.minecraft.client.gui.screen.ConfirmLinkScreen; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tooltip.Tooltip; @@ -9,10 +11,10 @@ import net.minecraft.client.util.InputUtil; import net.minecraft.text.Text; import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; import me.axieum.mcmod.authme.api.util.SessionUtils; import me.axieum.mcmod.authme.impl.AuthMe; -import static me.axieum.mcmod.authme.impl.AuthMe.WIDGETS_TEXTURE; import static me.axieum.mcmod.authme.impl.AuthMe.getConfig; /** @@ -25,6 +27,25 @@ public class AuthMethodScreen extends Screen // A greeting message shown for the current session private Text greeting = null; + // The 'Microsoft' authentication method button textures + public static final ButtonTextures MICROSOFT_BUTTON_TEXTURES = new ButtonTextures( + new Identifier("authme", "widget/microsoft_button"), + new Identifier("authme", "widget/microsoft_button_disabled"), + new Identifier("authme", "widget/microsoft_button_focused") + ); + // The 'Mojang (or legacy)' authentication method button textures + public static final ButtonTextures MOJANG_BUTTON_TEXTURES = new ButtonTextures( + new Identifier("authme", "widget/mojang_button"), + new Identifier("authme", "widget/mojang_button_disabled"), + new Identifier("authme", "widget/mojang_button_focused") + ); + // The 'Offline' authentication method button textures + public static final ButtonTextures OFFLINE_BUTTON_TEXTURES = new ButtonTextures( + new Identifier("authme", "widget/offline_button"), + new Identifier("authme", "widget/offline_button_disabled"), + new Identifier("authme", "widget/offline_button_focused") + ); + /** * Constructs a new authentication method choice screen. * @@ -51,7 +72,7 @@ protected void init() // Add a button for the 'Microsoft' authentication method TexturedButtonWidget msButton = new TexturedButtonWidget( width / 2 - 20 - 10 - 4, height / 2 - 5, 20, 20, - 0, 0, 20, WIDGETS_TEXTURE, 128, 128, + MICROSOFT_BUTTON_TEXTURES, button -> { // If 'Left Control' is being held, enforce user interaction final boolean selectAccount = InputUtil.isKeyPressed( @@ -86,17 +107,21 @@ protected void init() // Add a button for the 'Mojang (or legacy)' authentication method TexturedButtonWidget mojangButton = new TexturedButtonWidget( width / 2 - 10, height / 2 - 5, 20, 20, - 20, 0, 20, WIDGETS_TEXTURE, 128, 128, - button -> client.setScreen(new MojangAuthScreen(this, parentScreen)), + MOJANG_BUTTON_TEXTURES, + button -> ConfirmLinkScreen.open(AuthMe.MOJANG_ACCOUNT_MIGRATION_FAQ_URL, this, true), Text.translatable("gui.authme.method.button.mojang") ); - mojangButton.setTooltip(Tooltip.of(Text.translatable("gui.authme.method.button.mojang"))); + mojangButton.setTooltip(Tooltip.of( + Text.translatable("gui.authme.method.button.mojang") + .append("\n") + .append(Text.translatable("gui.authme.method.button.mojang.unavailable").formatted(Formatting.RED)) + )); addDrawableChild(mojangButton); // Add a button for the 'Offline' authentication method TexturedButtonWidget offlineButton = new TexturedButtonWidget( width / 2 + 10 + 4, height / 2 - 5, 20, 20, - 40, 0, 20, WIDGETS_TEXTURE, 128, 128, + OFFLINE_BUTTON_TEXTURES, button -> client.setScreen(new OfflineAuthScreen(this, parentScreen)), Text.translatable("gui.authme.method.button.offline") ); @@ -117,7 +142,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) assert client != null; // Render the background before any widgets - renderBackground(context); + renderBackground(context, mouseX, mouseY, delta); // Render a title for the screen context.drawCenteredTextWithShadow(client.textRenderer, title, width / 2, height / 2 - 27, 0xffffff); diff --git a/src/main/java/me/axieum/mcmod/authme/impl/gui/MicrosoftAuthScreen.java b/src/main/java/me/axieum/mcmod/authme/impl/gui/MicrosoftAuthScreen.java index 8cbbed1..a5855a7 100644 --- a/src/main/java/me/axieum/mcmod/authme/impl/gui/MicrosoftAuthScreen.java +++ b/src/main/java/me/axieum/mcmod/authme/impl/gui/MicrosoftAuthScreen.java @@ -144,7 +144,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) assert client != null; // Render the background before any widgets - renderBackground(context); + renderBackground(context, mouseX, mouseY, delta); // Render a title for the screen context.drawCenteredTextWithShadow(client.textRenderer, title, width / 2, height / 2 - 32, 0xffffff); diff --git a/src/main/java/me/axieum/mcmod/authme/impl/gui/MojangAuthScreen.java b/src/main/java/me/axieum/mcmod/authme/impl/gui/MojangAuthScreen.java deleted file mode 100644 index 27914ce..0000000 --- a/src/main/java/me/axieum/mcmod/authme/impl/gui/MojangAuthScreen.java +++ /dev/null @@ -1,224 +0,0 @@ -package me.axieum.mcmod.authme.impl.gui; - -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import com.mojang.authlib.exceptions.InvalidCredentialsException; - -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.toast.SystemToast; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; - -import me.axieum.mcmod.authme.api.gui.AuthScreen; -import me.axieum.mcmod.authme.api.gui.widget.PasswordFieldWidget; -import me.axieum.mcmod.authme.api.util.MojangUtils; -import me.axieum.mcmod.authme.api.util.SessionUtils; -import static me.axieum.mcmod.authme.impl.AuthMe.CONFIG; -import static me.axieum.mcmod.authme.impl.AuthMe.LOGGER; -import static me.axieum.mcmod.authme.impl.AuthMe.getConfig; - -/** - * A screen for handling user authentication via Mojang (or legacy). - */ -public class MojangAuthScreen extends AuthScreen -{ - // The executor to run the login task on - private ExecutorService executor = null; - // The completable future for all Mojang login tasks - private CompletableFuture task = null; - // The current progress/status of the login task - private Text status = null; - // The username and password text field widgets - private TextFieldWidget usernameField, passwordField; - // The login button widget - private ButtonWidget loginBtn; - - /** - * Constructs a new authentication via Mojang (or legacy) screen. - * - * @param parentScreen parent (or last) screen that opened this screen - * @param successScreen screen to be returned to after a successful login - */ - public MojangAuthScreen(Screen parentScreen, Screen successScreen) - { - super(Text.translatable("gui.authme.mojang.title"), parentScreen, successScreen); - this.closeOnSuccess = true; - } - - @Override - protected void init() - { - super.init(); - assert client != null; - - // Add a username text field - addDrawableChild( - usernameField = new TextFieldWidget( - client.textRenderer, - width / 2 - 100, height / 2 - 39, 200, 20, - Text.translatable("gui.authme.mojang.field.username") - ) - ); - usernameField.setMaxLength(128); - if (getConfig().methods.mojang.lastUsername != null) { - usernameField.setText(getConfig().methods.mojang.lastUsername); - } - usernameField.setChangedListener(value -> loginBtn.active = isFormValid()); - - // Add a password text field - addDrawableChild( - passwordField = new PasswordFieldWidget( - client.textRenderer, - width / 2 - 100, height / 2 + 6, 200, 20, - Text.translatable("gui.authme.mojang.field.password") - ) - ); - passwordField.setChangedListener(value -> loginBtn.active = isFormValid()); - - // Add a login button to submit the form - addDrawableChild( - loginBtn = ButtonWidget.builder( - Text.translatable("gui.authme.mojang.button.login"), - button -> login() - ).dimensions( - width / 2 - 100 - 2, height / 2 + 59, 100, 20 - ).build() - ); - loginBtn.active = isFormValid(); - - // Add a cancel button to abort the task - addDrawableChild( - ButtonWidget.builder( - Text.translatable("gui.cancel"), - button -> close() - ).dimensions( - width / 2 + 2, height / 2 + 59, 100, 20 - ).build() - ); - } - - /** - * Attempts to log into Mojang with the provided credentials. - */ - public void login() - { - assert client != null; - - // Check whether the form is valid - if (!isFormValid()) return; - - // Disable the form fields while logging in - usernameField.active = false; - passwordField.active = false; - loginBtn.active = false; - - // Set the initial progress/status of the login task - status = Text.translatable("gui.authme.mojang.status.loggingIn"); - - // Prepare a new executor thread to run the login task on - executor = Executors.newSingleThreadExecutor(); - - // Start the login task - task = MojangUtils - // Log into Mojang with username and password and hence build a new session - .login(usernameField.getText(), passwordField.getText(), executor) - - // Update the game session, sync the config and greet the player - .thenAccept(session -> { - // Apply the new session - SessionUtils.setSession(session); - // Sync configuration with the last used username - getConfig().methods.mojang.lastUsername = usernameField.getText(); - CONFIG.save(); - // Add a toast that greets the player - SystemToast.add( - client.getToastManager(), SystemToast.Type.TUTORIAL_HINT, - Text.translatable("gui.authme.toast.greeting", Text.literal(session.getUsername())), null - ); - // Mark the task as successful, in turn closing the screen - LOGGER.info("Successfully logged in via Mojang (or legacy)!"); - success = true; - }) - - // On any exception, update the status and re-enable form fields - .exceptionally(error -> { - status = Text.translatable( - error.getCause() instanceof InvalidCredentialsException ? "gui.authme.error.credentials" - : "gui.authme.error.generic" - ).formatted(Formatting.RED); - usernameField.active = true; - passwordField.active = true; - return null; // return a default value - }); - } - - /** - * Checks whether the form can be submitted, and hence logged in. - * - * @return true if both username & password fields are valid - */ - public boolean isFormValid() - { - return !usernameField.getText().isBlank() && !passwordField.getText().isBlank(); - } - - @Override - public void render(DrawContext context, int mouseX, int mouseY, float delta) - { - assert client != null; - - // Render the background before any widgets - renderBackground(context); - - // Render a title for the screen - context.drawCenteredTextWithShadow(client.textRenderer, title, width / 2, - usernameField.getY() - 16 - 23, 0xffffff); - - // Render the username & password field labels - context.drawTextWithShadow( - client.textRenderer, - usernameField.getMessage(), - usernameField.getX(), usernameField.getY() - 16, - 0xa0a0a0 - ); - context.drawTextWithShadow( - client.textRenderer, - passwordField.getMessage(), - passwordField.getX(), passwordField.getY() - 16, - 0xa0a0a0 - ); - - // Render the current progress/status of the login, if present - if (status != null) { - context.drawCenteredTextWithShadow(client.textRenderer, status, width / 2, - loginBtn.getY() - 20, 0xdddddd); - } - - // Cascade the rendering - super.render(context, mouseX, mouseY, delta); - } - - @Override - public boolean shouldCloseOnEsc() - { - return !usernameField.isFocused() && !passwordField.isFocused(); - } - - @Override - public void close() - { - // Cancel the login task if still running - if (task != null && !task.isDone()) { - task.cancel(true); - executor.shutdownNow(); - } - - // Cascade the closing - super.close(); - } -} diff --git a/src/main/java/me/axieum/mcmod/authme/impl/gui/OfflineAuthScreen.java b/src/main/java/me/axieum/mcmod/authme/impl/gui/OfflineAuthScreen.java index 3122a64..6b2c1db 100644 --- a/src/main/java/me/axieum/mcmod/authme/impl/gui/OfflineAuthScreen.java +++ b/src/main/java/me/axieum/mcmod/authme/impl/gui/OfflineAuthScreen.java @@ -125,7 +125,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta) assert client != null; // Render the background before any widgets - renderBackground(context); + renderBackground(context, mouseX, mouseY, delta); // Render a title for the screen context.drawCenteredTextWithShadow(client.textRenderer, title, width / 2, diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/AbuseReportContextAccessor.java b/src/main/java/me/axieum/mcmod/authme/mixin/AbuseReportContextAccessor.java index a24df18..57038cf 100644 --- a/src/main/java/me/axieum/mcmod/authme/mixin/AbuseReportContextAccessor.java +++ b/src/main/java/me/axieum/mcmod/authme/mixin/AbuseReportContextAccessor.java @@ -3,8 +3,8 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import net.minecraft.client.report.AbuseReportContext; -import net.minecraft.client.report.ReporterEnvironment; +import net.minecraft.client.session.report.AbuseReportContext; +import net.minecraft.client.session.report.ReporterEnvironment; /** * Provides the means to access protected members of the Abuse Report Context. diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftClientAccessor.java b/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftClientAccessor.java index 6694c2d..54850a0 100644 --- a/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftClientAccessor.java +++ b/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftClientAccessor.java @@ -5,13 +5,14 @@ import org.spongepowered.asm.mixin.gen.Accessor; import com.mojang.authlib.minecraft.UserApiService; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.SocialInteractionsManager; import net.minecraft.client.realms.RealmsPeriodicCheckers; -import net.minecraft.client.report.AbuseReportContext; -import net.minecraft.client.util.ProfileKeys; -import net.minecraft.client.util.Session; +import net.minecraft.client.session.ProfileKeys; +import net.minecraft.client.session.Session; +import net.minecraft.client.session.report.AbuseReportContext; /** * Provides the means to access protected members of the Minecraft client. @@ -28,6 +29,14 @@ public interface MinecraftClientAccessor @Mutable void setSession(Session session); + /** + * Returns the Minecraft authentication service. + * + * @return the Minecraft authentication service + */ + @Accessor + YggdrasilAuthenticationService getAuthenticationService(); + /** * Sets the Minecraft user API service. * diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java b/src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java new file mode 100644 index 0000000..aa6acf6 --- /dev/null +++ b/src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java @@ -0,0 +1,25 @@ +package me.axieum.mcmod.authme.mixin; + +import java.util.concurrent.CompletableFuture; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.gen.Accessor; + +import net.minecraft.client.realms.RealmsAvailability; + +/** + * Provides the means to access protected members of the Realms availability check. + */ +@Mixin(RealmsAvailability.class) +public interface RealmsAvailabilityAccessor +{ + /** + * Sets the Realms availability info checker. + * + * @param availabilityInfo Realms availability info completable future + */ + @Accessor + @Mutable + static void setCurrentFuture(CompletableFuture availabilityInfo) {} +} diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/RealmsMainScreenAccessor.java b/src/main/java/me/axieum/mcmod/authme/mixin/RealmsMainScreenAccessor.java deleted file mode 100644 index a8af236..0000000 --- a/src/main/java/me/axieum/mcmod/authme/mixin/RealmsMainScreenAccessor.java +++ /dev/null @@ -1,33 +0,0 @@ -package me.axieum.mcmod.authme.mixin; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.gen.Accessor; - -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.realms.gui.screen.RealmsMainScreen; - -/** - * Provides the means to access protected members of the Realms Main Screen. - */ -@Mixin(RealmsMainScreen.class) -public interface RealmsMainScreenAccessor -{ - /** - * Sets the 'checked client compatibility' flag. - * - * @param checked true if checked - */ - @Accessor - @Mutable - static void setCheckedClientCompatibility(boolean checked) {} - - /** - * Sets the 'Realms Generic Error' screen. - * - * @param screen error screen - */ - @Accessor - @Mutable - static void setRealmsGenericErrorScreen(Screen screen) {} -} diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/SplashTextResourceSupplierAccessor.java b/src/main/java/me/axieum/mcmod/authme/mixin/SplashTextResourceSupplierAccessor.java index 04083fb..8cd7bb7 100644 --- a/src/main/java/me/axieum/mcmod/authme/mixin/SplashTextResourceSupplierAccessor.java +++ b/src/main/java/me/axieum/mcmod/authme/mixin/SplashTextResourceSupplierAccessor.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; import net.minecraft.client.resource.SplashTextResourceSupplier; -import net.minecraft.client.util.Session; +import net.minecraft.client.session.Session; /** * Provides the means to access protected members of the Splash Text Resource supplier. diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/YggdrasilAuthenticationServiceAccessor.java b/src/main/java/me/axieum/mcmod/authme/mixin/YggdrasilAuthenticationServiceAccessor.java deleted file mode 100644 index 27c1613..0000000 --- a/src/main/java/me/axieum/mcmod/authme/mixin/YggdrasilAuthenticationServiceAccessor.java +++ /dev/null @@ -1,32 +0,0 @@ -package me.axieum.mcmod.authme.mixin; - -import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.gen.Accessor; - -import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; - -/** - * Provides the means to access protected members of the Yggdrasil Authentication service. - */ -@Mixin(YggdrasilAuthenticationService.class) -public interface YggdrasilAuthenticationServiceAccessor -{ - /** - * Returns the client token. - * - * @return client token - */ - @Accessor(remap = false) - @Nullable String getClientToken(); - - /** - * Sets the client token. - * - * @param clientToken new client token - */ - @Accessor(remap = false) - @Mutable - void setClientToken(String clientToken); -} diff --git a/src/main/resources/assets/authme/atlases/gui.json b/src/main/resources/assets/authme/atlases/gui.json new file mode 100644 index 0000000..e8afeda --- /dev/null +++ b/src/main/resources/assets/authme/atlases/gui.json @@ -0,0 +1,16 @@ +{ + "sources": [ + {"type": "single", "resource": "authme:widget/blank_button"}, + {"type": "single", "resource": "authme:widget/blank_button_disabled"}, + {"type": "single", "resource": "authme:widget/blank_button_focused"}, + {"type": "single", "resource": "authme:widget/microsoft_button"}, + {"type": "single", "resource": "authme:widget/microsoft_button_disabled"}, + {"type": "single", "resource": "authme:widget/microsoft_button_focused"}, + {"type": "single", "resource": "authme:widget/mojang_button"}, + {"type": "single", "resource": "authme:widget/mojang_button_disabled"}, + {"type": "single", "resource": "authme:widget/mojang_button_focused"}, + {"type": "single", "resource": "authme:widget/offline_button"}, + {"type": "single", "resource": "authme:widget/offline_button_disabled"}, + {"type": "single", "resource": "authme:widget/offline_button_focused"} + ] +} diff --git a/src/main/resources/assets/authme/lang/de_de.json b/src/main/resources/assets/authme/lang/de_de.json index 9f3df15..e1e5758 100644 --- a/src/main/resources/assets/authme/lang/de_de.json +++ b/src/main/resources/assets/authme/lang/de_de.json @@ -3,7 +3,6 @@ "gui.authme.button.auth.tooltip": "Hallo, %s!", "gui.authme.button.relogin": "Neu anmelden", - "gui.authme.error.credentials": "Falscher Benutzername oder Passwort!", "gui.authme.error.generic": "Etwas ist schief gelaufen! Bitte gehe zurück und versuche es erneut.", "gui.authme.error.timeout": "Zeitüberschreitung! Bitte gehe zurück und versuche es erneut.", @@ -25,10 +24,6 @@ "gui.authme.microsoft.status.mcProfile": "Hole dein Minecraft-Profil ab...", "gui.authme.mojang.title": "Mit Mojang (Legacy) anmelden", - "gui.authme.mojang.field.username": "Benutzername / E-Mail", - "gui.authme.mojang.field.password": "Passwort", - "gui.authme.mojang.button.login": "Anmelden", - "gui.authme.mojang.status.loggingIn": "Bei Mojang anmelden...", "gui.authme.offline.title": "Offline anmelden", "gui.authme.offline.field.username": "Wähle einen Benutzernamen", @@ -50,8 +45,6 @@ "text.autoconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS Autorisierungs-Url", "text.autoconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft Authentifizierungs-Url", "text.autoconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft-Profil-Url", - "text.autoconfig.authme.option.methods.mojang": "Mojang (oder Legacy)", - "text.autoconfig.authme.option.methods.mojang.lastUsername": "Zuletzt verwendeter Benutzername", "text.autoconfig.authme.option.methods.offline": "Offline", "text.autoconfig.authme.option.methods.offline.lastUsername": "Zuletzt verwendeter Benutzername" } diff --git a/src/main/resources/assets/authme/lang/en_us.json b/src/main/resources/assets/authme/lang/en_us.json index d22e90a..f4a0762 100644 --- a/src/main/resources/assets/authme/lang/en_us.json +++ b/src/main/resources/assets/authme/lang/en_us.json @@ -3,7 +3,6 @@ "gui.authme.button.auth.tooltip": "Hello, %s!", "gui.authme.button.relogin": "Re-login", - "gui.authme.error.credentials": "Incorrect username or password!", "gui.authme.error.generic": "Something went wrong! Please go back and try again.", "gui.authme.error.timeout": "Timed out! Please go back and try again.", @@ -14,6 +13,7 @@ "gui.authme.method.button.microsoft": "Microsoft", "gui.authme.method.button.microsoft.selectAccount": "Ctrl + click to choose account", "gui.authme.method.button.mojang": "Mojang (or legacy)", + "gui.authme.method.button.mojang.unavailable": "Unavailable, click to learn more", "gui.authme.method.button.offline": "Offline", "gui.authme.microsoft.title": "Login via Microsoft", @@ -30,10 +30,6 @@ "gui.authme.microsoft.warning.cancel": "Back to safety", "gui.authme.mojang.title": "Login via Mojang (Legacy)", - "gui.authme.mojang.field.username": "Username / Email", - "gui.authme.mojang.field.password": "Password", - "gui.authme.mojang.button.login": "Login", - "gui.authme.mojang.status.loggingIn": "Logging into Mojang...", "gui.authme.offline.title": "Login Offline", "gui.authme.offline.field.username": "Choose a Username", @@ -55,8 +51,6 @@ "text.autoconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS Authorization Url", "text.autoconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft Authentication Url", "text.autoconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft Profile Url", - "text.autoconfig.authme.option.methods.mojang": "Mojang (or legacy)", - "text.autoconfig.authme.option.methods.mojang.lastUsername": "Last Used Username", "text.autoconfig.authme.option.methods.offline": "Offline", "text.autoconfig.authme.option.methods.offline.lastUsername": "Last Used Username" } diff --git a/src/main/resources/assets/authme/lang/fi_fi.json b/src/main/resources/assets/authme/lang/fi_fi.json index b921b71..b3a6a8c 100644 --- a/src/main/resources/assets/authme/lang/fi_fi.json +++ b/src/main/resources/assets/authme/lang/fi_fi.json @@ -3,7 +3,6 @@ "gui.authme.button.auth.tooltip": "Hei, %s!", "gui.authme.button.relogin": "Kirjaudu uudelleen", - "gui.authme.error.credentials": "Väärä käyttäjätunnus tai salasana", "gui.authme.error.generic": "Jokin meni pieleen! Mene takaisin ja yritä uudelleen.", "gui.authme.error.timeout": "Aikakatkaisu! Mene takaisin ja yritä uudelleen.", @@ -25,10 +24,6 @@ "gui.authme.microsoft.status.mcProfile": "Haetaan Minecraft-profiiliasi...", "gui.authme.mojang.title": "Mojang (vanha)-kirjautuminen", - "gui.authme.mojang.field.username": "Käyttäjätunnus / sähköposti", - "gui.authme.mojang.field.password": "Salasana", - "gui.authme.mojang.button.login": "Kirjaudu", - "gui.authme.mojang.status.loggingIn": "Kirjaudutaan Mojang-tiliin...", "gui.authme.offline.title": "Yhteydetön peli", "gui.authme.offline.field.username": "Valitse pelinimi", @@ -50,8 +45,6 @@ "text.autoconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS-valtuutuksen osoite", "text.autoconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft-valtuutuksen osoite", "text.autoconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft-profiilin osoite", - "text.autoconfig.authme.option.methods.mojang": "Mojang (vanha menetelmä)", - "text.autoconfig.authme.option.methods.mojang.lastUsername": "Viimeksi käytetty käyttäjätunnus", "text.autoconfig.authme.option.methods.offline": "Yhteydetön", "text.autoconfig.authme.option.methods.offline.lastUsername": "Viimeksi käytetty käyttäjätunnus" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/authme/lang/fr_fr.json b/src/main/resources/assets/authme/lang/fr_fr.json index 53a6701..88bb35b 100644 --- a/src/main/resources/assets/authme/lang/fr_fr.json +++ b/src/main/resources/assets/authme/lang/fr_fr.json @@ -3,7 +3,6 @@ "gui.authme.button.auth.tooltip": "Bonjour, %s !", "gui.authme.button.relogin": "Reconnection", - "gui.authme.error.credentials": "Nom d'utilisateur ou mot de passe incorrect !", "gui.authme.error.generic": "Quelque chose n'a pas fonctionné ! Veuillez réessayez.", "gui.authme.error.timeout": "Temps d'attente dépassé ! Veuillez réessayez.", @@ -25,10 +24,6 @@ "gui.authme.microsoft.status.mcProfile": "Récupération de votre profil Minecraft...", "gui.authme.mojang.title": "Connexion grâce à Mojang (ou legacy)", - "gui.authme.mojang.field.username": "Nom d'utilisateur / Email", - "gui.authme.mojang.field.password": "Mot de passe", - "gui.authme.mojang.button.login": "Connexion", - "gui.authme.mojang.status.loggingIn": "Connexion à Mojang...", "gui.authme.offline.title": "Se connecter hors-ligne", "gui.authme.offline.field.username": "Choisissez un nom d'utilisateur", @@ -50,8 +45,6 @@ "text.autoconfig.authme.option.methods.microsoft.xboxXstsUrl": "URL d'authentification Xbox XSTS", "text.autoconfig.authme.option.methods.microsoft.mcAuthUrl": "URL d'authentification Minecraft", "text.autoconfig.authme.option.methods.microsoft.mcProfileUrl": "URL du profil Minecraft", - "text.autoconfig.authme.option.methods.mojang": "Mojang (ou legacy)", - "text.autoconfig.authme.option.methods.mojang.lastUsername": "Dernier nom d'utilisateur utilisé", "text.autoconfig.authme.option.methods.offline": "Hors-ligne", "text.autoconfig.authme.option.methods.offline.lastUsername": "Last Used Username" } diff --git a/src/main/resources/assets/authme/lang/pl_pl.json b/src/main/resources/assets/authme/lang/pl_pl.json index add22cf..95cb82a 100644 --- a/src/main/resources/assets/authme/lang/pl_pl.json +++ b/src/main/resources/assets/authme/lang/pl_pl.json @@ -1,57 +1,50 @@ { - "gui.authme.button.auth": "Autentykacja", - "gui.authme.button.auth.tooltip": "Witaj, %s!", - "gui.authme.button.relogin": "Zaloguj ponownie", - - "gui.authme.error.credentials": "Nieprawidłowa nazwa użytkownika lub hasło!", - "gui.authme.error.generic": "Coś poszło nie tak! Proszę wrócić i spróbować ponownie.", - "gui.authme.error.timeout": "Upłynął limit czasu! Proszę wrócić i spróbować ponownie.", - - "gui.authme.toast.greeting": "Witaj, %s!", - - "gui.authme.method.title": "Wybierz metodę logowania", - "gui.authme.method.greeting": "Witaj, %s!", - "gui.authme.method.button.microsoft": "Microsoft", - "gui.authme.method.button.mojang": "Mojang (lub stara metoda)", - "gui.authme.method.button.offline": "Offline", - - "gui.authme.microsoft.title": "Zaloguj przez Microsoft", - "gui.authme.microsoft.browser": "Możesz już zamknąć to okno i powrócić do Minecrafta!", - "gui.authme.microsoft.status.checkBrowser": "Proszę sprawdzić przeglądarkę...", - "gui.authme.microsoft.status.msAccessToken": "Pozyskiwanie tokenu dostępu Microsoft...", - "gui.authme.microsoft.status.xboxAccessToken": "Pozyskiwanie tokenu dostępu Xbox...", - "gui.authme.microsoft.status.xboxXstsToken": "Pozyskiwanie tokenu XSTS Xbox...", - "gui.authme.microsoft.status.mcAccessToken": "Pozyskiwanie tokenu dostępu Minecraft...", - "gui.authme.microsoft.status.mcProfile": "Pobieranie Twojego profilu Minecraft...", - - "gui.authme.mojang.title": "Zaloguj przez Mojang (stara metoda)", - "gui.authme.mojang.field.username": "Nazwa użytkownika / Email", - "gui.authme.mojang.field.password": "Hasło", - "gui.authme.mojang.button.login": "Login", - "gui.authme.mojang.status.loggingIn": "Logowanie do Mojang...", - - "gui.authme.offline.title": "Zaloguj offline", - "gui.authme.offline.field.username": "Wybierz nazwę użytkownika", - "gui.authme.offline.button.login": "Graj offline", - - "text.autoconfig.authme.title": "Konfiguracja Auth Me", - "text.autoconfig.authme.option.authButton": "Przycisk Auth", - "text.autoconfig.authme.option.authButton.x": "Pozycja X", - "text.autoconfig.authme.option.authButton.y": "Pozycja Y", - "text.autoconfig.authme.option.authButton.draggable": "Można przesuwać?", - "text.autoconfig.authme.option.methods": "Metody logowania", - "text.autoconfig.authme.option.methods.microsoft": "Microsoft", - "text.autoconfig.authme.option.methods.microsoft.prompt": "Powiadomienie o interakcji", - "text.autoconfig.authme.option.methods.microsoft.port": "Port Url wywołania zwrotnego OAuth2", - "text.autoconfig.authme.option.methods.microsoft.clientId": "ID klienta OAuth2", - "text.autoconfig.authme.option.methods.microsoft.authorizeUrl": "Url autoryzacji OAuth2", - "text.autoconfig.authme.option.methods.microsoft.tokenUrl": "Url tokenu dostępu OAuth2", - "text.autoconfig.authme.option.methods.microsoft.xboxAuthUrl": "Url autentykacji Xbox", - "text.autoconfig.authme.option.methods.microsoft.xboxXstsUrl": "Url autentykacji XSTS Xbox", - "text.autoconfig.authme.option.methods.microsoft.mcAuthUrl": "Url autentykacji Minecraft", - "text.autoconfig.authme.option.methods.microsoft.mcProfileUrl": "Url profilu Minecraft", - "text.autoconfig.authme.option.methods.mojang": "Mojang (stara metoda)", - "text.autoconfig.authme.option.methods.mojang.lastUsername": "Ostatnia nazwa użytkownika", - "text.autoconfig.authme.option.methods.offline": "Offline", - "text.autoconfig.authme.option.methods.offline.lastUsername": "Ostatnia nazwa użytkownika" + "gui.authme.button.auth": "Autentykacja", + "gui.authme.button.auth.tooltip": "Witaj, %s!", + "gui.authme.button.relogin": "Zaloguj ponownie", + + "gui.authme.error.generic": "Coś poszło nie tak! Proszę wrócić i spróbować ponownie.", + "gui.authme.error.timeout": "Upłynął limit czasu! Proszę wrócić i spróbować ponownie.", + + "gui.authme.toast.greeting": "Witaj, %s!", + + "gui.authme.method.title": "Wybierz metodę logowania", + "gui.authme.method.greeting": "Witaj, %s!", + "gui.authme.method.button.microsoft": "Microsoft", + "gui.authme.method.button.mojang": "Mojang (lub stara metoda)", + "gui.authme.method.button.offline": "Offline", + + "gui.authme.microsoft.title": "Zaloguj przez Microsoft", + "gui.authme.microsoft.browser": "Możesz już zamknąć to okno i powrócić do Minecrafta!", + "gui.authme.microsoft.status.checkBrowser": "Proszę sprawdzić przeglądarkę...", + "gui.authme.microsoft.status.msAccessToken": "Pozyskiwanie tokenu dostępu Microsoft...", + "gui.authme.microsoft.status.xboxAccessToken": "Pozyskiwanie tokenu dostępu Xbox...", + "gui.authme.microsoft.status.xboxXstsToken": "Pozyskiwanie tokenu XSTS Xbox...", + "gui.authme.microsoft.status.mcAccessToken": "Pozyskiwanie tokenu dostępu Minecraft...", + "gui.authme.microsoft.status.mcProfile": "Pobieranie Twojego profilu Minecraft...", + + "gui.authme.mojang.title": "Zaloguj przez Mojang (stara metoda)", + + "gui.authme.offline.title": "Zaloguj offline", + "gui.authme.offline.field.username": "Wybierz nazwę użytkownika", + "gui.authme.offline.button.login": "Graj offline", + + "text.autoconfig.authme.title": "Konfiguracja Auth Me", + "text.autoconfig.authme.option.authButton": "Przycisk Auth", + "text.autoconfig.authme.option.authButton.x": "Pozycja X", + "text.autoconfig.authme.option.authButton.y": "Pozycja Y", + "text.autoconfig.authme.option.authButton.draggable": "Można przesuwać?", + "text.autoconfig.authme.option.methods": "Metody logowania", + "text.autoconfig.authme.option.methods.microsoft": "Microsoft", + "text.autoconfig.authme.option.methods.microsoft.prompt": "Powiadomienie o interakcji", + "text.autoconfig.authme.option.methods.microsoft.port": "Port Url wywołania zwrotnego OAuth2", + "text.autoconfig.authme.option.methods.microsoft.clientId": "ID klienta OAuth2", + "text.autoconfig.authme.option.methods.microsoft.authorizeUrl": "Url autoryzacji OAuth2", + "text.autoconfig.authme.option.methods.microsoft.tokenUrl": "Url tokenu dostępu OAuth2", + "text.autoconfig.authme.option.methods.microsoft.xboxAuthUrl": "Url autentykacji Xbox", + "text.autoconfig.authme.option.methods.microsoft.xboxXstsUrl": "Url autentykacji XSTS Xbox", + "text.autoconfig.authme.option.methods.microsoft.mcAuthUrl": "Url autentykacji Minecraft", + "text.autoconfig.authme.option.methods.microsoft.mcProfileUrl": "Url profilu Minecraft", + "text.autoconfig.authme.option.methods.offline": "Offline", + "text.autoconfig.authme.option.methods.offline.lastUsername": "Ostatnia nazwa użytkownika" } diff --git a/src/main/resources/assets/authme/lang/zh_cn.json b/src/main/resources/assets/authme/lang/zh_cn.json index 7dae25e..48574db 100644 --- a/src/main/resources/assets/authme/lang/zh_cn.json +++ b/src/main/resources/assets/authme/lang/zh_cn.json @@ -3,7 +3,6 @@ "gui.authme.button.auth.tooltip": "欢迎回来, %s!", "gui.authme.button.relogin": "再次登录", - "gui.authme.error.credentials": "用户名或密码错误!", "gui.authme.error.generic": "出现了一些问题! 请返回再重试一遍.", "gui.authme.error.timeout": "超时! 请返回再重试一遍.", @@ -25,10 +24,6 @@ "gui.authme.microsoft.status.mcProfile": "正在获取您的 Minecraft 账号信息...", "gui.authme.mojang.title": "通过 Mojang (早期账户) 登录", - "gui.authme.mojang.field.username": "用户名 / 邮箱", - "gui.authme.mojang.field.password": "密码", - "gui.authme.mojang.button.login": "登录", - "gui.authme.mojang.status.loggingIn": "登录到 Mojang...", "gui.authme.offline.title": "使用离线登录", "gui.authme.offline.field.username": "输入用户名", @@ -50,8 +45,6 @@ "text.autoconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS 验证 接口连接", "text.autoconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft 验证接口连接", "text.autoconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft 账户信息接口连接", - "text.autoconfig.authme.option.methods.mojang": "Mojang (早期账户)", - "text.autoconfig.authme.option.methods.mojang.lastUsername": "最后一次使用的用户名", "text.autoconfig.authme.option.methods.offline": "Offline", "text.autoconfig.authme.option.methods.offline.lastUsername": "最后一次使用的用户名" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/authme/lang/zh_tw.json b/src/main/resources/assets/authme/lang/zh_tw.json index 6982cba..f2b8143 100644 --- a/src/main/resources/assets/authme/lang/zh_tw.json +++ b/src/main/resources/assets/authme/lang/zh_tw.json @@ -3,7 +3,6 @@ "gui.authme.button.auth.tooltip": "您好，%s！", "gui.authme.button.relogin": "重新登入", - "gui.authme.error.credentials": "使用者名稱錯誤或密碼錯誤！", "gui.authme.error.generic": "有些東西出錯了！請返回重試。", "gui.authme.error.timeout": "已逾時！請返回重試。", @@ -30,10 +29,6 @@ "gui.authme.microsoft.warning.cancel": "回到安全", "gui.authme.mojang.title": "透過 Mojang 登入（舊版）", - "gui.authme.mojang.field.username": "使用者名稱／電子郵件", - "gui.authme.mojang.field.password": "密碼", - "gui.authme.mojang.button.login": "登入", - "gui.authme.mojang.status.loggingIn": "登入至 Mojang...", "gui.authme.offline.title": "離線登入", "gui.authme.offline.field.username": "選擇使用者名稱", @@ -55,8 +50,6 @@ "text.autoconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS 授權 Url", "text.autoconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft 驗證 Url", "text.autoconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft 個人資料 Url", - "text.autoconfig.authme.option.methods.mojang": "Mojang（或舊版登入）", - "text.autoconfig.authme.option.methods.mojang.lastUsername": "最後使用的使用者名稱", "text.autoconfig.authme.option.methods.offline": "離線", "text.autoconfig.authme.option.methods.offline.lastUsername": "最後使用的使用者名稱" } diff --git a/src/main/resources/assets/authme/textures/gui/session_status.png b/src/main/resources/assets/authme/textures/gui/session_status.png new file mode 100644 index 0000000000000000000000000000000000000000..7df3ff2f230ec4a846f52444007f332a99eb3f8e GIT binary patch literal 1045 zcmaJ=U1-x#7!3-p4ksvrIzg`)3oAxXNCZCU_HGzL<9wWao%)o=YutHbALGJeCPY_cTdMV z4%AfFR#OyJ6K#_cWZp)G%e9XD-(PJ}$g~|tQn(ZK;+$+jDx{(`1W{eizyy@lk-?X+ znWEO#YsnN&#SV%J(iz#oFnQf1Y>H}b$(yp$4>3r?jAjJsuMZy6KvRQsmp8`6%rMMq zZKD?K9PLOdqy0)irCaua=DbJ*bckh;*9Qz+%m?X$u1MC-F-wC21osE&6;r8L9E6bt zL4e^J6^`S85MWfe3R(qL{0$3k0t>vwO33?t;KL;7o@Wo zn%vHwGLy^OYT0Cot^F;-ZCG)efa6ZoF<(ShHmu@UR-jW zTH_KHX6o-wJzIPouiAO`-)x@oeA;#0GilS4W9`=X!$;|R yWAjrxj?PZrxcucv?$?j1iMPh`JNr`ZNy9v~>8JeS)h%J%d8pAyhjeFu&+$K6MOjw> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button.png b/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button.png new file mode 100644 index 0000000000000000000000000000000000000000..f693d89e70ca8c57e598a1a15b639ea1331b116f GIT binary patch literal 1153 zcmaJ=U1$_n6rK{PAtnzE8Zi%LI%(BNcmCGRcBWa=xU-vVl3n9CCQAar$;{1Wnw`1h z%w2ajOREMSA}T1Dpc1j75Li@LC{+Bx2T|-pZKP<6pgvRtAEYl;L9p$en2mktc3|e7 zdpX~CzH`qv2m4c94Ry_R1VJ<;x+NK}tNpjO27j*%zUaWqIuuKz9dHcgRR<8AIvfRL z!c;Rr2C81z{Uc~6h?@0=l1AxdpQu5TR{b2>Gi{6}i1rT8R<#L$$Wf3ntO)hT)f*IP z=n-l#lw^~36pS0)lMdK1nNqaL2~E(cjxA)nCt?B`N$e^G8!$3( zVb0O;?8aLBQnna%fQq1_K$xvuWdArs&>e?1$#14Pa^s+3=`ioME&`HCF=4q#wKR~B zA{3^e4MP`sDHvqK64%z*#&cXOCdAvqQaBU}hT?6}FZit$tOT{32`p5>>hH09Rjh9Z z)5eu0;23*=9(SNgF7_-MRkcLpRr!{%dUY*qRV;(WF#cr!HR;L`wvQh!TNiJZ%?~W> zcn4d1&F%7I{96e9eM(H0Wkpd8!^q`w>2!L2ejWgjN~Ma$qUU)-Lqj7YBaY(?3=EV? zCEK>M*(`=a2p{e5d4r=138_=@9%hgBHr`}wqh)Qw+po4?{##vjB5`%P>DALCpH4r& z_R;Ax3v*|Bn-*rjyEEMSN#kd~)n6Cpnr8KVYFF>Pxbue2xmDg;W z?%7mqt-JJR^T)5tA4X<=|7GI%*}Zpb-)#Bz@KmWRuY6?<-)@=i%Y^umZ(5%{K^Jd* z`Ss6*pLV@G)%DludK0_kBQ|Jhzr=2(%ZlZXyv& KNtd?nn)(N}Gl9hb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_disabled.png b/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..3eb0efdf423c58a614058fa5348b20a1b03b0576 GIT binary patch literal 1079 zcmaJ=OH9;27_O3t65s$H1Vd6wAd+?aVjr}!B5W5~!op_RgpDSI($4NSOFOk4+`_?w zdLiL}io}C4QDX=f4ql9}5Kk(eG@c0I;)z6j5H6xdr?3kiT${A>&&>aQ|Mx#S74JV+ zRZ(9-5JXk9M@r!JsQVr+!{4Vv8y$G5Ly;63glUwQEkJata1@YHUCw|6kkyHcZ$LXi zlr?L~6iUVVL*$+W3m6c>iV9yjS^sA?>~v{7%4E)o&C13@Y1_qY1H1K~EltB94LGOhyy6|w3*Rw#*e$3Zu7WC>W>C7^a&P$zeC z7PZn^0wwthShcj4U`Z^4#V~GX|LSz{2#=3z?u{G~G;DtUnmbe%V17P+SGIPr Yl9=B*a{73BWEIOHqLF@Sv1{bYAJ3#*@Bjb+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_focused.png b/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_focused.png new file mode 100644 index 0000000000000000000000000000000000000000..f916abab2eceaae365286b2b0d867a4413f739b6 GIT binary patch literal 1153 zcmaJ>U1-!;7|q&My0X=xLj8dyM3gEvf76*U*-lHH%;=~ymNd3QDWz$0r<3g@H%;z1 zX=|BfWnq0&p|ULKlZXsu+pT?_P_4J!wwWnqh6Rn1=RsWw+=@DnK0E+ zAOlsO7+(M#1kte9P|_%!JT7X`q*Wh7d!~)q1kusu*{U`M5IF)y4J$&uy>*u&4Lw5j z2a{~lj)JUlWYPh>lPN`;9Mc4y>gpsrJP`|+0I8&B<}6qABGjs`i0A$`Ly@ZxG!~&g zno1{o$S8CGDbQ@2#_2$e<178#~cDA0uf4V_Vj69j=_d0zt~+S~~Xsa~7q?yf3Gz||bXMh3J@RRt!K{|`0I8rnrN_|NZWg;zGd^^pNt^J0j!-BhSm5@w|3Cl&QrGbPLp|AvP z7`n(y0U;l&vCJs5D$f=a4;AM#zWDA{GlpWf?D1L7OHaf8dqZLa{YENZ5&ww zj&Ta;aR-{@YR;lj--}dNZ;h+h^%9NMzP>(LmW##W;NW1nT=qQA zahyt}lF#SIe>{Hzi_9jZZpB;5oqN9N4EuHTsr<^C+gqvpcI-*%dBes1&(6I5^3R*+ z2S=~1xC`r+n&(b`vuF8o>q2Jsk6*v#j>UIwe)N-8m~Y%ZY#w}hVNdx*`=!5D=I`A9 z>h`r%_;y|_F1>&D@cUiO{nxqX;$q{!oo}*RA6%TB=_qk8Q#Z8fb%D-zxi@#NYJc}F zM&AAM#kqgT4c#Y)O0lC8Elt9e@1{aC)Rrs8`^USc*Ka3gT3h&^!Mzp#r;v!Hr1GKR GA3gx}K znYOe^kOi7CTi5`-1Q9xFsyURCPYF7-Xf4R0eapdUg6K{9j;2ooM2>?=(@szizxtXY zO(Q{#L}gZXQeetFIp>0*IYrgyrgh$+lE=wjU%&(wKpN>=dD|2G1hvI0;B|1!P~=t$ znodwpMdjoSnSw4Ld72IDEX$H{o;I{@Ee@h!;ti5xIgW`$7>)}^x`ZezuyJzxp>RRh zm=Ln!z;-#jOHfk?IRe9!N+r6~MMHOziSRtnuw1}_Gs51ijWj=Odq0mj6H1vUajPlm*Z9{wJ}g&N_g} z0uL5l9nWs!NKncVQZCRCbX5rR&5O)TK?J=i=#X4D9U+g6n6?2+Ugs7-mW8zKAKrIy&h z4wi!}i@-H!fHB}gi`?p2Fk5TsZ^^ffHCk&)wZt-53=>TDxk)#VuziB%j&<>7$Na#? zj(4%O8+UH&__t6pr&Os{tEsA5EEZkY&E;~-%ggn8y;7+tiej230KoVC`T6;=v9Zz7 z(WRxOY&PpS&hYSXKA&G%S!pyHk|aS07Z(>X<=L6OLpXe%7W-8HZvMTW_PtHMD1Nzi zo~hn=`N=zaI=w4xA{dC;l|%YWhCCqHg}H#4rpu5}jP41e?ZN!!}S i-A0@JaJKdV5h8wj|KNw8E%1L~{X|+)#MS zYPFH+z#Zu=l7>uH^>WyvX%jR>HN=Xxs&zpOvar*zqV(q*w`gGKQMx^t=F@f)%p1*p z4s7dd$!L9DT12N~8$d%*A_OMHDkz%WmMayb^c1f|V(*xv!Bh(FiqgMDb);KC6LKJk zusoyjJP*PVR#yXR7zSZ(9T0g@3UoC00c<7i}dxs_fiTWWHk zijk8+sJncTt$Bozn@2Vf1FQhnv>TR=3a)PokWNb}%f+gt!IT`O2?c8yx+Kc}NKlsj zp?F9XghV2e429)zFz62^Lrv?&#xhn$T8{}WT*m5uuz`wL&km+dD$CF@_CP)9AQMdW zEE$!x2o?FJv3g}KVnr-R#BknZ|C)69h}g#qXRJ#$Gv|B1OlU@qYT5aEIT*KZZS=_DFX$?;6_ zS@+hD1PA7rgQtQHdM#y+T8fjzN`t3 zKhHeb`QXFN=#^PleRX$DRCVml;}>7XMi2MSxlmopZ6A8|w$yemetp%U2ow>Dd+k&s3m^;f)%&w;T&n}ucz5n1R PB9KZYTIBPMyAJ#U2pw=o literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_focused.png b/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_focused.png new file mode 100644 index 0000000000000000000000000000000000000000..d8ecc30180c3585d055472a8ca66ddae3bceedb8 GIT binary patch literal 1287 zcmaJ>e@q)?7`_GnV9dp2E-YJ2JPre>aCg1ZcD>LwtXEvKU9F`;R||6Oeb5WN`_8*7 zJz$Zb@z;z@-9%+1TOclx30sy7=cd^Y7ls@25C3r4h{hk;;-W+ykR^_#e#a>DkKrYE z-;X@c^FHtUz2ChR3O=*8Xj2h}VQT~1xG);mTW?_j`kri@@uFd);g1^iu+_*48o+8r zm;iV{7TQ1<2x8|;-+&qnD=3p9Q6tLlV3SZL1q(x(vWnOkR^v5QA=wTLJOSDy#Y6mg z>NJ5%qK9a7@HDUbKuX%yrGfgcU?kbqo^*?ZcMD!)vPeJ%hJc%LTG3h4LoDjDXl`v& z1ilC{+C9WQQ&B#I`=ADJH%V6|X`04eZc-Gg1s8CD)=HeA8HTdiD2A!B*;xn8(k^`I zAy7a~Y-Ph--BLKT@(?M*P+5w~X0v40PC~7Xvbo)Eie@Yggs9Rx6+$lIZMOORZ2U>(hW>KrI4cI$y|83K~#PK^14JNgH0#C@CV$>Q62bc%BU? zx*;e@5a2unk{~5XWEsxxWZbmNS?gqMHoxCp=X7x{hr{lubNV(jTk~8FCNnZnj67Go z&)vKt*J=k@MUgq6NgY6})1Ztm=FCbD_F|_|^cD4%xZ=uQoGWrEWQMX%_CF_`-$LzU zO_y62EtZ=fD5&E#)Y=DUZcL+V@lI$*#2<^rqS0vXx6$u!j_wvQY-ewGclYQo|GfJ2 zx;qz6_yN}3+&nTe(mzqDs%q{6U2^nq2qAs^)?C`3PN#EUmmHY#<}P`?r)KAO?Tkbs z!yVYX9vrk657>))dV0bpHrwKCXlMWcV5yJZKC>Yl4nNm{VbXwUnwqA?XFtPnp?8W2E_Jv>P=AR9)Lo`!(zPkLwi>}i8 zKK14PH!h$2Y0LDH@il6^yzPrN4}W#>M35}&-M1j0USFifD+10I&m()T@l(d3 z5J%i-I=`viJNi)M*qgb(5}(=5nyYW`Ie`wrP9M7zu)L2 z(4$meD9xtrI2bYZk2~Ptct+92M>RpGx?UhVJrN6-0I8&B7A#lvqSU&sh;9Fvp~!Uz z8jVs9gUY3|WE?tx6lgY}u`EkQ1X@@3sSywY`R7TV<#~qV7@iMsK{3RNY=qo+DD2SD z^P(&zH{9V}lo~ zN?{4wFm#cZf^19@xNvuv=eR^dNQNU)BoqpUlHqs{$YiaRlf|2b$!1&Z1E_mX2gyy$!BjKNhwwm%+g>erNyH>Dmzx-jDZ+!fCW82nucOM^UmF9OMBdejO*IwPy^GvC7;qu?xIvVEDnaNX!KIu^| zUFz9UzE)kRE>$jm|IO)>kHsDw{$To8`{Jj6o@l+_JV>-WAY<=bPx`+mB9+KUpT!0z F{{eQxpoahe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_disabled.png b/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..6d31dd02a8e096856d2699ac99489d39e2b0b2ee GIT binary patch literal 1140 zcmaJ=TTC2P7#>p|ECmxA5?lK+8H7M!u6tu9tXy_>+clkavuw&fw8mlPEIV0d&Ny>m z7kH2u4f3`Xi6NMDO9F2aYkl!Tcv#X)Xi|eMM#6(JhNl|En2@N5XMjZ?z)5D#e@_1I z`@jGE-%KSFm+Na^t|bVfK7K_`;kChgpFe}YU-tjpg_nycnn8Uqiwdd(h#nmd05Wc> zgCGS|ee|t|ppziZG#lv*$|zSQ4VsMV?+!-mIsI&0E31VrhfTqg(3|- zO!Ws8PO&2(XIvR`K;Kv*t&Qb1QK!0IB|D1}CNKd~$)Y)Axl%Dq9q>vx_KsPKJV-(L zFm)&@qa?`)bO0$b9IbI2M}|a3SN&=T1VFZ(6gWX(d7c#nn)gWoPU1r3(L>>aj-HiL za_p!a-i4_gLbk-Rg+hTT_!#I6vb-pYEGKvzID>XaEuzB9I{+APm-URTvbMfv|!(>%_0Q40L4_e5ehJ!%6s1zb4n zXn1znMz54DMI4|a=%gVWs$OI=2N860&?W^x!;>xjhNZ)T+j;;{6e(`GNVPN&m%|jM zU<^Z-1lcDBWH}V<2?{(Pjf$~gNDc)8zCbJ(=@5FWSQ%==Ca_Qys~=)}gK~sF73FH9bluD&$W@hH+=bM_Ec%Gk~o%Q?uG)*%M6OBeU zHa1#YTQR7ut!;Vz&+l-w5SM$>#m%8){Dlfx_ip#x#@g!s+valVr*AU7Wi^<)U-`UJ z7kiX_Hu-T)zWcqK^dg&B{l1%jaraK;*Lxq_UD|29M89sj`MV+I>2FV%Na*5?%L|h? zgLkg8U$lv9=(UzaX=JZ`yScnqd%ok`?T+!qh9Ar0&Vz^JgA*T}eXM`B`^iM@*Xxt7 zyuY>f?cDa<>~nv-vGV)wtsQD>|Jo0gziKWJ@`nw7JDV>xV!=c_nvj=z-+bpEEk}Yp literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_focused.png b/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_focused.png new file mode 100644 index 0000000000000000000000000000000000000000..b485154cd0f4ee7a843ecaa442059abae5feddeb GIT binary patch literal 1190 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQak|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!ovKsVXIz(B#=QZFUZ zB+)$8G&M~}!N|bKNZ-&<-^fVU(Adh z^~=l4^~#O)@{7{-4J|D#^$mG8yO|S-EUn|eN;*!L?`- z;`%u?HzFb;Dk>^2F7Bgm*s4{lW+KtDJUq&&(9AD2}w;&4GIdXudfda z3;PrlQ&CY76BE-Yt+;O8x}u_@UwaS!|NpQZhu`51QcJhV0`=uS6Cer8SGKaB= zb>;DF>!qi)c3LlOHEIcJx)ge1?u4+4EN1_uzLyrpU193(XP}Jo%#-P1a?#~CFhtEJIho`Hb%Q~loCIHszlJx)p literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button.png b/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button.png new file mode 100644 index 0000000000000000000000000000000000000000..ec3f32d726869fcd91d549be5cd8c2ee47654f42 GIT binary patch literal 1185 zcmaJ=U1$_n6dp()tPn{>!3Lqjqz#JQ`P*!^J7f*X&cv){rs-x#wh3-KnYp_=WM}U5 z&fV@L5fl|P2}nvn1p5%SXdtnLAhghm)&~_qTBL1=Mz9YleQ2dnC>E^HJ24ykkaS?? zo_jgpcfNDaHxs?uq5AEO+bN2wPj|~1vhE7sZFS`P^}v&Mvb>I!EbfDOTrm)!IxIL0 z=(J-LKn57r=tp-!8%5PM+jrrNUOCEJOuPNF)**FNPc>BjS&`*a#x7-&A9efo~$)!!~s3 zkkJ^1Wt?P)*cV+m-UhAfuiq58GcGVZPGI@4t6HL}{(q|DY-Ia5177Ogl-SotJ-}sv z56j3Tv&%Pyr93HxfPo>>AuQD{vbP8^^o!7=#THhe_YK&t1uOpkHGry0Y1hYwYl5_# zWC#Uo+mQxJKa;K<5&MMUhIPqi z!~DP{jz`4W^9%dG zqi)sTS3jvibTyb)6<+o++^Y?G&&OFe*y!dS5#G~i;zTI2MPs-87 rODX=w2NO-Vif=AH|9G;25YP zh{YR?R3mDXcM2LbY1PZ2Gp3Ev1W{F;u~n@dAhHRx7*>?}`ec+M4LwRV1Z7sXW1!Wj z>v6#Dp8Ay5)2>Bys(Kq)l@Tz336M%=%nr*HGEr)lSHQ7%%uwWP3Tls1bD|pMBpHJa zAR{#E(^!@z!x36n18NuqLGu=pXL+9CIELqaoL>mC0vjgh9|{+A^kzX3z8HB0Wa633j3=g~iTw zVcH9{mOFn__|BM&YBLW9rn!*qA_e@>`%hvw)olYt0WR!xG(5ZJ4PGf* zh&ez-&`Ckqk-NxbD@4$3g*M3tXpY>}U|2d#yA`tlSr!tOi&RSk2{B4x3feGqffxO? zAu$#R)r5GClcY#I6c)q5pg$N7#kTUbIjjh^P7_!tht>aJgL$!@9ZVZn7J*}Q0X^*c!@ea23lL^tqzXhAz znUWMm2?PS!Y?kA=zP`Tl^76sK!QS59fq?;^&o?+V&%hG%}gUpaktpH+5x=$s;diCxbYNd2ky!Ncp86koPC7nYp5 zdFa}a_dl0^I32muKT!<(?^mr_?|i;+@yedj?^D*1$JZaAGao0~_74@kT63!l)$QH! zR@=O^Vf=R6Rckzc;*)iEWc7{*Pq#h1_vpsE(&_B8*V>OudlrrTJU=t@?Yner{Ke7X Zg0;lkmqpx2*^m#*Bob1+c&GNj;omDzdAa}q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_focused.png b/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_focused.png new file mode 100644 index 0000000000000000000000000000000000000000..2d638b87dc9178a4a539cf82ce2dbc856ae15166 GIT binary patch literal 1215 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 N002ovPDHLkV1i2Wf;<2K diff --git a/src/main/resources/authme.mixins.json b/src/main/resources/authme.mixins.json index 95ba9b2..0d1d626 100644 --- a/src/main/resources/authme.mixins.json +++ b/src/main/resources/authme.mixins.json @@ -11,9 +11,8 @@ "MinecraftClientAccessor", "MultiplayerScreenMixin", "RealmsGenericErrorScreenMixin", - "RealmsMainScreenAccessor", - "SplashTextResourceSupplierAccessor", - "YggdrasilAuthenticationServiceAccessor" + "RealmsAvailabilityAccessor", + "SplashTextResourceSupplierAccessor" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index b063a6c..183e90f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -35,7 +35,7 @@ ], "depends": { "java": ">=17", - "minecraft": "~1.20", + "minecraft": "~1.20.2", "fabricloader": ">=0.14.18", "fabric-lifecycle-events-v1": "*", "fabric-resource-loader-v0": "*",