diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 6d1864e..369b12b 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -8,56 +8,19 @@ on: required: true type: choice options: ["release", "beta", "alpha"] + minecraft-versions: + description: Overrides for supported versions + required: false + type: string jobs: publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up JDK - uses: actions/setup-java@v2 - with: - java-version: '17' - distribution: 'temurin' - cache: 'gradle' - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build - - - name: Read mod version - id: versions - uses: christian-draeger/read-properties@1.1.0 - with: - path: gradle.properties - properties: "mod_version minecraft_version" - - - name: Read changelog - uses: juliangruber/read-file-action@v1 - id: changelog - with: - path: "./changelog/${{ steps.versions.outputs.mod_version }}+${{ steps.versions.outputs.minecraft_version }}.md" - - - name: Publish - uses: Kir-Antipov/mc-publish@v3.2 - with: - name: "v${{ steps.versions.outputs.mod_version }} [${{ steps.versions.outputs.minecraft_version }}]" - version: ${{ steps.versions.outputs.mod_version }}+mc.${{ steps.versions.outputs.minecraft_version }} - version-type: ${{ inputs.version-type }} - - loaders: fabric quilt - java: 17 18 - - game-versions: ${{ steps.versions.outputs.minecraft_version }} - changelog: ${{ steps.changelog.outputs.content }} - - modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - modrinth-id: IF0Y4xFw - modrinth-featured: false - - curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} - curseforge-id: 689404 - - github-token: ${{ secrets.GITHUB_TOKEN }} - github-tag: ${{ steps.versions.outputs.mod_version }}+mc.${{ steps.versions.outputs.minecraft_version }} + uses: MattiDragon/MattiDragon/.github/workflows/publish-mc-mod.yaml@c066f67d80ff22e0b63bb5ad5c4ac83f583ad211 + with: + version-type: ${{ inputs.version-type }} + minecraft-versions: ${{ inputs.minecraft-versions }} + modrinth-id: IF0Y4xFw + curseforge-id: 689404 + secrets: + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} diff --git a/build.gradle b/build.gradle index eed045c..5f31bb6 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_version" // Core apis - modImplementation include("io.github.mattidragon:nodeflow:$nodeflow_version") + modImplementation include("com.github.mattidragon:nodeflow:$nodeflow_version") modImplementation include("com.kneelawk:graphlib:$graphlib_version") include modApi("teamreborn:energy:$energy_version") { exclude(group: "net.fabricmc.fabric-api") diff --git a/gradle.properties b/gradle.properties index fe99a16..54598fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ maven_group=io.github.mattidragon archives_base_name=advanced-networking fabric_version=0.89.3+1.20.2 -nodeflow_version=1.0.0-beta.3+mc.1.20.2 +nodeflow_version=1.0.0-mc.1.20.2 graphlib_version=1.4.0+1.20.2 energy_version=3.0.0 yacl_version=3.2.1+1.20.2 diff --git a/src/main/resources/assets/advanced_networking/lang/en_us.json b/src/main/resources/assets/advanced_networking/lang/en_us.json index a499be5..e38bd3c 100644 --- a/src/main/resources/assets/advanced_networking/lang/en_us.json +++ b/src/main/resources/assets/advanced_networking/lang/en_us.json @@ -127,11 +127,5 @@ "config.advanced_networking.option.disable_regex_filtering": "Disable Regex Filtering", "config.advanced_networking.option.disable_regex_filtering.tooltip": "Disables regex filtering for filter nodes. This is recommended for public servers because regex can be used to cause major lag.", "config.advanced_networking.option.show_adventure_mode_toggles": "Show Adventure Mode Toggle", - "config.advanced_networking.option.show_adventure_mode_toggles.tooltip": "If enabled, there will be a button in the controller ui that allows toggling of adventure mode access. This is only available to creative players with level 2 op. Useful for map-making or public showcases.", - - "__comment": "These should be in nodeflow, but I don't want to release another version right now", - "controlify.binding.nodeflow.editor_up": "Editor Up", - "controlify.binding.nodeflow.editor_down": "Editor Down", - "controlify.binding.nodeflow.editor_left": "Left Up", - "controlify.binding.nodeflow.editor_right": "Right Up" + "config.advanced_networking.option.show_adventure_mode_toggles.tooltip": "If enabled, there will be a button in the controller ui that allows toggling of adventure mode access. This is only available to creative players with level 2 op. Useful for map-making or public showcases." } \ No newline at end of file