conflicts resolved

1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java
index 75d53323..7434b92b 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java
@@ -49,7 +49,7 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select
         if (this.isOpen()) {
             matrices.push();
             matrices.translate(0.0D, 0.0D, 100.0D);
-            RenderSystem.setShader(GameRenderer::getPositionTexShader);
+            RenderSystem.setShader(GameRenderer::getPositionTexProgram);
             RenderSystem.setShaderTexture(0, TEXTURE);
             RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
             this.searchField = ((RecipeBookWidgetAccessor)this).getSearchField();
@@ -88,9 +88,9 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select
             if (this.searchField.mouseClicked(mouseX, mouseY, button)) {
                 this.results.closeRecipeView();
                 return true;
-            }
-            return this.results.mouseClicked(mouseX, mouseY, button);
-        }
-        return false;
+            } else
+                return this.results.mouseClicked(mouseX, mouseY, button);
+        } else
+            return false;
     }
-}
+}
\ No newline at end of file