diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index ba88d75c..399068a5 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -5,7 +5,7 @@ import static codechicken.lib.gui.GuiDraw.getMousePosition; import static codechicken.nei.NEIClientUtils.getGuiContainer; import static codechicken.nei.NEIClientUtils.translate; -import java.awt.Point; +import java.awt.*; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -13,7 +13,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; import javax.annotation.Nullable; diff --git a/src/main/java/codechicken/nei/GuiPotionCreator.java b/src/main/java/codechicken/nei/GuiPotionCreator.java index 23eae133..2a6e1b4b 100644 --- a/src/main/java/codechicken/nei/GuiPotionCreator.java +++ b/src/main/java/codechicken/nei/GuiPotionCreator.java @@ -2,7 +2,7 @@ package codechicken.nei; import static codechicken.nei.NEIClientUtils.translate; -import java.awt.Dimension; +import java.awt.*; import java.util.ArrayList; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/codechicken/nei/HUDRenderer.java b/src/main/java/codechicken/nei/HUDRenderer.java index dd4a09a8..05481db4 100644 --- a/src/main/java/codechicken/nei/HUDRenderer.java +++ b/src/main/java/codechicken/nei/HUDRenderer.java @@ -5,8 +5,7 @@ import static codechicken.lib.gui.GuiDraw.drawString; import static codechicken.lib.gui.GuiDraw.drawTooltipBox; import static codechicken.lib.gui.GuiDraw.getStringWidth; -import java.awt.Dimension; -import java.awt.Point; +import java.awt.*; import java.util.List; import net.minecraft.client.Minecraft; diff --git a/src/main/java/codechicken/nei/ItemsGrid.java b/src/main/java/codechicken/nei/ItemsGrid.java index 9459b59d..d3d3c34f 100644 --- a/src/main/java/codechicken/nei/ItemsGrid.java +++ b/src/main/java/codechicken/nei/ItemsGrid.java @@ -3,7 +3,7 @@ package codechicken.nei; import static codechicken.lib.gui.GuiDraw.drawRect; import static codechicken.lib.gui.GuiDraw.getMousePosition; -import java.awt.Point; +import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/codechicken/nei/NEICPH.java b/src/main/java/codechicken/nei/NEICPH.java index 4f2428be..170cfa7b 100644 --- a/src/main/java/codechicken/nei/NEICPH.java +++ b/src/main/java/codechicken/nei/NEICPH.java @@ -1,6 +1,7 @@ package codechicken.nei; -import static codechicken.nei.PacketIDs.*; +import static codechicken.nei.PacketIDs.C2S; +import static codechicken.nei.PacketIDs.S2C; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; diff --git a/src/main/java/codechicken/nei/NEIController.java b/src/main/java/codechicken/nei/NEIController.java index 110b7c28..fa2081e3 100644 --- a/src/main/java/codechicken/nei/NEIController.java +++ b/src/main/java/codechicken/nei/NEIController.java @@ -2,7 +2,7 @@ package codechicken.nei; import static codechicken.lib.gui.GuiDraw.getMousePosition; -import java.awt.Point; +import java.awt.*; import java.util.LinkedList; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java index 27b648e0..a5d7164c 100644 --- a/src/main/java/codechicken/nei/NEIModContainer.java +++ b/src/main/java/codechicken/nei/NEIModContainer.java @@ -1,7 +1,11 @@ package codechicken.nei; import java.io.File; -import java.util.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; import net.minecraft.util.EnumChatFormatting; diff --git a/src/main/java/codechicken/nei/NEISPH.java b/src/main/java/codechicken/nei/NEISPH.java index 2e265754..4b51d549 100644 --- a/src/main/java/codechicken/nei/NEISPH.java +++ b/src/main/java/codechicken/nei/NEISPH.java @@ -1,6 +1,7 @@ package codechicken.nei; -import static codechicken.nei.PacketIDs.*; +import static codechicken.nei.PacketIDs.C2S; +import static codechicken.nei.PacketIDs.S2C; import java.util.LinkedList; import java.util.Set; diff --git a/src/main/java/codechicken/nei/SubsetWidget.java b/src/main/java/codechicken/nei/SubsetWidget.java index 9625f874..9c12d463 100644 --- a/src/main/java/codechicken/nei/SubsetWidget.java +++ b/src/main/java/codechicken/nei/SubsetWidget.java @@ -2,7 +2,7 @@ package codechicken.nei; import static codechicken.nei.NEIClientUtils.translate; -import java.awt.Point; +import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/codechicken/nei/asm/NEITransformer.java b/src/main/java/codechicken/nei/asm/NEITransformer.java index ccf8ddcd..973c68e4 100644 --- a/src/main/java/codechicken/nei/asm/NEITransformer.java +++ b/src/main/java/codechicken/nei/asm/NEITransformer.java @@ -6,7 +6,14 @@ import static codechicken.lib.asm.InsnComparator.getControlFlowLabels; import static codechicken.lib.asm.InsnComparator.matches; import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES; import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ACC_PUBLIC; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ILOAD; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; +import static org.objectweb.asm.Opcodes.IRETURN; import java.util.Map; diff --git a/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java b/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java index 9155bd4c..35930acc 100644 --- a/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java +++ b/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java @@ -1,6 +1,22 @@ package codechicken.nei.asm; -import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Opcodes.ACC_FINAL; +import static org.objectweb.asm.Opcodes.ACC_PRIVATE; +import static org.objectweb.asm.Opcodes.ACC_STATIC; +import static org.objectweb.asm.Opcodes.ALOAD; +import static org.objectweb.asm.Opcodes.ASTORE; +import static org.objectweb.asm.Opcodes.ATHROW; +import static org.objectweb.asm.Opcodes.CHECKCAST; +import static org.objectweb.asm.Opcodes.DUP; +import static org.objectweb.asm.Opcodes.GETSTATIC; +import static org.objectweb.asm.Opcodes.GOTO; +import static org.objectweb.asm.Opcodes.IFNONNULL; +import static org.objectweb.asm.Opcodes.INVOKEINTERFACE; +import static org.objectweb.asm.Opcodes.INVOKESPECIAL; +import static org.objectweb.asm.Opcodes.MONITORENTER; +import static org.objectweb.asm.Opcodes.MONITOREXIT; +import static org.objectweb.asm.Opcodes.NEW; +import static org.objectweb.asm.Opcodes.PUTSTATIC; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/codechicken/nei/config/GuiHighlightTips.java b/src/main/java/codechicken/nei/config/GuiHighlightTips.java index cd37cfe2..f7762303 100644 --- a/src/main/java/codechicken/nei/config/GuiHighlightTips.java +++ b/src/main/java/codechicken/nei/config/GuiHighlightTips.java @@ -4,8 +4,7 @@ import static codechicken.lib.gui.GuiDraw.displaySize; import static codechicken.lib.gui.GuiDraw.getMousePosition; import static codechicken.nei.NEIClientUtils.translate; -import java.awt.Dimension; -import java.awt.Point; +import java.awt.*; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/codechicken/nei/config/GuiItemIconDumper.java b/src/main/java/codechicken/nei/config/GuiItemIconDumper.java index b3ad024a..93c13363 100644 --- a/src/main/java/codechicken/nei/config/GuiItemIconDumper.java +++ b/src/main/java/codechicken/nei/config/GuiItemIconDumper.java @@ -1,6 +1,6 @@ package codechicken.nei.config; -import java.awt.Dimension; +import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; diff --git a/src/main/java/codechicken/nei/config/GuiItemSorter.java b/src/main/java/codechicken/nei/config/GuiItemSorter.java index 8c31555d..635055e6 100644 --- a/src/main/java/codechicken/nei/config/GuiItemSorter.java +++ b/src/main/java/codechicken/nei/config/GuiItemSorter.java @@ -3,7 +3,7 @@ package codechicken.nei.config; import static codechicken.lib.gui.GuiDraw.drawStringC; import static codechicken.lib.gui.GuiDraw.getMousePosition; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/codechicken/nei/config/GuiOptionList.java b/src/main/java/codechicken/nei/config/GuiOptionList.java index b9d90b0e..34468f6e 100644 --- a/src/main/java/codechicken/nei/config/GuiOptionList.java +++ b/src/main/java/codechicken/nei/config/GuiOptionList.java @@ -6,9 +6,7 @@ import static codechicken.lib.gui.GuiDraw.fontRenderer; import static codechicken.lib.gui.GuiDraw.getMousePosition; import static net.minecraft.util.StatCollector.translateToLocal; -import java.awt.Dimension; -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/main/java/codechicken/nei/config/GuiOptionPane.java b/src/main/java/codechicken/nei/config/GuiOptionPane.java index b1fca939..ca467b58 100644 --- a/src/main/java/codechicken/nei/config/GuiOptionPane.java +++ b/src/main/java/codechicken/nei/config/GuiOptionPane.java @@ -5,8 +5,7 @@ import static codechicken.lib.gui.GuiDraw.fontRenderer; import static codechicken.lib.gui.GuiDraw.getMousePosition; import static net.minecraft.util.StatCollector.translateToLocal; -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/codechicken/nei/config/GuiPanelSettings.java b/src/main/java/codechicken/nei/config/GuiPanelSettings.java index 3f11d5b5..f534514b 100644 --- a/src/main/java/codechicken/nei/config/GuiPanelSettings.java +++ b/src/main/java/codechicken/nei/config/GuiPanelSettings.java @@ -2,7 +2,7 @@ package codechicken.nei.config; import static codechicken.lib.gui.GuiDraw.getMousePosition; -import java.awt.Point; +import java.awt.*; import java.util.ArrayList; import net.minecraft.client.Minecraft; diff --git a/src/main/java/codechicken/nei/config/OptionButton.java b/src/main/java/codechicken/nei/config/OptionButton.java index 46b4bc8b..89f06798 100644 --- a/src/main/java/codechicken/nei/config/OptionButton.java +++ b/src/main/java/codechicken/nei/config/OptionButton.java @@ -5,7 +5,7 @@ import static codechicken.lib.gui.GuiDraw.drawString; import static codechicken.lib.gui.GuiDraw.drawStringC; import static codechicken.lib.gui.GuiDraw.getStringWidth; -import java.awt.Rectangle; +import java.awt.*; import java.util.List; import net.minecraft.client.Minecraft; diff --git a/src/main/java/codechicken/nei/config/OptionKeyBind.java b/src/main/java/codechicken/nei/config/OptionKeyBind.java index 04387626..3e93d983 100644 --- a/src/main/java/codechicken/nei/config/OptionKeyBind.java +++ b/src/main/java/codechicken/nei/config/OptionKeyBind.java @@ -3,7 +3,7 @@ package codechicken.nei.config; import static codechicken.lib.gui.GuiDraw.drawRect; import static codechicken.lib.gui.GuiDraw.drawStringC; -import java.awt.Rectangle; +import java.awt.*; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java b/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java index 370af29f..0ba7007e 100644 --- a/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java +++ b/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java @@ -1,6 +1,6 @@ package codechicken.nei.config; -import java.awt.Rectangle; +import java.awt.*; import codechicken.nei.Image; import codechicken.nei.LayoutManager; diff --git a/src/main/java/codechicken/nei/guihook/HideousLinkedList.java b/src/main/java/codechicken/nei/guihook/HideousLinkedList.java index 0a4abf1c..d70538ab 100644 --- a/src/main/java/codechicken/nei/guihook/HideousLinkedList.java +++ b/src/main/java/codechicken/nei/guihook/HideousLinkedList.java @@ -1,6 +1,13 @@ package codechicken.nei.guihook; -import java.util.*; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.ListIterator; +import java.util.NoSuchElementException; +import java.util.Spliterator; import java.util.function.Consumer; import java.util.function.Predicate; import java.util.function.UnaryOperator; diff --git a/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java b/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java index 2153f378..9fb66e59 100644 --- a/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java @@ -2,7 +2,7 @@ package codechicken.nei.recipe; import static net.minecraft.init.Items.potionitem; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java b/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java index ff03bbd2..fd9805e9 100644 --- a/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java @@ -1,7 +1,6 @@ package codechicken.nei.recipe; -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; diff --git a/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java b/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java index 4ffb9881..fce00f82 100644 --- a/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java @@ -1,6 +1,6 @@ package codechicken.nei.recipe; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java b/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java index 83b90db8..12206d49 100644 --- a/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java @@ -2,7 +2,7 @@ package codechicken.nei.recipe; import static codechicken.lib.gui.GuiDraw.getMousePosition; -import java.awt.Point; +import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java index eb0f6f8f..c886635b 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java @@ -2,8 +2,7 @@ package codechicken.nei.recipe; import static codechicken.lib.gui.GuiDraw.fontRenderer; -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java b/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java index 7cff4a68..a3d0d5cd 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java @@ -10,7 +10,10 @@ import java.net.URL; import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.channels.ReadableByteChannel; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java b/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java index 73b41f07..7a900c1c 100644 --- a/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java @@ -1,6 +1,6 @@ package codechicken.nei.recipe; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java index c9b8c599..75d07a8f 100644 --- a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java @@ -4,8 +4,7 @@ import static codechicken.lib.gui.GuiDraw.changeTexture; import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; import static codechicken.lib.gui.GuiDraw.getMousePosition; -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap;