From 563df0f259bdbb6a09c3a66599bf7f81bd65db06 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 7 Jul 2023 20:14:15 +0200 Subject: [PATCH 1/5] fix: 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 +- build.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 198c89a61..08b79a86c 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.6.0 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.7.1 with: mutation-testing: false secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index fd2b11e19..9ad68dfe6 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.6.0 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.7.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 b80bdc294..682945e7d 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.6.0 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.7.1 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 9759845ef..4e4abb047 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.6.0 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.7.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 73023ae22..a3c881c33 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.6.0 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.7.1 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index 5db6ae8a8..02b7d4c29 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.6.0 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.7.1 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 8f3f0d023..9fcfcab72 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.6.0 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.7.1 \ No newline at end of file diff --git a/build.gradle b/build.gradle index d8c567d04..665e633f0 100755 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v0.6.0/helper.gradle" +apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v0.7.1/helper.gradle" repositories { maven { From 34d9e6865c8e59fcc4dc7825a1dbabc36356f2f1 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 7 Jul 2023 20:14:31 +0200 Subject: [PATCH 2/5] fix: validate commit messages now only logs a warning instead of failing the build There are some historical versions that got incremented wrongly based on semver. We can't change the past, so log warnings for now. --- .github/workflows/validate-commit-messages.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 4decd4a8c..43143da85 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,6 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.6.0 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.7.1 + with: + validation-level: 'warn' \ No newline at end of file From 32f4f0bce352c5078714fdf2110c166586237b98 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 7 Jul 2023 21:06:14 +0200 Subject: [PATCH 3/5] fix: not being able to type E in grid search box Fixes #3537 --- CHANGELOG.md | 4 ++++ .../refinedstorage/screen/DetectorScreen.java | 2 +- .../refinedstorage/screen/FilterScreen.java | 2 +- .../screen/grid/GridScreen.java | 1 - .../screen/widget/SearchWidget.java | 24 ++++++------------- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9c27442b..0996332ba 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Fixed + +- Fixed not being able to type "e" in Grid search box. + ## [1.12.2] - 2023-07-05 ### Fixed diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java index fefeed119..157cf38ad 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java @@ -81,7 +81,7 @@ public class DetectorScreen extends BaseScreen { return true; } - if (amountField.keyPressed(key, scanCode, modifiers)) { + if (amountField.keyPressed(key, scanCode, modifiers) || amountField.canConsumeInput()) { return true; } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java index ae91d5aa0..72beda3b2 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java @@ -101,7 +101,7 @@ public class FilterScreen extends BaseScreen { return true; } - if (nameField.keyPressed(key, scanCode, modifiers)) { + if (nameField.keyPressed(key, scanCode, modifiers) || nameField.canConsumeInput()) { return true; } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java index 00e617669..a5c11fd05 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java @@ -686,7 +686,6 @@ public class GridScreen extends BaseScreen implements IScreen if (searchField.keyPressed(key, scanCode, modifiers)) { return true; } - return super.keyPressed(key, scanCode, modifiers); } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java index eb109dddd..872949040 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java @@ -65,57 +65,47 @@ public class SearchWidget extends EditBox { @Override public boolean keyPressed(int keyCode, int scanCode, int modifier) { - boolean result = super.keyPressed(keyCode, scanCode, modifier); + if (super.keyPressed(keyCode, scanCode, modifier)) { + return true; + } if (isFocused()) { if (keyCode == GLFW.GLFW_KEY_UP) { updateHistory(-1); - - result = true; } else if (keyCode == GLFW.GLFW_KEY_DOWN) { updateHistory(1); - - result = true; } else if (keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER) { saveHistory(); - if (canLoseFocus) { setFocused(false); } - - result = true; } else if (keyCode == GLFW.GLFW_KEY_ESCAPE) { saveHistory(); - if (!canLoseFocus) { // If we can't lose focus, // and we press escape, // we unfocus ourselves, // and close the screen immediately. setFocused(false); - - result = false; // Bubble the event up to the screen. + return false; // Bubble the event up to the screen. } else { // If we can lose focus, // and we press escape, // we unfocus ourselves. // On the next escape press, the screen will close. setFocused(false); - - result = true; + return true; // Swallow } } } if (BaseScreen.isKeyDown(RSKeyBindings.FOCUS_SEARCH_BAR) && canLoseFocus) { setFocused(!isFocused()); - saveHistory(); - - result = true; + return true; } - return result; + return isFocused() && canConsumeInput() && keyCode != GLFW.GLFW_KEY_ESCAPE; } private void updateHistory(int delta) { From 27b5085092f1913c6f98b82edb30af8f8f6ebccc Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 7 Jul 2023 21:08:27 +0200 Subject: [PATCH 4/5] fix: validation level was on wrong workflow --- .github/workflows/validate-changelog.yml | 4 +++- .github/workflows/validate-commit-messages.yml | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index 9fcfcab72..43125b2f2 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,6 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.7.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.7.1 + with: + validation-level: 'warn' \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 43143da85..2eb18439a 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,6 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.7.1 - with: - validation-level: 'warn' \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.7.1 \ No newline at end of file From 0b9da717503add89fec688b68310a0841d0eeab6 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 7 Jul 2023 19:17:21 +0000 Subject: [PATCH 5/5] chore: prepare release v1.12.3 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0996332ba..c5416ac14 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [1.12.3] - 2023-07-07 + ### Fixed - Fixed not being able to type "e" in Grid search box. @@ -3473,7 +3475,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Internal test release. -[Unreleased]: https://github.com/refinedmods/refinedstorage/compare/v1.12.2...HEAD +[Unreleased]: https://github.com/refinedmods/refinedstorage/compare/v1.12.3...HEAD + +[1.12.3]: https://github.com/refinedmods/refinedstorage/compare/v1.12.2...v1.12.3 [1.12.2]: https://github.com/refinedmods/refinedstorage/compare/v1.12.1...v1.12.2