Starting off rewrite

17 files changed, 0 insertions, 2037 deletions

diff --git a/src/main/java/me/shedaniel/gui/ConfigGui.java b/src/main/java/me/shedaniel/gui/ConfigGui.java
deleted file mode 100644
index 6deeb24ea..000000000
--- a/src/main/java/me/shedaniel/gui/ConfigGui.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package me.shedaniel.gui;
-
-import me.shedaniel.ClientListener;
-import me.shedaniel.Core;
-import me.shedaniel.config.REIItemListOrdering;
-import me.shedaniel.gui.widget.KeyBindButton;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.render.GuiLighting;
-import net.minecraft.client.resource.language.I18n;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-public class ConfigGui extends Gui {
-    
-    private Gui parent;
-    
-    public ConfigGui(Gui parent) {
-        this.parent = parent;
-    }
-    
-    @Override
-    protected void onInitialized() {
-        addButton(new KeyBindButton(997, parent.width / 2 - 20, 30, 80, 20, Core.config.recipeKeyBind, key -> {
-            Core.config.recipeKeyBind = key;
-            ClientListener.recipeKeyBind.setKey(key);
-            try {
-                Core.saveConfig();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }));
-        addButton(new KeyBindButton(998, parent.width / 2 - 20, 60, 80, 20, Core.config.usageKeyBind, key -> {
-            Core.config.usageKeyBind = key;
-            ClientListener.usageKeyBind.setKey(key);
-            try {
-                Core.saveConfig();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }));
-        addButton(new KeyBindButton(999, parent.width / 2 - 20, 90, 80, 20, Core.config.hideKeyBind, key -> {
-            Core.config.hideKeyBind = key;
-            ClientListener.hideKeyBind.setKey(key);
-            try {
-                Core.saveConfig();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }));
-        addButton(new ButtonWidget(1000, parent.width / 2 - 90, 120, 150, 20, "") {
-            @Override
-            public void onPressed(double double_1, double double_2) {
-                Core.config.centreSearchBox = !Core.config.centreSearchBox;
-                try {
-                    Core.saveConfig();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            
-            @Override
-            public void draw(int int_1, int int_2, float float_1) {
-                this.text = I18n.translate("text.rei.centre_searchbox", Core.config.centreSearchBox ? "§a" : "§c", Core.config.centreSearchBox);
-                super.draw(int_1, int_2, float_1);
-                if (this.hovered)
-                    drawSuggestion(int_1, int_2);
-            }
-            
-            protected void drawSuggestion(int x, int y) {
-                drawTooltip(Arrays.asList(I18n.translate("text.rei.centre_searchbox.tooltip").split("\n")), x, y);
-            }
-        });
-        addButton(new ButtonWidget(1001, parent.width / 2 - 90, 150, 150, 20, "") {
-            @Override
-            public void onPressed(double double_1, double double_2) {
-                Core.config.enableCraftableOnlyButton = !Core.config.enableCraftableOnlyButton;
-                try {
-                    Core.saveConfig();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            
-            @Override
-            public void draw(int int_1, int int_2, float float_1) {
-                GuiLighting.disable();
-                this.text = I18n.translate("text.rei.enable_craftable_only.button", Core.config.enableCraftableOnlyButton ? "§a" : "§c", Core.config.enableCraftableOnlyButton);
-                super.draw(int_1, int_2, float_1);
-                if (this.hovered)
-                    drawSuggestion(int_1, int_2);
-            }
-            
-            protected void drawSuggestion(int x, int y) {
-                drawTooltip(Arrays.asList(I18n.translate("text.rei.enable_craftable_only.tooltip").split("\n")), x, y);
-            }
-        });
-        addButton(new ButtonWidget(1002, parent.width / 2 - 90, 180, 150, 20, "") {
-            @Override
-            public void onPressed(double double_1, double double_2) {
-                int index = Arrays.asList(REIItemListOrdering.values()).indexOf(Core.config.itemListOrdering) + 1;
-                if (index >= REIItemListOrdering.values().length) {
-                    index = 0;
-                    Core.config.isAscending = !Core.config.isAscending;
-                }
-                Core.config.itemListOrdering = REIItemListOrdering.values()[index];
-                try {
-                    Core.saveConfig();
-                    REIRenderHelper.reiGui.updateView();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            
-            @Override
-            public void draw(int int_1, int int_2, float float_1) {
-                GuiLighting.disable();
-                this.text = I18n.translate("text.rei.list_ordering_button", I18n.translate(Core.config.itemListOrdering.getNameTranslationKey()),
-                        I18n.translate(Core.config.isAscending ? "ordering.rei.ascending" : "ordering.rei.descending"));
-                super.draw(int_1, int_2, float_1);
-            }
-        });
-    }
-    
-    @Override
-    public void draw(int mouseX, int mouseY, float partialTicks) {
-        drawBackground();
-        super.draw(mouseX, mouseY, partialTicks);
-        GuiLighting.disable();
-        String text = I18n.translate("key.rei.recipe") + ": ";
-        drawString(MinecraftClient.getInstance().fontRenderer, text, parent.width / 2 - 25 - MinecraftClient.getInstance().fontRenderer.getStringWidth(text), 30 + 6, -1);
-        text = I18n.translate("key.rei.use") + ": ";
-        drawString(MinecraftClient.getInstance().fontRenderer, text, parent.width / 2 - 25 - MinecraftClient.getInstance().fontRenderer.getStringWidth(text), 60 + 6, -1);
-        text = I18n.translate("key.rei.hide") + ": ";
-        drawString(MinecraftClient.getInstance().fontRenderer, text, parent.width / 2 - 25 - MinecraftClient.getInstance().fontRenderer.getStringWidth(text), 90 + 6, -1);
-        text = I18n.translate("text.rei.list_ordering") + ": ";
-        drawString(MinecraftClient.getInstance().fontRenderer, text, parent.width / 2 - 95 - MinecraftClient.getInstance().fontRenderer.getStringWidth(text), 180 + 6, -1);
-    }
-    
-    @Override
-    public boolean keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_) {
-        if (p_keyPressed_1_ == 256 && this.doesEscapeKeyClose()) {
-            this.close();
-            if (parent != null)
-                MinecraftClient.getInstance().openGui(parent);
-            return true;
-        } else {
-            return super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_);
-        }
-    }
-    
-}
diff --git a/src/main/java/me/shedaniel/gui/Drawable.java b/src/main/java/me/shedaniel/gui/Drawable.java
deleted file mode 100755
index a2e5740a4..000000000
--- a/src/main/java/me/shedaniel/gui/Drawable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package me.shedaniel.gui;
-
-import me.shedaniel.api.IDrawable;
-import me.shedaniel.gui.widget.Control;
-
-import java.awt.*;
-
-/**
- * Created by James on 7/28/2018.
- */
-public abstract class Drawable implements IDrawable {
-    
-    protected Rectangle rect;
-    
-    public Drawable(int x, int y, int width, int height) {
-        rect = new Rectangle(x, y, width, height);
-    }
-    
-    public Drawable(Rectangle rect) {
-        this.rect = rect;
-    }
-    
-    public abstract void draw();
-    
-    public boolean isHighlighted() {
-        Point mousePoint = REIRenderHelper.getMouseLoc();
-        if (rect.contains(mousePoint.x, mousePoint.y)) {
-            if (this instanceof Control)
-                REIRenderHelper.reiGui.setLastHovered((Control) this);
-            return true;
-        }
-        return false;
-    }
-    
-}
diff --git a/src/main/java/me/shedaniel/gui/GuiItemList.java b/src/main/java/me/shedaniel/gui/GuiItemList.java
deleted file mode 100755
index e62f21490..000000000
--- a/src/main/java/me/shedaniel/gui/GuiItemList.java
+++ /dev/null
@@ -1,397 +0,0 @@
-package me.shedaniel.gui;
-
-import com.google.common.collect.ImmutableList;
-import com.mojang.blaze3d.platform.GlStateManager;
-import me.shedaniel.ClientListener;
-import me.shedaniel.Core;
-import me.shedaniel.config.REIItemListOrdering;
-import me.shedaniel.gui.widget.*;
-import me.shedaniel.gui.widget.Button;
-import me.shedaniel.impl.REIRecipeManager;
-import me.shedaniel.listenerdefinitions.IMixinContainerGui;
-import net.fabricmc.fabric.client.itemgroup.FabricCreativeGuiComponents;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.ContainerGui;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.render.GuiLighting;
-import net.minecraft.client.resource.language.I18n;
-import net.minecraft.client.util.Window;
-import net.minecraft.item.ItemGroup;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.util.DefaultedList;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.registry.Registry;
-
-import java.awt.*;
-import java.util.*;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-public class GuiItemList extends Drawable {
-    
-    public final int FOOTERSIZE;
-    private ContainerGui overlayedGui;
-    private static int page = 0;
-    private ArrayList<REISlot> displaySlots;
-    protected ArrayList<Control> controls;
-    private boolean needsResize = false;
-    Button buttonLeft, buttonRight, buttonCheating, buttonConfig;
-    private TextBox searchBox;
-    private ArrayList<ItemStack> view;
-    private Control lastHovered;
-    protected boolean visible = true;
-    private int oldGuiLeft = 0;
-    private boolean cheatMode = false;
-    private List<ItemStack> lastPlayerItems = new ArrayList<>();
-    
-    public GuiItemList(ContainerGui overlayedGui) {
-        super(calculateRect(overlayedGui));
-        FOOTERSIZE = Core.runtimeConfig.centreSearchBox ? 18 : 44;
-        displaySlots = new ArrayList<>();
-        controls = new ArrayList<>();
-        this.overlayedGui = overlayedGui;
-        view = new ArrayList<>();
-        resize();
-    }
-    
-    public boolean canCheat() {
-        ClientPlayerEntity player = MinecraftClient.getInstance().player;
-        if (cheatMode) {
-            if (!player.allowsPermissionLevel(1)) {
-                cheatClicked(0);
-                return false;
-            }
-            return true;
-        }
-        return false;
-    }
-    
-    private static Rectangle calculateRect(ContainerGui overlayedGui) {
-        Window res = REIRenderHelper.getResolution();
-        int startX = (((IMixinContainerGui) overlayedGui).getGuiLeft() + ((IMixinContainerGui) overlayedGui).getXSize()) + 10;
-        int width = res.getScaledWidth() - startX;
-        return new Rectangle(startX, 0, width, res.getScaledHeight());
-    }
-    
-    protected void resize() {
-        Window res = REIRenderHelper.getResolution();
-        
-        if (overlayedGui != MinecraftClient.getInstance().currentGui) {
-            if (MinecraftClient.getInstance().currentGui instanceof ContainerGui) {
-                overlayedGui = (ContainerGui) MinecraftClient.getInstance().currentGui;
-            } else {
-                needsResize = true;
-                return;
-            }
-        }
-        oldGuiLeft = ((IMixinContainerGui) overlayedGui).getGuiLeft();
-        rect = calculateRect(overlayedGui);
-        page = 0;
-        buttonLeft = new Button(rect.x, rect.y + 3, 16, 20, "<");
-        buttonLeft.onClick = this::btnLeftClicked;
-        buttonRight = new Button(rect.x + rect.width - 18, rect.y + 3, 16, 20, ">");
-        buttonRight.onClick = this::btnRightClicked;
-        controls.clear();
-        controls.add(buttonLeft);
-        controls.add(buttonRight);
-        String savedText = "";
-        if (searchBox != null) {
-            savedText = searchBox.getText();
-        }
-        searchBox = new TextBox(getSearchBoxArea());
-        searchBox.setText(savedText);
-        if (Core.config.enableCraftableOnlyButton) {
-            CraftableToggleButton buttonCraftableOnly = new CraftableToggleButton(getCraftableToggleArea());
-            buttonCraftableOnly.setOnClick(i -> {
-                Core.runtimeConfig.craftableOnly = !Core.runtimeConfig.craftableOnly;
-                REIRenderHelper.updateSearch();
-                return true;
-            });
-            controls.add(buttonCraftableOnly);
-        }
-        controls.add(searchBox);
-        buttonCheating = new Button(5, 5, 45, 20, getCheatModeText());
-        buttonCheating.onClick = this::cheatClicked;
-        buttonConfig = new Button(5, 28, 45, 20, I18n.translate("text.rei.config"));
-        buttonConfig.onClick = i -> {
-            MinecraftClient.getInstance().openGui(null);
-            MinecraftClient.getInstance().openGui(new ConfigGui(overlayedGui));
-            return true;
-        };
-        controls.add(buttonConfig);
-        controls.add(buttonCheating);
-        calculateSlots();
-        updateView();
-        fillSlots();
-        controls.addAll(displaySlots);
-    }
-    
-    private Rectangle getSearchBoxArea() {
-        int widthOffset = Core.config.enableCraftableOnlyButton ? -24 : 0;
-        int ch = ((IMixinContainerGui) overlayedGui).getContainerHeight(), cw = ((IMixinContainerGui) overlayedGui).getContainerWidth();
-        if (Core.runtimeConfig.centreSearchBox) {
-            if (ch + 4 + 18 > MinecraftClient.getInstance().window.getScaledHeight()) //Will be out of bounds
-                return new Rectangle(overlayedGui.width / 2 - cw / 2, rect.height + 100, cw + widthOffset, 18);
-            return new Rectangle(overlayedGui.width / 2 - cw / 2, rect.height - 31, cw + widthOffset, 18);
-        }
-        return new Rectangle(rect.x, rect.height - 31, rect.width - 4 + widthOffset, 18);
-    }
-    
-    private Rectangle getCraftableToggleArea() {
-        Rectangle searchBoxArea = getSearchBoxArea();
-        searchBoxArea.setLocation(searchBoxArea.x + searchBoxArea.width + 4, searchBoxArea.y - 1);
-        searchBoxArea.setSize(20, 20);
-        return searchBoxArea;
-    }
-    
-    private void fillSlots() {
-        page = MathHelper.clamp(page, 0, MathHelper.ceil(view.size() / displaySlots.size()));
-        int firstSlot = page * displaySlots.size();
-        for(int i = 0; i < displaySlots.size(); i++) {
-            if (firstSlot + i < view.size() && firstSlot + i >= 0) {
-                displaySlots.get(i).setStack(view.get(firstSlot + i));
-            } else {
-                displaySlots.get(i).setStack(ItemStack.EMPTY);
-            }
-        }
-    }
-    
-    private void calculateSlots() {
-        int x = rect.x, y = rect.y + 20;
-        Window res = REIRenderHelper.getResolution();
-        displaySlots.clear();
-        int xOffset = 0, yOffset = 0, row = 0, perRow = 0, currentX = 0, currentY = 0;
-        while (true) {
-            xOffset += 18;
-            if (row == 0)
-                perRow++;
-            if (x + xOffset + 22 > res.getScaledWidth()) {
-                xOffset = 0;
-                yOffset += 18;
-                row++;
-            }
-            if (y + yOffset + 9 + FOOTERSIZE > rect.height) {
-                xOffset = 0;
-                yOffset = 0;
-                break;
-            }
-        }
-        x += (rect.width - perRow * 18) / 2;
-        y += (rect.height - FOOTERSIZE - 2 - row * 18) / 2;
-        while (true) {
-            REISlot slot = new REISlot(x + xOffset, y + yOffset);
-            slot.setCheatable(true);
-            if (REIRecipeManager.instance().canAddSlot(MinecraftClient.getInstance().currentGui.getClass(), slot.rect))
-                displaySlots.add(slot);
-            xOffset += 18;
-            currentX++;
-            if (currentX >= perRow) {
-                xOffset = 0;
-                yOffset += 18;
-                currentX = 0;
-                currentY++;
-            }
-            if (currentY >= row)
-                break;
-        }
-    }
-    
-    @Override
-    public void draw() {
-        if (!visible)
-            return;
-        if (MinecraftClient.getInstance().currentGui instanceof ContainerGui)
-            overlayedGui = (ContainerGui) MinecraftClient.getInstance().currentGui;
-        if (needsResize == true || oldGuiLeft != ((IMixinContainerGui) overlayedGui).getGuiLeft())
-            resize();
-        else if (Core.runtimeConfig.craftableOnly && (!hasSameListContent(new LinkedList<>(lastPlayerItems), getInventoryItemsTypes()) || (getInventoryItemsTypes().size() != lastPlayerItems.size()))) {
-            this.lastPlayerItems = new LinkedList<>(getInventoryItemsTypes());
-            updateView();
-        }
-        GlStateManager.pushMatrix();
-        updateButtons();
-        controls.forEach(Control::draw);
-        GuiLighting.disable();
-        String header = String.format("%s/%s", page + 1, MathHelper.ceil(view.size() / displaySlots.size()) + 1);
-        MinecraftClient.getInstance().fontRenderer.drawWithShadow(header, rect.x + (rect.width / 2) - (MinecraftClient.getInstance().fontRenderer.getStringWidth(header) / 2), rect.y + 10, -1);
-        GlStateManager.popMatrix();
-    }
-    
-    private boolean hasSameListContent(List<ItemStack> list1, List<ItemStack> list2) {
-        Collections.sort(list1, (itemStack, t1) -> {
-            return itemStack.getDisplayName().getFormattedText().compareToIgnoreCase(t1.getDisplayName().getFormattedText());
-        });
-        Collections.sort(list2, (itemStack, t1) -> {
-            return itemStack.getDisplayName().getFormattedText().compareToIgnoreCase(t1.getDisplayName().getFormattedText());
-        });
-        String lastString = String.join("", list1.stream().map(itemStack -> {
-            return itemStack.getDisplayName().getFormattedText();
-        }).collect(Collectors.toList())), currentString = String.join("", list2.stream().map(itemStack -> {
-            return itemStack.getDisplayName().getFormattedText();
-        }).collect(Collectors.toList()));
-        return lastString.equals(currentString);
-    }
-    
-    private void updateButtons() {
-        buttonLeft.setEnabled(MathHelper.ceil(view.size() / displaySlots.size()) > 1);
-        buttonRight.setEnabled(MathHelper.ceil(view.size() / displaySlots.size()) > 1);
-    }
-    
-    public boolean btnRightClicked(int button) {
-        if (button == 0) {
-            page++;
-            if (page > MathHelper.ceil(view.size() / displaySlots.size()))
-                page = 0;
-            fillSlots();
-            return true;
-        }
-        return false;
-    }
-    
-    public boolean btnLeftClicked(int button) {
-        if (button == 0) {
-            page--;
-            if (page < 0)
-                page = MathHelper.ceil(view.size() / displaySlots.size());
-            fillSlots();
-            return true;
-        }
-        return false;
-    }
-    
-    public boolean cheatClicked(int button) {
-        if (button == 0) {
-            cheatMode = !cheatMode;
-            buttonCheating.setString(getCheatModeText());
-            return true;
-        }
-        return false;
-    }
-    
-    private String getCheatModeText() {
-        return I18n.translate(String.format("%s%s", "text.rei.", cheatMode ? "cheat" : "nocheat"));
-    }
-    
-    protected void updateView() {
-        String searchText = searchBox.getText();
-        view.clear();
-        List<ItemStack> stacks = new ArrayList<>();
-        if (ClientListener.stackList == null && !Registry.ITEM.isEmpty())
-            Core.getListeners(ClientListener.class).forEach(ClientListener::onDoneLoading);
-        if (ClientListener.stackList != null) {
-            List<ItemStack> stackList = new LinkedList<>(ClientListener.stackList);
-            List<ItemGroup> itemGroups = new LinkedList<>(Arrays.asList(ItemGroup.GROUPS));
-            FabricCreativeGuiComponents.COMMON_GROUPS.forEach(itemGroups::add);
-            itemGroups.add(null);
-            if (Core.config.itemListOrdering != REIItemListOrdering.REGISTRY)
-                Collections.sort(stackList, (itemStack, t1) -> {
-                    if (Core.config.itemListOrdering.equals(REIItemListOrdering.NAME))
-                        return itemStack.getDisplayName().getFormattedText().compareToIgnoreCase(t1.getDisplayName().getFormattedText());
-                    if (Core.config.itemListOrdering.equals(REIItemListOrdering.ITEM_GROUPS))
-                        return itemGroups.indexOf(itemStack.getItem().getItemGroup()) - itemGroups.indexOf(t1.getItem().getItemGroup());
-                    return 0;
-                });
-            if (!Core.config.isAscending)
-                Collections.reverse(stackList);
-            Arrays.stream(searchText.split("\\|")).forEachOrdered(s -> {
-                List<SearchArgument> arguments = new ArrayList<>();
-                while (s.startsWith(" ")) s = s.substring(1);
-                while (s.endsWith(" ")) s = s.substring(0, s.length());
-                if (s.startsWith("@-") || s.startsWith("-@"))
-                    arguments.add(new SearchArgument(SearchArgument.ArgumentType.MOD, s.substring(2), false));
-                else if (s.startsWith("@"))
-                    arguments.add(new SearchArgument(SearchArgument.ArgumentType.MOD, s.substring(1), true));
-                else if (s.startsWith("#-") || s.startsWith("-#"))
-                    arguments.add(new SearchArgument(SearchArgument.ArgumentType.TOOLTIP, s.substring(2), false));
-                else if (s.startsWith("#"))
-                    arguments.add(new SearchArgument(SearchArgument.ArgumentType.TOOLTIP, s.substring(1), true));
-                else if (s.startsWith("-"))
-                    arguments.add(new SearchArgument(SearchArgument.ArgumentType.TEXT, s.substring(1), false));
-                else
-                    arguments.add(new SearchArgument(SearchArgument.ArgumentType.TEXT, s, true));
-                stackList.stream().filter(itemStack -> filterItem(itemStack, arguments)).forEachOrdered(stacks::add);
-            });
-        }
-        List<ItemStack> workingItems = ClientListener.stackList == null || (Core.runtimeConfig.craftableOnly && lastPlayerItems.size() > 0) ? new ArrayList<>() : ClientListener.stackList;
-        if (Core.runtimeConfig.craftableOnly) {
-            REIRecipeManager.instance().findCraftableByItems(lastPlayerItems).forEach(workingItems::add);
-            workingItems.addAll(lastPlayerItems);
-        }
-        final List<ItemStack> finalWorkingItems = workingItems;
-        view.addAll(stacks.stream().filter(itemStack -> {
-            if (!Core.runtimeConfig.craftableOnly)
-                return true;
-            for(ItemStack workingItem : finalWorkingItems)
-                if (itemStack.isEqualIgnoreTags(workingItem))
-                    return true;
-            return false;
-        }).distinct().collect(Collectors.toList()));
-        page = 0;
-        fillSlots();
-    }
-    
-    private List<ItemStack> getInventoryItemsTypes() {
-        List<DefaultedList<ItemStack>> field_7543 = ImmutableList.of(MinecraftClient.getInstance().player.inventory.main, MinecraftClient.getInstance().player.inventory.armor
-                , MinecraftClient.getInstance().player.inventory.offHand);
-        List<ItemStack> inventoryStacks = new ArrayList<>();
-        field_7543.forEach(itemStacks -> itemStacks.forEach(itemStack -> {
-            if (!itemStack.getItem().equals(Items.AIR))
-                inventoryStacks.add(itemStack);
-        }));
-        return inventoryStacks;
-    }
-    
-    private boolean filterItem(ItemStack itemStack, List<SearchArgument> arguments) {
-        String mod = getMod(itemStack);
-        List<String> toolTipsList = REIRenderHelper.getOverlayedGui().getStackTooltip(itemStack);
-        String toolTipsMixed = toolTipsList.stream().skip(1).collect(Collectors.joining()).toLowerCase();
-        String allMixed = Stream.of(itemStack.getDisplayName().getString(), toolTipsMixed).collect(Collectors.joining()).toLowerCase();
-        for(SearchArgument searchArgument : arguments.stream().filter(searchArgument -> !searchArgument.isInclude()).collect(Collectors.toList())) {
-            if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.MOD))
-                if (mod.toLowerCase().contains(searchArgument.getText().toLowerCase()))
-                    return false;
-            if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.TOOLTIP))
-                if (toolTipsMixed.contains(searchArgument.getText().toLowerCase()))
-                    return false;
-            if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.TEXT))
-                if (allMixed.contains(searchArgument.getText().toLowerCase()))
-                    return false;
-        }
-        for(SearchArgument searchArgument : arguments.stream().filter(SearchArgument::isInclude).collect(Collectors.toList())) {
-            if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.MOD))
-                if (!mod.toLowerCase().contains(searchArgument.getText().toLowerCase()))
-                    return false;
-            if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.TOOLTIP))
-                if (!toolTipsMixed.contains(searchArgument.getText().toLowerCase()))
-                    return false;
-            if (searchArgument.getArgumentType().equals(SearchArgument.ArgumentType.TEXT))
-                if (!allMixed.contains(searchArgument.getText().toLowerCase()))
-                    return false;
-        }
-        return true;
-    }
-    
-    public void tick() {
-        controls.forEach(f -> f.tick());
-    }
-    
-    public void setLastHovered(Control ctrl) {
-        lastHovered = ctrl;
-    }
-    
-    public Control getLastHovered() {
-        return lastHovered;
-    }
-    
-    private String getMod(ItemStack stack) {
-        if (stack != null && !stack.isEmpty()) {
-            Identifier location = Registry.ITEM.getId(stack.getItem());
-            return location.getNamespace();
-        }
-        return "";
-    }
-    
-}
diff --git a/src/main/java/me/shedaniel/gui/REIRenderHelper.java b/src/main/java/me/shedaniel/gui/REIRenderHelper.java
deleted file mode 100755
index 81d5be801..000000000
--- a/src/main/java/me/shedaniel/gui/REIRenderHelper.java
+++ /dev/null
@@ -1,280 +0,0 @@
-package me.shedaniel.gui;
-
-import me.shedaniel.ClientListener;
-import me.shedaniel.gui.widget.Control;
-import me.shedaniel.gui.widget.IFocusable;
-import me.shedaniel.gui.widget.REISlot;
-import me.shedaniel.impl.REIRecipeManager;
-import me.shedaniel.listenerdefinitions.IMixinContainerGui;
-import net.fabricmc.loader.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.font.FontRenderer;
-import net.minecraft.client.gui.ContainerGui;
-import net.minecraft.client.render.item.ItemRenderer;
-import net.minecraft.client.util.Window;
-import net.minecraft.item.ItemStack;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-
-/**
- * Created by James on 7/28/2018.
- */
-public class REIRenderHelper {
-    
-    static Point mouseLoc;
-    static public GuiItemList reiGui;
-    static ContainerGui overlayedGui;
-    static List<TooltipData> tooltipsToRender = new ArrayList<>();
-    
-    public static void setMouseLoc(int x, int y) {
-        mouseLoc = new Point(x, y);
-    }
-    
-    static public IFocusable focusedControl;
-    
-    public static Point getMouseLoc() {
-        return mouseLoc;
-    }
-    
-    public static Window getResolution() {
-        return MinecraftClient.getInstance().window;
-    }
-    
-    public static String tryGettingModName(String modid) {
-        if (modid.equalsIgnoreCase("minecraft"))
-            return "Minecraft";
-        return FabricLoader.INSTANCE.getModContainers().stream()
-                .map(modContainer -> {
-                    return modContainer.getInfo();
-                })
-                .filter(modInfo -> modInfo.getId().equals(modid) || (modInfo.getName() != null && modInfo.getName().equals(modid)))
-                .findFirst().map(modInfo -> {
-                    if (modInfo.getName() != null)
-                        return modInfo.getName();
-                    return modid;
-                }).orElse(modid);
-    }
-    
-    public static void drawREI(ContainerGui overlayedGui) {
-        REIRenderHelper.overlayedGui = overlayedGui;
-        if (reiGui == null) {
-            reiGui = new GuiItemList(overlayedGui);
-        }
-        reiGui.draw();
-        renderTooltips();
-    }
-    
-    public static void resize(int scaledWidth, int scaledHeight) {
-        if (reiGui != null) {
-            reiGui.resize();
-        }
-        if (overlayedGui instanceof RecipeGui) {
-            overlayedGui.onScaleChanged(MinecraftClient.getInstance(), scaledWidth, scaledHeight);
-        }
-    }
-    
-    public static ItemRenderer getItemRender() {
-        return MinecraftClient.getInstance().getItemRenderer();
-    }
-    
-    public static FontRenderer getFontRenderer() {
-        return MinecraftClient.getInstance().fontRenderer;
-    }
-    
-    public static ContainerGui getOverlayedGui() {
-        if (overlayedGui instanceof ContainerGui)
-            return overlayedGui;
-        return null;
-    }
-    
-    public static void addToolTip(List<String> text, int x, int y) {
-        tooltipsToRender.add(new TooltipData(text, x, y));
-    }
-    
-    
-    private static void renderTooltips() {
-        tooltipsToRender.forEach(tooltipData -> getOverlayedGui().drawTooltip(tooltipData.text, tooltipData.x, tooltipData.y));
-        tooltipsToRender.clear();
-    }
-    
-    public static boolean mouseClick(int x, int y, int button) {
-        if (reiGui.visible) {
-            for(Control control : reiGui.controls) {
-                if (control.isHighlighted() &&a