diff --git a/gradle.properties b/gradle.properties index 0e0bdd3..38970d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,22 +7,22 @@ mod_version = 8.0.0+1.20.2 ## {x-release-please-end} # Fabric -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 +minecraft_version = 1.20.4 +loader_version = 0.15.1 +yarn_mappings = 1.20.4+build.1 +fabric_version = 0.91.2+1.20.4 # Dependencies -cloth_config_version = 12.0.109 -mod_menu_version = 8.0.0 +cloth_config_version = 13.0.114 +mod_menu_version = 9.0.0-pre.1 -checkstyle_version = 10.12.4 -jetbrains_annotations_version = 24.0.1 -junit_jupiter_version = 5.10.0 +checkstyle_version = 10.12.5 +jetbrains_annotations_version = 24.1.0 +junit_jupiter_version = 5.10.1 # CurseForge cf_project_id = 356643 -cf_game_versions = Fabric, Java 17, 1.20.2 +cf_game_versions = Fabric, Java 17, 1.20.3, 1.20.4 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.2 +mr_game_versions = 1.20.3, 1.20.4 mr_relations_required = P7dR8mSH mr_relations_optional = mOgUt4GM mr_relations_incompatible = 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 c91b146..f6b4267 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 @@ -241,10 +241,10 @@ protected void onDrag(double mouseX, double mouseY, double deltaX, double deltaY } @Override - public void renderButton(DrawContext context, int mouseX, int mouseY, float delta) + public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) { // Cascade the rendering - super.renderButton(context, mouseX, mouseY, delta); + super.renderWidget(context, mouseX, mouseY, delta); // Render the current session status final int u; 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 eb36239..70b1484 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 @@ -65,11 +65,7 @@ public static void setSession(Session session) // Re-create the user API service (ignore offline session) UserApiService userApiService = UserApiService.OFFLINE; if (!OFFLINE_TOKEN.equals(session.getAccessToken())) { - try { - userApiService = getAuthService().createUserApiService(session.getAccessToken()); - } catch (AuthenticationException e) { - LOGGER.error("Failed to verify authentication for new user API service!", e); - } + userApiService = getAuthService().createUserApiService(session.getAccessToken()); } ((MinecraftClientAccessor) client).setUserApiService(userApiService); 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 c525806..b160663 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 @@ -108,7 +108,7 @@ protected void init() TexturedButtonWidget mojangButton = new TexturedButtonWidget( width / 2 - 10, height / 2 - 5, 20, 20, MOJANG_BUTTON_TEXTURES, - button -> ConfirmLinkScreen.open(AuthMe.MOJANG_ACCOUNT_MIGRATION_FAQ_URL, this, true), + ConfirmLinkScreen.opening(this, AuthMe.MOJANG_ACCOUNT_MIGRATION_FAQ_URL), Text.translatable("gui.authme.method.button.mojang") ); mojangButton.setTooltip(Tooltip.of( 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 e020964..5d38c72 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 @@ -119,7 +119,7 @@ protected void init() SessionUtils.setSession(session); // Add a toast that greets the player SystemToast.add( - client.getToastManager(), SystemToast.Type.TUTORIAL_HINT, + client.getToastManager(), SystemToast.Type.PERIODIC_NOTIFICATION, Text.translatable("gui.authme.toast.greeting", Text.literal(session.getUsername())), null ); // Mark the task as successful, in turn closing the screen 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 6b2c1db..bd18eb1 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 @@ -100,7 +100,7 @@ public void login() // Add a toast that greets the player SystemToast.add( - client.getToastManager(), SystemToast.Type.TUTORIAL_HINT, + client.getToastManager(), SystemToast.Type.PERIODIC_NOTIFICATION, Text.translatable("gui.authme.toast.greeting", Text.literal(usernameField.getText())), null ); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 183e90f..40390af 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.2", + "minecraft": "~1.20.3", "fabricloader": ">=0.14.18", "fabric-lifecycle-events-v1": "*", "fabric-resource-loader-v0": "*",