chore: update refined storage

refinedmods · Jun 16, 2024 · 0dc100d · 0dc100d
1 parent 8814c40
commit 0dc100d
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 46 deletions.
diff --git 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
@@ -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
@@ -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
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.13.4
diff --git 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
@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * *'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.12.1
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.13.4
diff --git 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
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.13.4
diff --git 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
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.13.4
diff --git 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
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.13.4
diff --git 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
@@ -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
@@ -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()
diff --git 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()
diff --git 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()
diff --git 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'