From e5dfe069754e1453f3a1880ee241006045629bc6 Mon Sep 17 00:00:00 2001 From: BlayTheNinth <1933180+BlayTheNinth@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:33:46 +0100 Subject: [PATCH] build: Update project template --- .github/advanced-issue-labeler.yml | 22 +++ .github/workflows/build.yml | 30 ---- .github/workflows/label-issues.yaml | 28 +++ .github/workflows/manage-labels.yaml | 30 ++++ .github/workflows/publish-release.yml | 160 +++++++++++++++--- .github/workflows/publish-snapshot.yml | 44 +++-- {shared => common}/build.gradle | 2 - {shared => common}/dependencies.gradle | 0 .../mods/kleeslabs/BlockBreakHandler.java | 0 .../net/blay09/mods/kleeslabs/KleeSlabs.java | 0 .../mods/kleeslabs/KleeSlabsConfig.java | 0 .../mods/kleeslabs/KleeSlabsConfigData.java | 0 .../blay09/mods/kleeslabs/KleeSlabsMode.java | 0 .../mods/kleeslabs/LoginSyncHandler.java | 0 .../mods/kleeslabs/SlabDumpHandler.java | 0 .../kleeslabs/client/KleeSlabsClient.java | 0 .../converter/SimpleSlabConverter.java | 0 .../kleeslabs/converter/SlabConverter.java | 0 .../converter/SmartSlabConverter.java | 0 .../converter/SmarterSlabConverter.java | 0 .../mixin/LevelRendererAccessor.java | 0 .../network/KleeSlabsRegistryMessage.java | 0 .../mods/kleeslabs/network/ModNetworking.java | 0 .../mods/kleeslabs/registry/SlabRegistry.java | 0 .../kleeslabs/registry/SlabRegistryData.java | 0 .../registry/json/JsonCompatData.java | 0 .../registry/json/JsonCompatLoader.java | 0 .../assets/kleeslabs/lang/en_us.json | 0 .../assets/kleeslabs/lang/pt_br.json | 8 +- .../assets/kleeslabs/lang/uk_ua.json | 0 .../data/kleeslabs/kleeslabs_compat/ae2.json | 0 .../kleeslabs_compat/amendments.json | 0 .../kleeslabs_compat/betterarcheology.json | 0 .../kleeslabs_compat/biomesoplenty.json | 0 .../kleeslabs_compat/blue_skies.json | 0 .../kleeslabs/kleeslabs_compat/botania.json | 0 .../kleeslabs_compat/caveopolis.json | 0 .../kleeslabs_compat/concreteextends.json | 0 .../kleeslabs/kleeslabs_compat/create.json | 0 .../kleeslabs_compat/deeperdarker.json | 0 .../kleeslabs/kleeslabs_compat/erebus.json | 0 .../kleeslabs_compat/extendedslabs.json | 0 .../kleeslabs_compat/extratrees.json | 0 .../kleeslabs/kleeslabs_compat/forestry.json | 0 .../kleeslabs_compat/hearth_and_home.json | 0 .../kleeslabs/kleeslabs_compat/meadow.json | 0 .../kleeslabs_compat/mekanismadditions.json | 0 .../kleeslabs/kleeslabs_compat/minecraft.json | 0 .../kleeslabs_compat/missing_pieces.json | 0 .../more_slabs_stairs_and_walls.json | 0 .../kleeslabs_compat/mysticalagriculture.json | 0 .../kleeslabs_compat/naturalist.json | 0 .../kleeslabs_compat/oceanopolis.json | 0 .../kleeslabs_compat/philipsruins.json | 0 .../kleeslabs/kleeslabs_compat/quark.json | 0 .../kleeslabs_compat/regions_unexplored.json | 0 .../kleeslabs/kleeslabs_compat/ribbits.json | 0 .../kleeslabs/kleeslabs_compat/slabcraft.json | 0 .../kleeslabs_compat/supplementaries.json | 0 .../kleeslabs_compat/thebetweenlands.json | 0 .../kleeslabs_compat/underground_biomes.json | 0 .../kleeslabs_compat/upgrade_aquatic.json | 0 .../kleeslabs/kleeslabs_compat/vinery.json | 0 .../src/main/resources/kleeslabs-icon.png | Bin .../src/main/resources/pack.mcmeta | 0 fabric/build.gradle | 10 +- forge/build.gradle | 18 +- forge/src/main/resources/META-INF/mods.toml | 2 +- gradle.properties | 4 +- settings.gradle | 2 +- 70 files changed, 267 insertions(+), 93 deletions(-) create mode 100644 .github/advanced-issue-labeler.yml delete mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/label-issues.yaml create mode 100644 .github/workflows/manage-labels.yaml rename {shared => common}/build.gradle (97%) rename {shared => common}/dependencies.gradle (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/BlockBreakHandler.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfig.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfigData.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsMode.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/LoginSyncHandler.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/SlabDumpHandler.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/client/KleeSlabsClient.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/converter/SimpleSlabConverter.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/converter/SlabConverter.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/converter/SmartSlabConverter.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/converter/SmarterSlabConverter.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/mixin/LevelRendererAccessor.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/network/ModNetworking.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistry.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistryData.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatData.java (100%) rename {shared => common}/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java (100%) rename {shared => common}/src/main/resources/assets/kleeslabs/lang/en_us.json (100%) rename {shared => common}/src/main/resources/assets/kleeslabs/lang/pt_br.json (97%) rename {shared => common}/src/main/resources/assets/kleeslabs/lang/uk_ua.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/ae2.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/amendments.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/betterarcheology.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/biomesoplenty.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/blue_skies.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/botania.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/caveopolis.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/concreteextends.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/create.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/deeperdarker.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/erebus.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/extendedslabs.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/extratrees.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/forestry.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/hearth_and_home.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/meadow.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/mekanismadditions.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/minecraft.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/missing_pieces.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/more_slabs_stairs_and_walls.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/mysticalagriculture.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/naturalist.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/oceanopolis.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/philipsruins.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/quark.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/regions_unexplored.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/ribbits.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/slabcraft.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/supplementaries.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/thebetweenlands.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/underground_biomes.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/upgrade_aquatic.json (100%) rename {shared => common}/src/main/resources/data/kleeslabs/kleeslabs_compat/vinery.json (100%) rename {shared => common}/src/main/resources/kleeslabs-icon.png (100%) rename {shared => common}/src/main/resources/pack.mcmeta (100%) diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml new file mode 100644 index 0000000..5c37928 --- /dev/null +++ b/.github/advanced-issue-labeler.yml @@ -0,0 +1,22 @@ +policy: + - template: [report-a-bug.yml] + section: + - id: [minecraftVersion] + block-list: [other] + label: + - name: Minecraft 1.21.4 + keys: ['1.21.4'] + - name: Minecraft 1.21.1 + keys: ['1.21.1 (LTS)'] + - name: Minecraft 1.20.1 + keys: ['1.20.1 (LTS)'] + - name: EOL + keys: ['Other (specify below)'] + - id: [modLoader] + label: + - name: NeoForge + keys: ['NeoForge'] + - name: Fabric + keys: ['Fabric'] + - name: 'Forge' + keys: ['Forge'] \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index c01620f..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: build -on: - push: - branches: - - '**' - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - loader: [fabric, forge] - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - name: Validate gradle wrapper - uses: gradle/actions/wrapper-validation@v3 - - name: Setup JDK - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: temurin - - name: Make gradle wrapper executable - run: chmod +x ./gradlew - - name: Build - run: ./gradlew :${{ matrix.loader }}:build - env: - GPR_USERNAME: ${{secrets.GPR_USERNAME}} - GPR_TOKEN: ${{secrets.GPR_TOKEN}} - GPR_BUILD_NUMBER: ${{github.run_number}} \ No newline at end of file diff --git a/.github/workflows/label-issues.yaml b/.github/workflows/label-issues.yaml new file mode 100644 index 0000000..6abd8ba --- /dev/null +++ b/.github/workflows/label-issues.yaml @@ -0,0 +1,28 @@ +name: Label Issues +on: + issues: + types: [ opened ] +jobs: + label-component: + runs-on: ubuntu-latest + permissions: + contents: read + issues: write + strategy: + matrix: + template: [ report-a-bug.yml ] + steps: + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 + + - name: Parse issue form + uses: TwelveIterations/github-issue-parser@main + id: issue-parser + with: + template-path: https://raw.githubusercontent.com/TwelveIterationMods/.github/refs/heads/main/.github/ISSUE_TEMPLATE/${{ matrix.template }} + + - name: Set labels based on component field + uses: redhat-plumbers-in-action/advanced-issue-labeler@d498805e5c7c0658e336948b3363480bcfd68da6 + with: + issue-form: ${{ steps.issue-parser.outputs.jsonString }} + template: ${{ matrix.template }} + token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/manage-labels.yaml b/.github/workflows/manage-labels.yaml new file mode 100644 index 0000000..2c7026a --- /dev/null +++ b/.github/workflows/manage-labels.yaml @@ -0,0 +1,30 @@ +name: manage-labels +on: + workflow_dispatch: + inputs: + dry: + description: 'Dry run (no changes, log only)' + required: false + default: true + type: boolean + remove_missing: + description: 'Remove labels not present in the source data' + required: false + default: false + type: boolean +jobs: + manage-labels: + permissions: + contents: read + issues: write + runs-on: ubuntu-latest + name: manage-labels + steps: + - uses: actions/checkout@v2 + - uses: TwelveIterations/manage-labels@main + with: + dry: ${{ inputs.dry }} + remove_missing: ${{ inputs.remove_missing }} + source: https://raw.githubusercontent.com/TwelveIterationMods/.github/refs/heads/main/labels.yaml + env: + GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 97c2cff..b59bc2d 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -2,15 +2,21 @@ name: publish-release on: workflow_dispatch: inputs: - bump: - description: 'The bump in version for this release' + forge: + description: 'Forge' required: true - type: choice - default: patch - options: - - major - - minor - - patch + type: boolean + default: true + fabric: + description: 'Fabric' + required: true + type: boolean + default: true + neoforge: + description: 'NeoForge' + required: true + type: boolean + default: true jobs: create-release: @@ -18,22 +24,24 @@ jobs: outputs: ref: v${{ steps.bump-version.outputs.version }} version: ${{ steps.bump-version.outputs.version }} + build-matrix: ${{ steps.set-build-matrix.outputs.result }} + publish-matrix: ${{ steps.set-publish-matrix.outputs.result }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Extracting version from properties shell: bash - run: echo "version=$(cat gradle.properties | grep -w "\bmod_version" | cut -d= -f2)" >> $GITHUB_OUTPUT + run: echo "version=$(cat gradle.properties | grep -w "\bversion" | cut -d= -f2)" >> $GITHUB_OUTPUT id: extract-version - name: Bumping version uses: TwelveIterationMods/bump-version@v1 with: version: ${{ steps.extract-version.outputs.version }} - bump: ${{ inputs.bump }} + bump: patch id: bump-version - name: Updating version properties run: | - sed -i "s/^\s*mod_version\s*=.*/mod_version = ${{ steps.bump-version.outputs.version }}/g" gradle.properties + sed -i "s/^\s*version\s*=.*/version = ${{ steps.bump-version.outputs.version }}/g" gradle.properties git config user.name "GitHub Actions" git config user.email "<>" git commit -am "Set version to ${{ steps.bump-version.outputs.version }}" @@ -43,36 +51,136 @@ jobs: shell: bash env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} + - name: Preparing build matrix + id: set-build-matrix + uses: actions/github-script@v7 + with: + script: | + const fs = require('fs'); + const settingsGradle = fs.readFileSync('settings.gradle', 'utf8'); + const includePattern = /^(?!\s*\/\/)\s*include\s*\(\s*(['"]([^'"]+)['"](?:,\s*['"]([^'"]+)['"])*\s*)\)/gm; + const includes = [...settingsGradle.matchAll(includePattern)].flatMap(match => match[0].match(/['"]([^'"]+)['"]/g).map(item => item.replace(/['"]/g, ''))); + const includeFabric = includes.includes('fabric') && ${{inputs.fabric}}; + const includeForge = includes.includes('forge') && ${{inputs.forge}}; + const includeNeoForge = includes.includes('neoforge') && ${{inputs.neoforge}}; + return { + loader: [includeFabric ? 'fabric' : false, includeForge ? 'forge' : false, includeNeoForge ? 'neoforge' : false].filter(Boolean), + } + - name: Preparing publish matrix + id: set-publish-matrix + uses: actions/github-script@v7 + with: + script: | + const fs = require('fs'); + const settingsGradle = fs.readFileSync('settings.gradle', 'utf8'); + const includePattern = /^(?!\s*\/\/)\s*include\s*\(\s*(['"]([^'"]+)['"](?:,\s*['"]([^'"]+)['"])*\s*)\)/gm; + const includes = [...settingsGradle.matchAll(includePattern)].flatMap(match => match[0].match(/['"]([^'"]+)['"]/g).map(item => item.replace(/['"]/g, ''))); + const includeFabric = includes.includes('fabric') && ${{inputs.fabric}}; + const includeForge = includes.includes('forge') && ${{inputs.forge}}; + const includeNeoForge = includes.includes('neoforge') && ${{inputs.neoforge}}; + return { + loader: ['common', includeFabric ? 'fabric' : false, includeForge ? 'forge' : false, includeNeoForge ? 'neoforge' : false].filter(Boolean), + site: ['curseforge', 'modrinth', 'publish'], + exclude: [ + {loader: 'common', site: 'curseforge'}, + {loader: 'common', site: 'modrinth'} + ] + } + build-common: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ needs.create-release.outputs.ref }} + - name: Validate gradle wrapper + uses: gradle/actions/wrapper-validation@v3 + - name: Setup JDK + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: temurin + cache: 'gradle' + - name: Make gradle wrapper executable + run: chmod +x ./gradlew + - name: Build common artifact + run: ./gradlew :common:build '-Pversion=${{needs.create-release.outputs.version}}' + - name: Upload common artifact + uses: actions/upload-artifact@v4 + with: + name: common-artifact + path: common/build + needs: create-release + build-release: + runs-on: ubuntu-latest + strategy: + matrix: ${{fromJson(needs.create-release.outputs.build-matrix)}} + fail-fast: false + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ needs.create-release.outputs.ref }} + - name: Validate gradle wrapper + uses: gradle/actions/wrapper-validation@v3 + - name: Setup JDK + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: temurin + cache: 'gradle' + - name: Make gradle wrapper executable + run: chmod +x ./gradlew + - name: Download common artifact + uses: actions/download-artifact@v4 + with: + name: common-artifact + path: common/build + - name: Build ${{ matrix.loader }} artifact + run: ./gradlew :${{ matrix.loader }}:build '-Pversion=${{needs.create-release.outputs.version}}' + - name: Upload ${{ matrix.loader }} artifact + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.loader }}-artifact + path: ${{ matrix.loader }}/build + needs: + - create-release + - build-common publish-release: runs-on: ubuntu-latest - permissions: - packages: write strategy: - matrix: - loader: [ shared, fabric, forge ] - site: [ curseforge, modrinth, publish ] - exclude: - - loader: shared - site: curseforge - - loader: shared - site: modrinth + matrix: ${{fromJson(needs.create-release.outputs.publish-matrix)}} + fail-fast: false steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: ref: ${{ needs.create-release.outputs.ref }} + - name: Download ${{ matrix.loader }} artifact + uses: actions/download-artifact@v4 + with: + name: ${{ matrix.loader }}-artifact + path: ${{ matrix.loader }}/build - name: Validate gradle wrapper uses: gradle/actions/wrapper-validation@v3 - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin + cache: 'gradle' - name: Make gradle wrapper executable run: chmod +x ./gradlew + - name: Check current artifact hash TODO + run: sha1sum ${{ matrix.loader }}/build/libs/* - name: Publish run: ./gradlew :${{ matrix.loader }}:${{ matrix.site }} '-Pversion=${{needs.create-release.outputs.version}}' '-PtwelveIterationsNexusUsername=${{ secrets.NEXUS_USER }}' '-PtwelveIterationsNexusPassword=${{ secrets.NEXUS_PASSWORD }}' env: CURSEFORGE_TOKEN: ${{secrets.CURSEFORGE_TOKEN}} MODRINTH_TOKEN: ${{secrets.MODRINTH_TOKEN}} - needs: create-release \ No newline at end of file + - name: Check new artifact hash TODO + run: sha1sum ${{ matrix.loader }}/build/libs/* + needs: + - create-release + - build-common + - build-release \ No newline at end of file diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index e53dd9d..ef34a81 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -1,32 +1,53 @@ name: publish-snapshot on: push: - tags: - - '*' + branches: + - '**' jobs: + prepare-matrix: + runs-on: ubuntu-latest + outputs: + matrix: ${{ steps.set-matrix.outputs.result }} + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Preparing matrix + id: set-matrix + uses: actions/github-script@v7 + with: + script: | + const fs = require('fs'); + const settingsGradle = fs.readFileSync('settings.gradle', 'utf8'); + const includePattern = /^(?!\s*\/\/)\s*include\s*\(\s*(['"]([^'"]+)['"](?:,\s*['"]([^'"]+)['"])*\s*)\)/gm; + const includes = [...settingsGradle.matchAll(includePattern)] + .flatMap(match => match[0].match(/['"]([^'"]+)['"]/g).map(item => item.replace(/['"]/g, ''))); + const includeFabric = includes.includes('fabric'); + const includeForge = includes.includes('forge'); + const includeNeoForge = includes.includes('neoforge'); + return { + loader: ['common', includeFabric ? 'fabric' : false, includeForge ? 'forge' : false, includeNeoForge ? 'neoforge' : false].filter(Boolean), + }; publish-snapshot: runs-on: ubuntu-latest - permissions: - packages: write strategy: - matrix: - loader: [common, fabric, forge] + matrix: ${{fromJson(needs.prepare-matrix.outputs.matrix)}} + fail-fast: false steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Validate gradle wrapper uses: gradle/actions/wrapper-validation@v3 - name: Setup JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: - java-version: 17 + java-version: 21 distribution: temurin - name: Make gradle wrapper executable run: chmod +x ./gradlew - name: Extracting version from properties shell: bash - run: echo "version=$(cat gradle.properties | grep -w "\bmod_version" | cut -d= -f2)" >> $GITHUB_OUTPUT + run: echo "version=$(cat gradle.properties | grep -w "\bversion" | cut -d= -f2)" >> $GITHUB_OUTPUT id: extract-version - name: Bumping version uses: TwelveIterationMods/bump-version@v1 @@ -35,4 +56,5 @@ jobs: bump: patch id: bump-version - name: Publish - run: ./gradlew :${{ matrix.loader }}:publish '-Pversion=${{ steps.bump-version.outputs.version }}-SNAPSHOT' '-PtwelveIterationsNexusUsername=${{ secrets.NEXUS_USER }}' '-PtwelveIterationsNexusPassword=${{ secrets.NEXUS_PASSWORD }}' \ No newline at end of file + run: ./gradlew :${{ matrix.loader }}:publish '-Pversion=${{ steps.bump-version.outputs.version }}-SNAPSHOT' '-PtwelveIterationsNexusUsername=${{ secrets.NEXUS_USER }}' '-PtwelveIterationsNexusPassword=${{ secrets.NEXUS_PASSWORD }}' + needs: prepare-matrix \ No newline at end of file diff --git a/shared/build.gradle b/common/build.gradle similarity index 97% rename from shared/build.gradle rename to common/build.gradle index 826999c..3501b45 100644 --- a/shared/build.gradle +++ b/common/build.gradle @@ -4,8 +4,6 @@ plugins { id 'maven-publish' } -group = mod_group -version = mod_version archivesBaseName = "${mod_id}-common-${minecraft_version}" minecraft { diff --git a/shared/dependencies.gradle b/common/dependencies.gradle similarity index 100% rename from shared/dependencies.gradle rename to common/dependencies.gradle diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/BlockBreakHandler.java b/common/src/main/java/net/blay09/mods/kleeslabs/BlockBreakHandler.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/BlockBreakHandler.java rename to common/src/main/java/net/blay09/mods/kleeslabs/BlockBreakHandler.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java b/common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java rename to common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabs.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfig.java b/common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfig.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfig.java rename to common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfig.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfigData.java b/common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfigData.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfigData.java rename to common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsConfigData.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsMode.java b/common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsMode.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsMode.java rename to common/src/main/java/net/blay09/mods/kleeslabs/KleeSlabsMode.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/LoginSyncHandler.java b/common/src/main/java/net/blay09/mods/kleeslabs/LoginSyncHandler.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/LoginSyncHandler.java rename to common/src/main/java/net/blay09/mods/kleeslabs/LoginSyncHandler.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/SlabDumpHandler.java b/common/src/main/java/net/blay09/mods/kleeslabs/SlabDumpHandler.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/SlabDumpHandler.java rename to common/src/main/java/net/blay09/mods/kleeslabs/SlabDumpHandler.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/client/KleeSlabsClient.java b/common/src/main/java/net/blay09/mods/kleeslabs/client/KleeSlabsClient.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/client/KleeSlabsClient.java rename to common/src/main/java/net/blay09/mods/kleeslabs/client/KleeSlabsClient.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/converter/SimpleSlabConverter.java b/common/src/main/java/net/blay09/mods/kleeslabs/converter/SimpleSlabConverter.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/converter/SimpleSlabConverter.java rename to common/src/main/java/net/blay09/mods/kleeslabs/converter/SimpleSlabConverter.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/converter/SlabConverter.java b/common/src/main/java/net/blay09/mods/kleeslabs/converter/SlabConverter.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/converter/SlabConverter.java rename to common/src/main/java/net/blay09/mods/kleeslabs/converter/SlabConverter.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/converter/SmartSlabConverter.java b/common/src/main/java/net/blay09/mods/kleeslabs/converter/SmartSlabConverter.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/converter/SmartSlabConverter.java rename to common/src/main/java/net/blay09/mods/kleeslabs/converter/SmartSlabConverter.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/converter/SmarterSlabConverter.java b/common/src/main/java/net/blay09/mods/kleeslabs/converter/SmarterSlabConverter.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/converter/SmarterSlabConverter.java rename to common/src/main/java/net/blay09/mods/kleeslabs/converter/SmarterSlabConverter.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/mixin/LevelRendererAccessor.java b/common/src/main/java/net/blay09/mods/kleeslabs/mixin/LevelRendererAccessor.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/mixin/LevelRendererAccessor.java rename to common/src/main/java/net/blay09/mods/kleeslabs/mixin/LevelRendererAccessor.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java b/common/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java rename to common/src/main/java/net/blay09/mods/kleeslabs/network/KleeSlabsRegistryMessage.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/network/ModNetworking.java b/common/src/main/java/net/blay09/mods/kleeslabs/network/ModNetworking.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/network/ModNetworking.java rename to common/src/main/java/net/blay09/mods/kleeslabs/network/ModNetworking.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistry.java b/common/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistry.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistry.java rename to common/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistry.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistryData.java b/common/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistryData.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistryData.java rename to common/src/main/java/net/blay09/mods/kleeslabs/registry/SlabRegistryData.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatData.java b/common/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatData.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatData.java rename to common/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatData.java diff --git a/shared/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java b/common/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java similarity index 100% rename from shared/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java rename to common/src/main/java/net/blay09/mods/kleeslabs/registry/json/JsonCompatLoader.java diff --git a/shared/src/main/resources/assets/kleeslabs/lang/en_us.json b/common/src/main/resources/assets/kleeslabs/lang/en_us.json similarity index 100% rename from shared/src/main/resources/assets/kleeslabs/lang/en_us.json rename to common/src/main/resources/assets/kleeslabs/lang/en_us.json diff --git a/shared/src/main/resources/assets/kleeslabs/lang/pt_br.json b/common/src/main/resources/assets/kleeslabs/lang/pt_br.json similarity index 97% rename from shared/src/main/resources/assets/kleeslabs/lang/pt_br.json rename to common/src/main/resources/assets/kleeslabs/lang/pt_br.json index ded99f6..4f49688 100644 --- a/shared/src/main/resources/assets/kleeslabs/lang/pt_br.json +++ b/common/src/main/resources/assets/kleeslabs/lang/pt_br.json @@ -1,5 +1,5 @@ -{ - "config.kleeslabs.title": "KleeSlabs", - "config.kleeslabs.mode": "Modo", - "config.kleeslabs.disabledCompat": "Compatibilidade Desativada" +{ + "config.kleeslabs.title": "KleeSlabs", + "config.kleeslabs.mode": "Modo", + "config.kleeslabs.disabledCompat": "Compatibilidade Desativada" } \ No newline at end of file diff --git a/shared/src/main/resources/assets/kleeslabs/lang/uk_ua.json b/common/src/main/resources/assets/kleeslabs/lang/uk_ua.json similarity index 100% rename from shared/src/main/resources/assets/kleeslabs/lang/uk_ua.json rename to common/src/main/resources/assets/kleeslabs/lang/uk_ua.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/ae2.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/ae2.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/ae2.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/ae2.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/amendments.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/amendments.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/amendments.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/amendments.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/betterarcheology.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/betterarcheology.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/betterarcheology.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/betterarcheology.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/biomesoplenty.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/biomesoplenty.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/biomesoplenty.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/biomesoplenty.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/blue_skies.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/blue_skies.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/blue_skies.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/blue_skies.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/botania.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/botania.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/botania.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/botania.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/caveopolis.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/caveopolis.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/caveopolis.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/caveopolis.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/concreteextends.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/concreteextends.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/concreteextends.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/concreteextends.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/create.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/create.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/create.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/create.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/deeperdarker.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/deeperdarker.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/deeperdarker.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/deeperdarker.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/erebus.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/erebus.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/erebus.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/erebus.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/extendedslabs.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/extendedslabs.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/extendedslabs.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/extendedslabs.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/extratrees.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/extratrees.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/extratrees.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/extratrees.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/forestry.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/forestry.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/forestry.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/forestry.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/hearth_and_home.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/hearth_and_home.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/hearth_and_home.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/hearth_and_home.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/meadow.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/meadow.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/meadow.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/meadow.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/mekanismadditions.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/mekanismadditions.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/mekanismadditions.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/mekanismadditions.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/minecraft.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/minecraft.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/minecraft.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/minecraft.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/missing_pieces.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/missing_pieces.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/missing_pieces.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/missing_pieces.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/more_slabs_stairs_and_walls.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/more_slabs_stairs_and_walls.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/more_slabs_stairs_and_walls.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/more_slabs_stairs_and_walls.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/mysticalagriculture.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/mysticalagriculture.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/mysticalagriculture.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/mysticalagriculture.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/naturalist.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/naturalist.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/naturalist.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/naturalist.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/oceanopolis.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/oceanopolis.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/oceanopolis.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/oceanopolis.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/philipsruins.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/philipsruins.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/philipsruins.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/philipsruins.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/quark.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/quark.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/quark.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/quark.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/regions_unexplored.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/regions_unexplored.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/regions_unexplored.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/regions_unexplored.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/ribbits.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/ribbits.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/ribbits.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/ribbits.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/slabcraft.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/slabcraft.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/slabcraft.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/slabcraft.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/supplementaries.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/supplementaries.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/supplementaries.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/supplementaries.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/thebetweenlands.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/thebetweenlands.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/thebetweenlands.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/thebetweenlands.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/underground_biomes.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/underground_biomes.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/underground_biomes.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/underground_biomes.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/upgrade_aquatic.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/upgrade_aquatic.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/upgrade_aquatic.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/upgrade_aquatic.json diff --git a/shared/src/main/resources/data/kleeslabs/kleeslabs_compat/vinery.json b/common/src/main/resources/data/kleeslabs/kleeslabs_compat/vinery.json similarity index 100% rename from shared/src/main/resources/data/kleeslabs/kleeslabs_compat/vinery.json rename to common/src/main/resources/data/kleeslabs/kleeslabs_compat/vinery.json diff --git a/shared/src/main/resources/kleeslabs-icon.png b/common/src/main/resources/kleeslabs-icon.png similarity index 100% rename from shared/src/main/resources/kleeslabs-icon.png rename to common/src/main/resources/kleeslabs-icon.png diff --git a/shared/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta similarity index 100% rename from shared/src/main/resources/pack.mcmeta rename to common/src/main/resources/pack.mcmeta diff --git a/fabric/build.gradle b/fabric/build.gradle index 9e96042..c0d292c 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -6,9 +6,7 @@ plugins { id "com.modrinth.minotaur" version "2.+" } -group = mod_group archivesBaseName = "${mod_id}-fabric-${minecraft_version}" -version = mod_version dependencies { minecraft "com.mojang:minecraft:${minecraft_version}" @@ -16,7 +14,7 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - implementation project(":shared") + implementation project(":common") modImplementation("net.blay09.mods:balm-fabric:${balm_version}") { transitive = false @@ -64,7 +62,7 @@ loom { runDir("build/datagen") vmArg "-Dfabric-api.datagen" - vmArg "-Dfabric-api.datagen.output-dir=${project(":shared").file("src/main/generated")}" + vmArg "-Dfabric-api.datagen.output-dir=${project(":common").file("src/main/generated")}" vmArg "-Dfabric-api.datagen.modid=${mod_id}" } } @@ -79,7 +77,7 @@ sourceSets { } processResources { - from project(":shared").sourceSets.main.resources + from project(":common").sourceSets.main.resources inputs.property "version", project.version filesMatching("fabric.mod.json") { @@ -88,7 +86,7 @@ processResources { } tasks.withType(JavaCompile) { - source(project(":shared").sourceSets.main.allSource) + source(project(":common").sourceSets.main.allSource) } jar { diff --git a/forge/build.gradle b/forge/build.gradle index 39b951e..08c3dc8 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -18,9 +18,7 @@ plugins { apply plugin: "org.spongepowered.mixin" -group = mod_group archivesBaseName = "${mod_id}-forge-${minecraft_version}" -version = mod_version minecraft { mappings channel: 'official', version: minecraft_version @@ -52,7 +50,7 @@ minecraft { mods { "${mod_id}" { source sourceSets.main - source project(":shared").sourceSets.main + source project(":common").sourceSets.main } } } @@ -81,7 +79,7 @@ minecraft { mods { "${mod_id}" { source sourceSets.main - source project(":shared").sourceSets.main + source project(":common").sourceSets.main } } } @@ -110,7 +108,7 @@ minecraft { mods { "${mod_id}" { source sourceSets.main - source project(":shared").sourceSets.main + source project(":common").sourceSets.main } } } @@ -139,7 +137,7 @@ minecraft { mods { "${mod_id}" { source sourceSets.main - source project(":shared").sourceSets.main + source project(":common").sourceSets.main } } } @@ -158,7 +156,7 @@ sourceSets { dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" annotationProcessor 'org.spongepowered:mixin:0.8.4:processor' - compileOnly project(":shared") + compileOnly project(":common") implementation fg.deobf("net.blay09.mods:balm-forge:${balm_version}") { changing = balm_version.endsWith("SNAPSHOT") @@ -179,7 +177,7 @@ dependencies { apply from: 'dependencies.gradle' tasks.withType(JavaCompile) { - source(project(":shared").sourceSets.main.allSource) + source(project(":common").sourceSets.main.allSource) } def resourceTargets = ['META-INF/mods.toml', 'pack.mcmeta'] @@ -187,10 +185,10 @@ def replaceProperties = [ minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, forge_version: forge_version, forge_version_range: forge_version_range, forge_loader_version_range: forge_loader_version_range, - mod_id: mod_id, mod_version: mod_version, balm_version_range: balm_version_range, + mod_id: mod_id, version: version, balm_version_range: balm_version_range, ] processResources { - from project(":shared").sourceSets.main.resources + from project(":common").sourceSets.main.resources inputs.properties replaceProperties replaceProperties.put 'project', project diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index afd2c9c..3ab1130 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -5,7 +5,7 @@ issueTrackerURL="https://github.com/TwelveIterationMods/KleeSlabs/issues" [[mods]] modId="kleeslabs" -version="${mod_version}" +version="${version}" displayName="KleeSlabs" displayURL="https://mods.twelveiterations.com/mc/kleeslabs" logoFile="kleeslabs-icon.png" diff --git a/gradle.properties b/gradle.properties index 6e6d2e4..dadb987 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Mod -mod_version = 15.0.4 +version = 15.0.4 mod_id = kleeslabs -mod_group = net.blay09.mods +group = net.blay09.mods # Publishing curseforge_release_type = release diff --git a/settings.gradle b/settings.gradle index 8e372af..0b13e0f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,4 +12,4 @@ pluginManagement { } } -include("shared", "fabric", "forge") \ No newline at end of file +include("common", "fabric", "forge") \ No newline at end of file