diff --git a/.github/workflows/buildAndRelease.yml b/.github/workflows/buildAndRelease.yml index c71ef9e..bb68650 100644 --- a/.github/workflows/buildAndRelease.yml +++ b/.github/workflows/buildAndRelease.yml @@ -220,51 +220,26 @@ jobs: echo "---" >> $TEMP_FILE echo "" >> $TEMP_FILE - echo "## 📦 下载文件" >> $TEMP_FILE - echo "" >> $TEMP_FILE - echo "本次发布包含以下平台的构建文件:" >> $TEMP_FILE - echo "" >> $TEMP_FILE - - # 列出所有发布的文件 - echo "### Fabric 版本" >> $TEMP_FILE - echo "\`\`\`" >> $TEMP_FILE - ls -1 dist/*fabric*.jar 2>/dev/null | grep -v "sources\|javadoc" | xargs -n1 basename || echo "无 Fabric 主文件" >> $TEMP_FILE - echo "\`\`\`" >> $TEMP_FILE - echo "" >> $TEMP_FILE - - echo "### Forge 版本" >> $TEMP_FILE - echo "\`\`\`" >> $TEMP_FILE - ls -1 dist/*forge*.jar 2>/dev/null | grep -v "sources\|javadoc" | xargs -n1 basename || echo "无 Forge 主文件" >> $TEMP_FILE - echo "\`\`\`" >> $TEMP_FILE - echo "" >> $TEMP_FILE - - echo "### 通用模块" >> $TEMP_FILE - echo "\`\`\`" >> $TEMP_FILE - ls -1 dist/*common*.jar 2>/dev/null | grep -v "sources\|javadoc" | xargs -n1 basename || echo "无通用模块" >> $TEMP_FILE - echo "\`\`\`" >> $TEMP_FILE - echo "" >> $TEMP_FILE - - echo "### 源码和文档" >> $TEMP_FILE - echo "\`\`\`" >> $TEMP_FILE - ls -1 dist/*-sources.jar 2>/dev/null | xargs -n1 basename || echo "无源码文件" >> $TEMP_FILE - ls -1 dist/*-javadoc.jar 2>/dev/null | xargs -n1 basename || echo "无文档文件" >> $TEMP_FILE - echo "\`\`\`" >> $TEMP_FILE - echo "" >> $TEMP_FILE - echo "### 📜 详细提交历史" >> $TEMP_FILE echo "" >> $TEMP_FILE echo "
" >> $TEMP_FILE echo "点击展开查看完整提交历史" >> $TEMP_FILE echo "" >> $TEMP_FILE echo "\`\`\`" >> $TEMP_FILE - - # 显示所有提交的详细列表 + if [ -z "$PREV_TAG" ]; then - git log --pretty=format:"%h %s - %an (%ad)" --date=short --reverse >> $TEMP_FILE + # 使用 while 循环确保每条提交独立一行 + git log --pretty=format:"%h %s - %an (%ad)" --date=short --reverse | while IFS= read -r line; do + echo "$line" >> $TEMP_FILE + done else - git log --pretty=format:"%h %s - %an (%ad)" --date=short $PREV_TAG..HEAD >> $TEMP_FILE + git log --pretty=format:"%h %s - %an (%ad)" --date=short $PREV_TAG..HEAD | while IFS= read -r line; do + echo "$line" >> $TEMP_FILE + done fi - + + # 确保文件末尾有换行 + echo "" >> $TEMP_FILE echo "\`\`\`" >> $TEMP_FILE echo "
" >> $TEMP_FILE @@ -286,4 +261,60 @@ jobs: prerelease: false token: ${{ secrets.GITHUB_TOKEN }} allowUpdates: true - removeArtifacts: true \ No newline at end of file + removeArtifacts: true + # 新增:使用 mc-publish 发布到 Modrinth 和 CurseForge + - name: Publish to Modrinth & CurseForge + uses: Kir-Antipov/mc-publish@v3.3 + if: success() # 只有在之前的步骤都成功时才运行 + continue-on-error: true # 即使发布失败也不中断整个工作流 + with: + # 文件路径 - 指向所有构建的jar文件 + files: | + dist/*.jar + + # 版本信息 + name: "${{ steps.version_info.outputs.mod_name }} ${{ steps.version_info.outputs.version }}" + version: ${{ steps.version_info.outputs.version }} + + # 更新日志 - 使用上面生成的changelog + changelog: ${{ steps.generate_changelog.outputs.changelog }} + + # 版本类型:根据标签判断是否为预发布版本 + # 如果标签包含 alpha/beta/rc 则视为预发布 + version-type: ${{ contains(github.ref_name, 'alpha') || contains(github.ref_name, 'beta') || contains(github.ref_name, 'rc') && 'beta' || 'release' }} + + # 支持的加载器 + loaders: | + forge + fabric + + # 支持的Minecraft版本 + game-versions: | + ${{ steps.version_info.outputs.minecraft_version }} + + # Java版本 + java: | + 21 + 17 + + # Modrinth 配置 + modrinth-id: n65Vs1Vk + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + modrinth-featured: true + modrinth-unfeature-mode: any-version + + # CurseForge 配置 + curseforge-id: 1445917 + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + + # 依赖关系配置(可选) + # dependencies: | + # required | curseforge:123456 | https://www.curseforge.com/minecraft/mc-mods/example + # optional | modrinth:abcdefg + + # 文件排除模式(可选) + # files-primary: "*" # 主文件 + # files-secondary: "*-sources.jar" # 额外文件 + + # 如果发布失败时的行为 + fail-mode: skip # 可以设置为: fail, skip, warn \ No newline at end of file diff --git a/common/src/main/java/top/r3944realms/lib39/core/lang/ClassEncryptor.java b/common/src/main/java/top/r3944realms/lib39/core/lang/ClassEncryptor.java index adce3f9..7fe88ce 100644 --- a/common/src/main/java/top/r3944realms/lib39/core/lang/ClassEncryptor.java +++ b/common/src/main/java/top/r3944realms/lib39/core/lang/ClassEncryptor.java @@ -11,7 +11,7 @@ import java.util.stream.Stream; */ public class ClassEncryptor { static { - System.loadLibrary("ClassEncrypt"); +// System.loadLibrary("ClassEncrypt"); } /**