diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml index a156d5b..b40ec6a 100644 --- a/.github/workflows/publish-dev.yml +++ b/.github/workflows/publish-dev.yml @@ -3,9 +3,12 @@ on: push: branches: - 'dev' + paths: + - 'src/main/**' + workflow_dispatch: jobs: publish: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest env: MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} CHANGELOG: ${{ github.event.head_commit.message }} @@ -22,4 +25,4 @@ jobs: - name: make gradle wrapper executable run: chmod +x ./gradlew - name: publish to modrinth (dev) - run: ./gradlew modrinth + run: ./gradlew clean modrinth diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f3abe9b..e08321f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,11 +1,8 @@ name: publish main -on: - push: - branches: - - 'main' +on: [ pull_request, workflow_dispatch ] jobs: publish: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest env: MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} PROD: TRUE @@ -33,13 +30,13 @@ jobs: const commits = JSON.parse(process.env.COMMITS); var lines = ""; for (const commit of commits) { - lines += "* " + commit.message + " (" + commit.id + ") @" + commit.author.username + "\n" + lines += "* " + commit.message + " (" + commit.id.substring(0,8) + ") @" + commit.author.username + "\n" } return lines - name: publish to modrinth env: CHANGELOG: ${{ steps.changelog.outputs.result }} - run: ./gradlew modrinth + run: ./gradlew clean modrinth # from https://github.com/JsMacros/JsMacros/blob/d0991a04159eb54b32b534e4bcac96b5ce613ccb/.github/workflows/betabuild.yml - name: get current mod version uses: actions/github-script@v2 diff --git a/gradle.properties b/gradle.properties index 3cc1872..03c6a36 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,10 @@ org.gradle.parallel.threads=1 org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.18.2 # base version -fabric_loader_version=0.14.19 # base fabric loader version +# base version +minecraft_version=1.18.2 +# base fabric loader version +fabric_loader_version=0.14.9 # Dependencies fabric_api_version=0.76.0 @@ -16,7 +18,7 @@ fabric_kotlin_version=1.7.4+kotlin.1.6.21 mod_menu_version=3.2.5 # Mod Properties -mod_version=1.2.1 +mod_version=1.2.2 maven_group=net.usbwire.usbplus mod_id=usbplus mod_name=USBPlus @@ -24,5 +26,5 @@ mod_description=Port of my jsmacro scripts! # essential settings essential.defaults.loom=1 -essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.19 +essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.9 essential.defaults.loom.platform=fabric diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 6dc4c7f..6cb0d1a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,6 +9,7 @@ ], "contact": { "homepage": "https://discord.usbwire.net", + "issues": "https://github.com/U5B/kotlin-test-mod/issues", "sources": "https://github.com/U5B/kotlin-test-mod" }, "license": "GPL", diff --git a/versions/1.18.2-fabric/gradle.properties b/versions/1.18.2-fabric/gradle.properties index 240c375..8df6fa7 100644 --- a/versions/1.18.2-fabric/gradle.properties +++ b/versions/1.18.2-fabric/gradle.properties @@ -1,3 +1,5 @@ essential.defaults.loom.minecraft=com.mojang:minecraft:1.18.2 essential.defaults.loom.mappings=net.fabricmc:yarn:1.18.2+build.4:v2 -fabric_api_version=0.76.0 \ No newline at end of file +essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.9 +fabric_loader_version=0.14.9 +fabric_api_version=0.76.0 diff --git a/versions/1.19.2-fabric/gradle.properties b/versions/1.19.2-fabric/gradle.properties index 211c5eb..d481f77 100644 --- a/versions/1.19.2-fabric/gradle.properties +++ b/versions/1.19.2-fabric/gradle.properties @@ -1,3 +1,5 @@ essential.defaults.loom.minecraft=com.mojang:minecraft:1.19.2 essential.defaults.loom.mappings=net.fabricmc:yarn:1.19.2+build.9:v2 +essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.9 +fabric_loader_version=0.14.9 fabric_api_version=0.76.0 \ No newline at end of file diff --git a/versions/1.19.3-fabric/gradle.properties b/versions/1.19.3-fabric/gradle.properties index 48202a8..50de5d5 100644 --- a/versions/1.19.3-fabric/gradle.properties +++ b/versions/1.19.3-fabric/gradle.properties @@ -1,3 +1,5 @@ essential.defaults.loom.minecraft=com.mojang:minecraft:1.19.3 essential.defaults.loom.mappings=net.fabricmc:yarn:1.19.3+build.5:v2 +essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.10 +fabric_loader_version=0.14.10 fabric_api_version=0.76.1 \ No newline at end of file diff --git a/versions/1.19.4-fabric/gradle.properties b/versions/1.19.4-fabric/gradle.properties index 3265883..c335df2 100644 --- a/versions/1.19.4-fabric/gradle.properties +++ b/versions/1.19.4-fabric/gradle.properties @@ -1,3 +1,5 @@ essential.defaults.loom.minecraft=com.mojang:minecraft:1.19.4 essential.defaults.loom.mappings=net.fabricmc:yarn:1.19.4+build.2:v2 +essential.defaults.loom.fabric-loader=net.fabricmc:fabric-loader:0.14.19 +fabric_loader_version=0.14.19 fabric_api_version=0.80.0 \ No newline at end of file