Cleanup

mezz · Jul 15, 2017 · a08d5a0 · a08d5a0
1 parent c84422d
commit a08d5a0
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 12 deletions.
diff --git a/src/main/java/mezz/jei/config/Config.java b/src/main/java/mezz/jei/config/Config.java
@@ -25,7 +25,6 @@
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.versioning.ArtifactVersion;
 
 public final class Config {
 	private static final String configKeyPrefix = "config.jei";

diff --git a/src/main/java/mezz/jei/gui/Focus.java b/src/main/java/mezz/jei/gui/Focus.java
@@ -5,7 +5,6 @@
 import mezz.jei.api.recipe.IFocus;
 import mezz.jei.util.ErrorUtil;
 import mezz.jei.util.LegacyUtil;
-import net.minecraft.item.ItemStack;
 
 public class Focus<V> implements IFocus<V> {
 	private final Mode mode;

diff --git a/src/main/java/mezz/jei/ingredients/IngredientListElement.java b/src/main/java/mezz/jei/ingredients/IngredientListElement.java
@@ -13,7 +13,6 @@
 import com.google.common.collect.ImmutableSet;
 import mezz.jei.api.ingredients.IIngredientHelper;
 import mezz.jei.api.ingredients.IIngredientRenderer;
-import mezz.jei.config.Config;
 import mezz.jei.gui.ingredients.IIngredientListElement;
 import mezz.jei.startup.IModIdHelper;
 import mezz.jei.util.LegacyUtil;

diff --git a/src/main/java/mezz/jei/input/ClickedIngredient.java b/src/main/java/mezz/jei/input/ClickedIngredient.java
@@ -1,7 +1,6 @@
 package mezz.jei.input;
 
 import mezz.jei.util.ErrorUtil;
-import net.minecraft.item.ItemStack;
 
 public class ClickedIngredient<V> implements IClickedIngredient<V> {
 	private final V value;

diff --git a/src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeChecker.java b/src/main/java/mezz/jei/plugins/vanilla/crafting/CraftingRecipeChecker.java
@@ -25,8 +25,8 @@ private CraftingRecipeChecker() {
 	public static List<IRecipe> getValidRecipes(final IJeiHelpers jeiHelpers) {
 		CraftingRecipeValidator<ShapedOreRecipe> shapedOreRecipeValidator = new CraftingRecipeValidator<>(recipe -> new ShapedOreRecipeWrapper(jeiHelpers, recipe));
 		CraftingRecipeValidator<ShapedRecipes> shapedRecipesValidator = new CraftingRecipeValidator<>(recipe -> new ShapedRecipesWrapper(jeiHelpers, recipe));
-		CraftingRecipeValidator<ShapelessOreRecipe> shapelessOreRecipeValidator = new CraftingRecipeValidator<>(recipe -> new ShapelessRecipeWrapper(jeiHelpers, recipe));
-		CraftingRecipeValidator<ShapelessRecipes> shapelessRecipesValidator = new CraftingRecipeValidator<>(recipe -> new ShapelessRecipeWrapper(jeiHelpers, recipe));
+		CraftingRecipeValidator<ShapelessOreRecipe> shapelessOreRecipeValidator = new CraftingRecipeValidator<>(recipe -> new ShapelessRecipeWrapper<>(jeiHelpers, recipe));
+		CraftingRecipeValidator<ShapelessRecipes> shapelessRecipesValidator = new CraftingRecipeValidator<>(recipe -> new ShapelessRecipeWrapper<>(jeiHelpers, recipe));
 
 		Iterator<IRecipe> recipeIterator = CraftingManager.REGISTRY.iterator();
 		List<IRecipe> validRecipes = new ArrayList<>();

diff --git a/src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackHelper.java b/src/main/java/mezz/jei/plugins/vanilla/ingredients/FluidStackHelper.java
@@ -14,12 +14,10 @@
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.ForgeModContainer;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidUtil;
-import net.minecraftforge.fluids.UniversalBucket;
 
 public class FluidStackHelper implements IIngredientHelper<FluidStack> {
 	@Override

diff --git a/src/main/java/mezz/jei/recipes/RecipeRegistry.java b/src/main/java/mezz/jei/recipes/RecipeRegistry.java
@@ -159,7 +159,7 @@ private static ImmutableList<IRecipeHandler> buildRecipeHandlersList(List<IRecip
 			}
 
 			if (recipeHandlerClasses.contains(recipeClass)) {
-				Log.get().error("A Recipe Handler has already been registered for this recipe class: {}" + recipeClass.getName());
+				Log.get().error("A Recipe Handler has already been registered for this recipe class: {}", recipeClass.getName());
 				continue;
 			}
 
@@ -181,7 +181,7 @@ private static ImmutableMultimap<String, IRecipeHandler> buildRecipeHandlersMap(
 				recipeHandlerClasses.add(recipeClass);
 				builder.put(entry);
 			} else {
-				Log.get().error("A Recipe Handler has already been registered for this recipe class: {}" + recipeClass.getName());
+				Log.get().error("A Recipe Handler has already been registered for this recipe class: {}", recipeClass.getName());
 			}
 		}
 		return builder.build();

diff --git a/src/main/java/mezz/jei/render/GuiIngredientFastList.java b/src/main/java/mezz/jei/render/GuiIngredientFastList.java
@@ -6,7 +6,6 @@
 
 import mezz.jei.api.ingredients.IIngredientHelper;
 import mezz.jei.api.ingredients.IIngredientRegistry;
-import mezz.jei.config.Config;
 import mezz.jei.gui.ingredients.IIngredientListElement;
 import mezz.jei.input.ClickedIngredient;
 import mezz.jei.util.Log;

diff --git a/src/main/java/mezz/jei/startup/ProxyCommonClient.java b/src/main/java/mezz/jei/startup/ProxyCommonClient.java
@@ -12,7 +12,6 @@
 import mezz.jei.config.SessionData;
 import mezz.jei.gui.overlay.IngredientListOverlay;
 import mezz.jei.ingredients.IngredientFilter;
-import mezz.jei.ingredients.IngredientInformation;
 import mezz.jei.network.packets.PacketJei;
 import mezz.jei.plugins.jei.JEIInternalPlugin;
 import mezz.jei.plugins.vanilla.VanillaPlugin;