From 9a81ebfa50b2504e3042bd36ad5a715c743fc6cf Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Mon, 24 Aug 2020 20:25:03 +0200 Subject: [PATCH] Check the REI search field for being null before using it. --- .../modules/jei/ReiRuntimeAdapter.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/appeng/integration/modules/jei/ReiRuntimeAdapter.java b/src/main/java/appeng/integration/modules/jei/ReiRuntimeAdapter.java index 2080fafec..60c78a9a4 100644 --- a/src/main/java/appeng/integration/modules/jei/ReiRuntimeAdapter.java +++ b/src/main/java/appeng/integration/modules/jei/ReiRuntimeAdapter.java @@ -18,18 +18,18 @@ package appeng.integration.modules.jei; -import com.google.common.base.Strings; - -import me.shedaniel.rei.api.REIHelper; - import appeng.integration.abstraction.IRei; +import com.google.common.base.Preconditions; +import com.google.common.base.Strings; +import me.shedaniel.rei.api.REIHelper; +import me.shedaniel.rei.gui.widget.TextFieldWidget; class ReiRuntimeAdapter implements IRei { private final REIHelper runtime; ReiRuntimeAdapter() { - this.runtime = REIHelper.getInstance(); + this.runtime = Preconditions.checkNotNull(REIHelper.getInstance(), "REI helper was null"); } @Override @@ -39,11 +39,18 @@ class ReiRuntimeAdapter implements IRei { @Override public String getSearchText() { - return Strings.nullToEmpty(this.runtime.getSearchTextField().getText()); + TextFieldWidget searchField = this.runtime.getSearchTextField(); + if (searchField == null) { + return ""; + } + return Strings.nullToEmpty(searchField.getText()); } @Override public void setSearchText(String searchText) { - this.runtime.getSearchTextField().setText(Strings.nullToEmpty(searchText)); + TextFieldWidget searchField = this.runtime.getSearchTextField(); + if (searchField != null) { + searchField.setText(Strings.nullToEmpty(searchText)); + } } }