aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me
diff options
context:
space:
mode:
authorUnknown <shekwancheung0528@gmail.com>2019-05-11 14:35:48 +0800
committerUnknown <shekwancheung0528@gmail.com>2019-05-11 14:35:48 +0800
commitb0f0ce53fea5a9f3a51edcfdb4f4d5166de64a04 (patch)
tree3397b655af6d28413df9808a18e49cdd3eda3016 /src/main/java/me
parent2a5ebf385a00b4a0e1eab0ec23993e4697a0631b (diff)
parent68ba3c1f952c1e74129591fb8219056fddb1b5ee (diff)
downloadRoughlyEnoughItems-b0f0ce53fea5a9f3a51edcfdb4f4d5166de64a04.tar.gz
RoughlyEnoughItems-b0f0ce53fea5a9f3a51edcfdb4f4d5166de64a04.tar.bz2
RoughlyEnoughItems-b0f0ce53fea5a9f3a51edcfdb4f4d5166de64a04.zip
Merge remote-tracking branch 'origin/1.14' into 1.14-dev
Diffstat (limited to 'src/main/java/me')
-rw-r--r--src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
index 95ee28f89..2904be0ca 100644
--- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
+++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java
@@ -227,7 +227,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer {
ScreenHelper.getLastOverlay().lateRender(i, i1, v);
});
ClothClientHooks.SCREEN_KEY_PRESSED.register((minecraftClient, screen, i, i1, i2) -> {
- if (screen.getFocused() != null && screen.getFocused() instanceof TextFieldWidget || (screen.getFocused() instanceof RecipeBookGui && ((RecipeBookGuiHooks)screen.getFocused()).rei_getSearchField().isFocused()))
+ if (screen.getFocused() != null && screen.getFocused() instanceof TextFieldWidget || (screen.getFocused() instanceof RecipeBookGui && ((RecipeBookGuiHooks)screen.getFocused()).rei_getSearchField() != null && ((RecipeBookGuiHooks)screen.getFocused()).rei_getSearchField().isFocused()))
return ActionResult.PASS;
if (screen instanceof ContainerScreen)
if (ScreenHelper.getLastOverlay().keyPressed(i, i1, i2))