feat: port to 1.21.1, use new slimeballs tag

raoulvdberge · raoulvdberge · commit e508ab8c4f9c · 2024-08-08T21:16:58.000+02:00
Enforce usage of correct modloader versions
that have the new tag.

REI is no longer "suggested" on Fabric
as there are more recipe mods now there.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -35,7 +35,7 @@ body:
       description: |
         If your Minecraft version isn't listed here, it means that it isn't supported. In that case, don't create an issue.
       options:
-        - Minecraft 1.21
+        - Minecraft 1.21.1
     validations:
       required: true
   - type: input
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.16.9
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.17.1
     with:
       gametests: true
     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.16.9
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.17.1
     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.16.9
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.17.1
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.16.9
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.17.1
     secrets: inherit
     with:
       project-name: 'Refined Storage'
diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml
@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * 1'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.16.9
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.17.1
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.16.9
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.17.1
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.16.9
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.17.1
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.16.9
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.17.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Changed
+
+-   Updated to Minecraft 1.21.1.
+
+### Fixed
+
+-   Use new slimeballs convention tag for Processor Binding.
+
 ## [2.0.0-milestone.4.6] - 2024-08-08
 
 ### Added
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-refinedarchitectVersion=0.16.9
+refinedarchitectVersion=0.17.1
 # Gradle
 org.gradle.jvmargs=-Xmx1G
diff --git a/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json b/refinedstorage-common/src/main/resources/data/refinedstorage/recipe/processor_binding.json
@@ -10,7 +10,7 @@
       "tag": "c:strings"
     },
     "L": {
-      "tag": "c:slimeballs"
+      "tag": "c:slime_balls"
     }
   },
   "result": {
diff --git a/refinedstorage-fabric/src/main/resources/fabric.mod.json b/refinedstorage-fabric/src/main/resources/fabric.mod.json
@@ -38,14 +38,13 @@
   ],
   "depends": {
     "fabricloader": ">=0.14.6",
-    "fabric-api": "*",
-    "minecraft": "1.21",
+    "fabric-api": ">=0.101.0",
+    "minecraft": "~1.21",
     "java": ">=21",
     "cloth-config2": "*",
     "team_reborn_energy": "*"
   },
   "suggests": {
-    "roughlyenoughitems": "*",
     "modmenu": "*"
   }
 }
diff --git a/refinedstorage-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/refinedstorage-neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -15,6 +15,6 @@ Refined Storage is a mass storage mod for Minecraft that offers the player a net
 [[dependencies.refinedstorage]]
 modId = "neoforge"
 type = "required"
-versionRange = "[21.0.112-beta,)"
+versionRange = "[21.0.153,)"
 ordering = "NONE"
 side = "BOTH"

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"tag": "c:strings"`
`11`	`11`	`},`
`12`	`12`	`"L": {`
`13`		`- "tag": "c:slimeballs"`
	`13`	`+ "tag": "c:slime_balls"`
`14`	`14`	`}`
`15`	`15`	`},`
`16`	`16`	`"result": {`