Starting off rewrite

83 files changed, 249 insertions, 4609 deletions

diff --git a/.gitignore b/.gitignore
index 92af0487c..270cfeb7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /out
 /run
 /classes
+/old
 
 # IDE nonsense that could go in source control but really shouldn't
 .classpath
diff --git a/build.gradle b/build.gradle
index d8882ed80..2e4099ce7 100755
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 archivesBaseName = "RoughlyEnoughItems"
-version = "1.5.1-21"
+version = "2.0-22"
 
 minecraft {
 }
diff --git a/src/main/java/me/shedaniel/ClientListener.java b/src/main/java/me/shedaniel/ClientListener.java
deleted file mode 100755
index ec1061e2f..000000000
--- a/src/main/java/me/shedaniel/ClientListener.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package me.shedaniel;
-
-import me.shedaniel.api.IREIPlugin;
-import me.shedaniel.gui.REIRenderHelper;
-import me.shedaniel.impl.REIRecipeManager;
-import me.shedaniel.library.KeyBindFunction;
-import me.shedaniel.listenerdefinitions.DoneLoading;
-import me.shedaniel.listenerdefinitions.RecipeLoadListener;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.EnchantmentHelper;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.recipe.RecipeManager;
-import net.minecraft.util.DefaultedList;
-import net.minecraft.util.registry.Registry;
-
-import java.util.*;
-
-public class ClientListener implements DoneLoading, RecipeLoadListener {
-    
-    public static KeyBindFunction recipeKeyBind;
-    public static KeyBindFunction hideKeyBind;
-    public static KeyBindFunction usageKeyBind;
-    public static List<KeyBindFunction> keyBinds = new ArrayList<>();
-    
-    private List<IREIPlugin> plugins;
-    public static List<ItemStack> stackList;
-    
-    public static boolean processGuiKeyBinds(int typedChar) {
-        for(KeyBindFunction keyBind : keyBinds)
-            if (keyBind.apply(typedChar))
-                return true;
-        return false;
-    }
-    
-    @Override
-    public void onDoneLoading() {
-        plugins = new ArrayList<>();
-        stackList = new ArrayList<>();
-        
-        buildItemList();
-    }
-    
-    public void onInitializeKeyBind() {
-        recipeKeyBind = new KeyBindFunction(Core.config.recipeKeyBind) {
-            @Override
-            public boolean apply(int key) {
-                if (key == this.getKey())
-                    REIRenderHelper.recipeKeyBind();
-                return key == this.getKey();
-            }
-        };
-        hideKeyBind = new KeyBindFunction(Core.config.hideKeyBind) {
-            @Override
-            public boolean apply(int key) {
-                if (key == this.getKey())
-                    REIRenderHelper.hideKeyBind();
-                return key == this.getKey();
-            }
-        };
-        usageKeyBind = new KeyBindFunction(Core.config.usageKeyBind) {
-            @Override
-            public boolean apply(int key) {
-                if (key == this.getKey())
-                    REIRenderHelper.useKeyBind();
-                return key == this.getKey();
-            }
-        };
-        keyBinds.addAll(Arrays.asList(recipeKeyBind, hideKeyBind, usageKeyBind));
-    }
-    
-    private void buildItemList() {
-        if (!Registry.ITEM.isEmpty())
-            Registry.ITEM.forEach(this::processItem);
-        if (Registry.ENCHANTMENT.stream().count() > 0)
-            Registry.ENCHANTMENT.forEach(enchantment -> {
-                for(int i = enchantment.getMinimumLevel(); i < enchantment.getMaximumLevel(); i++) {
-                    ItemStack stack = new ItemStack(Items.ENCHANTED_BOOK);
-                    Map<Enchantment, Integer> map = new HashMap<>();
-                    map.put(enchantment, i);
-                    EnchantmentHelper.set(map, stack);
-                    processItemStack(stack);
-                }
-            });
-    }
-    
-    private void processItem(Item item) {
-        DefaultedList<ItemStack> items = DefaultedList.create();
-        try {
-            item.addStacksForDisplay(item.getItemGroup(), items);
-            items.forEach(stackList::add);
-        } catch (NullPointerException e) {
-        }
-    }
-    
-    private void processItemStack(ItemStack item) {
-        stackList.add(item);
-    }
-    
-    @Override
-    public void recipesLoaded(RecipeManager recipeManager) {
-        REIRecipeManager.instance().RecipesLoaded(recipeManager);
-    }
-    
-}
diff --git a/src/main/java/me/shedaniel/Core.java b/src/main/java/me/shedaniel/Core.java
deleted file mode 100755
index 2cc74161b..000000000
--- a/src/main/java/me/shedaniel/Core.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package me.shedaniel;
-
-import me.shedaniel.config.REIConfig;
-import me.shedaniel.config.REIRuntimeConfig;
-import me.shedaniel.listenerdefinitions.ClientTickable;
-import me.shedaniel.listenerdefinitions.IEvent;
-import me.shedaniel.listeners.DrawContainerListener;
-import me.shedaniel.network.CheatPacket;
-import me.shedaniel.plugin.VanillaPlugin;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.events.client.ClientTickEvent;
-import net.fabricmc.loader.FabricLoader;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.item.ItemStack;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-/**
- * Created by James on 7/27/2018.
- */
-public class Core implements ClientModInitializer {
-    
-    private static List<IEvent> events = new LinkedList<>();
-    public static final File configFile = new File(FabricLoader.INSTANCE.getConfigDirectory(), "rei.json");
-    public static REIConfig config;
-    public static REIRuntimeConfig runtimeConfig;
-    public static ClientListener clientListener;
-    public static Logger LOGGER = LogManager.getFormatterLogger("REI");
-    
-    @Override
-    public void onInitializeClient() {
-        this.clientListener = new ClientListener();
-        registerSelfEvents();
-        registerFabricEvents();
-        try {
-            loadConfig();
-            runtimeConfig = new REIRuntimeConfig();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        this.clientListener.onInitializeKeyBind();
-    }
-    
-    private void registerFabricEvents() {
-        ClientTickEvent.CLIENT.register(minecraftClient -> {
-            getListeners(ClientTickable.class).forEach(ClientTickable::clientTick);
-            if (!Core.config.enableCraftableOnlyButton)
-                Core.runtimeConfig.craftableOnly = false;
-        });
-    }
-    
-    private void registerSelfEvents() {
-        registerEvent(new DrawContainerListener());
-        registerEvent(clientListener);
-        registerPlugin(new VanillaPlugin());
-    }
-    
-    public static void registerPlugin(VanillaPlugin vanillaPlugin) {
-        registerEvent(vanillaPlugin);
-    }
-    
-    private static void registerEvent(IEvent event) {
-        events.add(event);
-    }
-    
-    public static <T> List<T> getListeners(Class<T> listenerInterface) {
-        List<T> list = new ArrayList<>();
-        events.forEach(iEvent -> {
-            if (listenerInterface.isAssignableFrom(iEvent.getClass()))
-                list.add(listenerInterface.cast(iEvent));
-        });
-        return list;
-    }
-    
-    public static void loadConfig() throws IOException {
-        if (!configFile.exists() || !configFile.canRead()) {
-            config = new REIConfig();
-            saveConfig();
-            return;
-        }
-        boolean failed = false;
-        try {
-            config = REIConfig.GSON.fromJson(new InputStreamReader(Files.newInputStream(configFile.toPath())), REIConfig.class);
-        } catch (Exception e) {
-            failed = true;
-        }
-        if (failed || config == null) {
-            Core.LOGGER.error("REI: Failed to load config! Overwriting with default config.");
-            config = new REIConfig();
-        }
-        saveConfig();
-    }
-    
-    public static void saveConfig() throws IOException {
-        configFile.getParentFile().mkdirs();
-        if (!configFile.exists() && !configFile.createNewFile()) {
-            Core.LOGGER.error("REI: Failed to save config! Overwriting with default config.");
-            config = new REIConfig();
-            return;
-        }