update beta to patch for selection screen

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -44,7 +44,6 @@ body:
         Please send the corresponding Minecraft log from the `logs` folder here.
         Please upload the log file as an attachment, or upload the log to [mclo.gs](https://mclo.gs/) and paste the url here - mclo.gs sanitizes sensitive information such as ip addresses.
         Please refrain from pasting the entire log file directly.
-        Leave empty if there is none.
       placeholder: https://mclo.gs/
   - type: input
     id: versions
@@ -93,5 +92,5 @@ body:
           required: true
         - label: I have provided all the necessary information to reproduce the issue.
           required: true
-        - label: I have verified that the issue does not occur without the AutoModpack - Ignore you are reporting a mod conflict issue.
+        - label: I have verified that the issue does not occur without the AutoModpack - Ignore if you are reporting a mod conflict issue.
           required: false

.github/workflows/build.yml

@@ -12,12 +12,6 @@ on:
         type: string
         required: false
         default: ''
-#      # [FEATURE] MIXIN_AUDITOR
-#      mixin_audit:
-#        description: run mixin audit for Minecraft server after build
-#        type: boolean
-#        required: false
-#        default: false
 
 jobs:
   build:
@@ -48,8 +42,7 @@ jobs:
           if [ -z "${{ inputs.target_subproject }}" ]; then
               echo "Building all subprojects"
               ./gradlew clean
-              ./gradlew chiseledBuild -x mergeJars
-              ./gradlew mergeJars
+              ./gradlew build
           else
               args=$(echo "${{ inputs.target_subproject }}" | tr ',' '\n' | sed 's/$/:build/' | paste -sd ' ')
               echo "Building with arguments=$args"
@@ -59,52 +52,8 @@ jobs:
           BUILD_ID: ${{ github.run_number }}
           BUILD_RELEASE: ${{ inputs.release }}
 
-      #      # [FEATURE] MIXIN_AUDITOR
-      #      - name: Run mixin audit check for Minecraft server
-      #        if: ${{ inputs.mixin_audit }}
-      #        timeout-minutes: 10
-      #        run: |
-      #          mkdir -p ./run
-      #          echo eula=true > ./run/eula.txt
-      #          ./gradlew runServerMixinAudit
-
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
-          path: merged
-
-  #      # [FEATURE] FALLENS_MAVEN
-  #      - name: Publish with gradle
-  #        if: inputs.release || github.ref == 'refs/heads/dev'
-  #        run: |
-  #          if [ -z "${{ inputs.target_subproject }}" ]; then
-  #              echo "Publishing all subprojects"
-  #              ./gradlew publish
-  #          else
-  #              args=$(echo "${{ inputs.target_subproject }}" | tr ',' '\n' | sed 's/$/:publish/' | paste -sd ' ')
-  #              echo "Publishing with arguments=$args"
-  #              ./gradlew $args
-  #          fi
-  #        env:
-  #          BUILD_RELEASE: ${{ inputs.release }}
-  #          FALLENS_MAVEN_TOKEN: ${{ secrets.FALLENS_MAVEN_TOKEN }}
-
-#  summary:
-#    runs-on: ubuntu-22.04
-#    needs:
-#      - build
-#
-#    steps:
-#      - uses: actions/checkout@v4
-#
-#      - name: Download build artifacts
-#        uses: actions/download-artifact@v4
-#        with:
-#          name: build-artifacts
-#          path: build-artifacts
-#
-#      - name: Make build summary
-#        run: python3 .github/workflows/scripts/summary.py  # ubuntu-22.04 uses Python 3.10.6
-#        env:
-#          TARGET_SUBPROJECT: ${{ inputs.target_subproject }}
+          path: merged

.github/workflows/gradle.yml

@@ -1,14 +1,11 @@
 name: Dev Builds
 
-on: [workflow_dispatch, pull_request, push]
+on: [workflow_dispatch, push]
 
 jobs:
   tests: # runs on linux and windows
     uses: ./.github/workflows/tests.yml
     secrets: inherit
   build: # runs on linux
     uses: ./.github/workflows/build.yml
-    secrets: inherit
-#    # [FEATURE] MIXIN_AUDITOR
-#    with:
-#      mixin_audit: true
+    secrets: inherit

.github/workflows/release.yml

@@ -103,25 +103,25 @@ jobs:
           fi
 
       - name: Read common properties
-        id: properties_common
+        id: properties_c
         uses: christian-draeger/read-properties@1.1.1
         with:
           path: gradle.properties
           properties: 'mod_name mod_version'
 
       - name: Read version-specific properties
-        id: properties_versioned
+        id: properties_v
         uses: christian-draeger/read-properties@1.1.1
         with:
           path: ${{ format('versions/{0}/gradle.properties', matrix.subproject) }}
-          properties: 'minecraft_version game_versions'
+          properties: 'publish_versions'
 
       - name: Fix game version
-        id: game_versions
+        id: publish_versions
         run: |
-          # Fixed \n in game_versions isn't parsed by christian-draeger/read-properties as a line separator
+          # Fixed \n in publish_versions isn't parsed by christian-draeger/read-properties as a line separator
           echo 'value<<EOF' >> $GITHUB_OUTPUT
-          echo -e "${{ steps.properties_versioned.outputs.game_versions }}" >> $GITHUB_OUTPUT
+          echo -e "${{ steps.properties_v.outputs.publish_versions }}" >> $GITHUB_OUTPUT
           echo 'EOF' >> $GITHUB_OUTPUT
 
       - name: Prepare file information
@@ -166,12 +166,12 @@ jobs:
 
           files: ${{ steps.file_info.outputs.path }}
 
-          name: ${{ format('{0} {1} {2}', steps.properties_common.outputs.mod_name, steps.properties_common.outputs.mod_version, matrix.mod_brand) }}
-          version: ${{ steps.properties_common.outputs.mod_version }}
+          name: ${{ format('{0} {1} {2}', steps.properties_c.outputs.mod_name, steps.properties_c.outputs.mod_version, matrix.mod_brand) }}
+          version: ${{ steps.properties_c.outputs.mod_version }}
           version-type: release
 
           loaders: ${{ matrix.mod_brand }}
-          game-versions: ${{ steps.game_versions.outputs.value }}
+          game-versions: ${{ steps.publish_versions.outputs.value }}
           game-version-filter: any
           dependencies: ''  # declare the dependencies explicitly, so mc-publish won't try to load from fabric.mod.json
 

.github/workflows/tests.yml

@@ -4,7 +4,7 @@ on: [workflow_call]
 
 jobs:
   tests:
-    runs-on: windows-2019
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 21

CONTRIBUTING.md

@@ -10,7 +10,7 @@ If you're a developer, you can contribute to the AutoModpack project by writing
 1. Discuss the changes you want to make. By e.g. creating an issue.
 2. Fork the repository and create a new branch for your feature or bug fix.
 3. Make your code changes.
-4. Build code with `./gradlew chiseledBuild` command.
+4. Build code with `./gradlew build` command.
 5. Test your changes thoroughly to prevent regressions.
 6. Submit a pull request, describing your changes and providing relevant context.
 

README.md

@@ -40,36 +40,38 @@ This isn't just another mod; it's a game-changer for private servers. Here's why
 
 ## 🛠️ How the Magic Happens
 
-AutoModpack works by generating a modpack (**metadata file**) on the server, containing all the files of your modpack. The server then hosts this file and the modpack files.
+AutoModpack works by generating a modpack (**metadata file**) on the server, which contains all the files of your modpack. The server then hosts this file and the modpack files.
 
-When a client connects to server (simplified):
+When a client connects to the server:
 
-1.  AutoModpack securely connects to the modpack host server and fetches the metadata.
-2.  It uses Modrinth and CurseForge APIs to download directly your modpack's files where possible.
-3.  All files are downloaded to the client's automodpack folder.
-4.  Restart the game, AutoModpack loads the modpack and the client is perfectly synced and ready to play!
+1.  Connection: AutoModpack establishes a secure connection and prompts you to [verify the server's certificate fingerprint](https://moddedmc.wiki/en/project/automodpack/docs/technicals/certificate).
+2.  Direct links: Fetches the APIs for direct downloads of your modpack's files from Modrinth and CurseForge, where possible (mods, resource packs, shaders).
+3.  Modpack download: All files are downloaded to the client's automodpack folder.
+4.  Game restart: AutoModpack loads the modpack, and the client is perfectly synced and ready to play!
 
-On subsequent game boots, AutoModpack checks for updates. If changes are detected, it updates the modpack in the background, no additional restarts required!
+On subsequent game launches, AutoModpack checks for updates. If changes are detected, it updates the modpack in the background—no additional restarts are required!
 
 ## ⚠️ Security and Trust - Read This!
 
 > With great power comes great responsibility.
 
-Because it downloads files directly into your game folder, it's crucial to **only use it on servers you absolutely trust**. A malicious server (administrator) *can* include harmful files.
+Be aware that this mod allows remote servers to download *arbitrary executable* files directly into your game folder. It's crucial to **only use it on servers you absolutely trust**. A malicious server (administrator) *can* include malicious/harmful files.
 
 While AutoModpack itself tries to be as secure as possible, due to the nature of the internet, the creators and contributors of AutoModpack are not responsible for any harm, damage, loss, or issues that may result from files downloaded from a server you connect to using the mod. **By using AutoModpack, you acknowledge and accept this risk.**
 
-**If you have valuable security insights or concerns, please reach out!** You can contact privately on [Discord](https://discordapp.com/users/464522287618457631) or open an issue on GitHub.
+**If you have valuable security insights or concerns, please reach out!** You can contact privately on [Discord](https://discordapp.com/users/464522287618457631) or publicly on [Discord server](https://discord.gg/hS6aMyeA9P) or just open an issue on [GitHub](https://github.com/Skidamek/AutoModpack/issues).
 ## 🚀 Getting Started is a Breeze!
 
 Installing AutoModpack is as simple as installing any other mod.
 
 1.  Download the AutoModpack from the releases page on [GitHub](https://github.com/Skidamek/AutoModpack/releases), [CurseForge](https://www.curseforge.com/minecraft/mc-mods/automodpack), or [Modrinth](https://modrinth.com/mod/automodpack).
 2.  Place the downloaded file into the `/mods/` folder of both your server and client Minecraft installations.
+3.  Start your server and let AutoModpack generate the initial modpack metadata.
+4.  Connect to your server with the mod installed on your client.
 
 That's typically all you need to do! AutoModpack will automatically create the modpack from your server's mods.
 
-**Want to customize your modpack further?** Add configs, client-side-only mods, and more? **Check out the [wiki](https://github.com/Skidamek/AutoModpack/wiki)!** It *hopefully* has all the details you need to tailor AutoModpack to your specific needs.
+**Want to customize your modpack further?** Add configs, client-side-only mods, and more? **Check out the [documentation](https://moddedmc.wiki/en/project/automodpack/docs)!** There's also a start guide covering more stuff. If you encounter any issues or have questions, feel free to join [Discord server](https://discord.gg/hS6aMyeA9P) or open an issue on [GitHub](https://github.com/Skidamek/AutoModpack/issues).
 
 Prefer an all-in-one solution? You can also use our [modified Fabric installer](https://github.com/Skidamek/AutoModpack-Installer/releases/tag/Latest) which downloads AutoModpack alongside the Fabric loader.
 

build.fabric.gradle.kts

@@ -0,0 +1,73 @@
+@file:Suppress("UnstableApiUsage")
+
+plugins {
+    kotlin("jvm")
+    id("automodpack.common")
+    id("fabric-loom")
+}
+
+version = "${property("mod_version")}"
+group = "${property("mod.group")}"
+base.archivesName.set("${property("mod_name")}-mc${property("deps.minecraft")}-fabric".lowercase())
+
+loom {
+    accessWidenerPath = rootProject.file("src/main/resources/automodpack.accesswidener")
+}
+
+dependencies {
+    implementation(project(":core"))
+    implementation(project(":loader-core"))
+
+    minecraft("com.mojang:minecraft:${property("deps.minecraft")}")
+    mappings(loom.layered {
+        officialMojangMappings()
+        if (hasProperty("deps.parchment"))
+            parchment("org.parchmentmc.data:parchment-${property("deps.parchment")}@zip")
+    })
+
+    modImplementation("net.fabricmc:fabric-loader:${property("deps.fabric-loader")}")
+
+    // TODO transitive false
+    setOf(
+        "api-base", // Required by modules below
+        "resource-loader-v0", // Required for translatable texts
+        "registry-sync-v0", // Required for custom sounds
+        "networking-api-v1" // Required by registry sync module
+    ).forEach {
+        include(modImplementation(fabricApi.module("fabric-$it", property("deps.fabric-api") as String))!!)
+    }
+
+    if (stonecutter.eval(stonecutter.current.version, "<1.19.2")) {
+        include(modImplementation(fabricApi.module("fabric-command-api-v1", property("deps.fabric-api") as String))!!) // TODO transitive false
+    } else {
+        include(modImplementation(fabricApi.module("fabric-command-api-v2", property("deps.fabric-api") as String))!!) // TODO transitive false
+    }
+
+    include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${property("deps.mixin-extras")}")!!)!!)
+}
+
+java {
+    if (stonecutter.eval(stonecutter.current.version, ">=1.20.5")) {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+    } else {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    }
+    withSourcesJar()
+}
+
+tasks {
+    processResources {
+        exclude("**/neoforge.mods.toml", "**/mods.toml", "**/accesstransformer.cfg")
+    }
+
+    register<Copy>("buildAndCollect") {
+        group = "build"
+        from(remapJar.map { it.archiveFile })
+        into(rootProject.layout.buildDirectory.file("libs/${project.property("mod_version")}"))
+        dependsOn("build")
+    }
+}