chore: port to minecraft 1.21

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -34,7 +34,7 @@ body:
             description: |
                 If your Minecraft version isn't listed here, it means that it's no longer supported. In that case, don't create an issue.
             options:
-                - Minecraft 1.20.4
+                - Minecraft 1.21
         validations:
             required: true
     -   type: input

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
     types: [ opened, synchronize, reopened ]
 jobs:
   build:
-    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.15.3
     with:
       mutation-testing: false
     secrets: inherit

.github/workflows/draft-release.yml

@@ -17,7 +17,7 @@ on:
         type: string
 jobs:
   draft:
-    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.15.3
     with:
       release-type: ${{ inputs.release-type }}
       version-number-override: ${{ inputs.version-number-override }}

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.15.3

.github/workflows/publish-release.yml

@@ -7,7 +7,7 @@ on:
       - closed
 jobs:
   publish-release:
-    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.15.3
     secrets: inherit
     with:
       project-name: 'Refined Storage - Mekanism Integration'

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.3

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.15.3

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.15.3

.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.13.4
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.15.3

.gitignore

@@ -15,4 +15,4 @@ out/
 /bin/
 logs/
 .cache/
-runs/
+run/

build.gradle

@@ -2,11 +2,11 @@ plugins {
     id 'java-library'
 }
 
-apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v0.13.4/helper.gradle"
+apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v0.15.3/helper.gradle"
 
 group = 'com.refinedmods.refinedstorage'
 
-forgeProject("refinedstorage_mekanism_integration")
+neoForgeProject("refinedstorage_mekanism_integration")
 
 archivesBaseName = 'refinedstorage-mekanism-integration'
 
@@ -28,7 +28,7 @@ repositories {
 }
 
 dependencies {
-    api "com.refinedmods.refinedstorage2:refinedstorage2-platform-forge:${refinedstorageVersion}"
+    api "com.refinedmods.refinedstorage:refinedstorage-platform-neoforge:${refinedstorageVersion}"
     compileOnlyApi "mekanism:Mekanism:${minecraftVersion}-${mekanismVersion}:api"
     runtimeOnly("mekanism:Mekanism:${minecraftVersion}-${mekanismVersion}:all") {
         exclude(group: "com.blamejared.crafttweaker")

gradle.properties

@@ -1,4 +1,4 @@
-refinedstorageVersion=2.0.0-milestone.3.13
-mekanismVersion=10.5.20.41
+refinedstorageVersion=2.0.0-milestone.4.2
+mekanismVersion=10.6.4.50
 # Gradle
 org.gradle.jvmargs=-Xmx1G

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/refinedmods/refinedstorage/mekanism/ModInitializer.java

@@ -1,6 +1,7 @@
 package com.refinedmods.refinedstorage.mekanism;
 
-import com.refinedmods.refinedstorage2.platform.common.util.IdentifierUtil;
+import com.refinedmods.refinedstorage.platform.common.util.IdentifierUtil;
+
 import mekanism.api.MekanismAPI;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;

src/main/java/com/refinedmods/refinedstorage/mekanism/package-info.java

@@ -2,6 +2,6 @@
 @FieldsAndMethodsAreNonnullByDefault
 package com.refinedmods.refinedstorage.mekanism;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault;
 
-import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/resources/META-INF/mods.toml → src/main/resources/META-INF/neoforge.mods.toml

@@ -6,18 +6,18 @@ license = "MIT"
 modId = "refinedstorage_mekanism_integration"
 version = "${version}"
 displayName = "Refined Storage - Mekanism Integration"
-displayURL = "https://github.com/refinedmods/refinedstorage-mekanism-integration"
+displayURL = "https://refinedmods.com/refined-storage"
 authors = "Refined Mods"
 description = '''
 Mekanism integration for Refined Storage.
 '''
 [[dependencies.refinedstorage_mekanism_integration]]
-modId = "refinedstorage2"
+modId = "refinedstorage"
 type = "required"
-versionRange = "2.0.0-milestone.3.13"
+versionRange = "2.0.0-milestone.4.2"
 side = "BOTH"
 [[dependencies.refinedstorage_mekanism_integration]]
 modId = "mekanism"
 type = "required"
-versionRange = "[10.5,11-)"
+versionRange = "[10.6,11-)"
 side = "BOTH"