Merge pull request #1139 from P3pp3rF1y/1.20.x-dev

Release merge

.github/workflows/gradle.yml

@@ -8,9 +8,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 200  # Fetch 200 latest commits to make sure changelog can be created from merge commits
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: zulu
@@ -19,7 +21,7 @@ jobs:
         env:
           USERNAME: ${{ secrets.USERNAME }}
           READ_PACKAGES_TOKEN: ${{ secrets.READ_PACKAGES_TOKEN }}
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 3
@@ -29,10 +31,22 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build publish
       - name: Cleanup old artifacts
-        uses: actions/delete-package-versions@v3
+        uses: actions/delete-package-versions@v5
         with:
           package-name: 'sophisticatedbackpacks.sophisticatedbackpacks'
+          package-type: 'maven'
           min-versions-to-keep: 10
+      - name: Publish to CurseForge
+        env:
+          CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
+        run: |
+          BRANCH_NAME=${GITHUB_REF##*/}
+          if [[ "$BRANCH_NAME" =~ ^[0-9]+\.[0-9]+\.([0-9]+|x)$ ]]; then
+            ./gradlew curseforge
+          else
+            echo "Branch name does not match the pattern: $BRANCH_NAME. Skipping CurseForge upload."
+            exit 0
+          fi
       - name: Code Quality
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -43,7 +57,7 @@ jobs:
           echo "VERSION_NAME=$(${{github.workspace}}/gradlew -q printVersionName | awk -F "version:" '{printf $2}')" >> $GITHUB_OUTPUT
         id: version
       - name : Compile version message
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const gh = ${{ toJSON(github) }};
@@ -64,11 +78,9 @@ jobs:
             core.setOutput('EMBED_DESCRIPTION', description);
         id: embed
       - name: Send Discord Notification
-        uses: tsickert/discord-webhook@v5.3.0
+        uses: tsickert/discord-webhook@v6.0.0
         with:
           webhook-url: ${{ secrets.DISCORD_WEBHOOK }}
-          embeds: ${{steps.embed.outputs.EMBEDS}}
-          content: null
           embed-title: "${{steps.embed.outputs.EMBED_TITLE}}"
           embed-url: "${{steps.embed.outputs.EMBED_URL}}"
           embed-description: "${{steps.embed.outputs.EMBED_DESCRIPTION}}"

build.gradle

@@ -4,6 +4,7 @@ plugins {
     id "maven-publish"
     id 'net.neoforged.gradle' version '[6.0.18,6.2)'
     id 'org.parchmentmc.librarian.forgegradle' version '1.+'
+    id "net.darkhax.curseforgegradle" version "1.1.15"
 }
 
 idea {
@@ -207,6 +208,119 @@ sonarqube {
     }
 }
 
+task generateChangelog {
+    doLast {
+        def changelog = new StringBuilder()
+
+        // Function to remove characters with Unicode code points 129 or higher
+        def removeHighUnicodeChars = { text ->
+            text.codePoints()
+                    .filter { codePoint -> codePoint <= 0x007F }  // Keep only ASCII characters (U+0000 to U+007F)
+                    .collect { codePoint -> new String(Character.toChars(codePoint)) }
+                    .join('')
+        }
+
+        // Function to format commit messages with nesting
+        def formatMultilineMessage = { message ->
+            // Split message by lines, trim whitespace, and create formatted list
+            def lines = message.split('\n')
+            def formattedMessage = lines[0].trim() // First line as top-level list item
+            if (lines.size() > 1) {
+                formattedMessage += "\n" + lines[1..-1].collect { line ->
+                    // Trim the line and remove leading dash if present
+                    def trimmedLine = line.trim()
+                    if (trimmedLine.startsWith('-')) {
+                        trimmedLine = trimmedLine.substring(1).trim()
+                    }
+                    "    - ${trimmedLine}" // Nested list for additional lines
+                }.join('\n')
+            }
+            return formattedMessage
+        }
+
+        // Function to remove [DEV] section from commit message
+        def removeDevSection = { message ->
+            def devIndex = message.indexOf('[DEV]')
+            if (devIndex != -1) {
+                return message.substring(0, devIndex).trim()
+            }
+            return message
+        }
+
+        // Get the latest commit hash
+        def latestCommitHash = "git rev-parse HEAD".execute().text.trim()
+
+        // Check if the latest commit is a merge commit
+        def parentCommits = "git rev-list --parents -n 1 ${latestCommitHash}".execute().text.split()
+        logger.info("Parent commits: ${parentCommits}")
+
+        def commitMessages = []
+        if (parentCommits.size() > 2) { // Merge commit has more than 2 parents
+            def firstParent = parentCommits[1]
+            def secondParent = parentCommits[2]
+            def gitLogCommand = [
+                    "bash", "-c", "git log --pretty=format:%B ${firstParent}..${secondParent}"
+            ]
+            commitMessages = gitLogCommand.execute().text.split('\n\n')  // Split by two newlines for each commit
+            logger.info("Merge commit, ran git log command: ${gitLogCommand.join(' ')} and got ${commitMessages}")
+        } else {
+            // Single commit log
+            commitMessages = "git log -1 --pretty=%B".execute().text.split('\n\n')
+            // Split by two newlines for each commit
+            logger.info("Single commit, ran git log command: git log -1 --pretty=%B and got ${commitMessages}");
+        }
+
+        def features = []
+        def fixes = []
+        commitMessages.each { commitMessage ->
+            commitMessage = removeHighUnicodeChars(commitMessage) // Remove high Unicode characters
+            commitMessage = removeDevSection(commitMessage) // Remove [DEV] section
+
+            if (commitMessage.startsWith('feat: ')) {
+                features.add(commitMessage.replaceFirst('feat: ', '').trim())
+            } else if (commitMessage.startsWith('fix: ')) {
+                fixes.add(commitMessage.replaceFirst('fix: ', '').trim())
+            }
+        }
+
+        if (features) {
+            changelog.append("### Features\n")
+            features.each { feature -> changelog.append("- ${formatMultilineMessage(feature)}\n") }
+        }
+
+        if (fixes) {
+            changelog.append("### Fixes\n")
+            fixes.each { fix -> changelog.append("- ${formatMultilineMessage(fix)}\n") }
+        }
+
+        // Store the changelog in a project property or an environment variable
+        logger.info("Compiled changelog: " + changelog.toString())
+        project.ext.changelog = changelog.toString()
+    }
+    project.ext.changelog = ""
+}
+
+task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
+    dependsOn 'generateChangelog'
+
+    apiToken = System.getenv("CURSEFORGE_TOKEN")
+    def mainFile = upload(project.curseforge_id, file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))
+    mainFile.changelogType = 'markdown'
+    mainFile.changelog = {project.ext.changelog}
+    mainFile.addModLoader('NeoForge')
+    mainFile.addModLoader('Forge')
+    mainFile.releaseType = "${release_type}"
+    "${release_versions}".split(',').each {
+        mainFile.addGameVersion("${it}")
+    }
+    mainFile
+    mainFile.addRequirement('sophisticated-core')
+    mainFile.addOptional('jei')
+    mainFile.addOptional('curios')
+    mainFile.addOptional('crafting-tweaks')
+    onlyIf { !project.ext.changelog.isEmpty() }
+}
+
 task printVersionName {
     println "version:" + project.version
 }

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 
 mod_id=sophisticatedbackpacks
 mod_group_id=sophisticatedbackpacks
-mod_version=3.20.6
+mod_version=3.20.7
 sonar_project_key=sophisticatedbackpacks:SophisticatedBackpacks
 github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedBackpacks
 
@@ -14,6 +14,11 @@ neo_version=47.1.5
 neo_version_range=[47.1,)
 loader_version_range=[47,)
 
+#publish
+curseforge_id=422301
+release_type=release
+release_versions=1.20.1
+
 #deps
 jei_mc_version=1.20.1-forge
 jei_version=15.3.0.4

src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/client/gui/BackpackScreen.java

@@ -23,6 +23,9 @@ public BackpackScreen(BackpackContainer screenContainer, Inventory inv, Componen
 
 	@Override
 	public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+		if (getFocused() != null) {
+			return super.keyPressed(keyCode, scanCode, modifiers);
+		}
 		if (keyCode == 256 || KeybindHandler.BACKPACK_OPEN_KEYBIND.isActiveAndMatches(InputConstants.getKey(keyCode, scanCode))) {
 			if (getMenu().isFirstLevelStorage() && (keyCode == 256 || mouseNotOverBackpack())) {
 				if (getMenu().getBackpackContext().wasOpenFromInventory()) {