Merge pull request #594 from refinedmods/fix/GH-572/refined-architect…

…-update Refined architect update
refinedmods · Jul 5, 2024 · 9440c39 · 9440c39
2 parents 9354e3f + e0e02cf
commit 9440c39
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 12 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.14.3
+    uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.15.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.14.3
+    uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.15.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.14.3
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.15.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.14.3
+    uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.15.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 * * *'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.14.3
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.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.14.3
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.15.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.14.3
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.15.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.14.3
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.15.1
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
+
+-   Fixed creative mode tab icon on NeoForge showing a durability bar.
+
 ## [2.0.0-milestone.4.0] - 2024-07-04
 
 ### Added

diff --git a/refinedstorage-platform-neoforge/.gitignore b/refinedstorage-platform-neoforge/.gitignore
@@ -1 +1 @@
-runs/
+run/
diff --git a/refinedstorage-platform-neoforge/build.gradle b/refinedstorage-platform-neoforge/build.gradle
@@ -1,4 +1,4 @@
-forgeProject("refinedstorage", project(":refinedstorage-platform-common"), apis, compileApis)
+neoForgeProject("refinedstorage", project(":refinedstorage-platform-common"), apis, compileApis)
 
 archivesBaseName = 'refinedstorage-platform-neoforge'
 

diff --git a/...oforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java b/...oforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java
@@ -448,7 +448,7 @@ public void onRegister(final RegisterEvent e) {
             createIdentifier("general"),
             CreativeModeTab.builder()
                 .title(ContentNames.MOD)
-                .icon(() -> new ItemStack(Blocks.INSTANCE.getController().getDefault()))
+                .icon(() -> new ItemStack(Blocks.INSTANCE.getCreativeController().getDefault()))
                 .displayItems((params, output) -> CreativeModeTabItems.append(output::accept))
                 .build()
         ));

diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-gradle.ext.refinedArchitectVersion = "0.14.3"
+gradle.ext.refinedArchitectVersion = "0.15.1"
 
 dependencyResolutionManagement {
     repositories {