From 100e3909512b24f5d8e32be4f40d8ffb6b8810cd Mon Sep 17 00:00:00 2001 From: Jonathan Hiles Date: Mon, 10 Feb 2025 18:33:36 +1000 Subject: [PATCH] feat!: add NeoForge support (#130) BREAKING CHANGE: The mod now produces both a Fabric and NeoForge distribution via Architectury and configuration via Resourceful Config. Release-As: 9.0.0+1.21.1 --- .editorconfig | 21 -- .gitattributes | 15 ++ .github/ISSUE_TEMPLATE/config.yml | 3 + .github/labeler.yml | 5 + .github/workflows/build.yml | 30 ++- .github/workflows/labeler.yml | 2 +- .github/workflows/release-1.19.4.yml | 72 ------ .github/workflows/release-1.20.2.yml | 72 ------ .github/workflows/release-1.20.4.yml | 72 ------ .github/workflows/release.yml | 93 +++++-- .gitignore | 76 ++---- LICENCE.txt | 2 +- README.md | 6 +- build.gradle | 237 +++++------------- common/build.gradle | 26 ++ .../me/axieum/mcmod/authme/api/AuthMe.java | 47 ++++ .../me/axieum/mcmod/authme/api/Config.java | 143 +++++++++++ .../api/gui/screen/AuthMethodScreen.java | 160 ++++++++++++ .../authme/api/gui/screen}/AuthScreen.java | 24 +- .../api/gui/screen}/MicrosoftAuthScreen.java | 77 +++--- .../api/gui/screen}/OfflineAuthScreen.java | 85 +++---- .../api/gui/widget/AuthButtonWidget.java | 81 +++--- .../mcmod/authme/api/util/MicrosoftUtils.java | 75 +++--- .../mcmod/authme/api/util/SessionUtils.java | 118 +++++---- .../authme/mixin/DisconnectedScreenMixin.java | 105 ++++++++ .../mixin/JoinMultiplayerScreenMixin.java | 48 ++-- .../mcmod/authme/mixin/MinecraftAccessor.java | 38 +-- .../mixin/RealmsAvailabilityAccessor.java | 6 +- .../mixin/RealmsGenericErrorScreenMixin.java | 47 ++-- .../mixin/ReportingContextAccessor.java | 10 +- .../authme/mixin/SplashManagerAccessor.java | 10 +- .../main/resources/architectury.common.json | 3 + .../resources/assets/authme/atlases/gui.json | 0 .../resources/assets/authme/lang/de_de.json | 36 +-- .../resources/assets/authme/lang/en_us.json | 41 +-- .../resources/assets/authme/lang/fi_fi.json | 36 +-- .../resources/assets/authme/lang/fr_fr.json | 36 +-- .../resources/assets/authme/lang/pl_pl.json | 36 +-- .../resources/assets/authme/lang/zh_cn.json | 100 ++++---- .../resources/assets/authme/lang/zh_tw.json | 36 +-- .../authme/textures/gui/session_status.png | Bin .../gui/sprites/widget/blank_button.png | Bin .../sprites/widget/blank_button_disabled.png | Bin .../sprites/widget/blank_button_focused.png | Bin .../gui/sprites/widget/microsoft_button.png | Bin .../widget/microsoft_button_disabled.png | Bin .../widget/microsoft_button_focused.png | Bin .../gui/sprites/widget/mojang_button.png | Bin .../sprites/widget/mojang_button_disabled.png | Bin .../sprites/widget/mojang_button_focused.png | Bin .../gui/sprites/widget/offline_button.png | Bin .../widget/offline_button_disabled.png | Bin .../sprites/widget/offline_button_focused.png | Bin .../src/main/resources/authme.accesswidener | 2 + .../src}/main/resources/authme.mixins.json | 14 +- .../src/main/resources}/icon.png | Bin common/src/main/resources/pack.mcmeta | 6 + fabric/build.gradle | 90 +++++++ fabric/gradle.properties | 1 + .../authme/impl/fabric/AuthMeFabric.java | 46 ++++ .../main/resources/authme.fabric.mixins.json | 12 + fabric/src/main/resources/fabric.mod.json | 43 ++++ gradle.properties | 61 +++-- gradle/wrapper/gradle-wrapper.jar | Bin 63721 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 6 +- gradlew.bat | 22 +- neoforge/build.gradle | 91 +++++++ neoforge/gradle.properties | 1 + .../authme/impl/neoforge/AuthMeNeoForge.java | 24 ++ .../resources/META-INF/neoforge.mods.toml | 46 ++++ .../resources/authme.neoforge.mixins.json | 12 + settings.gradle | 12 +- .../api/gui/widget/PasswordFieldWidget.java | 43 ---- .../me/axieum/mcmod/authme/impl/AuthMe.java | 33 --- .../authme/impl/compat/ModMenuApiImpl.java | 23 -- .../authme/impl/config/AuthMeConfig.java | 130 ---------- .../authme/impl/gui/AuthMethodScreen.java | 157 ------------ .../authme/mixin/DisconnectedScreenMixin.java | 104 -------- src/main/resources/authme.accesswidener | 2 - src/main/resources/fabric.mod.json | 47 ---- 81 files changed, 1595 insertions(+), 1565 deletions(-) delete mode 100644 .editorconfig create mode 100644 .gitattributes delete mode 100644 .github/workflows/release-1.19.4.yml delete mode 100644 .github/workflows/release-1.20.2.yml delete mode 100644 .github/workflows/release-1.20.4.yml create mode 100644 common/build.gradle create mode 100644 common/src/main/java/me/axieum/mcmod/authme/api/AuthMe.java create mode 100644 common/src/main/java/me/axieum/mcmod/authme/api/Config.java create mode 100644 common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/AuthMethodScreen.java rename {src/main/java/me/axieum/mcmod/authme/api/gui => common/src/main/java/me/axieum/mcmod/authme/api/gui/screen}/AuthScreen.java (56%) rename {src/main/java/me/axieum/mcmod/authme/impl/gui => common/src/main/java/me/axieum/mcmod/authme/api/gui/screen}/MicrosoftAuthScreen.java (66%) rename {src/main/java/me/axieum/mcmod/authme/impl/gui => common/src/main/java/me/axieum/mcmod/authme/api/gui/screen}/OfflineAuthScreen.java (51%) rename {src => common/src}/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java (74%) rename {src => common/src}/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java (91%) rename {src => common/src}/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java (57%) create mode 100644 common/src/main/java/me/axieum/mcmod/authme/mixin/DisconnectedScreenMixin.java rename src/main/java/me/axieum/mcmod/authme/mixin/MultiplayerScreenMixin.java => common/src/main/java/me/axieum/mcmod/authme/mixin/JoinMultiplayerScreenMixin.java (51%) rename src/main/java/me/axieum/mcmod/authme/mixin/MinecraftClientAccessor.java => common/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftAccessor.java (57%) rename {src => common/src}/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java (68%) rename {src => common/src}/main/java/me/axieum/mcmod/authme/mixin/RealmsGenericErrorScreenMixin.java (57%) rename src/main/java/me/axieum/mcmod/authme/mixin/AbuseReportContextAccessor.java => common/src/main/java/me/axieum/mcmod/authme/mixin/ReportingContextAccessor.java (56%) rename src/main/java/me/axieum/mcmod/authme/mixin/SplashTextResourceSupplierAccessor.java => common/src/main/java/me/axieum/mcmod/authme/mixin/SplashManagerAccessor.java (62%) create mode 100644 common/src/main/resources/architectury.common.json rename {src => common/src}/main/resources/assets/authme/atlases/gui.json (100%) rename {src => common/src}/main/resources/assets/authme/lang/de_de.json (52%) rename {src => common/src}/main/resources/assets/authme/lang/en_us.json (52%) rename {src => common/src}/main/resources/assets/authme/lang/fi_fi.json (51%) rename {src => common/src}/main/resources/assets/authme/lang/fr_fr.json (52%) rename {src => common/src}/main/resources/assets/authme/lang/pl_pl.json (52%) rename {src => common/src}/main/resources/assets/authme/lang/zh_cn.json (50%) rename {src => common/src}/main/resources/assets/authme/lang/zh_tw.json (58%) rename {src => common/src}/main/resources/assets/authme/textures/gui/session_status.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/blank_button.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_disabled.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_focused.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_disabled.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_focused.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_disabled.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_focused.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/offline_button.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_disabled.png (100%) rename {src => common/src}/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_focused.png (100%) create mode 100644 common/src/main/resources/authme.accesswidener rename {src => common/src}/main/resources/authme.mixins.json (62%) rename {src/main/resources/assets/authme => common/src/main/resources}/icon.png (100%) create mode 100644 common/src/main/resources/pack.mcmeta create mode 100644 fabric/build.gradle create mode 100644 fabric/gradle.properties create mode 100644 fabric/src/main/java/me/axieum/mcmod/authme/impl/fabric/AuthMeFabric.java create mode 100644 fabric/src/main/resources/authme.fabric.mixins.json create mode 100644 fabric/src/main/resources/fabric.mod.json create mode 100644 neoforge/build.gradle create mode 100644 neoforge/gradle.properties create mode 100644 neoforge/src/main/java/me/axieum/mcmod/authme/impl/neoforge/AuthMeNeoForge.java create mode 100644 neoforge/src/main/resources/META-INF/neoforge.mods.toml create mode 100644 neoforge/src/main/resources/authme.neoforge.mixins.json delete mode 100644 src/main/java/me/axieum/mcmod/authme/api/gui/widget/PasswordFieldWidget.java delete mode 100644 src/main/java/me/axieum/mcmod/authme/impl/AuthMe.java delete mode 100644 src/main/java/me/axieum/mcmod/authme/impl/compat/ModMenuApiImpl.java delete mode 100644 src/main/java/me/axieum/mcmod/authme/impl/config/AuthMeConfig.java delete mode 100644 src/main/java/me/axieum/mcmod/authme/impl/gui/AuthMethodScreen.java delete mode 100644 src/main/java/me/axieum/mcmod/authme/mixin/DisconnectedScreenMixin.java delete mode 100644 src/main/resources/authme.accesswidener delete mode 100644 src/main/resources/fabric.mod.json diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 2b9a317..0000000 --- a/.editorconfig +++ /dev/null @@ -1,21 +0,0 @@ -# https://editorconfig.org - -root = true - -[*] -charset = utf-8 -end_of_line = lf -insert_final_newline = true -indent_size = 4 -indent_style = space -trim_trailing_whitespace = true - -[*.java] -max_line_length = 120 - -[*.{json,xml,yml}] -indent_size = 2 - -[*.md] -max_line_length = 80 -trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..20fc528 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,15 @@ +* text eol=lf +*.bat text eol=crlf +*.patch text eol=lf +*.java text eol=lf +*.gradle text eol=crlf +*.png binary +*.gif binary +*.exe binary +*.dll binary +*.jar binary +*.lzma binary +*.zip binary +*.pyd binary +*.cfg text eol=lf +*.jks binary \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index ea6f233..3681153 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -6,3 +6,6 @@ contact_links: - name: About Fabric url: https://fabricmc.net/ about: Please find information regarding the Fabric mod loader here + - name: About NeoForge + url: https://neoforged.net/ + about: Please find information regarding the NeoForge mod loader here diff --git a/.github/labeler.yml b/.github/labeler.yml index 69c615c..db5d0e8 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -23,3 +23,8 @@ build: - '**/gradle.properties' - '**/settings.gradle' - '.github/workflows/build.yml' + +# Add labels for changes to each submodule +common: 'common/**' +fabric: 'fabric/**' +neoforge: 'neoforge/**' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65c7648..db69300 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,14 +4,12 @@ name: Build # On pull requests on: + push: + branches: + - '!main' + - '!master' pull_request: - paths: - - '**/src/**' - - '**/build.gradle' - - '**/gradle.properties' - - '**/settings.gradle' - - .github/workflows/build.yml - - LICENCE.txt + workflow_dispatch: jobs: build: @@ -39,20 +37,28 @@ jobs: run: ./gradlew build publishToMavenLocal - name: ðŸ“Ķ Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: artifacts - path: '**/build/libs/' + path: | + **/build/devlibs/*-sources.jar + **/build/libs/*.jar + !**/build/libs/*-dev-shadow.jar + !**/build/libs/*-sources.jar + !build/** + !common/** - name: 📝 Upload reports if: ${{ always() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: reports - path: '**/build/reports/' + path: | + **/build/reports/ + !build/** - name: 🗃 Upload Maven local - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: maven path: ~/.m2/repository/ diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index d547401..1aa012d 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -4,7 +4,7 @@ name: Labeler # On pull requests -on: [pull_request_target] +on: [ pull_request_target ] jobs: triage: diff --git a/.github/workflows/release-1.19.4.yml b/.github/workflows/release-1.19.4.yml deleted file mode 100644 index f8b2e7a..0000000 --- a/.github/workflows/release-1.19.4.yml +++ /dev/null @@ -1,72 +0,0 @@ -# Prepares, builds and publishes new releases - -name: Release 1.19.4 - -# On changes to release branches -on: - push: - branches: - - mc/1.19.4 - workflow_dispatch: - -jobs: - release: - name: Release - - runs-on: ubuntu-latest - - steps: - - name: 🙌 Prepare release - id: release-please - uses: google-github-actions/release-please-action@v4 - with: - config-file: .github/release-please.json - target-branch: mc/1.19.4 - token: ${{ secrets.GITHUB_TOKEN }} - - outputs: - paths_released: ${{ steps.release-please.outputs.paths_released }} - releases: ${{ toJson(steps.release-please.outputs) }} - - publish: - name: Publish - - runs-on: ubuntu-latest - needs: release - if: ${{ needs.release.outputs.paths_released != '[]' }} - - strategy: - fail-fast: false - matrix: - path: ${{ fromJson(needs.release.outputs.paths_released) }} - - steps: - - name: âœĻ Checkout repository - uses: actions/checkout@v4 - - - name: ☕ Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: temurin - - - name: 🐘 Set up Gradle - uses: gradle/gradle-build-action@v2 - - - name: ðŸ“Ē Publish new release - uses: gradle/gradle-build-action@v2 - with: - arguments: ${{ matrix.path == '.' && ':publish' || format('{0}:publish', matrix.path) }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} - CURSEFORGE_DEBUG: ${{ secrets.CURSEFORGE_DEBUG }} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} - MODRINTH_DEBUG: ${{ secrets.MODRINTH_DEBUG }} - - - name: ðŸ“Ķ Upload artifacts - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ fromJson(needs.release.outputs.releases)[matrix.path == '.' && 'tag_name' || format('{0}--tag_name', matrix.path)] }} - files: ${{ matrix.path }}/**/build/libs/* - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-1.20.2.yml b/.github/workflows/release-1.20.2.yml deleted file mode 100644 index ed75550..0000000 --- a/.github/workflows/release-1.20.2.yml +++ /dev/null @@ -1,72 +0,0 @@ -# Prepares, builds and publishes new releases - -name: Release 1.20.2 - -# On changes to release branches -on: - push: - branches: - - mc/1.20.2 - workflow_dispatch: - -jobs: - release: - name: Release - - runs-on: ubuntu-latest - - steps: - - name: 🙌 Prepare release - id: release-please - uses: google-github-actions/release-please-action@v4 - with: - config-file: .github/release-please.json - target-branch: mc/1.20.2 - token: ${{ secrets.GITHUB_TOKEN }} - - outputs: - paths_released: ${{ steps.release-please.outputs.paths_released }} - releases: ${{ toJson(steps.release-please.outputs) }} - - publish: - name: Publish - - runs-on: ubuntu-latest - needs: release - if: ${{ needs.release.outputs.paths_released != '[]' }} - - strategy: - fail-fast: false - matrix: - path: ${{ fromJson(needs.release.outputs.paths_released) }} - - steps: - - name: âœĻ Checkout repository - uses: actions/checkout@v4 - - - name: ☕ Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: temurin - - - name: 🐘 Set up Gradle - uses: gradle/gradle-build-action@v2 - - - name: ðŸ“Ē Publish new release - uses: gradle/gradle-build-action@v2 - with: - arguments: ${{ matrix.path == '.' && ':publish' || format('{0}:publish', matrix.path) }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} - CURSEFORGE_DEBUG: ${{ secrets.CURSEFORGE_DEBUG }} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} - MODRINTH_DEBUG: ${{ secrets.MODRINTH_DEBUG }} - - - name: ðŸ“Ķ Upload artifacts - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ fromJson(needs.release.outputs.releases)[matrix.path == '.' && 'tag_name' || format('{0}--tag_name', matrix.path)] }} - files: ${{ matrix.path }}/**/build/libs/* - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release-1.20.4.yml b/.github/workflows/release-1.20.4.yml deleted file mode 100644 index 7b03a17..0000000 --- a/.github/workflows/release-1.20.4.yml +++ /dev/null @@ -1,72 +0,0 @@ -# Prepares, builds and publishes new releases - -name: Release 1.20.4 - -# On changes to release branches -on: - push: - branches: - - mc/1.20.4 - workflow_dispatch: - -jobs: - release: - name: Release - - runs-on: ubuntu-latest - - steps: - - name: 🙌 Prepare release - id: release-please - uses: google-github-actions/release-please-action@v4 - with: - config-file: .github/release-please.json - target-branch: mc/1.20.4 - token: ${{ secrets.GITHUB_TOKEN }} - - outputs: - paths_released: ${{ steps.release-please.outputs.paths_released }} - releases: ${{ toJson(steps.release-please.outputs) }} - - publish: - name: Publish - - runs-on: ubuntu-latest - needs: release - if: ${{ needs.release.outputs.paths_released != '[]' }} - - strategy: - fail-fast: false - matrix: - path: ${{ fromJson(needs.release.outputs.paths_released) }} - - steps: - - name: âœĻ Checkout repository - uses: actions/checkout@v4 - - - name: ☕ Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: temurin - - - name: 🐘 Set up Gradle - uses: gradle/gradle-build-action@v2 - - - name: ðŸ“Ē Publish new release - uses: gradle/gradle-build-action@v2 - with: - arguments: ${{ matrix.path == '.' && ':publish' || format('{0}:publish', matrix.path) }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} - CURSEFORGE_DEBUG: ${{ secrets.CURSEFORGE_DEBUG }} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} - MODRINTH_DEBUG: ${{ secrets.MODRINTH_DEBUG }} - - - name: ðŸ“Ķ Upload artifacts - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ fromJson(needs.release.outputs.releases)[matrix.path == '.' && 'tag_name' || format('{0}--tag_name', matrix.path)] }} - files: ${{ matrix.path }}/**/build/libs/* - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0eb0040..965e23a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,27 +18,23 @@ jobs: steps: - name: 🙌 Prepare release - id: release-please - uses: google-github-actions/release-please-action@v4 + id: release + uses: googleapis/release-please-action@v4 with: config-file: .github/release-please.json token: ${{ secrets.GITHUB_TOKEN }} outputs: - paths_released: ${{ steps.release-please.outputs.paths_released }} - releases: ${{ toJson(steps.release-please.outputs) }} + release_created: ${{ steps.release.outputs.release_created }} + tag_name: ${{ steps.release.outputs.tag_name }} - publish: + build-and-publish-jar: name: Publish - runs-on: ubuntu-latest - needs: release - if: ${{ needs.release.outputs.paths_released != '[]' }} + needs: [ release ] + if: ${{ needs.release.outputs.release_created == 'true' }} - strategy: - fail-fast: false - matrix: - path: ${{ fromJson(needs.release.outputs.paths_released) }} + runs-on: ubuntu-latest steps: - name: âœĻ Checkout repository @@ -53,20 +49,75 @@ jobs: - name: 🐘 Set up Gradle uses: gradle/gradle-build-action@v2 - - name: ðŸ“Ē Publish new release + - name: 🔍 Get Gradle properties + id: props + uses: christian-draeger/read-properties@1.1.1 + with: + path: gradle.properties + properties: + mod_name + minecraft_version + enabled_platforms + cf_project_id + mr_project_id + + - name: ðŸŠķ Publish to Maven uses: gradle/gradle-build-action@v2 with: - arguments: ${{ matrix.path == '.' && ':publish' || format('{0}:publish', matrix.path) }} + arguments: 'publish' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} - CURSEFORGE_DEBUG: ${{ secrets.CURSEFORGE_DEBUG }} - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} - MODRINTH_DEBUG: ${{ secrets.MODRINTH_DEBUG }} + + - name: 📜 Publish Fabric release + id: fabric + if: contains(steps.props.outputs.enabled_platforms, 'fabric') + uses: Kir-Antipov/mc-publish@v3.3 + with: + name: "[Fabric] ${{ steps.props.outputs.mod_name }} ${{ needs.release.outputs.tag_name }}" + files: | + fabric/build/libs/!(*-@(dev|dev-shadow|sources)).jar + fabric/build/devlibs/*-sources.jar + version: ${{ needs.release.outputs.tag_name }} + changelog-file: CHANGELOG.md + loaders: | + fabric + quilt + java: 21 + game-versions: ${{ steps.props.outputs.minecraft_version }} + curseforge-id: ${{ steps.props.outputs.cf_project_id }} + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + modrinth-id: ${{ steps.props.outputs.mr_project_id }} + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + + - name: ðŸĶŠ Publish NeoForge release + id: neoforge + if: contains(steps.props.outputs.enabled_platforms, 'neoforge') + uses: Kir-Antipov/mc-publish@v3.3 + with: + name: "[NeoForge] ${{ steps.props.outputs.mod_name }} ${{ needs.release.outputs.tag_name }}" + files: | + neoforge/build/libs/!(*-@(dev|dev-shadow|sources)).jar + neoforge/build/devlibs/*-sources.jar + version: ${{ needs.release.outputs.tag_name }} + changelog-file: CHANGELOG.md + loaders: | + neoforge + java: 21 + game-versions: ${{ steps.props.outputs.minecraft_version }} + curseforge-id: ${{ steps.props.outputs.cf_project_id }} + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + modrinth-id: ${{ steps.props.outputs.mr_project_id }} + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - name: ðŸ“Ķ Upload artifacts - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: - tag_name: ${{ fromJson(needs.release.outputs.releases)[matrix.path == '.' && 'tag_name' || format('{0}--tag_name', matrix.path)] }} - files: ${{ matrix.path }}/**/build/libs/* + tag_name: ${{ needs.release.outputs.tag_name }} + files: | + **/build/devlibs/*-sources.jar + **/build/libs/*.jar + !**/build/libs/*-dev-shadow.jar + !**/build/libs/*-sources.jar + !build/** + !common/** token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 0cc75b4..461017f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,60 +1,24 @@ -### project - -### fabric - -# runtime -run/ - -### java - -# compiled classes -*.class - -# log files -*.log -*.log.gz - -# packaged files -*.ear -*.jar -*.nar -*.rar -*.tar.gz -*.war -*.zip - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - -### gradle - -.gradle/ - -# build -**/build/ -!src/**/build/ - -# wrapper -!gradle-wrapper.jar -!gradle-wrapper.properties - -### jetbrains - -.idea/ -*.iml - -### eclipse - -.settings/ - -# launch configurations +# eclipse +bin *.launch - -# project description +.settings +.metadata +.classpath .project -### vscode +# idea +out +*.ipr +*.iws +*.iml +.idea/* +!.idea/scopes + +# gradle +build +.gradle -.vscode/ -.history/ -*.code-workspace +# other +eclipse +run +runs diff --git a/LICENCE.txt b/LICENCE.txt index 6d213f2..f75f945 100644 --- a/LICENCE.txt +++ b/LICENCE.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Axieum +Copyright (c) 2020-2026 Axieum Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index d3f9bd6..f267007 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
-Auth Me Icon +Auth Me Icon # Auth Me @@ -19,8 +19,8 @@ Auth Me is a **Minecraft mod** that brings account authentication into the game in the efforts of overcoming the infamous session validation error when connecting to a server. -It is a **client-side** only mod, built on the [Fabric][fabric] mod loader and -is available for modern versions of [Minecraft][minecraft] Java Edition. +It is a **client-side** only mod and is available for modern versions +of [Minecraft][minecraft] Java Edition. #### Alternatives diff --git a/build.gradle b/build.gradle index a9aa670..808726b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,55 +1,36 @@ plugins { - id 'java' - id 'checkstyle' - id 'maven-publish' - id 'com.modrinth.minotaur' version '2.8.7' - id 'com.matthewprenger.cursegradle' version '1.4.0' - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'architectury-plugin' version '3.4-SNAPSHOT' + id 'dev.architectury.loom' version '1.7-SNAPSHOT' apply false } -allprojects { - apply plugin: 'java' - apply plugin: 'checkstyle' - apply plugin: 'maven-publish' - apply plugin: 'fabric-loom' - - group = project.maven_group - version = project.mod_version - archivesBaseName = project.mod_id +architectury { + minecraft = project.minecraft_version +} - sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21 +subprojects { + apply plugin: 'dev.architectury.loom' - // Configure Loom loom { - accessWidenerPath = file("src/main/resources/${project.mod_id}.accesswidener") + silentMojangMappingsLicense() } - // Declare dependencies dependencies { - // Fabric minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + mappings loom.officialMojangMappings() + } +} - // Mods - include(fabricApi.module("fabric-api-base", project.fabric_version)) - modImplementation include(fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version)) - modImplementation include(fabricApi.module("fabric-resource-loader-v0", project.fabric_version)) - modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}" - modImplementation include("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { - exclude group: 'com.terraformersmc' - exclude group: 'net.fabricmc.fabric-api' - } +allprojects { + apply plugin: 'java' + apply plugin: 'checkstyle' + apply plugin: 'maven-publish' + apply plugin: 'architectury-plugin' - // Needed by ModMenu - modLocalRuntime fabricApi.module("fabric-screen-api-v1", project.fabric_version) - modLocalRuntime fabricApi.module("fabric-key-binding-api-v1", project.fabric_version) + group = rootProject.maven_group + version = rootProject.version + archivesBaseName = rootProject.archives_base_name - // Code Quality - compileOnly "org.jetbrains:annotations:${project.jetbrains_annotations_version}" - testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit_jupiter_version}" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit_jupiter_version}" - } + sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21 // Perform tests using the JUnit test suite test { @@ -58,31 +39,14 @@ allprojects { // Produce additional distributions java { + withJavadocJar() withSourcesJar() - // withJavadocJar() } // Add the licence to all distributions tasks.withType(Jar).configureEach { it.from rootProject.file('LICENCE.txt') - } - - // Process any resources - processResources { - inputs.property 'id', project.mod_id - inputs.property 'name', project.mod_name - inputs.property 'description', project.mod_description - inputs.property 'version', project.version - - // fabric.mod.json - filesMatching('fabric.mod.json') { - expand([ - 'id': project.mod_id, - 'name': project.mod_name, - 'description': project.mod_description, - 'version': project.version, - ]) - } + it.duplicatesStrategy = 'EXCLUDE' } // Perform linting using Checkstyle @@ -94,52 +58,48 @@ allprojects { // Add any additional repositories repositories { mavenCentral() - maven { name 'Fabric'; url 'https://maven.fabricmc.net/' } - maven { name 'Shedaniel'; url 'https://maven.shedaniel.me/' } - maven { name 'TerraformersMC'; url 'https://maven.terraformersmc.com/' } - } - - // Read the `CHANGELOG.md` for the project version's changelog notes if present - ext.getChangelogNotes = { -> - final File changelog = project.file("CHANGELOG.md") - if (changelog.canRead()) { - def match = changelog.text =~ "(?ms)^## \\[\\Q${project.version}\\E].*?(?=^## |\\Z)" - if (match.find() && !match.group().isBlank()) return match.group().trim() - } - return "For a list of changes, please refer to https://github.com/${project.github_repo}/releases/tag/v${project.version}" + maven { name = 'Architectury'; url = 'https://maven.architectury.dev/' } + maven { name = 'Fabric'; url = 'https://maven.fabricmc.net/' } + maven { name = 'Forge'; url = 'https://maven.minecraftforge.net/' } + maven { name = 'Modrinth'; url = 'https://api.modrinth.com/maven' } + maven { name = 'NeoForge'; url = 'https://maven.neoforged.net/releases/' } + maven { name = 'Sponge'; url = 'https://repo.spongepowered.org/repository/maven-public' } + maven { name = 'Team Resourceful'; url = 'https://maven.teamresourceful.com/repository/maven-public/' } + maven { name = 'TerraformersMC'; url = 'https://maven.terraformersmc.com/' } } // Define how packages are published publishing { // Declare all publications - publications { - mavenJava(MavenPublication) { - from components.java - pom { - name = project.mod_name - description = project.mod_description - url = "https://github.com/${project.github_repo}" - licenses { license { name = 'MIT'; url = 'https://opensource.org/licenses/MIT' } } - developers { - developer { - name = 'Axieum' - email = 'imaxieum@gmail.com' - url = 'https://github.com/axieum' - } - } - scm { - connection = "scm:git:git://github.com/${project.github_repo}.git" - developerConnection = "scm:git:ssh://git@github.com:${project.github_repo}.git" + if (project != rootProject) { + publications { + mavenJava(MavenPublication) { + from components.java + artifactId "${rootProject.archives_base_name}-${project.name}" + pom { + name = project.mod_name + description = project.mod_description url = "https://github.com/${project.github_repo}" + licenses { license { name = 'MIT'; url = 'https://opensource.org/licenses/MIT' } } + developers { + developer { + name = project.mod_author + email = project.mod_author_email + url = "https://github.com/${project.mod_author}" + } + } + scm { + connection = "scm:git:git://github.com/${project.github_repo}.git" + developerConnection = "scm:git:ssh://git@github.com:${project.github_repo}.git" + url = "https://github.com/${project.github_repo}" + } + issueManagement { system = 'GitHub'; url = "https://github.com/${project.github_repo}/issues" } + ciManagement { system = 'GitHub'; url = "https://github.com/${project.github_repo}/actions" } + properties = [ + 'mod_id' : project.mod_id, + 'minecraft_version': project.minecraft_version, + ] } - issueManagement { system = 'GitHub'; url = "https://github.com/${project.github_repo}/issues" } - ciManagement { system = 'GitHub'; url = "https://github.com/${project.github_repo}/actions" } - properties = [ - 'mod_id': project.mod_id, - 'minecraft_version': project.minecraft_version, - 'loader_version': project.loader_version, - 'yarn_mappings': project.yarn_mappings, - ] } } } @@ -158,86 +118,3 @@ allprojects { } } } - -// Define how artifacts are published to CurseForge (https://curseforge.com) -curseforge { - // Set the API token from the environment - apiKey System.getenv('CURSEFORGE_TOKEN') ?: '' - - // Declare all projects - project { - // Set the project id - id = project.cf_project_id - // Set the release type - releaseType = project.version.contains('alpha') ? 'alpha' : project.version.contains('beta') ? 'beta' : 'release' - // Set the release notes - changelog = project.getChangelogNotes() - // Add all supported game versions - project.cf_game_versions.split(', ').each { addGameVersion it } - // Add the main artifact - mainArtifact(remapJar) { displayName = "${project.mod_name} v${project.version}" } - // Add any additional artifacts - addArtifact remapSourcesJar - // addArtifact javadocJar - subprojects.each { - addArtifact it.remapJar - addArtifact it.remapSourcesJar - // addArtifact it.javadocJar - } - // Add any dependencies - relations { - if (project.cf_relations_required) project.cf_relations_required.split(', ').each { requiredDependency it } - if (project.cf_relations_optional) project.cf_relations_optional.split(', ').each { optionalDependency it } - if (project.cf_relations_embedded) project.cf_relations_embedded.split(', ').each { embeddedLibrary it } - if (project.cf_relations_tools) project.cf_relations_tools.split(', ').each { tool it } - if (project.cf_relations_incompatible) project.cf_relations_incompatible.split(', ').each { incompatible it } - } - } - - // Configure other options - options { - forgeGradleIntegration = false - debug = (System.getenv('CURSEFORGE_DEBUG') ?: 'false').toBoolean() - } -} - -// Define how artifacts are published to Modrinth (https://modrinth.com) -import com.modrinth.minotaur.dependencies.ModDependency -modrinth { - // Set the API token from the environment - token = System.getenv('MODRINTH_TOKEN') ?: '' - // Set whether debug mode is enabled - debugMode = (System.getenv('MODRINTH_DEBUG') ?: 'false').toBoolean() - // Set the project id - projectId = project.mr_project_id - // Set the release name - versionName = "${project.mod_name} v${project.version}" - // Set the release type - versionType = project.version.contains('alpha') ? 'alpha' : project.version.contains('beta') ? 'beta' : 'release' - // Set the release version - versionNumber = project.version - // Set the release notes - changelog = project.getChangelogNotes() - // Set the project body sync target - syncBodyFrom = rootProject.file('README.md').getText() - // Add all supported mod loaders - loaders = ['fabric'] - // Add all supported game versions - project.mr_game_versions.split(', ').each { gameVersions.add it } - // Add the main artifact - uploadFile = remapJar - // Add any additional artifacts - additionalFiles.add remapSourcesJar - // additionalFiles.add javadocJar - subprojects.each { - additionalFiles.add it.remapJar - additionalFiles.add it.remapSourcesJar - // additionalFiles.add it.javadocJar - } - // Add any dependencies - if (project.mr_relations_required) dependencies.addAll project.mr_relations_required.split(', ').collect { new ModDependency(it, 'required') } - if (project.mr_relations_optional) dependencies.addAll project.mr_relations_optional.split(', ').collect { new ModDependency(it, 'optional') } - if (project.mr_relations_incompatible) dependencies.addAll project.mr_relations_incompatible.split(', ').collect { new ModDependency(it, 'incompatible') } -} - -publish.finalizedBy tasks.curseforge, tasks.modrinth diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..4121581 --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,26 @@ +architectury { + common rootProject.enabled_platforms.split(", ") +} + +dependencies { + modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" + + modApi "com.teamresourceful.resourcefulconfig:resourcefulconfig-common-${project.resourceful_config_version}" +} + +loom { + accessWidenerPath = file("src/main/resources/${project.mod_id}.accesswidener") +} + +processResources { + inputs.property 'mod_id', project.mod_id + inputs.property 'mod_name', project.mod_name + inputs.property 'mod_description', project.mod_description + inputs.property 'mod_author', project.mod_author + inputs.property 'mod_license', project.mod_license + inputs.property 'version', project.version + inputs.property 'minecraft_version', project.minecraft_version + + // pack.mcmeta + filesMatching('pack.mcmeta') { expand(['mod_name': project.mod_name]) } +} diff --git a/common/src/main/java/me/axieum/mcmod/authme/api/AuthMe.java b/common/src/main/java/me/axieum/mcmod/authme/api/AuthMe.java new file mode 100644 index 0000000..de76081 --- /dev/null +++ b/common/src/main/java/me/axieum/mcmod/authme/api/AuthMe.java @@ -0,0 +1,47 @@ +package me.axieum.mcmod.authme.api; + +import com.teamresourceful.resourcefulconfig.api.loader.Configurator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The multi-platform common mod. + */ +public final class AuthMe +{ + private AuthMe() {} + + /** + * The mod identifier. + */ + public static final String MOD_ID = "authme"; + + /** + * The mod display name. + */ + public static final String MOD_NAME = "Auth Me"; + + /** + * The mod logger. + */ + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_NAME); + + /** + * The mod configuration. + */ + public static final Configurator CONFIG = new Configurator(MOD_ID); + + /** + * The legacy Mojang account migration FAQ link. + */ + public static final String MOJANG_ACCOUNT_MIGRATION_FAQ_URL = "https://aka.ms/MinecraftPostMigrationFAQ"; + + /** + * Initialises the multi-platform mod. + */ + public static void init() + { + // Register the configuration + CONFIG.register(Config.class); + } +} diff --git a/common/src/main/java/me/axieum/mcmod/authme/api/Config.java b/common/src/main/java/me/axieum/mcmod/authme/api/Config.java new file mode 100644 index 0000000..740e479 --- /dev/null +++ b/common/src/main/java/me/axieum/mcmod/authme/api/Config.java @@ -0,0 +1,143 @@ +package me.axieum.mcmod.authme.api; + +import java.util.Objects; + +import com.teamresourceful.resourcefulconfig.api.annotations.Category; +import com.teamresourceful.resourcefulconfig.api.annotations.ConfigEntry; +import com.teamresourceful.resourcefulconfig.api.annotations.ConfigInfo; +import com.teamresourceful.resourcefulconfig.api.annotations.ConfigInfo.Link; + +import me.axieum.mcmod.authme.api.util.MicrosoftUtils; +import me.axieum.mcmod.authme.api.util.MicrosoftUtils.MicrosoftPrompt; + +/** + * The mod configuration. + */ +@com.teamresourceful.resourcefulconfig.api.annotations.Config( + value = AuthMe.MOD_ID, + categories = { + Config.AuthButton.class, + Config.LoginMethods.class, + } +) +@ConfigInfo( + titleTranslation = "text.rconfig.authme.title", + descriptionTranslation = "text.rconfig.authme.description", + icon = "unlock", + links = { + @Link(text = "CurseForge", icon = "curseforge", value = "https://curseforge.com/minecraft/mc-mods/auth-me"), + @Link(text = "Modrinth", icon = "modrinth", value = "https://modrinth.com/mod/auth-me"), + @Link(text = "GitHub", icon = "github", value = "https://github.com/axieum/authme"), + } +) +public class Config +{ + /** Authentication button configuration schema. */ + @Category(value = "authButton") + @ConfigInfo( + titleTranslation = "text.rconfig.authme.option.authButton", + descriptionTranslation = "text.rconfig.authme.option.authButton.description" + ) + public static class AuthButton + { + /** X coordinate of the button on the multiplayer screen. */ + @ConfigEntry(id = "x", translation = "text.rconfig.authme.option.authButton.x") + public static int x = 6; + + /** Y coordinate of the button on the multiplayer screen. */ + @ConfigEntry(id = "y", translation = "text.rconfig.authme.option.authButton.y") + public static int y = 6; + + /** True if the button can be dragged to a new position. */ + @ConfigEntry(id = "draggable", translation = "text.rconfig.authme.option.authButton.draggable") + public static boolean draggable = true; + } + + /** Authentication methods configuration schema. */ + @Category( + value = "methods", + categories = { + LoginMethods.Microsoft.class, + LoginMethods.Offline.class, + } + ) + @ConfigInfo( + titleTranslation = "text.rconfig.authme.option.methods", + descriptionTranslation = "text.rconfig.authme.option.methods.description" + ) + public static class LoginMethods + { + /** Login via Microsoft configuration schema. */ + @Category(value = "microsoft") + @ConfigInfo( + titleTranslation = "text.rconfig.authme.option.methods.microsoft", + descriptionTranslation = "text.rconfig.authme.option.methods.microsoft.description" + ) + public static class Microsoft + { + /** Indicates the type of user interaction that is required. */ + @ConfigEntry(id = "prompt", translation = "text.rconfig.authme.option.methods.microsoft.prompt") + public static MicrosoftPrompt prompt = MicrosoftPrompt.DEFAULT; + + /** The port from which to listen for OAuth2 callbacks. */ + @ConfigEntry(id = "port", translation = "text.rconfig.authme.option.methods.microsoft.port") + public static int port = 25585; + + /** OAuth2 client id. */ + @ConfigEntry(id = "clientId", translation = "text.rconfig.authme.option.methods.microsoft.clientId") + public static String clientId = MicrosoftUtils.CLIENT_ID; + + /** OAuth2 authorization url. */ + @ConfigEntry(id = "authorizeUrl", translation = "text.rconfig.authme.option.methods.microsoft.authorizeUrl") + public static String authorizeUrl = MicrosoftUtils.AUTHORIZE_URL; + + /** OAuth2 access token url. */ + @ConfigEntry(id = "tokenUrl", translation = "text.rconfig.authme.option.methods.microsoft.tokenUrl") + public static String tokenUrl = MicrosoftUtils.TOKEN_URL; + + /** Xbox authentication url. */ + @ConfigEntry(id = "xboxAuthUrl", translation = "text.rconfig.authme.option.methods.microsoft.xboxAuthUrl") + public static String xboxAuthUrl = MicrosoftUtils.XBOX_AUTH_URL; + + /** Xbox XSTS authorization url. */ + @ConfigEntry(id = "xboxXstsUrl", translation = "text.rconfig.authme.option.methods.microsoft.xboxXstsUrl") + public static String xboxXstsUrl = MicrosoftUtils.XBOX_XSTS_URL; + + /** Minecraft authentication url. */ + @ConfigEntry(id = "mcAuthUrl", translation = "text.rconfig.authme.option.methods.microsoft.mcAuthUrl") + public static String mcAuthUrl = MicrosoftUtils.MC_AUTH_URL; + + /** Minecraft profile url. */ + @ConfigEntry(id = "mcProfileUrl", translation = "text.rconfig.authme.option.methods.microsoft.mcProfileUrl") + public static String mcProfileUrl = MicrosoftUtils.MC_PROFILE_URL; + + /** + * Determines whether the configured URLs differ from the defaults. + * + * @return true if the configured URLs are unchanged + */ + public static boolean isDefaults() + { + return Objects.equals(authorizeUrl, MicrosoftUtils.AUTHORIZE_URL) + && Objects.equals(tokenUrl, MicrosoftUtils.TOKEN_URL) + && Objects.equals(xboxAuthUrl, MicrosoftUtils.XBOX_AUTH_URL) + && Objects.equals(xboxXstsUrl, MicrosoftUtils.XBOX_XSTS_URL) + && Objects.equals(mcAuthUrl, MicrosoftUtils.MC_AUTH_URL) + && Objects.equals(mcProfileUrl, MicrosoftUtils.MC_PROFILE_URL); + } + } + + /** Login offline configuration schema. */ + @Category(value = "offline") + @ConfigInfo( + titleTranslation = "text.rconfig.authme.option.methods.offline", + descriptionTranslation = "text.rconfig.authme.option.methods.offline.description" + ) + public static class Offline + { + /** Last used username. */ + @ConfigEntry(id = "lastUsername", translation = "text.rconfig.authme.option.methods.offline.lastUsername") + public static String lastUsername = ""; + } + } +} diff --git a/common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/AuthMethodScreen.java b/common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/AuthMethodScreen.java new file mode 100644 index 0000000..ce4bc29 --- /dev/null +++ b/common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/AuthMethodScreen.java @@ -0,0 +1,160 @@ +package me.axieum.mcmod.authme.api.gui.screen; + +import com.mojang.blaze3d.platform.InputConstants; + +import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.ImageButton; +import net.minecraft.client.gui.components.StringWidget; +import net.minecraft.client.gui.components.Tooltip; +import net.minecraft.client.gui.components.WidgetSprites; +import net.minecraft.client.gui.screens.ConfirmLinkScreen; +import net.minecraft.client.gui.screens.ConfirmScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; + +import me.axieum.mcmod.authme.api.AuthMe; +import me.axieum.mcmod.authme.api.Config; +import me.axieum.mcmod.authme.api.util.SessionUtils; +import static me.axieum.mcmod.authme.api.AuthMe.LOGGER; + +/** + * The authentication method selection screen. + */ +public class AuthMethodScreen extends Screen +{ + /** The parent (or last) screen that opened this screen. */ + private final Screen parentScreen; + /** The 'Microsoft' authentication method button textures. */ + public static final WidgetSprites MICROSOFT_BUTTON_TEXTURES = new WidgetSprites( + ResourceLocation.fromNamespaceAndPath("authme", "widget/microsoft_button"), + ResourceLocation.fromNamespaceAndPath("authme", "widget/microsoft_button_disabled"), + ResourceLocation.fromNamespaceAndPath("authme", "widget/microsoft_button_focused") + ); + /** The 'Mojang (or legacy)' authentication method button textures. */ + public static final WidgetSprites MOJANG_BUTTON_TEXTURES = new WidgetSprites( + ResourceLocation.fromNamespaceAndPath("authme", "widget/mojang_button"), + ResourceLocation.fromNamespaceAndPath("authme", "widget/mojang_button_disabled"), + ResourceLocation.fromNamespaceAndPath("authme", "widget/mojang_button_focused") + ); + /** The 'Offline' authentication method button textures. */ + public static final WidgetSprites OFFLINE_BUTTON_TEXTURES = new WidgetSprites( + ResourceLocation.fromNamespaceAndPath("authme", "widget/offline_button"), + ResourceLocation.fromNamespaceAndPath("authme", "widget/offline_button_disabled"), + ResourceLocation.fromNamespaceAndPath("authme", "widget/offline_button_focused") + ); + + /** + * Constructs a new authentication method choice screen. + * + * @param parentScreen parent (or last) screen that opened this screen + */ + public AuthMethodScreen(Screen parentScreen) + { + super(Component.translatable("gui.authme.method.title")); + this.parentScreen = parentScreen; + } + + @Override + protected void init() + { + super.init(); + assert minecraft != null; + + // Add a title + StringWidget titleWidget = new StringWidget(width, height, title, font); + titleWidget.setColor(0xffffff); + titleWidget.setPosition(width / 2 - titleWidget.getWidth() / 2, height / 2 - titleWidget.getHeight() / 2 - 22); + addRenderableWidget(titleWidget); + + // Add a greeting message + StringWidget greetingWidget = new StringWidget( + width, height, + Component.translatable( + "gui.authme.method.greeting", + Component.literal(SessionUtils.getUser().getName()).withStyle(ChatFormatting.YELLOW) + ), + font + ); + greetingWidget.setColor(0xa0a0a0); + greetingWidget.setPosition( + width / 2 - greetingWidget.getWidth() / 2, height / 2 - greetingWidget.getHeight() / 2 - 42 + ); + addRenderableWidget(greetingWidget); + + // Add a button for the 'Microsoft' authentication method + ImageButton msButton = new ImageButton( + width / 2 - 20 - 10 - 4, height / 2 - 5, 20, 20, + MICROSOFT_BUTTON_TEXTURES, + button -> { + // If 'Left Control' is being held, enforce user interaction + final boolean selectAccount = InputConstants.isKeyDown( + minecraft.getWindow().getWindow(), InputConstants.KEY_LCONTROL + ); + if (Config.LoginMethods.Microsoft.isDefaults()) { + minecraft.setScreen(new MicrosoftAuthScreen(this, parentScreen, selectAccount)); + } else { + LOGGER.warn("Non-default Microsoft authentication URLs are in use!"); + ConfirmScreen confirmScreen = new ConfirmScreen( + a -> minecraft.setScreen(a ? new MicrosoftAuthScreen(this, parentScreen, selectAccount) : this), + Component.translatable("gui.authme.microsoft.warning.title"), + Component.translatable("gui.authme.microsoft.warning.body"), + Component.translatable("gui.authme.microsoft.warning.accept"), + Component.translatable("gui.authme.microsoft.warning.cancel") + ); + minecraft.setScreen(confirmScreen); + confirmScreen.setDelay(40); + } + }, + Component.translatable("gui.authme.method.button.microsoft") + ); + msButton.setTooltip(Tooltip.create( + Component.translatable("gui.authme.method.button.microsoft") + .append("\n") + .append( + Component.translatable("gui.authme.method.button.microsoft.selectAccount") + .withStyle(ChatFormatting.GRAY) + ) + )); + addRenderableWidget(msButton); + + // Add a button for the 'Mojang (or legacy)' authentication method + ImageButton mojangButton = new ImageButton( + width / 2 - 10, height / 2 - 5, 20, 20, + MOJANG_BUTTON_TEXTURES, + ConfirmLinkScreen.confirmLink(this, AuthMe.MOJANG_ACCOUNT_MIGRATION_FAQ_URL), + Component.translatable("gui.authme.method.button.mojang") + ); + mojangButton.setTooltip(Tooltip.create( + Component.translatable("gui.authme.method.button.mojang") + .append("\n") + .append(Component.translatable("gui.authme.method.button.mojang.unavailable") + .withStyle(ChatFormatting.GRAY)) + )); + addRenderableWidget(mojangButton); + + // Add a button for the 'Offline' authentication method + ImageButton offlineButton = new ImageButton( + width / 2 + 10 + 4, height / 2 - 5, 20, 20, + OFFLINE_BUTTON_TEXTURES, + button -> minecraft.setScreen(new OfflineAuthScreen(this, parentScreen)), + Component.translatable("gui.authme.method.button.offline") + ); + offlineButton.setTooltip(Tooltip.create(Component.translatable("gui.authme.method.button.offline"))); + addRenderableWidget(offlineButton); + + // Add a button to go back + addRenderableWidget( + Button.builder(Component.translatable("gui.back"), button -> onClose()) + .bounds(width / 2 - 50, height / 2 + 27, 100, 20) + .build() + ); + } + + @Override + public void onClose() + { + if (minecraft != null) minecraft.setScreen(parentScreen); + } +} diff --git a/src/main/java/me/axieum/mcmod/authme/api/gui/AuthScreen.java b/common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/AuthScreen.java similarity index 56% rename from src/main/java/me/axieum/mcmod/authme/api/gui/AuthScreen.java rename to common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/AuthScreen.java index 05dad4f..61fac60 100644 --- a/src/main/java/me/axieum/mcmod/authme/api/gui/AuthScreen.java +++ b/common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/AuthScreen.java @@ -1,20 +1,20 @@ -package me.axieum.mcmod.authme.api.gui; +package me.axieum.mcmod.authme.api.gui.screen; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.Text; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; /** * A screen for handling user authentication. */ public abstract class AuthScreen extends Screen { - // The parent (or last) screen that opened this screen + /** The parent (or last) screen that opened this screen. */ protected final Screen parentScreen; - // The screen to be returned to after a successful login + /** The screen to be returned to after a successful login. */ protected final Screen successScreen; - // True if the login task completed successfully + /** True if the login task completed successfully. */ protected boolean success = false; - // True if the screen should be closed on success stat (via render thread) + /** True if the screen should be closed on success stat (via render thread). */ protected boolean closeOnSuccess = false; /** @@ -24,7 +24,7 @@ public abstract class AuthScreen extends Screen * @param parentScreen parent (or last) screen that opened this screen * @param successScreen screen to be returned to after a successful login */ - public AuthScreen(Text title, Screen parentScreen, Screen successScreen) + public AuthScreen(Component title, Screen parentScreen, Screen successScreen) { super(title); this.parentScreen = parentScreen; @@ -35,7 +35,7 @@ public AuthScreen(Text title, Screen parentScreen, Screen successScreen) protected void init() { super.init(); - assert client != null; + assert minecraft != null; } @Override @@ -44,12 +44,12 @@ public void tick() super.tick(); // Optionally close the screen if the login task completed successfully - if (success && closeOnSuccess) this.close(); + if (success && closeOnSuccess) this.onClose(); } @Override - public void close() + public void onClose() { - if (client != null) client.setScreen(success ? successScreen : parentScreen); + if (minecraft != null) minecraft.setScreen(success ? successScreen : parentScreen); } } diff --git a/src/main/java/me/axieum/mcmod/authme/impl/gui/MicrosoftAuthScreen.java b/common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/MicrosoftAuthScreen.java similarity index 66% rename from src/main/java/me/axieum/mcmod/authme/impl/gui/MicrosoftAuthScreen.java rename to common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/MicrosoftAuthScreen.java index 6fc3eaf..5387a16 100644 --- a/src/main/java/me/axieum/mcmod/authme/impl/gui/MicrosoftAuthScreen.java +++ b/common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/MicrosoftAuthScreen.java @@ -1,4 +1,4 @@ -package me.axieum.mcmod.authme.impl.gui; +package me.axieum.mcmod.authme.api.gui.screen; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; @@ -6,17 +6,16 @@ import org.apache.http.conn.ConnectTimeoutException; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.TextWidget; -import net.minecraft.client.toast.SystemToast; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; +import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.StringWidget; +import net.minecraft.client.gui.components.toasts.SystemToast; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; -import me.axieum.mcmod.authme.api.gui.AuthScreen; import me.axieum.mcmod.authme.api.util.MicrosoftUtils; import me.axieum.mcmod.authme.api.util.SessionUtils; -import static me.axieum.mcmod.authme.impl.AuthMe.LOGGER; +import static me.axieum.mcmod.authme.api.AuthMe.LOGGER; /** * A screen for handling user authentication via Microsoft. @@ -28,7 +27,7 @@ public class MicrosoftAuthScreen extends AuthScreen // The completable future for all Microsoft login tasks private CompletableFuture task = null; // The current progress/status of the login task - private TextWidget statusWidget = null; + private StringWidget statusWidget = null; // True if Microsoft should prompt to select an account private final boolean selectAccount; @@ -41,7 +40,7 @@ public class MicrosoftAuthScreen extends AuthScreen */ public MicrosoftAuthScreen(Screen parentScreen, Screen successScreen, boolean selectAccount) { - super(Text.translatable("gui.authme.microsoft.title"), parentScreen, successScreen); + super(Component.translatable("gui.authme.microsoft.title"), parentScreen, successScreen); this.selectAccount = selectAccount; this.closeOnSuccess = true; } @@ -50,29 +49,29 @@ public MicrosoftAuthScreen(Screen parentScreen, Screen successScreen, boolean se protected void init() { super.init(); - assert client != null; + assert minecraft != null; // Add a title - TextWidget titleWidget = new TextWidget(width, height, title, textRenderer); - titleWidget.setTextColor(0xffffff); + StringWidget titleWidget = new StringWidget(width, height, title, font); + titleWidget.setColor(0xffffff); titleWidget.setPosition(width / 2 - titleWidget.getWidth() / 2, height / 2 - titleWidget.getHeight() / 2 - 27); - addDrawableChild(titleWidget); + addRenderableWidget(titleWidget); // Add a status message - statusWidget = new TextWidget(width, height, title, textRenderer); - statusWidget.setTextColor(0xdddddd); + statusWidget = new StringWidget(width, height, title, font); + statusWidget.setColor(0xdddddd); statusWidget.setPosition( width / 2 - statusWidget.getWidth() / 2, height / 2 - statusWidget.getHeight() / 2 - 1 ); - addDrawableChild(statusWidget); + addRenderableWidget(statusWidget); // Add a cancel button to abort the task - final ButtonWidget cancelBtn; - addDrawableChild( - cancelBtn = ButtonWidget.builder( - Text.translatable("gui.cancel"), - button -> close() - ).dimensions( + final Button cancelBtn; + addRenderableWidget( + cancelBtn = Button.builder( + Component.translatable("gui.cancel"), + button -> onClose() + ).bounds( width / 2 - 50, height / 2 + 22, 100, 20 ).build() ); @@ -81,7 +80,7 @@ protected void init() if (task != null) return; // Set the initial progress/status of the login task - statusWidget.setMessage(Text.translatable("gui.authme.microsoft.status.checkBrowser")); + statusWidget.setMessage(Component.translatable("gui.authme.microsoft.status.checkBrowser")); // Prepare a new executor thread to run the login task on executor = Executors.newSingleThreadExecutor(); @@ -90,32 +89,32 @@ protected void init() task = MicrosoftUtils // Acquire a Microsoft auth code .acquireMSAuthCode( - success -> Text.translatable("gui.authme.microsoft.browser").getString(), + success -> Component.translatable("gui.authme.microsoft.browser").getString(), executor, selectAccount ? MicrosoftUtils.MicrosoftPrompt.SELECT_ACCOUNT : null ) // Exchange the Microsoft auth code for an access token .thenComposeAsync(msAuthCode -> { - statusWidget.setMessage(Text.translatable("gui.authme.microsoft.status.msAccessToken")); + statusWidget.setMessage(Component.translatable("gui.authme.microsoft.status.msAccessToken")); return MicrosoftUtils.acquireMSAccessToken(msAuthCode, executor); }) // Exchange the Microsoft access token for an Xbox access token .thenComposeAsync(msAccessToken -> { - statusWidget.setMessage(Text.translatable("gui.authme.microsoft.status.xboxAccessToken")); + statusWidget.setMessage(Component.translatable("gui.authme.microsoft.status.xboxAccessToken")); return MicrosoftUtils.acquireXboxAccessToken(msAccessToken, executor); }) // Exchange the Xbox access token for an XSTS token .thenComposeAsync(xboxAccessToken -> { - statusWidget.setMessage(Text.translatable("gui.authme.microsoft.status.xboxXstsToken")); + statusWidget.setMessage(Component.translatable("gui.authme.microsoft.status.xboxXstsToken")); return MicrosoftUtils.acquireXboxXstsToken(xboxAccessToken, executor); }) // Exchange the Xbox XSTS token for a Minecraft access token .thenComposeAsync(xboxXstsData -> { - statusWidget.setMessage(Text.translatable("gui.authme.microsoft.status.mcAccessToken")); + statusWidget.setMessage(Component.translatable("gui.authme.microsoft.status.mcAccessToken")); return MicrosoftUtils.acquireMCAccessToken( xboxXstsData.get("Token"), xboxXstsData.get("uhs"), executor ); @@ -123,18 +122,18 @@ protected void init() // Build a new Minecraft session with the Minecraft access token .thenComposeAsync(mcToken -> { - statusWidget.setMessage(Text.translatable("gui.authme.microsoft.status.mcProfile")); + statusWidget.setMessage(Component.translatable("gui.authme.microsoft.status.mcProfile")); return MicrosoftUtils.login(mcToken, executor); }) // Update the game session and greet the player - .thenAccept(session -> { + .thenAccept(user -> { // Apply the new session - SessionUtils.setSession(session); + SessionUtils.setUser(user); // Add a toast that greets the player SystemToast.add( - client.getToastManager(), SystemToast.Type.PERIODIC_NOTIFICATION, - Text.translatable("gui.authme.toast.greeting", Text.literal(session.getUsername())), null + minecraft.getToasts(), SystemToast.SystemToastId.PERIODIC_NOTIFICATION, + Component.translatable("gui.authme.toast.greeting", Component.literal(user.getName())), null ); // Mark the task as successful, in turn closing the screen LOGGER.info("Successfully logged in via Microsoft!"); @@ -151,14 +150,14 @@ protected void init() } else { key = "gui.authme.error.generic"; } - statusWidget.setMessage(Text.translatable(key).formatted(Formatting.RED)); - cancelBtn.setMessage(Text.translatable("gui.back")); + statusWidget.setMessage(Component.translatable(key).withStyle(ChatFormatting.RED)); + cancelBtn.setMessage(Component.translatable("gui.back")); return null; // return a default value }); } @Override - public void close() + public void onClose() { // Cancel the login task if still running if (task != null && !task.isDone()) { @@ -167,6 +166,6 @@ public void close() } // Cascade the closing - super.close(); + super.onClose(); } } diff --git a/src/main/java/me/axieum/mcmod/authme/impl/gui/OfflineAuthScreen.java b/common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/OfflineAuthScreen.java similarity index 51% rename from src/main/java/me/axieum/mcmod/authme/impl/gui/OfflineAuthScreen.java rename to common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/OfflineAuthScreen.java index 70781cc..df9a8e6 100644 --- a/src/main/java/me/axieum/mcmod/authme/impl/gui/OfflineAuthScreen.java +++ b/common/src/main/java/me/axieum/mcmod/authme/api/gui/screen/OfflineAuthScreen.java @@ -1,17 +1,15 @@ -package me.axieum.mcmod.authme.impl.gui; +package me.axieum.mcmod.authme.api.gui.screen; -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.gui.widget.TextWidget; -import net.minecraft.client.toast.SystemToast; -import net.minecraft.text.Text; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.components.StringWidget; +import net.minecraft.client.gui.components.toasts.SystemToast; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; -import me.axieum.mcmod.authme.api.gui.AuthScreen; +import me.axieum.mcmod.authme.api.Config; 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; +import static me.axieum.mcmod.authme.api.AuthMe.LOGGER; /** * A screen for handling offline user authentication. @@ -19,9 +17,9 @@ public class OfflineAuthScreen extends AuthScreen { // The username and password text field widgets - private TextFieldWidget usernameField; + private EditBox usernameField; // The login button widget - private ButtonWidget loginBtn; + private Button loginBtn; /** * Constructs a new offline authentication screen. @@ -31,7 +29,7 @@ public class OfflineAuthScreen extends AuthScreen */ public OfflineAuthScreen(Screen parentScreen, Screen successScreen) { - super(Text.translatable("gui.authme.offline.title"), parentScreen, successScreen); + super(Component.translatable("gui.authme.offline.title"), parentScreen, successScreen); this.closeOnSuccess = true; } @@ -39,54 +37,54 @@ public OfflineAuthScreen(Screen parentScreen, Screen successScreen) protected void init() { super.init(); - assert client != null; + assert minecraft != null; // Add a title - TextWidget titleWidget = new TextWidget(width, height, title, textRenderer); - titleWidget.setTextColor(0xffffff); + StringWidget titleWidget = new StringWidget(width, height, title, font); + titleWidget.setColor(0xffffff); titleWidget.setPosition(width / 2 - titleWidget.getWidth() / 2, height / 2 - titleWidget.getHeight() / 2 - 40); - addDrawableChild(titleWidget); + addRenderableWidget(titleWidget); // Add a username text field - addDrawableChild( - usernameField = new TextFieldWidget( - client.textRenderer, + addRenderableWidget( + usernameField = new EditBox( + font, width / 2 - 100, height / 2 - 6, 200, 20, - Text.translatable("gui.authme.offline.field.username") + Component.translatable("gui.authme.offline.field.username") ) ); usernameField.setMaxLength(128); - if (getConfig().methods.offline.lastUsername != null) { - usernameField.setText(getConfig().methods.offline.lastUsername); + if (Config.LoginMethods.Offline.lastUsername != null) { + usernameField.setValue(Config.LoginMethods.Offline.lastUsername); } - usernameField.setChangedListener(value -> loginBtn.active = isFormValid()); + usernameField.setResponder(value -> loginBtn.active = isFormValid()); // Add a label for the username field - TextWidget labelWidget = new TextWidget(width, height, usernameField.getMessage(), textRenderer); - labelWidget.setTextColor(0xdddddd); + StringWidget labelWidget = new StringWidget(width, height, usernameField.getMessage(), font); + labelWidget.setColor(0xdddddd); labelWidget.setPosition( width / 2 - labelWidget.getWidth() / 2 - 51, height / 2 - labelWidget.getHeight() / 2 - 17 ); - addDrawableChild(labelWidget); + addRenderableWidget(labelWidget); // Add a login button to submit the form - addDrawableChild( - loginBtn = ButtonWidget.builder( - Text.translatable("gui.authme.offline.button.login"), + addRenderableWidget( + loginBtn = Button.builder( + Component.translatable("gui.authme.offline.button.login"), button -> login() - ).dimensions( + ).bounds( width / 2 - 100 - 2, height / 2 + 26, 100, 20 ).build() ); loginBtn.active = isFormValid(); // Add a cancel button to abort the task - addDrawableChild( - ButtonWidget.builder( - Text.translatable("gui.cancel"), - button -> close() - ).dimensions( + addRenderableWidget( + Button.builder( + Component.translatable("gui.cancel"), + button -> onClose() + ).bounds( width / 2 + 2, height / 2 + 26, 100, 20 ).build() ); @@ -97,7 +95,7 @@ protected void init() */ public void login() { - assert client != null; + assert minecraft != null; // Check whether the form is valid if (!isFormValid()) return; @@ -107,16 +105,15 @@ public void login() loginBtn.active = false; // Create and apply a new offline Minecraft session - SessionUtils.setSession(SessionUtils.offline(usernameField.getText())); + SessionUtils.setUser(SessionUtils.offline(usernameField.getValue())); // Sync configuration with the last used username - getConfig().methods.offline.lastUsername = usernameField.getText(); - CONFIG.save(); + Config.LoginMethods.Offline.lastUsername = usernameField.getValue(); // Add a toast that greets the player SystemToast.add( - client.getToastManager(), SystemToast.Type.PERIODIC_NOTIFICATION, - Text.translatable("gui.authme.toast.greeting", Text.literal(usernameField.getText())), null + minecraft.getToasts(), SystemToast.SystemToastId.PERIODIC_NOTIFICATION, + Component.translatable("gui.authme.toast.greeting", Component.literal(usernameField.getValue())), null ); // Mark the task as successful, in turn closing the screen @@ -131,6 +128,6 @@ public void login() */ public boolean isFormValid() { - return !usernameField.getText().isBlank(); + return !usernameField.getValue().isBlank(); } } diff --git a/src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java b/common/src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java similarity index 74% rename from src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java rename to common/src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java index 562fbb4..2c281a7 100644 --- a/src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java +++ b/common/src/main/java/me/axieum/mcmod/authme/api/gui/widget/AuthButtonWidget.java @@ -2,15 +2,14 @@ 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.client.render.RenderLayer; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.ImageButton; +import net.minecraft.client.gui.components.Tooltip; +import net.minecraft.client.gui.components.WidgetSprites; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; import me.axieum.mcmod.authme.api.util.SessionUtils; import me.axieum.mcmod.authme.api.util.SessionUtils.SessionStatus; @@ -18,25 +17,26 @@ /** * The textured button widget for opening the authentication screens. */ -public class AuthButtonWidget extends TexturedButtonWidget +public class AuthButtonWidget extends ImageButton { - // The screen used to constrain the button movements to + /** The screen used to constrain the button movements to. */ private final @Nullable Screen screen; - // Callback for after the button has been dragged + /** Callback for after the button has been dragged. */ private final @Nullable MoveAction moveAction; - // True if the button was just dragged + /** True if the button was just dragged. */ private boolean didDrag = false; - // The last known status of the Minecraft session + /** 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( - Identifier.of("widget/locked_button"), - Identifier.of("widget/locked_button_disabled"), - Identifier.of("widget/locked_button_highlighted") + /** The authentication button textures. */ + public static final WidgetSprites BUTTON_TEXTURES = new WidgetSprites( + ResourceLocation.parse("widget/locked_button"), + ResourceLocation.parse("widget/locked_button_disabled"), + ResourceLocation.parse("widget/locked_button_highlighted") + ); + /** The session status icon texture. */ + public static final ResourceLocation SESSION_STATUS_TEXTURE = ResourceLocation.fromNamespaceAndPath( + "authme", "textures/gui/session_status.png" ); - // The session status icon texture - public static final Identifier SESSION_STATUS_TEXTURE = Identifier.of("authme", "textures/gui/session_status.png"); /** * Constructs a fixed (no drag) authentication button. @@ -44,9 +44,9 @@ public class AuthButtonWidget extends TexturedButtonWidget * @param x x coordinate * @param y y coordinate * @param pressAction on click action - * @see #AuthButtonWidget(Screen, int, int, PressAction, MoveAction) + * @see #AuthButtonWidget(Screen, int, int, OnPress, MoveAction) */ - public AuthButtonWidget(int x, int y, PressAction pressAction) + public AuthButtonWidget(int x, int y, OnPress pressAction) { this(null, x, y, pressAction, null); } @@ -58,9 +58,9 @@ public AuthButtonWidget(int x, int y, PressAction pressAction) * @param y y coordinate * @param pressAction on click action * @param message non-visible button text - * @see #AuthButtonWidget(Screen, int, int, PressAction, MoveAction, Tooltip, Text) + * @see #AuthButtonWidget(Screen, int, int, OnPress, MoveAction, Tooltip, Component) */ - public AuthButtonWidget(int x, int y, PressAction pressAction, @Nullable Text message) + public AuthButtonWidget(int x, int y, OnPress pressAction, @Nullable Component message) { this(null, x, y, pressAction, null, null, message); } @@ -73,10 +73,10 @@ public AuthButtonWidget(int x, int y, PressAction pressAction, @Nullable Text me * @param pressAction on click action * @param tooltip tooltip * @param message non-visible button text - * @see #AuthButtonWidget(Screen, int, int, PressAction, MoveAction, Tooltip, Text) + * @see #AuthButtonWidget(Screen, int, int, OnPress, MoveAction, Tooltip, Component) */ public AuthButtonWidget( - int x, int y, PressAction pressAction, @Nullable Tooltip tooltip, @Nullable Text message + int x, int y, OnPress pressAction, @Nullable Tooltip tooltip, @Nullable Component message ) { this(null, x, y, pressAction, null, tooltip, message); @@ -90,13 +90,13 @@ public AuthButtonWidget( * @param y initial y coordinate * @param pressAction on click action * @param moveAction on move action - * @see #AuthButtonWidget(Screen, int, int, PressAction, MoveAction, Text) + * @see #AuthButtonWidget(Screen, int, int, OnPress, MoveAction, Component) */ public AuthButtonWidget( - @Nullable Screen screen, int x, int y, PressAction pressAction, @Nullable MoveAction moveAction + @Nullable Screen screen, int x, int y, OnPress pressAction, @Nullable MoveAction moveAction ) { - this(screen, x, y, pressAction, moveAction, Text.translatable("gui.authme.button.auth")); + this(screen, x, y, pressAction, moveAction, Component.translatable("gui.authme.button.auth")); } /** @@ -108,15 +108,15 @@ public AuthButtonWidget( * @param pressAction on click action * @param moveAction on move action * @param message non-visible button text - * @see #AuthButtonWidget(Screen, int, int, PressAction, MoveAction, Tooltip, Text) + * @see #AuthButtonWidget(Screen, int, int, OnPress, MoveAction, Tooltip, Component) */ public AuthButtonWidget( @Nullable Screen screen, int x, int y, - PressAction pressAction, + OnPress pressAction, @Nullable MoveAction moveAction, - @Nullable Text message + @Nullable Component message ) { this(screen, x, y, pressAction, moveAction, null, message); @@ -137,10 +137,10 @@ public AuthButtonWidget( @Nullable Screen screen, int x, int y, - PressAction pressAction, + OnPress pressAction, @Nullable MoveAction moveAction, @Nullable Tooltip tooltip, - Text message + Component message ) { super(x, y, 20, 20, BUTTON_TEXTURES, pressAction, message); @@ -198,7 +198,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) /** * Adjusts the default mouse up behaviour to trigger a click. * - * @see super#mouseClicked for mouse click implementation + * @see ImageButton#mouseClicked(double, double, int) */ @Override public boolean mouseReleased(double mouseX, double mouseY, int button) @@ -242,7 +242,7 @@ protected void onDrag(double mouseX, double mouseY, double deltaX, double deltaY } @Override - public void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) + public void renderWidget(GuiGraphics context, int mouseX, int mouseY, float delta) { // Cascade the rendering super.renderWidget(context, mouseX, mouseY, delta); @@ -255,8 +255,7 @@ public void renderWidget(DrawContext context, int mouseX, int mouseY, float delt default -> u = 16; } - context.drawTexture( - gui -> RenderLayer.getGuiTexturedOverlay(SESSION_STATUS_TEXTURE), + context.blit( SESSION_STATUS_TEXTURE, getX() + width - 6, getY() - 1, @@ -280,6 +279,6 @@ public interface MoveAction * * @param button button that was moved */ - void onMove(ButtonWidget button); + void onMove(Button button); } } diff --git a/src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java b/common/src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java similarity index 91% rename from src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java rename to common/src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java index ef5aed0..40d0176 100644 --- a/src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java +++ b/common/src/main/java/me/axieum/mcmod/authme/api/util/MicrosoftUtils.java @@ -39,12 +39,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import net.minecraft.client.session.Session; -import net.minecraft.util.JsonHelper; -import net.minecraft.util.Util; +import net.minecraft.Util; +import net.minecraft.client.User; +import net.minecraft.util.GsonHelper; -import static me.axieum.mcmod.authme.impl.AuthMe.LOGGER; -import static me.axieum.mcmod.authme.impl.AuthMe.getConfig; +import me.axieum.mcmod.authme.api.Config; +import static me.axieum.mcmod.authme.api.AuthMe.LOGGER; /** * Utility methods for authenticating via Microsoft. @@ -54,9 +54,12 @@ */ public final class MicrosoftUtils { - // A reusable Apache HTTP request config - // NB: We use Apache's HTTP implementation as the native HTTP client does - // not appear to free its resources after use! + /** + * A reusable Apache HTTP request config + * + *

NB: We use Apache's HTTP implementation as the native HTTP client does + * not appear to free its resources after use! + */ public static final RequestConfig REQUEST_CONFIG = RequestConfig .custom() .setConnectionRequestTimeout(30_000) @@ -64,16 +67,22 @@ public final class MicrosoftUtils .setSocketTimeout(30_000) .build(); - // A secure random for OAuth2 state generation + /** A secure random for OAuth2 state generation. */ private static final RandomGenerator SECURE_RANDOM = RandomGenerator.of("SecureRandom"); - // Default URLs used in the configuration. + /** The default client id used in the configuration. */ public static final String CLIENT_ID = "e16699bb-2aa8-46da-b5e3-45cbcce29091"; + /** The default authorization url used in the configuration. */ public static final String AUTHORIZE_URL = "https://login.microsoftonline.com/consumers/oauth2/v2.0/authorize"; + /** The default token url used in the configuration. */ public static final String TOKEN_URL = "https://login.microsoftonline.com/consumers/oauth2/v2.0/token"; + /** The default Xbox authentication url used in the configuration. */ public static final String XBOX_AUTH_URL = "https://user.auth.xboxlive.com/user/authenticate"; + /** The default Xbox XSTS url used in the configuration. */ public static final String XBOX_XSTS_URL = "https://xsts.auth.xboxlive.com/xsts/authorize"; + /** The default Minecraft authentication url used in the configuration. */ public static final String MC_AUTH_URL = "https://api.minecraftservices.com/authentication/login_with_xbox"; + /** The default Minecraft profile url used in the configuration. */ public static final String MC_PROFILE_URL = "https://api.minecraftservices.com/minecraft/profile"; private MicrosoftUtils() {} @@ -96,7 +105,7 @@ public static CompletableFuture acquireMSAuthCode( final Function browserMessage, final Executor executor ) { - return acquireMSAuthCode(url -> Util.getOperatingSystem().open(url), browserMessage, executor); + return acquireMSAuthCode(url -> Util.getPlatform().openUri(url), browserMessage, executor); } /** @@ -120,7 +129,7 @@ public static CompletableFuture acquireMSAuthCode( final @Nullable MicrosoftPrompt prompt ) { - return acquireMSAuthCode(url -> Util.getOperatingSystem().open(url), browserMessage, executor, prompt); + return acquireMSAuthCode(url -> Util.getPlatform().openUri(url), browserMessage, executor, prompt); } /** @@ -176,7 +185,7 @@ public static CompletableFuture acquireMSAuthCode( // Prepare a temporary HTTP server we can listen for the OAuth2 callback on final HttpServer server = HttpServer.create( - new InetSocketAddress(getConfig().methods.microsoft.port), 0 + new InetSocketAddress(Config.LoginMethods.Microsoft.port), 0 ); final CountDownLatch latch = new CountDownLatch(1); // track when a request has been handled final AtomicReference<@Nullable String> authCode = new AtomicReference<>(null), @@ -215,17 +224,17 @@ public static CompletableFuture acquireMSAuthCode( }); // Build a Microsoft login url - final URIBuilder uriBuilder = new URIBuilder(getConfig().methods.microsoft.authorizeUrl) - .addParameter("client_id", getConfig().methods.microsoft.clientId) + final URIBuilder uriBuilder = new URIBuilder(Config.LoginMethods.Microsoft.authorizeUrl) + .addParameter("client_id", Config.LoginMethods.Microsoft.clientId) .addParameter("response_type", "code") .addParameter( "redirect_uri", String.format("http://localhost:%d/callback", server.getAddress().getPort()) ) .addParameter("scope", "XboxLive.signin offline_access") .addParameter("state", state); - if (prompt != null || getConfig().methods.microsoft.prompt != MicrosoftPrompt.DEFAULT) { + if (prompt != null || Config.LoginMethods.Microsoft.prompt != MicrosoftPrompt.DEFAULT) { uriBuilder.addParameter( - "prompt", (prompt != null ? prompt : getConfig().methods.microsoft.prompt).toString() + "prompt", (prompt != null ? prompt : Config.LoginMethods.Microsoft.prompt).toString() ); } final URI uri = uriBuilder.build(); @@ -285,18 +294,18 @@ public static CompletableFuture acquireMSAccessToken(final String authCo LOGGER.info("Exchanging Microsoft auth code for an access token..."); try (CloseableHttpClient client = HttpClients.createMinimal()) { // Build a new HTTP request - final HttpPost request = new HttpPost(URI.create(getConfig().methods.microsoft.tokenUrl)); + final HttpPost request = new HttpPost(URI.create(Config.LoginMethods.Microsoft.tokenUrl)); request.setConfig(REQUEST_CONFIG); request.setHeader("Content-Type", "application/x-www-form-urlencoded"); request.setEntity(new UrlEncodedFormEntity( List.of( - new BasicNameValuePair("client_id", getConfig().methods.microsoft.clientId), + new BasicNameValuePair("client_id", Config.LoginMethods.Microsoft.clientId), new BasicNameValuePair("grant_type", "authorization_code"), new BasicNameValuePair("code", authCode), // We must provide the exact redirect URI that was used to obtain the auth code new BasicNameValuePair( "redirect_uri", - String.format("http://localhost:%d/callback", getConfig().methods.microsoft.port) + String.format("http://localhost:%d/callback", Config.LoginMethods.Microsoft.port) ) ), "UTF-8" @@ -308,7 +317,7 @@ public static CompletableFuture acquireMSAccessToken(final String authCo final org.apache.http.HttpResponse res = client.execute(request); // Attempt to parse the response body as JSON and extract the access token - final JsonObject json = JsonHelper.deserialize(EntityUtils.toString(res.getEntity())); + final JsonObject json = GsonHelper.parse(EntityUtils.toString(res.getEntity())); return Optional.ofNullable(json.get("access_token")) .map(JsonElement::getAsString) .filter(token -> !token.isBlank()) @@ -352,7 +361,7 @@ public static CompletableFuture acquireXboxAccessToken(final String acce LOGGER.info("Exchanging Microsoft access token for an Xbox Live access token..."); try (CloseableHttpClient client = HttpClients.createMinimal()) { // Build a new HTTP request - final HttpPost request = new HttpPost(URI.create(getConfig().methods.microsoft.xboxAuthUrl)); + final HttpPost request = new HttpPost(URI.create(Config.LoginMethods.Microsoft.xboxAuthUrl)); request.setConfig(REQUEST_CONFIG); request.setHeader("Content-Type", "application/json"); request.setEntity(new StringEntity( @@ -376,7 +385,7 @@ public static CompletableFuture acquireXboxAccessToken(final String acce // Attempt to parse the response body as JSON and extract the access token // NB: No response body is sent if the response is not ok final JsonObject json = res.getStatusLine().getStatusCode() == 200 - ? JsonHelper.deserialize(EntityUtils.toString(res.getEntity())) + ? GsonHelper.parse(EntityUtils.toString(res.getEntity())) : new JsonObject(); return Optional.ofNullable(json.get("Token")) .map(JsonElement::getAsString) @@ -422,7 +431,7 @@ public static CompletableFuture> acquireXboxXstsToken( LOGGER.info("Exchanging Xbox Live token for an Xbox Live XSTS token..."); try (CloseableHttpClient client = HttpClients.createMinimal()) { // Build a new HTTP request - final HttpPost request = new HttpPost(URI.create(getConfig().methods.microsoft.xboxXstsUrl)); + final HttpPost request = new HttpPost(URI.create(Config.LoginMethods.Microsoft.xboxXstsUrl)); request.setConfig(REQUEST_CONFIG); request.setHeader("Content-Type", "application/json"); request.setEntity(new StringEntity( @@ -445,7 +454,7 @@ public static CompletableFuture> acquireXboxXstsToken( // Attempt to parse the response body as JSON and extract the access token and user hash // NB: No response body is sent if the response is not ok final JsonObject json = res.getStatusLine().getStatusCode() == 200 - ? JsonHelper.deserialize(EntityUtils.toString(res.getEntity())) + ? GsonHelper.parse(EntityUtils.toString(res.getEntity())) : new JsonObject(); return Optional.ofNullable(json.get("Token")) .map(JsonElement::getAsString) @@ -497,7 +506,7 @@ public static CompletableFuture acquireMCAccessToken( LOGGER.info("Exchanging Xbox Live XSTS token for a Minecraft access token..."); try (CloseableHttpClient client = HttpClients.createMinimal()) { // Build a new HTTP request - final HttpPost request = new HttpPost(URI.create(getConfig().methods.microsoft.mcAuthUrl)); + final HttpPost request = new HttpPost(URI.create(Config.LoginMethods.Microsoft.mcAuthUrl)); request.setConfig(REQUEST_CONFIG); request.setHeader("Content-Type", "application/json"); request.setEntity(new StringEntity( @@ -510,7 +519,7 @@ public static CompletableFuture acquireMCAccessToken( final org.apache.http.HttpResponse res = client.execute(request); // Attempt to parse the response body as JSON and extract the access token - final JsonObject json = JsonHelper.deserialize(EntityUtils.toString(res.getEntity())); + final JsonObject json = GsonHelper.parse(EntityUtils.toString(res.getEntity())); return Optional.ofNullable(json.get("access_token")) .map(JsonElement::getAsString) .filter(token -> !token.isBlank()) @@ -546,15 +555,15 @@ public static CompletableFuture acquireMCAccessToken( * @param mcToken Minecraft access token * @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 + * @see SessionUtils#setUser(User) to apply the new session */ - public static CompletableFuture login(final String mcToken, final Executor executor) + public static CompletableFuture login(final String mcToken, final Executor executor) { return CompletableFuture.supplyAsync(() -> { LOGGER.info("Fetching Minecraft profile..."); try (CloseableHttpClient client = HttpClients.createMinimal()) { // Build a new HTTP request - final HttpGet request = new HttpGet(URI.create(getConfig().methods.microsoft.mcProfileUrl)); + final HttpGet request = new HttpGet(URI.create(Config.LoginMethods.Microsoft.mcProfileUrl)); request.setConfig(REQUEST_CONFIG); request.setHeader("Authorization", "Bearer " + mcToken); @@ -564,7 +573,7 @@ public static CompletableFuture login(final String mcToken, final Execu final org.apache.http.HttpResponse res = client.execute(request); // Attempt to parse the response body as JSON and extract the profile - final JsonObject json = JsonHelper.deserialize(EntityUtils.toString(res.getEntity())); + final JsonObject json = GsonHelper.parse(EntityUtils.toString(res.getEntity())); return Optional.ofNullable(json.get("id")) .map(JsonElement::getAsString) .filter(uuid -> !uuid.isBlank()) @@ -579,13 +588,13 @@ public static CompletableFuture login(final String mcToken, final Execu .map(uuid -> { LOGGER.info("Fetched Minecraft profile! (name={}, uuid={})", json.get("name").getAsString(), uuid); - return new Session( + return new User( json.get("name").getAsString(), uuid, mcToken, Optional.empty(), Optional.empty(), - Session.AccountType.MSA + User.Type.MSA ); }) // Otherwise, throw an exception with the error description if present diff --git a/src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java b/common/src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java similarity index 57% rename from src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java rename to common/src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java index 6956f01..7dafb63 100644 --- a/src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java +++ b/common/src/main/java/me/axieum/mcmod/authme/api/util/SessionUtils.java @@ -8,102 +8,105 @@ import com.mojang.authlib.minecraft.UserApiService; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; +import com.mojang.realmsclient.client.RealmsClient; +import com.mojang.realmsclient.gui.RealmsDataFetcher; -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.session.ProfileKeys; -import net.minecraft.client.session.Session; -import net.minecraft.client.session.report.AbuseReportContext; -import net.minecraft.util.Util; - -import me.axieum.mcmod.authme.mixin.AbuseReportContextAccessor; -import me.axieum.mcmod.authme.mixin.MinecraftClientAccessor; +import net.minecraft.Util; +import net.minecraft.client.Minecraft; +import net.minecraft.client.User; +import net.minecraft.client.gui.screens.social.PlayerSocialManager; +import net.minecraft.client.multiplayer.ProfileKeyPairManager; +import net.minecraft.client.multiplayer.chat.report.ReportingContext; + +import me.axieum.mcmod.authme.mixin.MinecraftAccessor; import me.axieum.mcmod.authme.mixin.RealmsAvailabilityAccessor; -import me.axieum.mcmod.authme.mixin.SplashTextResourceSupplierAccessor; -import static me.axieum.mcmod.authme.impl.AuthMe.LOGGER; +import me.axieum.mcmod.authme.mixin.ReportingContextAccessor; +import me.axieum.mcmod.authme.mixin.SplashManagerAccessor; +import static me.axieum.mcmod.authme.api.AuthMe.LOGGER; /** * Utility methods for interacting with the Microsoft game session. */ public final class SessionUtils { - // The access token used for offline sessions + /** The access token used for offline sessions. */ public static final String OFFLINE_TOKEN = "invalidtoken"; - // The number of milliseconds that a session status is cached for + /** The number of milliseconds that a session status is cached for. */ public static final long STATUS_TTL = 60_000L; // 60s - // The time of the last session status check (milliseconds since epoch) + /** The time of the last session status check (milliseconds since epoch). */ private static long lastStatusCheck; - // The last session status value + /** The last session status value. */ private static SessionStatus lastStatus = SessionStatus.UNKNOWN; private SessionUtils() {} /** - * Returns the current Minecraft session. + * Returns the current Minecraft user. * - * @return current Minecraft session instance + * @return current Minecraft user instance */ - public static Session getSession() + public static User getUser() { - return MinecraftClient.getInstance().getSession(); + return Minecraft.getInstance().getUser(); } /** - * Replaces the Minecraft session instance. + * Replaces the Minecraft user instance. * - * @param session new Minecraft session + * @param user new Minecraft user */ - public static void setSession(Session session) + public static void setUser(User user) { - final MinecraftClient client = MinecraftClient.getInstance(); + final Minecraft client = Minecraft.getInstance(); // Use an accessor mixin to update the 'private final' Minecraft session - ((MinecraftClientAccessor) client).setSession(session); - ((SplashTextResourceSupplierAccessor) client.getSplashTextLoader()).setSession(session); + ((MinecraftAccessor) client).setUser(user); + ((SplashManagerAccessor) client.getSplashManager()).setUser(user); // Re-create the game profile future - ((MinecraftClientAccessor) client).setGameProfileFuture( - CompletableFuture.supplyAsync(() -> client.getSessionService().fetchProfile(session.getUuidOrNull(), true), - Util.getDownloadWorkerExecutor())); + ((MinecraftAccessor) client).setProfileFuture( + CompletableFuture.supplyAsync( + () -> client.getMinecraftSessionService().fetchProfile(user.getProfileId(), true), + Util.nonCriticalIoPool() + ) + ); // Re-create the user API service (ignore offline session) UserApiService userApiService = UserApiService.OFFLINE; - if (!OFFLINE_TOKEN.equals(session.getAccessToken())) { - userApiService = getAuthService().createUserApiService(session.getAccessToken()); + if (!OFFLINE_TOKEN.equals(user.getAccessToken())) { + userApiService = getAuthService().createUserApiService(user.getAccessToken()); } - ((MinecraftClientAccessor) client).setUserApiService(userApiService); + ((MinecraftAccessor) client).setUserApiService(userApiService); // Re-create the social interactions manager - ((MinecraftClientAccessor) client).setSocialInteractionsManager( - new SocialInteractionsManager(client, userApiService) + ((MinecraftAccessor) client).setPlayerSocialManager( + new PlayerSocialManager(client, userApiService) ); // Re-create the profile keys - ((MinecraftClientAccessor) client).setProfileKeys( - ProfileKeys.create(userApiService, session, client.runDirectory.toPath()) + ((MinecraftAccessor) client).setProfileKeyPairManager( + ProfileKeyPairManager.create(userApiService, user, client.gameDirectory.toPath()) ); // Re-create the abuse report context - ((MinecraftClientAccessor) client).setAbuseReportContext( - AbuseReportContext.create( - ((AbuseReportContextAccessor) (Object) client.getAbuseReportContext()).getEnvironment(), + ((MinecraftAccessor) client).setReportingContext( + ReportingContext.create( + ((ReportingContextAccessor) (Object) client.getReportingContext()).getEnvironment(), userApiService ) ); // Necessary for Realms to re-check for a valid session - RealmsClient realmsClient = RealmsClient.createRealmsClient(client); - ((MinecraftClientAccessor) client).setRealmsPeriodicCheckers(new RealmsPeriodicCheckers(realmsClient)); - RealmsAvailabilityAccessor.setCurrentFuture(null); + RealmsClient realmsClient = RealmsClient.create(client); + ((MinecraftAccessor) client).setRealmsDataFetcher(new RealmsDataFetcher(realmsClient)); + RealmsAvailabilityAccessor.setFuture(null); // The cached status is now stale lastStatus = SessionStatus.UNKNOWN; lastStatusCheck = 0; LOGGER.info( - "Minecraft session for {} (uuid={}) has been applied", session.getUsername(), session.getUuidOrNull() + "Minecraft session for {} (uuid={}) has been applied", user.getName(), user.getProfileId() ); } @@ -112,17 +115,17 @@ public static void setSession(Session session) * * @param username custom username * @return a new offline Minecraft session - * @see #setSession(Session) to apply the new session + * @see #setUser(User) to apply the new session */ - public static Session offline(String username) + public static User offline(String username) { - return new Session( + return new User( username, UUID.nameUUIDFromBytes(("offline:" + username).getBytes()), OFFLINE_TOKEN, Optional.empty(), Optional.empty(), - Session.AccountType.LEGACY + User.Type.LEGACY ); } @@ -146,15 +149,15 @@ public static CompletableFuture getStatus() // Otherwise, return an asynchronous action to check the session status return CompletableFuture.supplyAsync(() -> { // Fetch the current session - final Session session = getSession(); + final User session = getUser(); 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(session.getUuidOrNull(), session.getAccessToken(), serverId); - if (sessionService.hasJoinedServer(session.getUsername(), serverId, null) != null) { + sessionService.joinServer(session.getProfileId(), session.getAccessToken(), serverId); + if (sessionService.hasJoinedServer(session.getName(), serverId, null) != null) { LOGGER.info("The Minecraft session is valid"); lastStatus = SessionStatus.VALID; } else { @@ -179,7 +182,7 @@ public static CompletableFuture getStatus() */ public static YggdrasilMinecraftSessionService getSessionService() { - return (YggdrasilMinecraftSessionService) MinecraftClient.getInstance().getSessionService(); + return (YggdrasilMinecraftSessionService) Minecraft.getInstance().getMinecraftSessionService(); } /** @@ -189,7 +192,7 @@ public static YggdrasilMinecraftSessionService getSessionService() */ public static YggdrasilAuthenticationService getAuthService() { - return ((MinecraftClientAccessor) MinecraftClient.getInstance()).getAuthenticationService(); + return ((MinecraftAccessor) Minecraft.getInstance()).getAuthenticationService(); } /** @@ -199,6 +202,13 @@ public static YggdrasilAuthenticationService getAuthService() */ public enum SessionStatus { - VALID, INVALID, OFFLINE, UNKNOWN + /** The session is valid. */ + VALID, + /** The session is invalid. */ + INVALID, + /** The session is offline. */ + OFFLINE, + /** The session is undetermined. */ + UNKNOWN, } } diff --git a/common/src/main/java/me/axieum/mcmod/authme/mixin/DisconnectedScreenMixin.java b/common/src/main/java/me/axieum/mcmod/authme/mixin/DisconnectedScreenMixin.java new file mode 100644 index 0000000..cf7fe22 --- /dev/null +++ b/common/src/main/java/me/axieum/mcmod/authme/mixin/DisconnectedScreenMixin.java @@ -0,0 +1,105 @@ +package me.axieum.mcmod.authme.mixin; + +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.DisconnectionDetails; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.contents.TranslatableContents; + +import me.axieum.mcmod.authme.api.gui.screen.AuthMethodScreen; +import static me.axieum.mcmod.authme.api.AuthMe.LOGGER; + +/** + * Injects a button into the disconnected screen to open the authentication screen. + */ +@Mixin(DisconnectedScreen.class) +public abstract class DisconnectedScreenMixin extends Screen +{ + @Shadow + @Final + private Screen parent; + + @Shadow + @Final + private DisconnectionDetails details; + + private DisconnectedScreenMixin(Component title) + { + super(title); + } + + /** + * Injects into the creation of the screen and adds the authentication button. + * + * @param ci injection callback info + */ + @Inject(method = "init", at = @At("TAIL")) + private void init(CallbackInfo ci) + { + // Determine if the disconnection reason is user or session related + if (authme$isUserRelated(details.reason())) { + LOGGER.info("Adding auth button to the disconnected screen"); + assert minecraft != null; + + // Create and add the button to the screen where the back button is + final Button backButton = (Button) children().get(2); + addRenderableWidget( + Button.builder( + Component.translatable("gui.authme.button.relogin"), + btn -> minecraft.setScreen(new AuthMethodScreen(parent)) + ).bounds( + backButton.getX(), + backButton.getY(), + backButton.getWidth(), + backButton.getHeight() + ).build() + ); + + // Shift the back button down below our new button + backButton.setY(backButton.getY() + backButton.getHeight() + 4); + } + } + + /** + * Determines if a server disconnection reason is user or session related. + * + * @param reason disconnect reason text + * @return true if the disconnection reason is user or session related + */ + @Unique + @SuppressWarnings("checkstyle:methodname") + private static boolean authme$isUserRelated(final @Nullable Component reason) + { + if (reason != null && reason.getContents() instanceof TranslatableContents content) { + final String key = content.getKey(); + return switch (key) { + case "disconnect.kicked", + "multiplayer.disconnect.banned", + "multiplayer.disconnect.banned.reason", + "multiplayer.disconnect.banned.expiration", + "multiplayer.disconnect.duplicate_login", + "multiplayer.disconnect.kicked", + "multiplayer.disconnect.unverified_username", + "multiplayer.disconnect.not_whitelisted", + "multiplayer.disconnect.name_taken", + "multiplayer.disconnect.missing_public_key", + "multiplayer.disconnect.expired_public_key", + "multiplayer.disconnect.invalid_public_key_signature", + "multiplayer.disconnect.unsigned_chat", + "multiplayer.disconnect.chat_validation_failed" -> true; + default -> key.startsWith("disconnect.loginFailed"); + }; + } + return false; + } +} diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/MultiplayerScreenMixin.java b/common/src/main/java/me/axieum/mcmod/authme/mixin/JoinMultiplayerScreenMixin.java similarity index 51% rename from src/main/java/me/axieum/mcmod/authme/mixin/MultiplayerScreenMixin.java rename to common/src/main/java/me/axieum/mcmod/authme/mixin/JoinMultiplayerScreenMixin.java index ba21af2..e5895df 100644 --- a/src/main/java/me/axieum/mcmod/authme/mixin/MultiplayerScreenMixin.java +++ b/common/src/main/java/me/axieum/mcmod/authme/mixin/JoinMultiplayerScreenMixin.java @@ -5,26 +5,25 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; -import net.minecraft.client.gui.tooltip.Tooltip; -import net.minecraft.text.Text; -import net.minecraft.util.Formatting; +import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.components.Tooltip; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; +import net.minecraft.network.chat.Component; +import me.axieum.mcmod.authme.api.Config; +import me.axieum.mcmod.authme.api.gui.screen.AuthMethodScreen; import me.axieum.mcmod.authme.api.gui.widget.AuthButtonWidget; import me.axieum.mcmod.authme.api.util.SessionUtils; -import me.axieum.mcmod.authme.impl.gui.AuthMethodScreen; -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; +import static me.axieum.mcmod.authme.api.AuthMe.LOGGER; /** * Injects a button into the multiplayer screen to open the authentication screen. */ -@Mixin(MultiplayerScreen.class) -public abstract class MultiplayerScreenMixin extends Screen +@Mixin(JoinMultiplayerScreen.class) +public abstract class JoinMultiplayerScreenMixin extends Screen { - private MultiplayerScreenMixin(Text title) + private JoinMultiplayerScreenMixin(Component title) { super(title); } @@ -34,34 +33,33 @@ private MultiplayerScreenMixin(Text title) * * @param ci injection callback info */ - @Inject(method = "init", at = @At("HEAD")) + @Inject(method = "init", at = @At("TAIL")) private void init(CallbackInfo ci) { LOGGER.info("Adding auth button to the multiplayer screen"); - assert client != null; + assert minecraft != null; // Create and add the button to the screen - addDrawableChild( + addRenderableWidget( new AuthButtonWidget( this, - getConfig().authButton.x, - getConfig().authButton.y, - btn -> client.setScreen(new AuthMethodScreen(this)), + Config.AuthButton.x, + Config.AuthButton.y, + btn -> minecraft.setScreen(new AuthMethodScreen(this)), // Optionally, enable button dragging - getConfig().authButton.draggable ? btn -> { + Config.AuthButton.draggable ? btn -> { // Sync configuration with the updated button position LOGGER.info("Moved the auth button to {}, {}", btn.getX(), btn.getY()); - getConfig().authButton.x = btn.getX(); - getConfig().authButton.y = btn.getY(); - CONFIG.save(); + Config.AuthButton.x = btn.getX(); + Config.AuthButton.y = btn.getY(); } : null, // Add a tooltip to greet the player - Tooltip.of(Text.translatable( + Tooltip.create(Component.translatable( "gui.authme.button.auth.tooltip", - Text.literal(SessionUtils.getSession().getUsername()).formatted(Formatting.YELLOW) + Component.literal(SessionUtils.getUser().getName()).withStyle(ChatFormatting.YELLOW) )), // Non-visible text, useful for screen narrator - Text.translatable("gui.authme.button.auth") + Component.translatable("gui.authme.button.auth") ) ); } diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftClientAccessor.java b/common/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftAccessor.java similarity index 57% rename from src/main/java/me/axieum/mcmod/authme/mixin/MinecraftClientAccessor.java rename to common/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftAccessor.java index 20e5100..1d99480 100644 --- a/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftClientAccessor.java +++ b/common/src/main/java/me/axieum/mcmod/authme/mixin/MinecraftAccessor.java @@ -9,28 +9,28 @@ import com.mojang.authlib.minecraft.UserApiService; import com.mojang.authlib.yggdrasil.ProfileResult; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.realmsclient.gui.RealmsDataFetcher; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.network.SocialInteractionsManager; -import net.minecraft.client.realms.RealmsPeriodicCheckers; -import net.minecraft.client.session.ProfileKeys; -import net.minecraft.client.session.Session; -import net.minecraft.client.session.report.AbuseReportContext; +import net.minecraft.client.Minecraft; +import net.minecraft.client.User; +import net.minecraft.client.gui.screens.social.PlayerSocialManager; +import net.minecraft.client.multiplayer.ProfileKeyPairManager; +import net.minecraft.client.multiplayer.chat.report.ReportingContext; /** * Provides the means to access protected members of the Minecraft client. */ -@Mixin(MinecraftClient.class) -public interface MinecraftClientAccessor +@Mixin(Minecraft.class) +public interface MinecraftAccessor { /** * Sets the Minecraft session. * - * @param session new Minecraft session + * @param user new Minecraft session */ @Accessor @Mutable - void setSession(Session session); + void setUser(User user); /** * Sets the game profile. @@ -39,7 +39,7 @@ public interface MinecraftClientAccessor */ @Accessor @Mutable - void setGameProfileFuture(CompletableFuture future); + void setProfileFuture(CompletableFuture future); /** * Returns the Minecraft authentication service. @@ -61,36 +61,36 @@ public interface MinecraftClientAccessor /** * Sets the Minecraft social interactions manager. * - * @param socialInteractionsManager new Minecraft social interactions manager + * @param playerSocialManager new Minecraft social interactions manager */ @Accessor @Mutable - void setSocialInteractionsManager(SocialInteractionsManager socialInteractionsManager); + void setPlayerSocialManager(PlayerSocialManager playerSocialManager); /** * Sets the Minecraft profile keys. * - * @param profileKeys new Minecraft profile keys + * @param profileKeyPairManager new Minecraft profile keys */ @Accessor @Mutable - void setProfileKeys(ProfileKeys profileKeys); + void setProfileKeyPairManager(ProfileKeyPairManager profileKeyPairManager); /** * Sets the Minecraft abuse report context. * - * @param abuseReportContext new Minecraft abuse report context + * @param reportContext new Minecraft abuse report context */ @Accessor @Mutable - void setAbuseReportContext(AbuseReportContext abuseReportContext); + void setReportingContext(ReportingContext reportContext); /** * Sets the Minecraft Realms periodic checkers. * - * @param realmsPeriodicCheckers new Minecraft Realms periodic checkers + * @param realmsDataFetcher new Minecraft Realms periodic checkers */ @Accessor @Mutable - void setRealmsPeriodicCheckers(RealmsPeriodicCheckers realmsPeriodicCheckers); + void setRealmsDataFetcher(RealmsDataFetcher realmsDataFetcher); } diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java b/common/src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java similarity index 68% rename from src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java rename to common/src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java index aa6acf6..b071634 100644 --- a/src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java +++ b/common/src/main/java/me/axieum/mcmod/authme/mixin/RealmsAvailabilityAccessor.java @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.gen.Accessor; -import net.minecraft.client.realms.RealmsAvailability; +import com.mojang.realmsclient.RealmsAvailability; /** * Provides the means to access protected members of the Realms availability check. @@ -17,9 +17,9 @@ public interface RealmsAvailabilityAccessor /** * Sets the Realms availability info checker. * - * @param availabilityInfo Realms availability info completable future + * @param future Realms availability info completable future */ @Accessor @Mutable - static void setCurrentFuture(CompletableFuture availabilityInfo) {} + static void setFuture(CompletableFuture future) {} } diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/RealmsGenericErrorScreenMixin.java b/common/src/main/java/me/axieum/mcmod/authme/mixin/RealmsGenericErrorScreenMixin.java similarity index 57% rename from src/main/java/me/axieum/mcmod/authme/mixin/RealmsGenericErrorScreenMixin.java rename to common/src/main/java/me/axieum/mcmod/authme/mixin/RealmsGenericErrorScreenMixin.java index a414fb8..5c1911e 100644 --- a/src/main/java/me/axieum/mcmod/authme/mixin/RealmsGenericErrorScreenMixin.java +++ b/common/src/main/java/me/axieum/mcmod/authme/mixin/RealmsGenericErrorScreenMixin.java @@ -9,15 +9,16 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.realms.gui.screen.RealmsGenericErrorScreen; -import net.minecraft.client.realms.gui.screen.RealmsScreen; -import net.minecraft.text.Text; -import net.minecraft.text.TranslatableTextContent; +import com.mojang.realmsclient.gui.screens.RealmsGenericErrorScreen; -import me.axieum.mcmod.authme.impl.gui.AuthMethodScreen; -import static me.axieum.mcmod.authme.impl.AuthMe.LOGGER; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.realms.RealmsScreen; + +import me.axieum.mcmod.authme.api.gui.screen.AuthMethodScreen; +import static me.axieum.mcmod.authme.api.AuthMe.LOGGER; /** * Injects a button into the Realms' error screen to open the authentication screen. @@ -27,13 +28,13 @@ public abstract class RealmsGenericErrorScreenMixin extends RealmsScreen { @Shadow @Final - private Screen parent; + private Screen nextScreen; @Shadow @Final - private RealmsGenericErrorScreen.ErrorMessages errorMessages; + private RealmsGenericErrorScreen.ErrorMessage lines; - private RealmsGenericErrorScreenMixin(Text title) + private RealmsGenericErrorScreenMixin(Component title) { super(title); } @@ -47,17 +48,17 @@ private RealmsGenericErrorScreenMixin(Text title) private void init(CallbackInfo ci) { // Determine if the disconnection reason is user or session related - if (isUserRelated(errorMessages.detail())) { + if (authme$isUserRelated(lines.detail())) { LOGGER.info("Adding auth button to the Realms error screen"); - assert client != null; + assert minecraft != null; // Create and add the button to the screen above the back button - final ButtonWidget backButton = (ButtonWidget) children().getFirst(); - addDrawableChild( - ButtonWidget.builder( - Text.translatable("gui.authme.button.relogin"), - btn -> client.setScreen(new AuthMethodScreen(parent)) - ).dimensions( + final Button backButton = (Button) children().getFirst(); + addRenderableWidget( + Button.builder( + Component.translatable("gui.authme.button.relogin"), + btn -> minecraft.setScreen(new AuthMethodScreen(nextScreen)) + ).bounds( backButton.getX(), backButton.getY() - backButton.getHeight() - 4, backButton.getWidth(), @@ -74,11 +75,11 @@ private void init(CallbackInfo ci) * @return true if the disconnection reason is user or session related */ @Unique - private static boolean isUserRelated(final @Nullable Text reason) + @SuppressWarnings("checkstyle:methodname") + private static boolean authme$isUserRelated(final @Nullable Component reason) { - if (reason != null && reason.getContent() instanceof TranslatableTextContent content) { - final String key = content.getKey(); - return key != null && key.startsWith("mco.error.invalid.session"); + if (reason != null && reason.getContents() instanceof TranslatableContents content) { + return content.getKey().startsWith("mco.error.invalid.session"); } return false; } diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/AbuseReportContextAccessor.java b/common/src/main/java/me/axieum/mcmod/authme/mixin/ReportingContextAccessor.java similarity index 56% rename from src/main/java/me/axieum/mcmod/authme/mixin/AbuseReportContextAccessor.java rename to common/src/main/java/me/axieum/mcmod/authme/mixin/ReportingContextAccessor.java index 57038cf..5020011 100644 --- a/src/main/java/me/axieum/mcmod/authme/mixin/AbuseReportContextAccessor.java +++ b/common/src/main/java/me/axieum/mcmod/authme/mixin/ReportingContextAccessor.java @@ -3,14 +3,14 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import net.minecraft.client.session.report.AbuseReportContext; -import net.minecraft.client.session.report.ReporterEnvironment; +import net.minecraft.client.multiplayer.chat.report.ReportEnvironment; +import net.minecraft.client.multiplayer.chat.report.ReportingContext; /** * Provides the means to access protected members of the Abuse Report Context. */ -@Mixin(AbuseReportContext.class) -public interface AbuseReportContextAccessor +@Mixin(ReportingContext.class) +public interface ReportingContextAccessor { /** * Returns the reporter environment. @@ -18,5 +18,5 @@ public interface AbuseReportContextAccessor * @return environment */ @Accessor - ReporterEnvironment getEnvironment(); + ReportEnvironment getEnvironment(); } diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/SplashTextResourceSupplierAccessor.java b/common/src/main/java/me/axieum/mcmod/authme/mixin/SplashManagerAccessor.java similarity index 62% rename from src/main/java/me/axieum/mcmod/authme/mixin/SplashTextResourceSupplierAccessor.java rename to common/src/main/java/me/axieum/mcmod/authme/mixin/SplashManagerAccessor.java index 8cd7bb7..7b15348 100644 --- a/src/main/java/me/axieum/mcmod/authme/mixin/SplashTextResourceSupplierAccessor.java +++ b/common/src/main/java/me/axieum/mcmod/authme/mixin/SplashManagerAccessor.java @@ -4,14 +4,14 @@ import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.gen.Accessor; -import net.minecraft.client.resource.SplashTextResourceSupplier; -import net.minecraft.client.session.Session; +import net.minecraft.client.User; +import net.minecraft.client.resources.SplashManager; /** * Provides the means to access protected members of the Splash Text Resource supplier. */ -@Mixin(SplashTextResourceSupplier.class) -public interface SplashTextResourceSupplierAccessor +@Mixin(SplashManager.class) +public interface SplashManagerAccessor { /** * Sets the Minecraft session. @@ -20,5 +20,5 @@ public interface SplashTextResourceSupplierAccessor */ @Accessor @Mutable - void setSession(Session session); + void setUser(User session); } diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json new file mode 100644 index 0000000..8810057 --- /dev/null +++ b/common/src/main/resources/architectury.common.json @@ -0,0 +1,3 @@ +{ + "accessWidener": "authme.accesswidener" +} diff --git a/src/main/resources/assets/authme/atlases/gui.json b/common/src/main/resources/assets/authme/atlases/gui.json similarity index 100% rename from src/main/resources/assets/authme/atlases/gui.json rename to common/src/main/resources/assets/authme/atlases/gui.json diff --git a/src/main/resources/assets/authme/lang/de_de.json b/common/src/main/resources/assets/authme/lang/de_de.json similarity index 52% rename from src/main/resources/assets/authme/lang/de_de.json rename to common/src/main/resources/assets/authme/lang/de_de.json index e1e5758..432e63f 100644 --- a/src/main/resources/assets/authme/lang/de_de.json +++ b/common/src/main/resources/assets/authme/lang/de_de.json @@ -29,22 +29,22 @@ "gui.authme.offline.field.username": "WÃĪhle einen Benutzernamen", "gui.authme.offline.button.login": "Offline spielen", - "text.autoconfig.authme.title": "Auth Me Einstellungen", - "text.autoconfig.authme.option.authButton": "Auth Knopf", - "text.autoconfig.authme.option.authButton.x": "X-Koordinate", - "text.autoconfig.authme.option.authButton.y": "Y-Koordinate", - "text.autoconfig.authme.option.authButton.draggable": "Kann ziehen?", - "text.autoconfig.authme.option.methods": "Anmelde-Methoden", - "text.autoconfig.authme.option.methods.microsoft": "Microsoft", - "text.autoconfig.authme.option.methods.microsoft.prompt": "Interaktionsaufforderung", - "text.autoconfig.authme.option.methods.microsoft.port": "OAuth2 Callback Url Port", - "text.autoconfig.authme.option.methods.microsoft.clientId": "OAuth2 Client Id", - "text.autoconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2 Autorisierungs-Url", - "text.autoconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2 Access Token Url", - "text.autoconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox Authentifizierungs-Url", - "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.offline": "Offline", - "text.autoconfig.authme.option.methods.offline.lastUsername": "Zuletzt verwendeter Benutzername" + "text.rconfig.authme.title": "Auth Me Einstellungen", + "text.rconfig.authme.option.authButton": "Auth Knopf", + "text.rconfig.authme.option.authButton.x": "X-Koordinate", + "text.rconfig.authme.option.authButton.y": "Y-Koordinate", + "text.rconfig.authme.option.authButton.draggable": "Kann ziehen?", + "text.rconfig.authme.option.methods": "Anmelde-Methoden", + "text.rconfig.authme.option.methods.microsoft": "Microsoft", + "text.rconfig.authme.option.methods.microsoft.prompt": "Interaktionsaufforderung", + "text.rconfig.authme.option.methods.microsoft.port": "OAuth2 Callback Url Port", + "text.rconfig.authme.option.methods.microsoft.clientId": "OAuth2 Client Id", + "text.rconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2 Autorisierungs-Url", + "text.rconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2 Access Token Url", + "text.rconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox Authentifizierungs-Url", + "text.rconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS Autorisierungs-Url", + "text.rconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft Authentifizierungs-Url", + "text.rconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft-Profil-Url", + "text.rconfig.authme.option.methods.offline": "Offline", + "text.rconfig.authme.option.methods.offline.lastUsername": "Zuletzt verwendeter Benutzername" } diff --git a/src/main/resources/assets/authme/lang/en_us.json b/common/src/main/resources/assets/authme/lang/en_us.json similarity index 52% rename from src/main/resources/assets/authme/lang/en_us.json rename to common/src/main/resources/assets/authme/lang/en_us.json index 27f732e..186c43f 100644 --- a/src/main/resources/assets/authme/lang/en_us.json +++ b/common/src/main/resources/assets/authme/lang/en_us.json @@ -36,22 +36,27 @@ "gui.authme.offline.field.username": "Choose a Username", "gui.authme.offline.button.login": "Play Offline", - "text.autoconfig.authme.title": "Auth Me Config", - "text.autoconfig.authme.option.authButton": "Auth Button", - "text.autoconfig.authme.option.authButton.x": "X Coordinate", - "text.autoconfig.authme.option.authButton.y": "Y Coordinate", - "text.autoconfig.authme.option.authButton.draggable": "Can Drag?", - "text.autoconfig.authme.option.methods": "Login Methods", - "text.autoconfig.authme.option.methods.microsoft": "Microsoft", - "text.autoconfig.authme.option.methods.microsoft.prompt": "Interaction Prompt", - "text.autoconfig.authme.option.methods.microsoft.port": "OAuth2 Callback Url Port", - "text.autoconfig.authme.option.methods.microsoft.clientId": "OAuth2 Client Id", - "text.autoconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2 Authorization Url", - "text.autoconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2 Access Token Url", - "text.autoconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox Authentication Url", - "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.offline": "Offline", - "text.autoconfig.authme.option.methods.offline.lastUsername": "Last Used Username" + "text.rconfig.authme.title": "Auth Me", + "text.rconfig.authme.description": "Authenticate yourself in Minecraft and re-validate your session", + "text.rconfig.authme.option.authButton": "Auth Button", + "text.rconfig.authme.option.authButton.description": "Control the behaviour of the authentication button on the multiplayer screen", + "text.rconfig.authme.option.authButton.x": "X Coordinate", + "text.rconfig.authme.option.authButton.y": "Y Coordinate", + "text.rconfig.authme.option.authButton.draggable": "Can Drag?", + "text.rconfig.authme.option.methods": "Login Methods", + "text.rconfig.authme.option.methods.description": "Control the behaviour of the available login methods", + "text.rconfig.authme.option.methods.microsoft": "Microsoft", + "text.rconfig.authme.option.methods.microsoft.description": "Control the behaviour of the Microsoft login method", + "text.rconfig.authme.option.methods.microsoft.prompt": "Interaction Prompt", + "text.rconfig.authme.option.methods.microsoft.port": "OAuth2 Callback Url Port", + "text.rconfig.authme.option.methods.microsoft.clientId": "OAuth2 Client Id", + "text.rconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2 Authorization Url", + "text.rconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2 Access Token Url", + "text.rconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox Authentication Url", + "text.rconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS Authorization Url", + "text.rconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft Authentication Url", + "text.rconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft Profile Url", + "text.rconfig.authme.option.methods.offline": "Offline", + "text.rconfig.authme.option.methods.offline.description": "Control the behaviour of the offline login method", + "text.rconfig.authme.option.methods.offline.lastUsername": "Last Used Username" } diff --git a/src/main/resources/assets/authme/lang/fi_fi.json b/common/src/main/resources/assets/authme/lang/fi_fi.json similarity index 51% rename from src/main/resources/assets/authme/lang/fi_fi.json rename to common/src/main/resources/assets/authme/lang/fi_fi.json index b3a6a8c..ffee974 100644 --- a/src/main/resources/assets/authme/lang/fi_fi.json +++ b/common/src/main/resources/assets/authme/lang/fi_fi.json @@ -29,22 +29,22 @@ "gui.authme.offline.field.username": "Valitse pelinimi", "gui.authme.offline.button.login": "Pelaa ilman yhteyttÃĪ", - "text.autoconfig.authme.title": "Auth Me-asetukset", - "text.autoconfig.authme.option.authButton": "Auth-nappi", - "text.autoconfig.authme.option.authButton.x": "X-koordinaatti", - "text.autoconfig.authme.option.authButton.y": "Y-koordinaatti", - "text.autoconfig.authme.option.authButton.draggable": "VedettÃĪvissÃĪ?", - "text.autoconfig.authme.option.methods": "KirjautumismenetelmÃĪt", - "text.autoconfig.authme.option.methods.microsoft": "Microsoft", - "text.autoconfig.authme.option.methods.microsoft.prompt": "Vuorovaikutuskehote", - "text.autoconfig.authme.option.methods.microsoft.port": "OAuth2-takaisinkutsuosoitteen portti", - "text.autoconfig.authme.option.methods.microsoft.clientId": "OAuth2-asiakkaan ID", - "text.autoconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2-valtuutusosoite", - "text.autoconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2-pÃĪÃĪsytunnuksen osoite", - "text.autoconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox-valtuutuksen osoite", - "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.offline": "YhteydetÃķn", - "text.autoconfig.authme.option.methods.offline.lastUsername": "Viimeksi kÃĪytetty kÃĪyttÃĪjÃĪtunnus" + "text.rconfig.authme.title": "Auth Me-asetukset", + "text.rconfig.authme.option.authButton": "Auth-nappi", + "text.rconfig.authme.option.authButton.x": "X-koordinaatti", + "text.rconfig.authme.option.authButton.y": "Y-koordinaatti", + "text.rconfig.authme.option.authButton.draggable": "VedettÃĪvissÃĪ?", + "text.rconfig.authme.option.methods": "KirjautumismenetelmÃĪt", + "text.rconfig.authme.option.methods.microsoft": "Microsoft", + "text.rconfig.authme.option.methods.microsoft.prompt": "Vuorovaikutuskehote", + "text.rconfig.authme.option.methods.microsoft.port": "OAuth2-takaisinkutsuosoitteen portti", + "text.rconfig.authme.option.methods.microsoft.clientId": "OAuth2-asiakkaan ID", + "text.rconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2-valtuutusosoite", + "text.rconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2-pÃĪÃĪsytunnuksen osoite", + "text.rconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox-valtuutuksen osoite", + "text.rconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS-valtuutuksen osoite", + "text.rconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft-valtuutuksen osoite", + "text.rconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft-profiilin osoite", + "text.rconfig.authme.option.methods.offline": "YhteydetÃķn", + "text.rconfig.authme.option.methods.offline.lastUsername": "Viimeksi kÃĪytetty kÃĪyttÃĪjÃĪtunnus" } diff --git a/src/main/resources/assets/authme/lang/fr_fr.json b/common/src/main/resources/assets/authme/lang/fr_fr.json similarity index 52% rename from src/main/resources/assets/authme/lang/fr_fr.json rename to common/src/main/resources/assets/authme/lang/fr_fr.json index 88bb35b..fcd7d85 100644 --- a/src/main/resources/assets/authme/lang/fr_fr.json +++ b/common/src/main/resources/assets/authme/lang/fr_fr.json @@ -29,22 +29,22 @@ "gui.authme.offline.field.username": "Choisissez un nom d'utilisateur", "gui.authme.offline.button.login": "Jouer hors-ligne", - "text.autoconfig.authme.title": "Configuration d'Auth Me", - "text.autoconfig.authme.option.authButton": "Bouton d'authentification", - "text.autoconfig.authme.option.authButton.x": "CoordonnÃĐe X", - "text.autoconfig.authme.option.authButton.y": "CoordonnÃĐe Y", - "text.autoconfig.authme.option.authButton.draggable": "PossibilitÃĐ de dÃĐplacer le bouton", - "text.autoconfig.authme.option.methods": "MÃĐthodes de connexion", - "text.autoconfig.authme.option.methods.microsoft": "Microsoft", - "text.autoconfig.authme.option.methods.microsoft.prompt": "Boite d'interaction", - "text.autoconfig.authme.option.methods.microsoft.port": "Port d'URL de rappel OAuth2", - "text.autoconfig.authme.option.methods.microsoft.clientId": "Id OAuth2 du client", - "text.autoconfig.authme.option.methods.microsoft.authorizeUrl": "URL OAuth2 d'autorisation", - "text.autoconfig.authme.option.methods.microsoft.tokenUrl": "URL OAuth2 d'accÃĻs au jeton", - "text.autoconfig.authme.option.methods.microsoft.xboxAuthUrl": "URL d'authentification Xbox", - "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.offline": "Hors-ligne", - "text.autoconfig.authme.option.methods.offline.lastUsername": "Last Used Username" + "text.rconfig.authme.title": "Configuration d'Auth Me", + "text.rconfig.authme.option.authButton": "Bouton d'authentification", + "text.rconfig.authme.option.authButton.x": "CoordonnÃĐe X", + "text.rconfig.authme.option.authButton.y": "CoordonnÃĐe Y", + "text.rconfig.authme.option.authButton.draggable": "PossibilitÃĐ de dÃĐplacer le bouton", + "text.rconfig.authme.option.methods": "MÃĐthodes de connexion", + "text.rconfig.authme.option.methods.microsoft": "Microsoft", + "text.rconfig.authme.option.methods.microsoft.prompt": "Boite d'interaction", + "text.rconfig.authme.option.methods.microsoft.port": "Port d'URL de rappel OAuth2", + "text.rconfig.authme.option.methods.microsoft.clientId": "Id OAuth2 du client", + "text.rconfig.authme.option.methods.microsoft.authorizeUrl": "URL OAuth2 d'autorisation", + "text.rconfig.authme.option.methods.microsoft.tokenUrl": "URL OAuth2 d'accÃĻs au jeton", + "text.rconfig.authme.option.methods.microsoft.xboxAuthUrl": "URL d'authentification Xbox", + "text.rconfig.authme.option.methods.microsoft.xboxXstsUrl": "URL d'authentification Xbox XSTS", + "text.rconfig.authme.option.methods.microsoft.mcAuthUrl": "URL d'authentification Minecraft", + "text.rconfig.authme.option.methods.microsoft.mcProfileUrl": "URL du profil Minecraft", + "text.rconfig.authme.option.methods.offline": "Hors-ligne", + "text.rconfig.authme.option.methods.offline.lastUsername": "Last Used Username" } diff --git a/src/main/resources/assets/authme/lang/pl_pl.json b/common/src/main/resources/assets/authme/lang/pl_pl.json similarity index 52% rename from src/main/resources/assets/authme/lang/pl_pl.json rename to common/src/main/resources/assets/authme/lang/pl_pl.json index 95cb82a..8dab411 100644 --- a/src/main/resources/assets/authme/lang/pl_pl.json +++ b/common/src/main/resources/assets/authme/lang/pl_pl.json @@ -29,22 +29,22 @@ "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" + "text.rconfig.authme.title": "Konfiguracja Auth Me", + "text.rconfig.authme.option.authButton": "Przycisk Auth", + "text.rconfig.authme.option.authButton.x": "Pozycja X", + "text.rconfig.authme.option.authButton.y": "Pozycja Y", + "text.rconfig.authme.option.authButton.draggable": "MoÅžna przesuwać?", + "text.rconfig.authme.option.methods": "Metody logowania", + "text.rconfig.authme.option.methods.microsoft": "Microsoft", + "text.rconfig.authme.option.methods.microsoft.prompt": "Powiadomienie o interakcji", + "text.rconfig.authme.option.methods.microsoft.port": "Port Url wywołania zwrotnego OAuth2", + "text.rconfig.authme.option.methods.microsoft.clientId": "ID klienta OAuth2", + "text.rconfig.authme.option.methods.microsoft.authorizeUrl": "Url autoryzacji OAuth2", + "text.rconfig.authme.option.methods.microsoft.tokenUrl": "Url tokenu dostępu OAuth2", + "text.rconfig.authme.option.methods.microsoft.xboxAuthUrl": "Url autentykacji Xbox", + "text.rconfig.authme.option.methods.microsoft.xboxXstsUrl": "Url autentykacji XSTS Xbox", + "text.rconfig.authme.option.methods.microsoft.mcAuthUrl": "Url autentykacji Minecraft", + "text.rconfig.authme.option.methods.microsoft.mcProfileUrl": "Url profilu Minecraft", + "text.rconfig.authme.option.methods.offline": "Offline", + "text.rconfig.authme.option.methods.offline.lastUsername": "Ostatnia nazwa uÅžytkownika" } diff --git a/src/main/resources/assets/authme/lang/zh_cn.json b/common/src/main/resources/assets/authme/lang/zh_cn.json similarity index 50% rename from src/main/resources/assets/authme/lang/zh_cn.json rename to common/src/main/resources/assets/authme/lang/zh_cn.json index 48574db..4f4e718 100644 --- a/src/main/resources/assets/authme/lang/zh_cn.json +++ b/common/src/main/resources/assets/authme/lang/zh_cn.json @@ -1,50 +1,50 @@ -{ - "gui.authme.button.auth": "驌čŊ", - "gui.authme.button.auth.tooltip": "æŽĒčŋŽå›žæĨ, %s!", - "gui.authme.button.relogin": "å†æŽĄį™ŧå―•", - - "gui.authme.error.generic": "凚įŽ°äš†äļ€äš›é—ŪéĒ˜! čŊ·čŋ”回再重čŊ•äļ€é.", - "gui.authme.error.timeout": "čķ…æ—ķ! čŊ·čŋ”回再重čŊ•äļ€é.", - - "gui.authme.toast.greeting": "æŽĒčŋŽå›žæĨ, %s!", - - "gui.authme.method.title": "选æ‹Đä― įš„į™ŧå―•æ–đ垏", - "gui.authme.method.greeting": "ä― åĨ―, %s!", - "gui.authme.method.button.microsoft": "åūŪč―ŊčīĶ号", - "gui.authme.method.button.mojang": "Mojang (æ—Đ期čīĶ户)", - "gui.authme.method.button.offline": "įĶŧįšŋ", - - "gui.authme.microsoft.title": "通čŋ‡åūŪč―Ŋį™ŧå―•", - "gui.authme.microsoft.browser": "įŽ°åœĻåŊäŧĨå…ģ闭æ­Īį•ŒéĒåđķäļ”čŋ”回 Minecraft 乆!", - "gui.authme.microsoft.status.checkBrowser": "æ­ĢåœĻ前åū€ä― įš„æĩč§ˆå™Ļ...", - "gui.authme.microsoft.status.msAccessToken": "čŽ·å– Microsoft Access äŧĪį‰Œ...", - "gui.authme.microsoft.status.xboxAccessToken": "čŽ·å– Xbox Access äŧĪį‰Œ...", - "gui.authme.microsoft.status.xboxXstsToken": "čŽ·å– Xbox XSTS äŧĪį‰Œ...", - "gui.authme.microsoft.status.mcAccessToken": "čŽ·å– Minecraft Access äŧĪį‰Œ...", - "gui.authme.microsoft.status.mcProfile": "æ­ĢåœĻčŽ·å–æ‚Ļįš„ Minecraft čīĶ号äŋĄæŊ...", - - "gui.authme.mojang.title": "通čŋ‡ Mojang (æ—Đ期čīĶ户) į™ŧå―•", - - "gui.authme.offline.title": "ä―ŋį”ĻįĶŧįšŋį™ŧå―•", - "gui.authme.offline.field.username": "čū“å…Ĩį”Ļ户名", - "gui.authme.offline.button.login": "įĶŧįšŋæļļ戏", - - "text.autoconfig.authme.title": "Auth Me čŪūį―Ū", - "text.autoconfig.authme.option.authButton": "į™ŧå―•æŒ‰é’Ū", - "text.autoconfig.authme.option.authButton.x": "X 坐标", - "text.autoconfig.authme.option.authButton.y": "Y 坐标", - "text.autoconfig.authme.option.authButton.draggable": "čƒ―åĶ拖åŠĻ?", - "text.autoconfig.authme.option.methods": "į™ŧå―•æ–đ垏", - "text.autoconfig.authme.option.methods.microsoft": "Microsoft", - "text.autoconfig.authme.option.methods.microsoft.prompt": "į―‘éĄĩį™ŧå―•æĻĄåž", - "text.autoconfig.authme.option.methods.microsoft.port": "OAuth2 å›žč°ƒé“ūæŽĨįŦŊåĢ", - "text.autoconfig.authme.option.methods.microsoft.clientId": "OAuth2 åŪĒ户įŦŊ ID", - "text.autoconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2 驌čŊé“ūæŽĨ", - "text.autoconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2 Access äŧĪį‰ŒæŽĨåĢé“ūæŽĨ", - "text.autoconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox 驌čŊ æŽĨåĢčŋžæŽĨ", - "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.offline": "Offline", - "text.autoconfig.authme.option.methods.offline.lastUsername": "最后äļ€æŽĄä―ŋį”Ļįš„į”Ļ户名" -} +{ + "gui.authme.button.auth": "驌čŊ", + "gui.authme.button.auth.tooltip": "æŽĒčŋŽå›žæĨ, %s!", + "gui.authme.button.relogin": "å†æŽĄį™ŧå―•", + + "gui.authme.error.generic": "凚įŽ°äš†äļ€äš›é—ŪéĒ˜! čŊ·čŋ”回再重čŊ•äļ€é.", + "gui.authme.error.timeout": "čķ…æ—ķ! čŊ·čŋ”回再重čŊ•äļ€é.", + + "gui.authme.toast.greeting": "æŽĒčŋŽå›žæĨ, %s!", + + "gui.authme.method.title": "选æ‹Đä― įš„į™ŧå―•æ–đ垏", + "gui.authme.method.greeting": "ä― åĨ―, %s!", + "gui.authme.method.button.microsoft": "åūŪč―ŊčīĶ号", + "gui.authme.method.button.mojang": "Mojang (æ—Đ期čīĶ户)", + "gui.authme.method.button.offline": "įĶŧįšŋ", + + "gui.authme.microsoft.title": "通čŋ‡åūŪč―Ŋį™ŧå―•", + "gui.authme.microsoft.browser": "įŽ°åœĻåŊäŧĨå…ģ闭æ­Īį•ŒéĒåđķäļ”čŋ”回 Minecraft 乆!", + "gui.authme.microsoft.status.checkBrowser": "æ­ĢåœĻ前åū€ä― įš„æĩč§ˆå™Ļ...", + "gui.authme.microsoft.status.msAccessToken": "čŽ·å– Microsoft Access äŧĪį‰Œ...", + "gui.authme.microsoft.status.xboxAccessToken": "čŽ·å– Xbox Access äŧĪį‰Œ...", + "gui.authme.microsoft.status.xboxXstsToken": "čŽ·å– Xbox XSTS äŧĪį‰Œ...", + "gui.authme.microsoft.status.mcAccessToken": "čŽ·å– Minecraft Access äŧĪį‰Œ...", + "gui.authme.microsoft.status.mcProfile": "æ­ĢåœĻčŽ·å–æ‚Ļįš„ Minecraft čīĶ号äŋĄæŊ...", + + "gui.authme.mojang.title": "通čŋ‡ Mojang (æ—Đ期čīĶ户) į™ŧå―•", + + "gui.authme.offline.title": "ä―ŋį”ĻįĶŧįšŋį™ŧå―•", + "gui.authme.offline.field.username": "čū“å…Ĩį”Ļ户名", + "gui.authme.offline.button.login": "įĶŧįšŋæļļ戏", + + "text.rconfig.authme.title": "Auth Me čŪūį―Ū", + "text.rconfig.authme.option.authButton": "į™ŧå―•æŒ‰é’Ū", + "text.rconfig.authme.option.authButton.x": "X 坐标", + "text.rconfig.authme.option.authButton.y": "Y 坐标", + "text.rconfig.authme.option.authButton.draggable": "čƒ―åĶ拖åŠĻ?", + "text.rconfig.authme.option.methods": "į™ŧå―•æ–đ垏", + "text.rconfig.authme.option.methods.microsoft": "Microsoft", + "text.rconfig.authme.option.methods.microsoft.prompt": "į―‘éĄĩį™ŧå―•æĻĄåž", + "text.rconfig.authme.option.methods.microsoft.port": "OAuth2 å›žč°ƒé“ūæŽĨįŦŊåĢ", + "text.rconfig.authme.option.methods.microsoft.clientId": "OAuth2 åŪĒ户įŦŊ ID", + "text.rconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2 驌čŊé“ūæŽĨ", + "text.rconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2 Access äŧĪį‰ŒæŽĨåĢé“ūæŽĨ", + "text.rconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox 驌čŊ æŽĨåĢčŋžæŽĨ", + "text.rconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS 驌čŊ æŽĨåĢčŋžæŽĨ", + "text.rconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft 驌čŊæŽĨåĢčŋžæŽĨ", + "text.rconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft čīĶ户äŋĄæŊæŽĨåĢčŋžæŽĨ", + "text.rconfig.authme.option.methods.offline": "Offline", + "text.rconfig.authme.option.methods.offline.lastUsername": "最后äļ€æŽĄä―ŋį”Ļįš„į”Ļ户名" +} diff --git a/src/main/resources/assets/authme/lang/zh_tw.json b/common/src/main/resources/assets/authme/lang/zh_tw.json similarity index 58% rename from src/main/resources/assets/authme/lang/zh_tw.json rename to common/src/main/resources/assets/authme/lang/zh_tw.json index f2b8143..f530d96 100644 --- a/src/main/resources/assets/authme/lang/zh_tw.json +++ b/common/src/main/resources/assets/authme/lang/zh_tw.json @@ -34,22 +34,22 @@ "gui.authme.offline.field.username": "éļ擇ä―ŋį”Ļč€…åįĻą", "gui.authme.offline.button.login": "é›Ēį·šéŠįŽĐ", - "text.autoconfig.authme.title": "Auth Me čĻ­åŪš", - "text.autoconfig.authme.option.authButton": "éĐ—č­‰æŒ‰įī", - "text.autoconfig.authme.option.authButton.x": "X 嚧æĻ™", - "text.autoconfig.authme.option.authButton.y": "Y 嚧æĻ™", - "text.autoconfig.authme.option.authButton.draggable": "åŊäŧĨ拖動", - "text.autoconfig.authme.option.methods": "į™ŧå…Ĩæ–đ垏", - "text.autoconfig.authme.option.methods.microsoft": "Microsoft", - "text.autoconfig.authme.option.methods.microsoft.prompt": "䚒動提įĪš", - "text.autoconfig.authme.option.methods.microsoft.port": "OAuth2 回å‚ģ Url įŦŊåĢ", - "text.autoconfig.authme.option.methods.microsoft.clientId": "OAuth2 į”Ļæˆķ Id", - "text.autoconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2 授掊 Url", - "text.autoconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2 存取掊杖 Url", - "text.autoconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox éЗ證 Url", - "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.offline": "é›Ēį·š", - "text.autoconfig.authme.option.methods.offline.lastUsername": "最åūŒä―ŋį”Ļįš„ä―ŋį”Ļč€…åįĻą" + "text.rconfig.authme.title": "Auth Me čĻ­åŪš", + "text.rconfig.authme.option.authButton": "éĐ—č­‰æŒ‰įī", + "text.rconfig.authme.option.authButton.x": "X 嚧æĻ™", + "text.rconfig.authme.option.authButton.y": "Y 嚧æĻ™", + "text.rconfig.authme.option.authButton.draggable": "åŊäŧĨ拖動", + "text.rconfig.authme.option.methods": "į™ŧå…Ĩæ–đ垏", + "text.rconfig.authme.option.methods.microsoft": "Microsoft", + "text.rconfig.authme.option.methods.microsoft.prompt": "䚒動提įĪš", + "text.rconfig.authme.option.methods.microsoft.port": "OAuth2 回å‚ģ Url įŦŊåĢ", + "text.rconfig.authme.option.methods.microsoft.clientId": "OAuth2 į”Ļæˆķ Id", + "text.rconfig.authme.option.methods.microsoft.authorizeUrl": "OAuth2 授掊 Url", + "text.rconfig.authme.option.methods.microsoft.tokenUrl": "OAuth2 存取掊杖 Url", + "text.rconfig.authme.option.methods.microsoft.xboxAuthUrl": "Xbox éЗ證 Url", + "text.rconfig.authme.option.methods.microsoft.xboxXstsUrl": "Xbox XSTS 授掊 Url", + "text.rconfig.authme.option.methods.microsoft.mcAuthUrl": "Minecraft éЗ證 Url", + "text.rconfig.authme.option.methods.microsoft.mcProfileUrl": "Minecraft 個䚚čģ‡æ–™ Url", + "text.rconfig.authme.option.methods.offline": "é›Ēį·š", + "text.rconfig.authme.option.methods.offline.lastUsername": "最åūŒä―ŋį”Ļįš„ä―ŋį”Ļč€…åįĻą" } diff --git a/src/main/resources/assets/authme/textures/gui/session_status.png b/common/src/main/resources/assets/authme/textures/gui/session_status.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/session_status.png rename to common/src/main/resources/assets/authme/textures/gui/session_status.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_disabled.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_disabled.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_disabled.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_disabled.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_focused.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_focused.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_focused.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/blank_button_focused.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_disabled.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_disabled.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_disabled.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_disabled.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_focused.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_focused.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_focused.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/microsoft_button_focused.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_disabled.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_disabled.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_disabled.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_disabled.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_focused.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_focused.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_focused.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/mojang_button_focused.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_disabled.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_disabled.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_disabled.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_disabled.png diff --git a/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_focused.png b/common/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_focused.png similarity index 100% rename from src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_focused.png rename to common/src/main/resources/assets/authme/textures/gui/sprites/widget/offline_button_focused.png diff --git a/common/src/main/resources/authme.accesswidener b/common/src/main/resources/authme.accesswidener new file mode 100644 index 0000000..55fc75e --- /dev/null +++ b/common/src/main/resources/authme.accesswidener @@ -0,0 +1,2 @@ +accessWidener v2 named +accessible class com/mojang/realmsclient/gui/screens/RealmsGenericErrorScreen$ErrorMessage diff --git a/src/main/resources/authme.mixins.json b/common/src/main/resources/authme.mixins.json similarity index 62% rename from src/main/resources/authme.mixins.json rename to common/src/main/resources/authme.mixins.json index 0d1d626..f6a0b22 100644 --- a/src/main/resources/authme.mixins.json +++ b/common/src/main/resources/authme.mixins.json @@ -2,18 +2,18 @@ "required": true, "minVersion": "0.8", "package": "me.axieum.mcmod.authme.mixin", - "compatibilityLevel": "JAVA_16", + "compatibilityLevel": "JAVA_18", "mixins": [], - "server": [], "client": [ - "AbuseReportContextAccessor", "DisconnectedScreenMixin", - "MinecraftClientAccessor", - "MultiplayerScreenMixin", - "RealmsGenericErrorScreenMixin", + "JoinMultiplayerScreenMixin", + "MinecraftAccessor", "RealmsAvailabilityAccessor", - "SplashTextResourceSupplierAccessor" + "RealmsGenericErrorScreenMixin", + "ReportingContextAccessor", + "SplashManagerAccessor" ], + "server": [], "injectors": { "defaultRequire": 1 } diff --git a/src/main/resources/assets/authme/icon.png b/common/src/main/resources/icon.png similarity index 100% rename from src/main/resources/assets/authme/icon.png rename to common/src/main/resources/icon.png diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..41b63a1 --- /dev/null +++ b/common/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "${mod_name}", + "pack_format": 8 + } +} diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..80e7f63 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,90 @@ +plugins { + id 'com.github.johnrengelman.shadow' version '7.1.2' +} + +architectury { + platformSetupLoomIde() + fabric() +} + +configurations { + common + shadowCommon + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentFabric.extendsFrom common +} + +dependencies { + common(project(path: ':common', configuration: 'namedElements')) { transitive false } + shadowCommon(project(path: ':common', configuration: 'transformProductionFabric')) { transitive false } + + modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}" + modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + + modImplementation include("com.teamresourceful.resourcefulconfig:resourcefulconfig-fabric-${project.resourceful_config_version}") + modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}" +} + +processResources { + inputs.property 'mod_id', project.mod_id + inputs.property 'mod_name', project.mod_name + inputs.property 'mod_description', project.mod_description + inputs.property 'mod_author', project.mod_author + inputs.property 'mod_license', project.mod_license + inputs.property 'version', project.version + inputs.property 'minecraft_version', project.minecraft_version + inputs.property 'fabric_loader_version_range', project.fabric_loader_version_range + + // fabric.mod.json + filesMatching('fabric.mod.json') { + expand([ + 'mod_id': project.mod_id, + 'mod_name': project.mod_name, + 'mod_description': project.mod_description, + 'mod_author': project.mod_author, + 'mod_license': project.mod_license, + 'version': project.version, + 'minecraft_version': project.minecraft_version, + 'fabric_loader_version_range': project.fabric_loader_version_range, + ]) + } +} + +jar { + archiveAppendix.set project.name + archiveClassifier.set 'dev' +} + +shadowJar { + configurations = [project.configurations.shadowCommon] + archiveAppendix.set project.name + archiveClassifier.set 'dev-shadow' +} + +remapJar { + dependsOn tasks.shadowJar + setInput tasks.shadowJar.archiveFile + archiveAppendix.set project.name + archiveClassifier.set null +} + +sourcesJar { + def commonSources = project(':common').tasks.sourcesJar + dependsOn commonSources + from commonSources.archiveFile.map { zipTree(it) } + archiveAppendix.set project.name +} + +javadocJar { + def commonJavadocs = project(':common').tasks.javadocJar + dependsOn commonJavadocs + from commonJavadocs.archiveFile.map { zipTree(it) } + archiveAppendix.set project.name +} + +components.java { + withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { + skip() + } +} diff --git a/fabric/gradle.properties b/fabric/gradle.properties new file mode 100644 index 0000000..6c59476 --- /dev/null +++ b/fabric/gradle.properties @@ -0,0 +1 @@ +loom.platform = fabric diff --git a/fabric/src/main/java/me/axieum/mcmod/authme/impl/fabric/AuthMeFabric.java b/fabric/src/main/java/me/axieum/mcmod/authme/impl/fabric/AuthMeFabric.java new file mode 100644 index 0000000..a54efd9 --- /dev/null +++ b/fabric/src/main/java/me/axieum/mcmod/authme/impl/fabric/AuthMeFabric.java @@ -0,0 +1,46 @@ +package me.axieum.mcmod.authme.impl.fabric; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.loader.api.FabricLoader; + +import me.axieum.mcmod.authme.api.AuthMe; +import static me.axieum.mcmod.authme.api.AuthMe.LOGGER; + +/** + * The Fabric platform mod. + */ +public class AuthMeFabric implements ModInitializer +{ + @Override + public void onInitialize() + { + // Migrate the old `config/authme.json5` configuration file + migrateConfig(); + + // Cascade mod initialisation + AuthMe.init(); + } + + /** + * Migrates the old `authme.json5` config to new `authme.jsonc`. + */ + private static void migrateConfig() + { + Path configDir = FabricLoader.getInstance().getConfigDir(); + Path oldConfig = configDir.resolve("authme.json5"); + Path newConfig = configDir.resolve("authme.jsonc"); + + if (Files.exists(oldConfig) && Files.notExists(newConfig)) { + LOGGER.warn("Found old config file '{}', renaming to '{}'", oldConfig, newConfig); + try { + Files.move(oldConfig, newConfig); + } catch (IOException e) { + LOGGER.error("Could not migrate old config file to '{}'", newConfig, e); + } + } + } +} diff --git a/fabric/src/main/resources/authme.fabric.mixins.json b/fabric/src/main/resources/authme.fabric.mixins.json new file mode 100644 index 0000000..6e430d8 --- /dev/null +++ b/fabric/src/main/resources/authme.fabric.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "me.axieum.mcmod.authme.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [], + "client": [], + "server": [], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..eaa7289 --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,43 @@ +{ + "schemaVersion": 1, + "id": "${mod_id}", + "version": "${version}", + "name": "${mod_name}", + "description": "${mod_description}", + "authors": [ + "${mod_author}" + ], + "contact": { + "sources": "https://github.com/axieum/authme", + "issues": "https://github.com/axieum/authme/issues" + }, + "license": "${mod_license}", + "icon": "icon.png", + "environment": "client", + "entrypoints": { + "main": [ + "me.axieum.mcmod.authme.impl.fabric.AuthMeFabric" + ] + }, + "mixins": [ + "${mod_id}.mixins.json", + "${mod_id}.fabric.mixins.json" + ], + "depends": { + "minecraft": "~${minecraft_version}", + "fabricloader": "${fabric_loader_version_range}", + "fabric-lifecycle-events-v1": "*", + "fabric-resource-loader-v0": "*", + "resourcefulconfig": "*" + }, + "suggests": { + "modmenu": "*" + }, + "custom": { + "mc-publish": { + "dependencies": [ + "resourcefulconfig(embedded){curseforge:714059}{modrinth:M1953qlQ}" + ] + } + } +} diff --git a/gradle.properties b/gradle.properties index 4ebf5f4..aed0f1e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,44 +1,39 @@ -# Mod +# Project +maven_group = me.axieum.mcmod.authme +archives_base_name = authme +## {x-release-please-start-version} +version = 8.0.0+1.21.4 +## {x-release-please-end} + +# Metadata mod_id = authme mod_name = Auth Me mod_description = Authenticate yourself in Minecraft and re-validate your session -## {x-release-please-start-version} -mod_version = 8.0.0+1.21.4 -## {x-release-please-end} +mod_author = axieum +mod_author_email = imaxieum@gmail.com +mod_license = MIT +minecraft_version = 1.21.1 +enabled_platforms = fabric, neoforge # Fabric -minecraft_version = 1.21.4 -loader_version = 0.16.9 -yarn_mappings = 1.21.4+build.2 -fabric_version = 0.112.0+1.21.4 - -# Dependencies -cloth_config_version = 17.0.144 -mod_menu_version = 13.0.0-beta.1 +fabric_loader_version = 0.15.11 +fabric_loader_version_range = >=0.15 +fabric_api_version = 0.115.0+1.21.1 -checkstyle_version = 10.21.0 -jetbrains_annotations_version = 26.0.1 -junit_jupiter_version = 5.11.3 +# NeoForge +neoforge_version = 21.1.117 +neoforge_loader_version_range = [4,) -# CurseForge -cf_project_id = 356643 -cf_game_versions = Fabric, Java 21, 1.21.4 -cf_relations_required = fabric-api -cf_relations_optional = modmenu -cf_relations_embedded = cloth-config -cf_relations_tools = -cf_relations_incompatible = - -# Modrinth -mr_project_id = yjgIrBjZ -mr_game_versions = 1.21.4 -mr_relations_required = P7dR8mSH -mr_relations_optional = mOgUt4GM -mr_relations_incompatible = +# Dependencies +checkstyle_version = 10.21.2 +mod_menu_version = 11.0.3 +resourceful_config_version = 1.21:3.0.9 # Publish -maven_group = me.axieum.mcmod.authme github_repo = axieum/authme +cf_project_id = 356643 +mr_project_id = yjgIrBjZ -# Other -org.gradle.jvmargs=-Xmx1G +# Gradle +org.gradle.jvmargs = -Xmx3G +org.gradle.daemon = false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..9d21a21 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/neoforge/build.gradle b/neoforge/build.gradle new file mode 100644 index 0000000..e03c03a --- /dev/null +++ b/neoforge/build.gradle @@ -0,0 +1,91 @@ +plugins { + id 'com.github.johnrengelman.shadow' version '7.1.2' +} + +architectury { + platformSetupLoomIde() + neoForge() +} + +configurations { + common + shadowCommon + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentNeoForge.extendsFrom common +} + +dependencies { + common(project(path: ':common', configuration: 'namedElements')) { transitive false } + shadowCommon(project(path: ':common', configuration: 'transformProductionNeoForge')) { transitive false } + + neoForge "net.neoforged:neoforge:${project.neoforge_version}" + + modImplementation include("com.teamresourceful.resourcefulconfig:resourcefulconfig-neoforge-${project.resourceful_config_version}") +} + +processResources { + inputs.property 'mod_id', project.mod_id + inputs.property 'mod_name', project.mod_name + inputs.property 'mod_description', project.mod_description + inputs.property 'mod_author', project.mod_author + inputs.property 'mod_license', project.mod_license + inputs.property 'version', project.version + inputs.property 'minecraft_version', project.minecraft_version + inputs.property 'neoforge_version', project.neoforge_version + inputs.property 'neoforge_loader_version_range', project.neoforge_loader_version_range + + // neoforge.mods.toml + filesMatching('META-INF/neoforge.mods.toml') { + expand([ + 'mod_id': project.mod_id, + 'mod_name': project.mod_name, + 'mod_description': project.mod_description, + 'mod_author': project.mod_author, + 'mod_license': project.mod_license, + 'version': project.version, + 'minecraft_version': project.minecraft_version, + 'neoforge_version': project.neoforge_version, + 'neoforge_loader_version_range': project.neoforge_loader_version_range, + ]) + } +} + +jar { + archiveAppendix.set project.name + archiveClassifier.set 'dev' +} + +shadowJar { + configurations = [project.configurations.shadowCommon] + archiveAppendix.set project.name + archiveClassifier.set 'dev-shadow' + exclude 'architectury.common.json' +} + +remapJar { + dependsOn tasks.shadowJar + setInput tasks.shadowJar.archiveFile + archiveAppendix.set project.name + archiveClassifier.set null +} + +sourcesJar { + def commonSources = project(':common').tasks.sourcesJar + dependsOn commonSources + from commonSources.archiveFile.map { zipTree(it) } + archiveAppendix.set project.name +} + +javadocJar { + def commonJavadocs = project(':common').tasks.javadocJar + dependsOn commonJavadocs + from commonJavadocs.archiveFile.map { zipTree(it) } + archiveAppendix.set project.name +} + +components.java { + withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { + skip() + } +} diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties new file mode 100644 index 0000000..2e6ed76 --- /dev/null +++ b/neoforge/gradle.properties @@ -0,0 +1 @@ +loom.platform = neoforge diff --git a/neoforge/src/main/java/me/axieum/mcmod/authme/impl/neoforge/AuthMeNeoForge.java b/neoforge/src/main/java/me/axieum/mcmod/authme/impl/neoforge/AuthMeNeoForge.java new file mode 100644 index 0000000..f0be20a --- /dev/null +++ b/neoforge/src/main/java/me/axieum/mcmod/authme/impl/neoforge/AuthMeNeoForge.java @@ -0,0 +1,24 @@ +package me.axieum.mcmod.authme.impl.neoforge; + +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; + +import me.axieum.mcmod.authme.api.AuthMe; + +/** + * The NeoForge platform mod. + */ +@Mod(AuthMe.MOD_ID) +public class AuthMeNeoForge +{ + /** + * Constructs a new NeoForge platform mod. + * + * @param eventBus the NeoForge event bus + */ + public AuthMeNeoForge(IEventBus eventBus) + { + // Cascade mod initialisation + AuthMe.init(); + } +} diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..8635c38 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,46 @@ +modLoader = "javafml" +loaderVersion = "${neoforge_loader_version_range}" +license = "${mod_license}" +issueTrackerURL = "https://github.com/axieum/authme/issues" +clientSideOnly = true + +[[mods]] +modId = "${mod_id}" +version = "${version}" +displayName = "${mod_name}" +displayURL = "https://github.com/axieum/authme" +logoFile = "icon.png" +authors = "${mod_author}" +description = '''${mod_description}''' + +[[mixins]] +config = "${mod_id}.mixins.json" + +[[mixins]] +config = "${mod_id}.neoforge.mixins.json" + +[[dependencies.'${mod_id}']] +modId = "neoforge" +type = "required" +versionRange = "[${neoforge_version},)" +ordering = "NONE" +side = "CLIENT" + +[[dependencies.'${mod_id}']] +modId = "minecraft" +type = "required" +versionRange = "[${minecraft_version},)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.'${mod_id}']] +modId = "resourcefulconfig" +type = "required" +versionRange = "*" +ordering = "BEFORE" +side = "BOTH" + +[mc-publish] +dependencies = [ + "resourcefulconfig(embedded){curseforge:714059}{modrinth:M1953qlQ}" +] diff --git a/neoforge/src/main/resources/authme.neoforge.mixins.json b/neoforge/src/main/resources/authme.neoforge.mixins.json new file mode 100644 index 0000000..6e430d8 --- /dev/null +++ b/neoforge/src/main/resources/authme.neoforge.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "me.axieum.mcmod.authme.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [], + "client": [], + "server": [], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/settings.gradle b/settings.gradle index 85bc40b..35ac28a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,19 @@ pluginManagement { repositories { mavenCentral() - maven { name 'Fabric'; url 'https://maven.fabricmc.net/' } gradlePluginPortal() + maven { name = 'Architectury'; url = 'https://maven.architectury.dev/' } + maven { name = 'Fabric'; url = 'https://maven.fabricmc.net/' } + maven { name = 'Forge'; url = 'https://maven.minecraftforge.net/' } + maven { name = 'Modrinth'; url = 'https://api.modrinth.com/maven' } + maven { name = 'NeoForge'; url = 'https://maven.neoforged.net/releases/' } + maven { name = 'Sponge'; url = 'https://repo.spongepowered.org/repository/maven-public' } + maven { name = 'Team Resourceful'; url = 'https://maven.teamresourceful.com/repository/maven-public/' } + maven { name = 'TerraformersMC'; url = 'https://maven.terraformersmc.com/' } } } rootProject.name = 'authme' +include 'common' +include 'fabric' +include 'neoforge' diff --git a/src/main/java/me/axieum/mcmod/authme/api/gui/widget/PasswordFieldWidget.java b/src/main/java/me/axieum/mcmod/authme/api/gui/widget/PasswordFieldWidget.java deleted file mode 100644 index 7c6fe65..0000000 --- a/src/main/java/me/axieum/mcmod/authme/api/gui/widget/PasswordFieldWidget.java +++ /dev/null @@ -1,43 +0,0 @@ -package me.axieum.mcmod.authme.api.gui.widget; - -import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.text.Text; - -/** - * A text field widget for masking typed passwords. - */ -public class PasswordFieldWidget extends TextFieldWidget -{ - /** - * Constructs a new password field widget. - * - * @param textRenderer text renderer - * @param x x position - * @param y y position - * @param width widget width - * @param height widget height - * @param text label - */ - public PasswordFieldWidget(TextRenderer textRenderer, int x, int y, int width, int height, Text text) - { - super(textRenderer, x, y, width, height, text); - setRenderTextProvider( - (val, limit) -> Text.literal(val).styled(style -> style.withObfuscated(true)).asOrderedText() - ); - // NB: Overriding the rendered characters affects interaction, as the - // rendered characters have different widths to the actual underlying text. - // i.e. setRenderTextProvider((value, limit) -> StringUtils.repeat('⁎', value.length())); - } - - @Override - public boolean keyPressed(int keyCode, int scanCode, int modifiers) - { - // Prevent copying the password to clipboard - if (!this.isActive() || Screen.isCopy(keyCode) || Screen.isCut(keyCode)) { - return false; - } - return super.keyPressed(keyCode, scanCode, modifiers); - } -} diff --git a/src/main/java/me/axieum/mcmod/authme/impl/AuthMe.java b/src/main/java/me/axieum/mcmod/authme/impl/AuthMe.java deleted file mode 100644 index b5464b1..0000000 --- a/src/main/java/me/axieum/mcmod/authme/impl/AuthMe.java +++ /dev/null @@ -1,33 +0,0 @@ -package me.axieum.mcmod.authme.impl; - -import me.shedaniel.autoconfig.ConfigHolder; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import net.fabricmc.api.ClientModInitializer; - -import me.axieum.mcmod.authme.impl.config.AuthMeConfig; - -/** - * Auth Me - authenticate yourself in Minecraft and re-validate your session. - */ -public final class AuthMe implements ClientModInitializer -{ - public static final Logger LOGGER = LogManager.getLogger(); - public static final ConfigHolder CONFIG = AuthMeConfig.init(); - public static final String MOJANG_ACCOUNT_MIGRATION_FAQ_URL = "https://aka.ms/MinecraftPostMigrationFAQ"; - - @Override - public void onInitializeClient() {} - - /** - * Returns the config instance. - * - * @return config instance - * @see ConfigHolder#getConfig() - */ - public static AuthMeConfig getConfig() - { - return CONFIG.getConfig(); - } -} diff --git a/src/main/java/me/axieum/mcmod/authme/impl/compat/ModMenuApiImpl.java b/src/main/java/me/axieum/mcmod/authme/impl/compat/ModMenuApiImpl.java deleted file mode 100644 index 216ff45..0000000 --- a/src/main/java/me/axieum/mcmod/authme/impl/compat/ModMenuApiImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package me.axieum.mcmod.authme.impl.compat; - -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; -import me.shedaniel.autoconfig.AutoConfig; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -import me.axieum.mcmod.authme.impl.config.AuthMeConfig; - -/** - * A compat layer for integrating with Mod Menu. - */ -@Environment(EnvType.CLIENT) -public class ModMenuApiImpl implements ModMenuApi -{ - @Override - public ConfigScreenFactory getModConfigScreenFactory() - { - return screen -> AutoConfig.getConfigScreen(AuthMeConfig.class, screen).get(); - } -} 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 deleted file mode 100644 index 9c1598a..0000000 --- a/src/main/java/me/axieum/mcmod/authme/impl/config/AuthMeConfig.java +++ /dev/null @@ -1,130 +0,0 @@ -package me.axieum.mcmod.authme.impl.config; - -import java.util.Objects; - -import me.shedaniel.autoconfig.AutoConfig; -import me.shedaniel.autoconfig.ConfigData; -import me.shedaniel.autoconfig.ConfigHolder; -import me.shedaniel.autoconfig.annotation.Config; -import me.shedaniel.autoconfig.annotation.ConfigEntry; -import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; -import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Comment; -import org.jetbrains.annotations.Nullable; - -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; - -import me.axieum.mcmod.authme.api.util.MicrosoftUtils; -import me.axieum.mcmod.authme.api.util.MicrosoftUtils.MicrosoftPrompt; - -@Config(name = "authme") -public class AuthMeConfig implements ConfigData -{ - @Comment("Auth Button") - @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) - public AuthButtonSchema authButton = new AuthButtonSchema(); - - /** - * Authentication button configuration schema. - */ - public static class AuthButtonSchema - { - @Comment("Position of the button on the multiplayer screen") - public int x = 6, y = 6; - - @Comment("True if the button can be dragged to a new position") - public boolean draggable = true; - } - - @Comment("Login Methods") - @ConfigEntry.Gui.CollapsibleObject(startExpanded = true) - public LoginMethodsSchema methods = new LoginMethodsSchema(); - - /** - * Authentication methods configuration schema. - */ - public static class LoginMethodsSchema - { - @Comment("Login via Microsoft") - @ConfigEntry.Gui.CollapsibleObject - public MicrosoftLoginSchema microsoft = new MicrosoftLoginSchema(); - - /** - * Login via Microsoft configuration schema. - */ - public static class MicrosoftLoginSchema - { - @Comment("Indicates the type of user interaction that is required") - public MicrosoftPrompt prompt = MicrosoftPrompt.DEFAULT; - - @Comment("The port from which to listen for OAuth2 callbacks") - public int port = 25585; - - @Comment("OAuth2 client id") - public String clientId = MicrosoftUtils.CLIENT_ID; - - @Comment("OAuth2 authorization url") - public String authorizeUrl = MicrosoftUtils.AUTHORIZE_URL; - - @Comment("OAuth2 access token url") - public String tokenUrl = MicrosoftUtils.TOKEN_URL; - - @Comment("Xbox authentication url") - public String xboxAuthUrl = MicrosoftUtils.XBOX_AUTH_URL; - - @Comment("Xbox XSTS authorization url") - public String xboxXstsUrl = MicrosoftUtils.XBOX_XSTS_URL; - - @Comment("Minecraft authentication url") - public String mcAuthUrl = MicrosoftUtils.MC_AUTH_URL; - - @Comment("Minecraft profile url") - public String mcProfileUrl = MicrosoftUtils.MC_PROFILE_URL; - - /** - * Determines whether the configured URLs differ from the defaults. - * - * @return true if the configured URLs are unchanged - */ - public boolean isDefaults() - { - return Objects.equals(authorizeUrl, MicrosoftUtils.AUTHORIZE_URL) - && Objects.equals(tokenUrl, MicrosoftUtils.TOKEN_URL) - && Objects.equals(xboxAuthUrl, MicrosoftUtils.XBOX_AUTH_URL) - && Objects.equals(xboxXstsUrl, MicrosoftUtils.XBOX_XSTS_URL) - && Objects.equals(mcAuthUrl, MicrosoftUtils.MC_AUTH_URL) - && Objects.equals(mcProfileUrl, MicrosoftUtils.MC_PROFILE_URL); - } - } - - @Comment("Login Offline") - @ConfigEntry.Gui.CollapsibleObject - public OfflineLoginSchema offline = new OfflineLoginSchema(); - - /** - * Login offline configuration schema. - */ - public static class OfflineLoginSchema - { - @Comment("Last used username") - public @Nullable String lastUsername = ""; - } - } - - /** - * Registers and prepares a new configuration instance. - * - * @return registered config holder - * @see AutoConfig#register - */ - public static ConfigHolder init() - { - // Register the config - ConfigHolder holder = AutoConfig.register(AuthMeConfig.class, JanksonConfigSerializer::new); - - // Listen for when the server is reloading (i.e. /reload), and reload the config - ServerLifecycleEvents.START_DATA_PACK_RELOAD.register((s, m) -> - AutoConfig.getConfigHolder(AuthMeConfig.class).load()); - - return holder; - } -} 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 deleted file mode 100644 index 83c0923..0000000 --- a/src/main/java/me/axieum/mcmod/authme/impl/gui/AuthMethodScreen.java +++ /dev/null @@ -1,157 +0,0 @@ -package me.axieum.mcmod.authme.impl.gui; - -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; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.TextWidget; -import net.minecraft.client.gui.widget.TexturedButtonWidget; -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.getConfig; - -/** - * A screen for choosing a user authentication method. - */ -public class AuthMethodScreen extends Screen -{ - // The parent (or last) screen that opened this screen - private final Screen parentScreen; - - // The 'Microsoft' authentication method button textures - public static final ButtonTextures MICROSOFT_BUTTON_TEXTURES = new ButtonTextures( - Identifier.of("authme", "widget/microsoft_button"), - Identifier.of("authme", "widget/microsoft_button_disabled"), - Identifier.of("authme", "widget/microsoft_button_focused") - ); - // The 'Mojang (or legacy)' authentication method button textures - public static final ButtonTextures MOJANG_BUTTON_TEXTURES = new ButtonTextures( - Identifier.of("authme", "widget/mojang_button"), - Identifier.of("authme", "widget/mojang_button_disabled"), - Identifier.of("authme", "widget/mojang_button_focused") - ); - // The 'Offline' authentication method button textures - public static final ButtonTextures OFFLINE_BUTTON_TEXTURES = new ButtonTextures( - Identifier.of("authme", "widget/offline_button"), - Identifier.of("authme", "widget/offline_button_disabled"), - Identifier.of("authme", "widget/offline_button_focused") - ); - - /** - * Constructs a new authentication method choice screen. - * - * @param parentScreen parent (or last) screen that opened this screen - */ - public AuthMethodScreen(Screen parentScreen) - { - super(Text.translatable("gui.authme.method.title")); - this.parentScreen = parentScreen; - } - - @Override - protected void init() - { - super.init(); - assert client != null; - - // Add a title - TextWidget titleWidget = new TextWidget(width, height, title, textRenderer); - titleWidget.setTextColor(0xffffff); - titleWidget.setPosition(width / 2 - titleWidget.getWidth() / 2, height / 2 - titleWidget.getHeight() / 2 - 22); - addDrawableChild(titleWidget); - - // Add a greeting message - TextWidget greetingWidget = new TextWidget( - width, height, - Text.translatable( - "gui.authme.method.greeting", - Text.literal(SessionUtils.getSession().getUsername()).formatted(Formatting.YELLOW) - ), - textRenderer - ); - greetingWidget.setTextColor(0xa0a0a0); - greetingWidget.setPosition( - width / 2 - greetingWidget.getWidth() / 2, height / 2 - greetingWidget.getHeight() / 2 - 42 - ); - addDrawableChild(greetingWidget); - - // Add a button for the 'Microsoft' authentication method - TexturedButtonWidget msButton = new TexturedButtonWidget( - width / 2 - 20 - 10 - 4, height / 2 - 5, 20, 20, - MICROSOFT_BUTTON_TEXTURES, - button -> { - // If 'Left Control' is being held, enforce user interaction - final boolean selectAccount = InputUtil.isKeyPressed( - client.getWindow().getHandle(), InputUtil.GLFW_KEY_LEFT_CONTROL - ); - if (getConfig().methods.microsoft.isDefaults()) { - client.setScreen(new MicrosoftAuthScreen(this, parentScreen, selectAccount)); - } else { - AuthMe.LOGGER.warn("Non-default Microsoft authentication URLs are in use!"); - ConfirmScreen confirmScreen = new ConfirmScreen( - a -> client.setScreen(a ? new MicrosoftAuthScreen(this, parentScreen, selectAccount) : this), - Text.translatable("gui.authme.microsoft.warning.title"), - Text.translatable("gui.authme.microsoft.warning.body"), - Text.translatable("gui.authme.microsoft.warning.accept"), - Text.translatable("gui.authme.microsoft.warning.cancel") - ); - client.setScreen(confirmScreen); - confirmScreen.disableButtons(40); - } - }, - Text.translatable("gui.authme.method.button.microsoft") - ); - msButton.setTooltip(Tooltip.of( - Text.translatable("gui.authme.method.button.microsoft") - .append("\n") - .append( - Text.translatable("gui.authme.method.button.microsoft.selectAccount").formatted(Formatting.GRAY) - ) - )); - addDrawableChild(msButton); - - // Add a button for the 'Mojang (or legacy)' authentication method - TexturedButtonWidget mojangButton = new TexturedButtonWidget( - width / 2 - 10, height / 2 - 5, 20, 20, - MOJANG_BUTTON_TEXTURES, - ConfirmLinkScreen.opening(this, AuthMe.MOJANG_ACCOUNT_MIGRATION_FAQ_URL), - 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, - OFFLINE_BUTTON_TEXTURES, - button -> client.setScreen(new OfflineAuthScreen(this, parentScreen)), - Text.translatable("gui.authme.method.button.offline") - ); - offlineButton.setTooltip(Tooltip.of(Text.translatable("gui.authme.method.button.offline"))); - addDrawableChild(offlineButton); - - // Add a button to go back - addDrawableChild( - ButtonWidget.builder(Text.translatable("gui.back"), button -> close()) - .dimensions(width / 2 - 50, height / 2 + 27, 100, 20) - .build() - ); - } - - @Override - public void close() - { - if (client != null) client.setScreen(parentScreen); - } -} diff --git a/src/main/java/me/axieum/mcmod/authme/mixin/DisconnectedScreenMixin.java b/src/main/java/me/axieum/mcmod/authme/mixin/DisconnectedScreenMixin.java deleted file mode 100644 index 7f73473..0000000 --- a/src/main/java/me/axieum/mcmod/authme/mixin/DisconnectedScreenMixin.java +++ /dev/null @@ -1,104 +0,0 @@ -package me.axieum.mcmod.authme.mixin; - -import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import net.minecraft.client.gui.screen.DisconnectedScreen; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.network.DisconnectionInfo; -import net.minecraft.text.Text; -import net.minecraft.text.TranslatableTextContent; - -import me.axieum.mcmod.authme.impl.gui.AuthMethodScreen; -import static me.axieum.mcmod.authme.impl.AuthMe.LOGGER; - -/** - * Injects a button into the disconnected screen to open the authentication screen. - */ -@Mixin(DisconnectedScreen.class) -public abstract class DisconnectedScreenMixin extends Screen -{ - @Shadow - @Final - private Screen parent; - - @Shadow - @Final - private DisconnectionInfo info; - - private DisconnectedScreenMixin(Text title) - { - super(title); - } - - /** - * Injects into the creation of the screen and adds the authentication button. - * - * @param ci injection callback info - */ - @Inject(method = "init", at = @At("TAIL")) - private void init(CallbackInfo ci) - { - // Determine if the disconnection reason is user or session related - if (isUserRelated(info.reason())) { - LOGGER.info("Adding auth button to the disconnected screen"); - assert client != null; - - // Create and add the button to the screen where the back button is - final ButtonWidget backButton = (ButtonWidget) children().get(2); - addDrawableChild( - ButtonWidget.builder( - Text.translatable("gui.authme.button.relogin"), - btn -> client.setScreen(new AuthMethodScreen(parent)) - ).dimensions( - backButton.getX(), - backButton.getY(), - backButton.getWidth(), - backButton.getHeight() - ).build() - ); - - // Shift the back button down below our new button - backButton.setY(backButton.getY() + backButton.getHeight() + 4); - } - } - - /** - * Determines if a server disconnection reason is user or session related. - * - * @param reason disconnect reason text - * @return true if the disconnection reason is user or session related - */ - @Unique - private static boolean isUserRelated(final @Nullable Text reason) - { - if (reason != null && reason.getContent() instanceof TranslatableTextContent content) { - final String key = content.getKey(); - return key != null && switch (key) { - case "disconnect.kicked", - "multiplayer.disconnect.banned", - "multiplayer.disconnect.banned.reason", - "multiplayer.disconnect.banned.expiration", - "multiplayer.disconnect.duplicate_login", - "multiplayer.disconnect.kicked", - "multiplayer.disconnect.unverified_username", - "multiplayer.disconnect.not_whitelisted", - "multiplayer.disconnect.name_taken", - "multiplayer.disconnect.missing_public_key", - "multiplayer.disconnect.expired_public_key", - "multiplayer.disconnect.invalid_public_key_signature", - "multiplayer.disconnect.unsigned_chat", - "multiplayer.disconnect.chat_validation_failed" -> true; - default -> key.startsWith("disconnect.loginFailed"); - }; - } - return false; - } -} diff --git a/src/main/resources/authme.accesswidener b/src/main/resources/authme.accesswidener deleted file mode 100644 index 7fcb85f..0000000 --- a/src/main/resources/authme.accesswidener +++ /dev/null @@ -1,2 +0,0 @@ -accessWidener v1 named -accessible class net/minecraft/client/realms/gui/screen/RealmsGenericErrorScreen$ErrorMessages diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json deleted file mode 100644 index 884f6a9..0000000 --- a/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "schemaVersion": 1, - "id": "${id}", - "version": "${version}", - "name": "${name}", - "description": "${description}", - "contact": { - "homepage": "https://github.com/axieum/authme", - "sources": "https://github.com/axieum/authme", - "issues": "https://github.com/axieum/authme/issues" - }, - "authors": [ - { - "name": "Axieum", - "contact": { - "email": "imaxieum@gmail.com", - "homepage": "https://github.com/axieum" - } - } - ], - "license": "MIT", - "icon": "assets/authme/icon.png", - "environment": "client", - "entrypoints": { - "client": [ - "me.axieum.mcmod.authme.impl.AuthMe" - ], - "modmenu": [ - "me.axieum.mcmod.authme.impl.compat.ModMenuApiImpl" - ] - }, - "accessWidener" : "authme.accesswidener", - "mixins": [ - "authme.mixins.json" - ], - "depends": { - "java": ">=21", - "minecraft": "~1.21.4", - "fabricloader": ">=0.14.18", - "fabric-lifecycle-events-v1": "*", - "fabric-resource-loader-v0": "*", - "cloth-config2": "*" - }, - "suggests": { - "modmenu": "*" - } -}