From dd645fef650b1c4a7c92bf8ea7baa3e5bbf1a8c7 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 5 Jul 2024 19:18:42 +0200 Subject: [PATCH 1/2] ci: upgrade refined architect --- .github/workflows/build.yml | 2 +- .github/workflows/draft-release.yml | 2 +- .github/workflows/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 +- .github/workflows/validate-commit-messages.yml | 2 +- refinedstorage-platform-neoforge/.gitignore | 2 +- refinedstorage-platform-neoforge/build.gradle | 2 +- settings.gradle | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 26ea270df..d10e815fe 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.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 index 2498347be..f1a44f028 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.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 index fbe1751c1..68f5d19e5 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.14.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.15.1 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index de7a0f22c..b38ffab28 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.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 index 46aca1095..f40e8ed2d 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.14.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.1 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index 48b3acb59..0e3e2e1e1 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.14.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.15.1 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 797504050..e16cf7eb7 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.14.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.15.1 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 72b08ed2e..dbef381a7 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.14.3 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.15.1 \ No newline at end of file diff --git a/refinedstorage-platform-neoforge/.gitignore b/refinedstorage-platform-neoforge/.gitignore index 643cb1816..737e26b00 100644 --- a/refinedstorage-platform-neoforge/.gitignore +++ b/refinedstorage-platform-neoforge/.gitignore @@ -1 +1 @@ -runs/ \ No newline at end of file +run/ \ No newline at end of file diff --git a/refinedstorage-platform-neoforge/build.gradle b/refinedstorage-platform-neoforge/build.gradle index 2b0405b8a..8386aac06 100644 --- 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/settings.gradle b/settings.gradle index 9f353bdd6..abebcebd5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,4 @@ -gradle.ext.refinedArchitectVersion = "0.14.3" +gradle.ext.refinedArchitectVersion = "0.15.1" dependencyResolutionManagement { repositories { From e0e02cf70b3fb1c6e4dd9540c093705f10608e87 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 5 Jul 2024 19:21:21 +0200 Subject: [PATCH 2/2] fix: durability bar on creative mode tab --- CHANGELOG.md | 4 ++++ .../refinedstorage/platform/neoforge/ModInitializer.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee35870ae..e2e0b6b31 100644 --- 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/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java b/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java index 8abc754b3..ee6a5f8b2 100644 --- a/refinedstorage-platform-neoforge/src/main/java/com/refinedmods/refinedstorage/platform/neoforge/ModInitializer.java +++ b/refinedstorage-platform-neoforge/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() ));