A bit of a clean

Author: Testure

src/main/java/turing/tmb/RecipeIndex.java

@@ -9,15 +9,14 @@
 import java.util.function.Function;
 
 public class RecipeIndex implements IRecipeIndex {
-	private final TMBRuntime runtime;
 	protected final List<IRecipeCategory<?>> categories = new ArrayList<>();
 	protected final List<String> hiddenCategories = new ArrayList<>();
 	protected final Map<IRecipeCategory<?>, List<ITypedIngredient<?>>> catalysts = new HashMap<>();
 	protected final Map<IRecipeCategory<?>, List<IRecipeTranslator<?>>> recipeLists = new HashMap<>();
 	protected final Map<ILookupContext, List<Pair<IRecipeCategory<?>, IRecipeTranslator<?>>>> recipeLookupCache = new HashMap<>();
 
 	public RecipeIndex(TMBRuntime runtime) {
-		this.runtime = runtime;
+
 	}
 
 	protected void clear() {

src/main/java/turing/tmb/TMB.java

@@ -72,7 +72,7 @@ public static void onClientStart() {
 		category1.withComponent(new BooleanOptionComponent(TMBOptions.isRecipeViewEnabled));
 		OptionsPages.GENERAL.withComponent(category1);
 		loadTMB();
-		runtime.index.gatherIngredients();
+		runtime.gatherIngredients();
 	}
 
 	@Override
@@ -90,7 +90,7 @@ private static void loadTMB() {
 			plugin.registerIngredientTypes(runtime);
 			plugin.registerRecipeCategories(runtime);
 		}
-		runtime.getRecipeIndex().loadLists();
+		runtime.loadLists();
 		for (ITMBPlugin plugin : plugins) {
 			plugin.registerIngredients(runtime);
 			plugin.registerRecipeCatalysts(runtime);
@@ -220,15 +220,15 @@ public static void reloadTMB() {
 		clear();
 		gatherPlugins(true);
 		loadTMB();
-		runtime.index.gatherIngredients();
+		runtime.gatherIngredients();
 	}
 
 	public static void registerPlugin(ITMBPlugin plugin) {
 		plugins.add(plugin);
 	}
 
 	public static ITMBRuntime getRuntime() {
-		if (!runtime.isReady) {
+		if (!runtime.isReady()) {
 			throw new IllegalStateException("Attempt to get runtime before it is ready!");
 		}
 		return runtime;

src/main/java/turing/tmb/TMBRuntime.java

@@ -34,7 +34,7 @@ public class TMBRuntime implements ITMBRuntime {
 	protected final GuiHelper guiHelper = new GuiHelper(this);
 	public final List<ITypedIngredient<?>> favourites = new ArrayList<>();
 	protected final Map<RecipeIngredient, IRecipeTranslator<?>> defaultRecipes = new HashMap<>();
-	protected final Map<Class<? extends Screen>, RecipeFiller> recipeFillers = new HashMap<>();
+	protected final Map<Class<? extends Screen>, RecipeFiller<?, ?>> recipeFillers = new HashMap<>();
 	protected boolean isReady;
 
 	protected TMBRuntime() {
@@ -50,6 +50,19 @@ protected void clear() {
 		recipeFillers.clear();
 	}
 
+	protected void gatherIngredients() {
+		index.gatherIngredients();
+	}
+
+	protected void loadLists() {
+		recipeIndex.loadLists();
+	}
+
+	@Override
+	public boolean isReady() {
+		return isReady;
+	}
+
 	@Override
 	public void showRecipe(ILookupContext lookup) {
 		List<Pair<IRecipeCategory<?>, IRecipeTranslator<?>>> results = recipeIndex.searchRecipes(lookup);
@@ -117,7 +130,7 @@ public RecipeIndex getRecipeIndex() {
 	}
 
 	@Override
-	public Map<Class<? extends Screen>, RecipeFiller> getRecipeFillers() {
+	public Map<Class<? extends Screen>, RecipeFiller<?, ?>> getRecipeFillers() {
 		return recipeFillers;
 	}
 

src/main/java/turing/tmb/api/runtime/ITMBRuntime.java

@@ -27,7 +27,7 @@ public interface ITMBRuntime {
 
 	IRecipeIndex getRecipeIndex();
 
-	Map<Class<? extends Screen>, RecipeFiller> getRecipeFillers();
+	Map<Class<? extends Screen>, RecipeFiller<?, ?>> getRecipeFillers();
 
 	void showRecipe(ILookupContext lookup);
 
@@ -38,4 +38,6 @@ public interface ITMBRuntime {
 	Map<RecipeIngredient, IRecipeTranslator<?>> getDefaultRecipes();
 
 	List<ITypedIngredient<?>> getFavourites();
+
+	boolean isReady();
 }