From 0dc100dd7b84369c5cf9b108dffce7b1c59e9338 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 15 Jun 2024 15:26:08 +0200 Subject: [PATCH] chore: update refined storage --- .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .../issue-for-unsupported-version.yml | 2 +- .github/workflows/publish-release.yml | 2 +- .github/workflows/resolved-issue-locking.yml | 2 +- .github/workflows/validate-branch-name.yml | 2 +- .github/workflows/validate-changelog.yml | 2 +- .../workflows/validate-commit-messages.yml | 2 +- CHANGELOG.md | 4 ++++ gradle.properties | 3 ++- .../build.gradle | 11 +++++----- .../build.gradle | 17 +++++----------- .../build.gradle | 20 +++++++++++-------- settings.gradle | 13 +----------- 14 files changed, 38 insertions(+), 46 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74e8b46..b2a7493 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.12.1 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.13.4 with: mutation-testing: false secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 6fad3ac..5ea1d94 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.12.1 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.13.4 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index 1664acf..9f9ee90 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.12.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.13.4 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 5eb88f6..ce76bfc 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.12.1 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.13.4 secrets: inherit with: project-name: 'Refined Storage - JEI Integration' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index 6023644..16b1cf9 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -4,4 +4,4 @@ on: - cron: '0 0 * * *' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.12.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.13.4 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index c862e1c..b2ddb77 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.12.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.13.4 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 8c6b2e8..2adc54f 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.12.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.13.4 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 306fbb8..8ef06cd 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.12.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.13.4 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 72af435..0362cab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed + +- Support for Refined Storage v2.0.0-milestone.3.9. + ## [0.2.0] - 2024-06-09 ### Fixed diff --git a/gradle.properties b/gradle.properties index d22703a..58ffed3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ -refinedstorageVersion=2.0.0-milestone.3.8 +refinedstorageVersion=2.0.0-milestone.3.10 +jeiVersion=17.3.0.52 # Gradle org.gradle.jvmargs=-Xmx1G diff --git a/refinedstorage-jei-integration-common/build.gradle b/refinedstorage-jei-integration-common/build.gradle index 7905ef1..aa799c0 100644 --- a/refinedstorage-jei-integration-common/build.gradle +++ b/refinedstorage-jei-integration-common/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'java-library' +} + archivesBaseName = 'refinedstorage-jei-integration-common' repositories { @@ -17,11 +21,8 @@ repositories { commonProject() dependencies { - compileOnly common.jei.api - implementation "com.refinedmods.refinedstorage2:refinedstorage2-platform-common:${refinedstorageVersion}" - implementation "com.refinedmods.refinedstorage2:refinedstorage2-platform-api:${refinedstorageVersion}" - implementation "com.refinedmods.refinedstorage2:refinedstorage2-resource-api:${refinedstorageVersion}" - implementation "com.refinedmods.refinedstorage2:refinedstorage2-grid-api:${refinedstorageVersion}" + api "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}" + api "com.refinedmods.refinedstorage2:refinedstorage2-platform-common:${refinedstorageVersion}" } enablePublishing() \ No newline at end of file diff --git a/refinedstorage-jei-integration-fabric/build.gradle b/refinedstorage-jei-integration-fabric/build.gradle index 15efb1c..39a841e 100644 --- a/refinedstorage-jei-integration-fabric/build.gradle +++ b/refinedstorage-jei-integration-fabric/build.gradle @@ -19,13 +19,9 @@ repositories { url 'https://maven.terraformersmc.com/' } maven { - name = 'Cloth Config, REI' + name = 'Cloth Config' url 'https://maven.shedaniel.me/' } - maven { - name = 'wthit' - url "https://maven.bai.lol" - } maven { name = 'NoIndium' url = 'https://maven.cafeteria.dev/releases/' @@ -37,13 +33,10 @@ repositories { } dependencies { - modImplementation "com.refinedmods.refinedstorage2:refinedstorage2-platform-fabric:${refinedstorageVersion}" - implementation "com.refinedmods.refinedstorage2:refinedstorage2-platform-api:${refinedstorageVersion}" - implementation "com.refinedmods.refinedstorage2:refinedstorage2-resource-api:${refinedstorageVersion}" - implementation "com.refinedmods.refinedstorage2:refinedstorage2-grid-api:${refinedstorageVersion}" - modCompileOnly common.jei.api - modCompileOnly fabric.jei.api - modRuntimeOnly fabric.jei.impl + modApi "com.refinedmods.refinedstorage2:refinedstorage2-platform-fabric:${refinedstorageVersion}" + modApi "mezz.jei:jei-${minecraftVersion}-fabric:${jeiVersion}" + modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}" + modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-fabric-api:${jeiVersion}" } enablePublishing() \ No newline at end of file diff --git a/refinedstorage-jei-integration-forge/build.gradle b/refinedstorage-jei-integration-forge/build.gradle index 4af45af..34fa228 100644 --- a/refinedstorage-jei-integration-forge/build.gradle +++ b/refinedstorage-jei-integration-forge/build.gradle @@ -1,3 +1,7 @@ +plugins { + id 'java-library' +} + archivesBaseName = 'refinedstorage-jei-integration-forge' forgeProject("refinedstorage_jei_integration", project(":refinedstorage-jei-integration-common")) @@ -7,6 +11,10 @@ repositories { name = 'JEI' url = "https://maven.blamejared.com/" } + maven { + name = 'Curios' + url = "https://maven.theillusivec4.top/" + } maven { url = uri("https://maven.pkg.github.com/refinedmods/refinedstorage2") credentials { @@ -17,14 +25,10 @@ repositories { } dependencies { - implementation("com.refinedmods.refinedstorage2:refinedstorage2-platform-forge:${refinedstorageVersion}") { - transitive = false - } - - compileOnly common.jei.api - testCompileOnly common.jei.api - compileOnly forge.jei.api - runtimeOnly forge.jei.impl + api "com.refinedmods.refinedstorage2:refinedstorage2-platform-forge:${refinedstorageVersion}" + api "mezz.jei:jei-${minecraftVersion}-neoforge:${jeiVersion}" + compileOnlyApi "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}" + compileOnlyApi "mezz.jei:jei-${minecraftVersion}-neoforge-api:${jeiVersion}" } enablePublishing() \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 1ac7431..2c5e81b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -gradle.ext.refinedArchitectVersion = "0.12.1" +gradle.ext.refinedArchitectVersion = "0.13.4" dependencyResolutionManagement { repositories { @@ -10,17 +10,6 @@ dependencyResolutionManagement { } } } - versionCatalogs { - create("common") { - from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-common:${gradle.ext.refinedArchitectVersion}") - } - create("fabric") { - from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-fabric:${gradle.ext.refinedArchitectVersion}") - } - create("forge") { - from("com.refinedmods.refinedarchitect:refinedarchitect-catalog-platform-forge:${gradle.ext.refinedArchitectVersion}") - } - } } rootProject.name = 'refinedstorage-jei-integration'