Merge pull request #3540 from refinedmods/release/1.12.3

raoulvdberge · web-flow · commit 0f83b3ae9582 · 2023-07-07T21:24:05.000+02:00
Release v1.12.3
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.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
@@ -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
@@ -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
+    uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.7.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.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
@@ -4,4 +4,4 @@ on:
     - cron: '0 0 * * *'
 jobs:
   lock:
-    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.6.0
+    uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.7.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.6.0
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.7.1
diff --git 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.6.0
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.7.1
+    with:
+      validation-level: 'warn'
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.6.0
+    uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.7.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ 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.
+
 ## [1.12.2] - 2023-07-05
 
 ### Fixed
@@ -3469,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
 
diff --git 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 {
diff --git 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 boolean keyPressed(int key, int scanCode, int modifiers) {
             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
@@ -101,7 +101,7 @@ public boolean keyPressed(int key, int scanCode, int modifiers) {
             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
@@ -686,7 +686,6 @@ public boolean keyPressed(int key, int scanCode, int modifiers) {
         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
@@ -65,57 +65,47 @@ public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
 
     @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) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v0.6.0/helper.gradle"`
	`1`	`+apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v0.7.1/helper.gradle"`
`2`	`2`
`3`	`3`	`repositories {`
`4`	`4`	`maven {`