diff --git a/src/main/java/codechicken/nei/BookmarkContainerInfo.java b/src/main/java/codechicken/nei/BookmarkContainerInfo.java index 7b7a82ef..504c5035 100644 --- a/src/main/java/codechicken/nei/BookmarkContainerInfo.java +++ b/src/main/java/codechicken/nei/BookmarkContainerInfo.java @@ -1,12 +1,11 @@ package codechicken.nei; -import java.util.HashMap; - -import net.minecraft.client.gui.inventory.GuiChest; -import net.minecraft.client.gui.inventory.GuiContainer; - import codechicken.nei.api.API; import codechicken.nei.api.IBookmarkContainerHandler; +import net.minecraft.client.gui.inventory.GuiChest; +import net.minecraft.client.gui.inventory.GuiContainer; + +import java.util.HashMap; public class BookmarkContainerInfo { diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index 399068a5..9bd28daf 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -1,11 +1,28 @@ package codechicken.nei; -import static codechicken.lib.gui.GuiDraw.drawRect; -import static codechicken.lib.gui.GuiDraw.getMousePosition; -import static codechicken.nei.NEIClientUtils.getGuiContainer; -import static codechicken.nei.NEIClientUtils.translate; +import codechicken.core.CommonUtils; +import codechicken.lib.vec.Rectangle4i; +import codechicken.nei.ItemPanel.ItemPanelSlot; +import codechicken.nei.api.IBookmarkContainerHandler; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.recipe.BookmarkRecipeId; +import codechicken.nei.recipe.StackInfo; +import codechicken.nei.util.NBTJson; +import codechicken.nei.util.ReadableNumberConverter; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSyntaxException; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import org.apache.commons.io.IOUtils; +import org.lwjgl.opengl.GL11; + +import javax.annotation.Nullable; +import java.awt.Point; -import java.awt.*; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -19,30 +36,10 @@ import java.util.List; import java.util.Map; import java.util.WeakHashMap; -import javax.annotation.Nullable; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import org.apache.commons.io.IOUtils; -import org.lwjgl.opengl.GL11; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSyntaxException; - -import codechicken.core.CommonUtils; -import codechicken.lib.vec.Rectangle4i; -import codechicken.nei.ItemPanel.ItemPanelSlot; -import codechicken.nei.api.IBookmarkContainerHandler; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.recipe.BookmarkRecipeId; -import codechicken.nei.recipe.StackInfo; -import codechicken.nei.util.NBTJson; -import codechicken.nei.util.ReadableNumberConverter; +import static codechicken.lib.gui.GuiDraw.drawRect; +import static codechicken.lib.gui.GuiDraw.getMousePosition; +import static codechicken.nei.NEIClientUtils.getGuiContainer; +import static codechicken.nei.NEIClientUtils.translate; public class BookmarkPanel extends PanelWidget { diff --git a/src/main/java/codechicken/nei/Button.java b/src/main/java/codechicken/nei/Button.java index d4af7908..a54a5134 100644 --- a/src/main/java/codechicken/nei/Button.java +++ b/src/main/java/codechicken/nei/Button.java @@ -1,9 +1,9 @@ package codechicken.nei; -import static codechicken.lib.gui.GuiDraw.getStringWidth; - import java.util.List; +import static codechicken.lib.gui.GuiDraw.getStringWidth; + public abstract class Button extends Widget { public Button(String s) { diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index aebd60e0..56c5c4a4 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -1,5 +1,36 @@ package codechicken.nei; +import codechicken.core.ClientUtils; +import codechicken.core.GuiModListScroll; +import codechicken.lib.packet.PacketCustom; +import codechicken.nei.api.API; +import codechicken.nei.api.ItemInfo; +import codechicken.nei.recipe.GuiRecipeTab; +import codechicken.nei.recipe.StackInfo; +import com.google.common.collect.Lists; +import cpw.mods.fml.client.CustomModLoadingErrorDisplayException; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiErrorScreen; +import net.minecraft.client.gui.GuiMainMenu; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiSelectWorld; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.world.World; +import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.common.MinecraftForge; +import org.apache.commons.csv.CSVFormat; +import org.apache.commons.csv.CSVParser; +import org.apache.commons.csv.CSVRecord; +import org.apache.commons.io.IOUtils; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -15,40 +46,6 @@ import java.util.List; import java.util.regex.Pattern; import java.util.stream.Collectors; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiErrorScreen; -import net.minecraft.client.gui.GuiMainMenu; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.GuiSelectWorld; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderWorldLastEvent; -import net.minecraftforge.common.MinecraftForge; - -import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVParser; -import org.apache.commons.csv.CSVRecord; -import org.apache.commons.io.IOUtils; - -import com.google.common.collect.Lists; - -import codechicken.core.ClientUtils; -import codechicken.core.GuiModListScroll; -import codechicken.lib.packet.PacketCustom; -import codechicken.nei.api.API; -import codechicken.nei.api.ItemInfo; -import codechicken.nei.recipe.GuiRecipeTab; -import codechicken.nei.recipe.StackInfo; -import cpw.mods.fml.client.CustomModLoadingErrorDisplayException; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; - public class ClientHandler { private static String[] defaultHandlerOrdering = { diff --git a/src/main/java/codechicken/nei/ContainerCreativeInv.java b/src/main/java/codechicken/nei/ContainerCreativeInv.java index 44ab51be..17bc4a75 100644 --- a/src/main/java/codechicken/nei/ContainerCreativeInv.java +++ b/src/main/java/codechicken/nei/ContainerCreativeInv.java @@ -1,5 +1,7 @@ package codechicken.nei; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -9,9 +11,6 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class ContainerCreativeInv extends Container { private class SlotArmor extends Slot { diff --git a/src/main/java/codechicken/nei/ContainerEnchantmentModifier.java b/src/main/java/codechicken/nei/ContainerEnchantmentModifier.java index b7823a97..dcbe0f36 100644 --- a/src/main/java/codechicken/nei/ContainerEnchantmentModifier.java +++ b/src/main/java/codechicken/nei/ContainerEnchantmentModifier.java @@ -1,7 +1,6 @@ package codechicken.nei; -import java.util.ArrayList; - +import codechicken.lib.render.CCRenderState; import net.minecraft.client.gui.Gui; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; @@ -13,10 +12,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; -import codechicken.lib.render.CCRenderState; +import java.util.ArrayList; /** * This is crap code, don't ever do this. diff --git a/src/main/java/codechicken/nei/ContainerPotionCreator.java b/src/main/java/codechicken/nei/ContainerPotionCreator.java index 3f7afd0b..efd387c6 100644 --- a/src/main/java/codechicken/nei/ContainerPotionCreator.java +++ b/src/main/java/codechicken/nei/ContainerPotionCreator.java @@ -1,5 +1,10 @@ package codechicken.nei; +import codechicken.lib.inventory.ContainerExtended; +import codechicken.lib.inventory.InventoryNBT; +import codechicken.lib.inventory.InventoryUtils; +import codechicken.lib.inventory.SlotHandleClicks; +import codechicken.lib.packet.PacketCustom; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -11,12 +16,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.potion.PotionEffect; -import codechicken.lib.inventory.ContainerExtended; -import codechicken.lib.inventory.InventoryNBT; -import codechicken.lib.inventory.InventoryUtils; -import codechicken.lib.inventory.SlotHandleClicks; -import codechicken.lib.packet.PacketCustom; - public class ContainerPotionCreator extends ContainerExtended { public class SlotPotion extends Slot { diff --git a/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java b/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java index 9f97f1e5..eb36d540 100644 --- a/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java +++ b/src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java @@ -1,12 +1,11 @@ package codechicken.nei; -import java.util.ArrayList; -import java.util.LinkedList; - +import codechicken.nei.api.IBookmarkContainerHandler; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import codechicken.nei.api.IBookmarkContainerHandler; +import java.util.ArrayList; +import java.util.LinkedList; public class DefaultBookmarkContainerHandler implements IBookmarkContainerHandler { diff --git a/src/main/java/codechicken/nei/DefaultHighlightHandler.java b/src/main/java/codechicken/nei/DefaultHighlightHandler.java index f24a7378..d51299ca 100644 --- a/src/main/java/codechicken/nei/DefaultHighlightHandler.java +++ b/src/main/java/codechicken/nei/DefaultHighlightHandler.java @@ -1,16 +1,15 @@ package codechicken.nei; -import java.util.List; - +import codechicken.nei.api.IHighlightHandler; +import codechicken.nei.api.ItemInfo; +import codechicken.nei.guihook.GuiContainerManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import codechicken.nei.api.IHighlightHandler; -import codechicken.nei.api.ItemInfo; -import codechicken.nei.guihook.GuiContainerManager; +import java.util.List; public class DefaultHighlightHandler implements IHighlightHandler { diff --git a/src/main/java/codechicken/nei/DoubleFilteredFilter.java b/src/main/java/codechicken/nei/DoubleFilteredFilter.java index 6663f02d..bc3208db 100644 --- a/src/main/java/codechicken/nei/DoubleFilteredFilter.java +++ b/src/main/java/codechicken/nei/DoubleFilteredFilter.java @@ -1,8 +1,7 @@ package codechicken.nei; -import net.minecraft.item.ItemStack; - import codechicken.nei.api.ItemFilter; +import net.minecraft.item.ItemStack; public class DoubleFilteredFilter implements ItemFilter { diff --git a/src/main/java/codechicken/nei/ExtendedCreativeInv.java b/src/main/java/codechicken/nei/ExtendedCreativeInv.java index 588158d0..08469057 100644 --- a/src/main/java/codechicken/nei/ExtendedCreativeInv.java +++ b/src/main/java/codechicken/nei/ExtendedCreativeInv.java @@ -1,11 +1,10 @@ package codechicken.nei; +import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import cpw.mods.fml.relauncher.Side; - public class ExtendedCreativeInv implements IInventory { final PlayerSave playerSave; diff --git a/src/main/java/codechicken/nei/FastTransferManager.java b/src/main/java/codechicken/nei/FastTransferManager.java index 79d8cfa5..6ee5e7b1 100644 --- a/src/main/java/codechicken/nei/FastTransferManager.java +++ b/src/main/java/codechicken/nei/FastTransferManager.java @@ -1,20 +1,19 @@ package codechicken.nei; -import static codechicken.nei.NEIServerUtils.areStacksIdentical; -import static codechicken.nei.NEIServerUtils.areStacksSameType; -import static codechicken.nei.NEIServerUtils.copyStack; +import codechicken.nei.guihook.GuiContainerManager; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import codechicken.nei.guihook.GuiContainerManager; +import static codechicken.nei.NEIServerUtils.areStacksIdentical; +import static codechicken.nei.NEIServerUtils.areStacksSameType; +import static codechicken.nei.NEIServerUtils.copyStack; public class FastTransferManager { diff --git a/src/main/java/codechicken/nei/GuiEnchantmentModifier.java b/src/main/java/codechicken/nei/GuiEnchantmentModifier.java index cf9c429f..535d3d7e 100644 --- a/src/main/java/codechicken/nei/GuiEnchantmentModifier.java +++ b/src/main/java/codechicken/nei/GuiEnchantmentModifier.java @@ -1,16 +1,14 @@ package codechicken.nei; -import static codechicken.nei.NEIClientUtils.translate; - +import codechicken.lib.render.CCRenderState; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.world.World; - import org.lwjgl.opengl.GL11; -import codechicken.lib.render.CCRenderState; +import static codechicken.nei.NEIClientUtils.translate; public class GuiEnchantmentModifier extends GuiContainer { diff --git a/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java b/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java index 5f76fb4f..c069a69a 100644 --- a/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java +++ b/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java @@ -1,19 +1,17 @@ package codechicken.nei; -import java.util.Collections; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - import codechicken.lib.render.CCRenderState; import codechicken.lib.vec.Rectangle4i; import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import org.lwjgl.opengl.GL11; + +import java.util.Collections; +import java.util.List; public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler { diff --git a/src/main/java/codechicken/nei/GuiNEIButton.java b/src/main/java/codechicken/nei/GuiNEIButton.java index 962f5720..a6f146e1 100644 --- a/src/main/java/codechicken/nei/GuiNEIButton.java +++ b/src/main/java/codechicken/nei/GuiNEIButton.java @@ -4,7 +4,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; - import org.lwjgl.opengl.GL11; public class GuiNEIButton extends GuiButton { diff --git a/src/main/java/codechicken/nei/GuiPotionCreator.java b/src/main/java/codechicken/nei/GuiPotionCreator.java index 2a6e1b4b..e8993ba7 100644 --- a/src/main/java/codechicken/nei/GuiPotionCreator.java +++ b/src/main/java/codechicken/nei/GuiPotionCreator.java @@ -1,25 +1,24 @@ package codechicken.nei; -import static codechicken.nei.NEIClientUtils.translate; - -import java.awt.*; -import java.util.ArrayList; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; - import codechicken.core.gui.GuiCCButton; import codechicken.core.gui.GuiCCTextField; import codechicken.core.gui.GuiScrollSlot; import codechicken.core.inventory.GuiContainerWidget; import codechicken.lib.render.CCRenderState; import codechicken.lib.render.FontUtils; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.StatCollector; +import org.lwjgl.opengl.GL11; +import java.awt.Dimension; + + +import java.util.ArrayList; + +import static codechicken.nei.NEIClientUtils.translate; public class GuiPotionCreator extends GuiContainerWidget { diff --git a/src/main/java/codechicken/nei/HUDRenderer.java b/src/main/java/codechicken/nei/HUDRenderer.java index 05481db4..9e8c794a 100644 --- a/src/main/java/codechicken/nei/HUDRenderer.java +++ b/src/main/java/codechicken/nei/HUDRenderer.java @@ -1,27 +1,27 @@ package codechicken.nei; -import static codechicken.lib.gui.GuiDraw.displaySize; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawTooltipBox; -import static codechicken.lib.gui.GuiDraw.getStringWidth; - -import java.awt.*; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; -import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import codechicken.lib.config.ConfigTag; import codechicken.nei.KeyManager.IKeyStateTracker; import codechicken.nei.api.ItemInfo; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.recipe.StackInfo; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; +import java.awt.Dimension; +import java.awt.Point; + + +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.displaySize; +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawTooltipBox; +import static codechicken.lib.gui.GuiDraw.getStringWidth; public class HUDRenderer implements IKeyStateTracker { diff --git a/src/main/java/codechicken/nei/InfiniteStackSizeHandler.java b/src/main/java/codechicken/nei/InfiniteStackSizeHandler.java index dc957a02..fdb5c87d 100644 --- a/src/main/java/codechicken/nei/InfiniteStackSizeHandler.java +++ b/src/main/java/codechicken/nei/InfiniteStackSizeHandler.java @@ -1,10 +1,9 @@ package codechicken.nei; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - import codechicken.lib.inventory.InventoryUtils; import codechicken.nei.api.IInfiniteItemHandler; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; public class InfiniteStackSizeHandler implements IInfiniteItemHandler { diff --git a/src/main/java/codechicken/nei/InfiniteToolHandler.java b/src/main/java/codechicken/nei/InfiniteToolHandler.java index 5899e40f..5af9eaab 100644 --- a/src/main/java/codechicken/nei/InfiniteToolHandler.java +++ b/src/main/java/codechicken/nei/InfiniteToolHandler.java @@ -1,10 +1,9 @@ package codechicken.nei; +import codechicken.nei.api.IInfiniteItemHandler; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import codechicken.nei.api.IInfiniteItemHandler; - public class InfiniteToolHandler implements IInfiniteItemHandler { @Override diff --git a/src/main/java/codechicken/nei/ItemList.java b/src/main/java/codechicken/nei/ItemList.java index 8ca7c97a..64f259a0 100644 --- a/src/main/java/codechicken/nei/ItemList.java +++ b/src/main/java/codechicken/nei/ItemList.java @@ -1,5 +1,16 @@ package codechicken.nei; +import codechicken.nei.ThreadOperationTimer.TimeoutException; +import codechicken.nei.api.ItemFilter; +import codechicken.nei.api.ItemFilter.ItemFilterProvider; +import codechicken.nei.api.ItemInfo; +import codechicken.nei.guihook.GuiContainerManager; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -9,19 +20,6 @@ import java.util.concurrent.ForkJoinPool; import java.util.regex.Pattern; import java.util.stream.Collectors; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ListMultimap; - -import codechicken.nei.ThreadOperationTimer.TimeoutException; -import codechicken.nei.api.ItemFilter; -import codechicken.nei.api.ItemFilter.ItemFilterProvider; -import codechicken.nei.api.ItemInfo; -import codechicken.nei.guihook.GuiContainerManager; - public class ItemList { /** diff --git a/src/main/java/codechicken/nei/ItemMobSpawner.java b/src/main/java/codechicken/nei/ItemMobSpawner.java index 23f86dc5..3fbfa208 100644 --- a/src/main/java/codechicken/nei/ItemMobSpawner.java +++ b/src/main/java/codechicken/nei/ItemMobSpawner.java @@ -1,9 +1,5 @@ package codechicken.nei; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -20,6 +16,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class ItemMobSpawner extends ItemBlock { private static final Map entityHashMap = new HashMap<>(); diff --git a/src/main/java/codechicken/nei/ItemPanel.java b/src/main/java/codechicken/nei/ItemPanel.java index 255cc9ed..e76660fd 100644 --- a/src/main/java/codechicken/nei/ItemPanel.java +++ b/src/main/java/codechicken/nei/ItemPanel.java @@ -1,15 +1,13 @@ package codechicken.nei; -import static codechicken.lib.gui.GuiDraw.drawRect; - -import java.util.ArrayList; - -import javax.annotation.Nullable; - +import codechicken.lib.vec.Rectangle4i; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import codechicken.lib.vec.Rectangle4i; +import javax.annotation.Nullable; +import java.util.ArrayList; + +import static codechicken.lib.gui.GuiDraw.drawRect; public class ItemPanel extends PanelWidget { diff --git a/src/main/java/codechicken/nei/ItemSorter.java b/src/main/java/codechicken/nei/ItemSorter.java index 8d1633ef..f662d9e5 100644 --- a/src/main/java/codechicken/nei/ItemSorter.java +++ b/src/main/java/codechicken/nei/ItemSorter.java @@ -1,20 +1,19 @@ package codechicken.nei; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - import codechicken.lib.config.ConfigTagParent; import codechicken.nei.ItemList.ItemsLoadedCallback; import codechicken.nei.api.API; import codechicken.nei.api.ItemInfo; import codechicken.nei.config.GuiItemSorter; import codechicken.nei.config.OptionOpenGui; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; public class ItemSorter implements Comparator, ItemsLoadedCallback { diff --git a/src/main/java/codechicken/nei/ItemStackMap.java b/src/main/java/codechicken/nei/ItemStackMap.java index 8827982e..0cf02a1b 100644 --- a/src/main/java/codechicken/nei/ItemStackMap.java +++ b/src/main/java/codechicken/nei/ItemStackMap.java @@ -1,19 +1,18 @@ package codechicken.nei; -import static codechicken.lib.inventory.InventoryUtils.actualDamage; -import static codechicken.lib.inventory.InventoryUtils.newItemStack; -import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE; +import com.google.common.base.Objects; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import com.google.common.base.Objects; +import static codechicken.lib.inventory.InventoryUtils.actualDamage; +import static codechicken.lib.inventory.InventoryUtils.newItemStack; +import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE; /** * A maplike class for ItemStack keys with wildcard damage/NBT. Optimised for lookup diff --git a/src/main/java/codechicken/nei/ItemStackSet.java b/src/main/java/codechicken/nei/ItemStackSet.java index 31c0543c..38f6bef8 100644 --- a/src/main/java/codechicken/nei/ItemStackSet.java +++ b/src/main/java/codechicken/nei/ItemStackSet.java @@ -1,11 +1,10 @@ package codechicken.nei; +import codechicken.nei.api.ItemFilter; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import codechicken.nei.api.ItemFilter; - public class ItemStackSet extends ItemStackMap implements ItemFilter { public ItemStackSet with(ItemStack... items) { diff --git a/src/main/java/codechicken/nei/ItemsGrid.java b/src/main/java/codechicken/nei/ItemsGrid.java index d3d3c34f..d8f4bfde 100644 --- a/src/main/java/codechicken/nei/ItemsGrid.java +++ b/src/main/java/codechicken/nei/ItemsGrid.java @@ -1,16 +1,13 @@ package codechicken.nei; -import static codechicken.lib.gui.GuiDraw.drawRect; -import static codechicken.lib.gui.GuiDraw.getMousePosition; - -import java.awt.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nullable; - +import codechicken.lib.vec.Rectangle4i; +import codechicken.nei.ItemPanel.ItemPanelSlot; +import codechicken.nei.api.GuiInfo; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.recipe.BookmarkRecipeId; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.StackInfo; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.ScaledResolution; @@ -21,18 +18,19 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.shader.Framebuffer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import java.awt.Point; -import codechicken.lib.vec.Rectangle4i; -import codechicken.nei.ItemPanel.ItemPanelSlot; -import codechicken.nei.api.GuiInfo; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.recipe.BookmarkRecipeId; -import codechicken.nei.recipe.GuiCraftingRecipe; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.StackInfo; +import javax.annotation.Nullable; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.drawRect; +import static codechicken.lib.gui.GuiDraw.getMousePosition; public class ItemsGrid { diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java index 7201c20d..baf2545f 100644 --- a/src/main/java/codechicken/nei/LayoutManager.java +++ b/src/main/java/codechicken/nei/LayoutManager.java @@ -1,5 +1,37 @@ package codechicken.nei; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.KeyManager.IKeyStateTracker; +import codechicken.nei.api.API; +import codechicken.nei.api.GuiInfo; +import codechicken.nei.api.IRecipeOverlayRenderer; +import codechicken.nei.api.ItemInfo; +import codechicken.nei.api.LayoutStyle; +import codechicken.nei.drawable.DrawableBuilder; +import codechicken.nei.drawable.DrawableResource; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.guihook.IContainerDrawHandler; +import codechicken.nei.guihook.IContainerInputHandler; +import codechicken.nei.guihook.IContainerObjectHandler; +import codechicken.nei.guihook.IContainerTooltipHandler; +import codechicken.nei.recipe.GuiRecipeTab; +import codechicken.nei.recipe.RecipeCatalysts; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.inventory.GuiContainerCreative; +import net.minecraft.client.renderer.InventoryEffectRenderer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import java.util.HashMap; +import java.util.List; +import java.util.TreeSet; + import static codechicken.lib.gui.GuiDraw.changeTexture; import static codechicken.lib.gui.GuiDraw.drawRect; import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; @@ -32,40 +64,6 @@ import static codechicken.nei.NEIClientUtils.toggleMagnetMode; import static codechicken.nei.NEIClientUtils.toggleRaining; import static codechicken.nei.NEIClientUtils.translate; -import java.util.HashMap; -import java.util.List; -import java.util.TreeSet; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiContainerCreative; -import net.minecraft.client.renderer.InventoryEffectRenderer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.KeyManager.IKeyStateTracker; -import codechicken.nei.api.API; -import codechicken.nei.api.GuiInfo; -import codechicken.nei.api.IRecipeOverlayRenderer; -import codechicken.nei.api.ItemInfo; -import codechicken.nei.api.LayoutStyle; -import codechicken.nei.drawable.DrawableBuilder; -import codechicken.nei.drawable.DrawableResource; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerDrawHandler; -import codechicken.nei.guihook.IContainerInputHandler; -import codechicken.nei.guihook.IContainerObjectHandler; -import codechicken.nei.guihook.IContainerTooltipHandler; -import codechicken.nei.recipe.GuiRecipeTab; -import codechicken.nei.recipe.RecipeCatalysts; - public class LayoutManager implements IContainerInputHandler, IContainerTooltipHandler, IContainerDrawHandler, IContainerObjectHandler, IKeyStateTracker { diff --git a/src/main/java/codechicken/nei/LayoutStyleMinecraft.java b/src/main/java/codechicken/nei/LayoutStyleMinecraft.java index f1177591..1f87dc66 100644 --- a/src/main/java/codechicken/nei/LayoutStyleMinecraft.java +++ b/src/main/java/codechicken/nei/LayoutStyleMinecraft.java @@ -1,5 +1,10 @@ package codechicken.nei; +import codechicken.nei.api.LayoutStyle; +import codechicken.nei.drawable.DrawableBuilder; +import net.minecraft.client.gui.inventory.GuiContainer; +import org.lwjgl.opengl.GL11; + import static codechicken.lib.gui.GuiDraw.drawStringC; import static codechicken.nei.LayoutManager.bookmarkPanel; import static codechicken.nei.LayoutManager.bookmarksButton; @@ -20,13 +25,6 @@ import static codechicken.nei.NEIClientConfig.disabledActions; import static codechicken.nei.NEIClientConfig.getMagnetMode; import static codechicken.nei.NEIClientConfig.isEnabled; -import net.minecraft.client.gui.inventory.GuiContainer; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.api.LayoutStyle; -import codechicken.nei.drawable.DrawableBuilder; - public class LayoutStyleMinecraft extends LayoutStyle { public int buttonCount; diff --git a/src/main/java/codechicken/nei/NEICPH.java b/src/main/java/codechicken/nei/NEICPH.java index 170cfa7b..22e56431 100644 --- a/src/main/java/codechicken/nei/NEICPH.java +++ b/src/main/java/codechicken/nei/NEICPH.java @@ -1,8 +1,10 @@ package codechicken.nei; -import static codechicken.nei.PacketIDs.C2S; -import static codechicken.nei.PacketIDs.S2C; - +import codechicken.core.ClientUtils; +import codechicken.lib.inventory.InventoryUtils; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.packet.PacketCustom.IClientPacketHandler; +import cpw.mods.fml.relauncher.Side; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.item.ItemStack; @@ -10,11 +12,8 @@ import net.minecraft.network.play.INetHandlerPlayClient; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; -import codechicken.core.ClientUtils; -import codechicken.lib.inventory.InventoryUtils; -import codechicken.lib.packet.PacketCustom; -import codechicken.lib.packet.PacketCustom.IClientPacketHandler; -import cpw.mods.fml.relauncher.Side; +import static codechicken.nei.PacketIDs.C2S; +import static codechicken.nei.PacketIDs.S2C; public class NEICPH implements IClientPacketHandler { diff --git a/src/main/java/codechicken/nei/NEIChestGuiHandler.java b/src/main/java/codechicken/nei/NEIChestGuiHandler.java index b924db08..9776796a 100644 --- a/src/main/java/codechicken/nei/NEIChestGuiHandler.java +++ b/src/main/java/codechicken/nei/NEIChestGuiHandler.java @@ -1,15 +1,14 @@ package codechicken.nei; -import java.util.Collections; -import java.util.List; - +import codechicken.nei.api.INEIGuiAdapter; +import codechicken.nei.api.TaggedInventoryArea; import net.minecraft.client.gui.inventory.GuiChest; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.ContainerChest; import net.minecraft.item.ItemStack; -import codechicken.nei.api.INEIGuiAdapter; -import codechicken.nei.api.TaggedInventoryArea; +import java.util.Collections; +import java.util.List; public class NEIChestGuiHandler extends INEIGuiAdapter { diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java index 34bd9f10..1c563355 100644 --- a/src/main/java/codechicken/nei/NEIClientConfig.java +++ b/src/main/java/codechicken/nei/NEIClientConfig.java @@ -1,28 +1,5 @@ package codechicken.nei; -import java.io.File; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.function.Function; -import java.util.regex.Pattern; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraft.world.storage.SaveFormatComparator; -import net.minecraftforge.common.MinecraftForge; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.lwjgl.input.Keyboard; - -import com.google.common.base.Objects; - import codechicken.core.CCUpdateChecker; import codechicken.core.ClassDiscoverer; import codechicken.core.ClientUtils; @@ -54,6 +31,26 @@ import codechicken.nei.recipe.IRecipeHandler; import codechicken.nei.recipe.RecipeCatalysts; import codechicken.nei.recipe.RecipeInfo; import codechicken.obfuscator.ObfuscationRun; +import com.google.common.base.Objects; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraft.world.storage.SaveFormatComparator; +import net.minecraftforge.common.MinecraftForge; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.lwjgl.input.Keyboard; + +import java.io.File; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.function.Function; +import java.util.regex.Pattern; public class NEIClientConfig { diff --git a/src/main/java/codechicken/nei/NEIClientUtils.java b/src/main/java/codechicken/nei/NEIClientUtils.java index 5af02ff9..7e2a592b 100644 --- a/src/main/java/codechicken/nei/NEIClientUtils.java +++ b/src/main/java/codechicken/nei/NEIClientUtils.java @@ -1,12 +1,26 @@ package codechicken.nei; -import static codechicken.nei.NEIClientConfig.canCheatItem; -import static codechicken.nei.NEIClientConfig.canPerformAction; -import static codechicken.nei.NEIClientConfig.getStringArrSetting; -import static codechicken.nei.NEIClientConfig.getStringSetting; -import static codechicken.nei.NEIClientConfig.hasSMPCounterPart; -import static codechicken.nei.NEIClientConfig.invCreativeMode; -import static codechicken.nei.NEIClientConfig.world; +import codechicken.lib.inventory.InventoryRange; +import codechicken.lib.inventory.InventoryUtils; +import codechicken.lib.util.LangProxy; +import codechicken.nei.api.GuiInfo; +import codechicken.nei.api.IInfiniteItemHandler; +import codechicken.nei.api.ItemInfo; +import com.google.common.collect.Iterables; +import net.minecraft.client.Minecraft; +import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.input.Keyboard; import java.io.PrintWriter; import java.io.StringWriter; @@ -27,30 +41,13 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.input.Keyboard; - -import com.google.common.collect.Iterables; - -import codechicken.lib.inventory.InventoryRange; -import codechicken.lib.inventory.InventoryUtils; -import codechicken.lib.util.LangProxy; -import codechicken.nei.api.GuiInfo; -import codechicken.nei.api.IInfiniteItemHandler; -import codechicken.nei.api.ItemInfo; +import static codechicken.nei.NEIClientConfig.canCheatItem; +import static codechicken.nei.NEIClientConfig.canPerformAction; +import static codechicken.nei.NEIClientConfig.getStringArrSetting; +import static codechicken.nei.NEIClientConfig.getStringSetting; +import static codechicken.nei.NEIClientConfig.hasSMPCounterPart; +import static codechicken.nei.NEIClientConfig.invCreativeMode; +import static codechicken.nei.NEIClientConfig.world; public class NEIClientUtils extends NEIServerUtils { diff --git a/src/main/java/codechicken/nei/NEIController.java b/src/main/java/codechicken/nei/NEIController.java index fa2081e3..121556c1 100644 --- a/src/main/java/codechicken/nei/NEIController.java +++ b/src/main/java/codechicken/nei/NEIController.java @@ -1,17 +1,5 @@ package codechicken.nei; -import static codechicken.lib.gui.GuiDraw.getMousePosition; - -import java.awt.*; -import java.util.LinkedList; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiContainerCreative; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.inventory.SlotCrafting; -import net.minecraft.item.ItemStack; - import codechicken.nei.api.API; import codechicken.nei.api.GuiInfo; import codechicken.nei.api.IInfiniteItemHandler; @@ -21,6 +9,18 @@ import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; import codechicken.nei.guihook.IContainerSlotClickHandler; import codechicken.nei.recipe.GuiRecipe; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.inventory.GuiContainerCreative; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.inventory.SlotCrafting; +import net.minecraft.item.ItemStack; +import java.awt.Point; + + +import java.util.LinkedList; + +import static codechicken.lib.gui.GuiDraw.getMousePosition; public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler { diff --git a/src/main/java/codechicken/nei/NEICreativeGuiHandler.java b/src/main/java/codechicken/nei/NEICreativeGuiHandler.java index 40e0432a..ec0db1c3 100644 --- a/src/main/java/codechicken/nei/NEICreativeGuiHandler.java +++ b/src/main/java/codechicken/nei/NEICreativeGuiHandler.java @@ -1,11 +1,10 @@ package codechicken.nei; +import codechicken.nei.api.INEIGuiAdapter; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainerCreative; import net.minecraft.creativetab.CreativeTabs; -import codechicken.nei.api.INEIGuiAdapter; - public class NEICreativeGuiHandler extends INEIGuiAdapter { @Override diff --git a/src/main/java/codechicken/nei/NEIDummySlotHandler.java b/src/main/java/codechicken/nei/NEIDummySlotHandler.java index 0cfec373..a05e78a6 100644 --- a/src/main/java/codechicken/nei/NEIDummySlotHandler.java +++ b/src/main/java/codechicken/nei/NEIDummySlotHandler.java @@ -1,12 +1,11 @@ package codechicken.nei; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - import codechicken.lib.inventory.ContainerExtended; import codechicken.lib.inventory.SlotDummy; import codechicken.nei.api.INEIGuiAdapter; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class NEIDummySlotHandler extends INEIGuiAdapter { diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java index a5d7164c..897b7c70 100644 --- a/src/main/java/codechicken/nei/NEIModContainer.java +++ b/src/main/java/codechicken/nei/NEIModContainer.java @@ -1,23 +1,13 @@ package codechicken.nei; -import java.io.File; -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; - -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; - import codechicken.core.CommonUtils; import codechicken.core.launch.CodeChickenCorePlugin; import codechicken.nei.api.IConfigureNEI; import codechicken.nei.asm.NEICorePlugin; import codechicken.nei.config.IMCHandler; import codechicken.nei.recipe.GuiRecipeTab; +import com.google.common.eventbus.EventBus; +import com.google.common.eventbus.Subscribe; import cpw.mods.fml.client.FMLFileResourcePack; import cpw.mods.fml.client.FMLFolderResourcePack; import cpw.mods.fml.common.DummyModContainer; @@ -31,6 +21,14 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.VersionParser; import cpw.mods.fml.common.versioning.VersionRange; +import net.minecraft.util.EnumChatFormatting; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; public class NEIModContainer extends DummyModContainer { diff --git a/src/main/java/codechicken/nei/NEIPotionGuiHandler.java b/src/main/java/codechicken/nei/NEIPotionGuiHandler.java index bbce8874..b8bd4848 100644 --- a/src/main/java/codechicken/nei/NEIPotionGuiHandler.java +++ b/src/main/java/codechicken/nei/NEIPotionGuiHandler.java @@ -1,15 +1,14 @@ package codechicken.nei; -import java.util.Collection; - +import codechicken.lib.vec.Rectangle4i; +import codechicken.nei.api.INEIGuiAdapter; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.potion.PotionEffect; -import codechicken.lib.vec.Rectangle4i; -import codechicken.nei.api.INEIGuiAdapter; +import java.util.Collection; /** * Inspired by InventoryEffectRendererGuiHandler.java in JEI diff --git a/src/main/java/codechicken/nei/NEISPH.java b/src/main/java/codechicken/nei/NEISPH.java index 4b51d549..d3d84cd2 100644 --- a/src/main/java/codechicken/nei/NEISPH.java +++ b/src/main/java/codechicken/nei/NEISPH.java @@ -1,11 +1,12 @@ package codechicken.nei; -import static codechicken.nei.PacketIDs.C2S; -import static codechicken.nei.PacketIDs.S2C; - -import java.util.LinkedList; -import java.util.Set; - +import codechicken.core.CommonUtils; +import codechicken.core.ServerUtils; +import codechicken.lib.inventory.SlotDummy; +import codechicken.lib.packet.PacketCustom; +import codechicken.lib.packet.PacketCustom.IServerPacketHandler; +import codechicken.lib.vec.BlockCoord; +import cpw.mods.fml.relauncher.Side; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.InventoryBasic; @@ -16,13 +17,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.world.World; -import codechicken.core.CommonUtils; -import codechicken.core.ServerUtils; -import codechicken.lib.inventory.SlotDummy; -import codechicken.lib.packet.PacketCustom; -import codechicken.lib.packet.PacketCustom.IServerPacketHandler; -import codechicken.lib.vec.BlockCoord; -import cpw.mods.fml.relauncher.Side; +import java.util.LinkedList; +import java.util.Set; + +import static codechicken.nei.PacketIDs.C2S; +import static codechicken.nei.PacketIDs.S2C; public class NEISPH implements IServerPacketHandler { diff --git a/src/main/java/codechicken/nei/NEIServerConfig.java b/src/main/java/codechicken/nei/NEIServerConfig.java index 9e03dfae..7b670eff 100644 --- a/src/main/java/codechicken/nei/NEIServerConfig.java +++ b/src/main/java/codechicken/nei/NEIServerConfig.java @@ -1,5 +1,24 @@ package codechicken.nei; +import codechicken.core.CommonUtils; +import codechicken.core.ServerUtils; +import codechicken.lib.config.ConfigFile; +import codechicken.lib.inventory.InventoryUtils; +import codechicken.lib.packet.PacketCustom; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.JsonToNBT; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.io.File; import java.io.FileReader; import java.io.PrintWriter; @@ -12,27 +31,6 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.JsonToNBT; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import codechicken.core.CommonUtils; -import codechicken.core.ServerUtils; -import codechicken.lib.config.ConfigFile; -import codechicken.lib.inventory.InventoryUtils; -import codechicken.lib.packet.PacketCustom; - public class NEIServerConfig { private static MinecraftServer server; diff --git a/src/main/java/codechicken/nei/NEIServerUtils.java b/src/main/java/codechicken/nei/NEIServerUtils.java index 92c86e80..17dce3c1 100644 --- a/src/main/java/codechicken/nei/NEIServerUtils.java +++ b/src/main/java/codechicken/nei/NEIServerUtils.java @@ -1,17 +1,14 @@ package codechicken.nei; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.AbstractList; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.zip.ZipException; - +import codechicken.core.CommonUtils; +import codechicken.core.ServerUtils; +import codechicken.lib.inventory.InventoryRange; +import codechicken.lib.inventory.InventoryUtils; +import codechicken.lib.packet.PacketCustom; +import codechicken.nei.PacketIDs.S2C; +import codechicken.nei.util.NBTHelper; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.command.ICommandSender; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; @@ -34,18 +31,19 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.oredict.OreDictionary; - import org.apache.logging.log4j.Level; -import codechicken.core.CommonUtils; -import codechicken.core.ServerUtils; -import codechicken.lib.inventory.InventoryRange; -import codechicken.lib.inventory.InventoryUtils; -import codechicken.lib.packet.PacketCustom; -import codechicken.nei.PacketIDs.S2C; -import codechicken.nei.util.NBTHelper; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.registry.GameRegistry; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.zip.ZipException; public class NEIServerUtils { diff --git a/src/main/java/codechicken/nei/OffsetPositioner.java b/src/main/java/codechicken/nei/OffsetPositioner.java index 775a633c..a5e8fe52 100644 --- a/src/main/java/codechicken/nei/OffsetPositioner.java +++ b/src/main/java/codechicken/nei/OffsetPositioner.java @@ -1,9 +1,9 @@ package codechicken.nei; -import java.util.ArrayList; - import codechicken.nei.api.IStackPositioner; +import java.util.ArrayList; + public class OffsetPositioner implements IStackPositioner { public OffsetPositioner(int x, int y) { diff --git a/src/main/java/codechicken/nei/PanelWidget.java b/src/main/java/codechicken/nei/PanelWidget.java index f0a53c1a..a3c25451 100644 --- a/src/main/java/codechicken/nei/PanelWidget.java +++ b/src/main/java/codechicken/nei/PanelWidget.java @@ -1,11 +1,5 @@ package codechicken.nei; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - import codechicken.lib.vec.Rectangle4i; import codechicken.nei.ItemPanel.ItemPanelSlot; import codechicken.nei.api.GuiInfo; @@ -14,6 +8,11 @@ import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; + +import java.util.ArrayList; +import java.util.List; public abstract class PanelWidget extends Widget { diff --git a/src/main/java/codechicken/nei/PlayerSave.java b/src/main/java/codechicken/nei/PlayerSave.java index b92ff09e..139b2459 100644 --- a/src/main/java/codechicken/nei/PlayerSave.java +++ b/src/main/java/codechicken/nei/PlayerSave.java @@ -1,14 +1,13 @@ package codechicken.nei; -import java.io.File; - +import codechicken.core.ServerUtils; +import codechicken.lib.inventory.InventoryUtils; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import codechicken.core.ServerUtils; -import codechicken.lib.inventory.InventoryUtils; +import java.io.File; public class PlayerSave { diff --git a/src/main/java/codechicken/nei/PopupInputHandler.java b/src/main/java/codechicken/nei/PopupInputHandler.java index 7ea149ed..66cbf623 100644 --- a/src/main/java/codechicken/nei/PopupInputHandler.java +++ b/src/main/java/codechicken/nei/PopupInputHandler.java @@ -1,10 +1,9 @@ package codechicken.nei; -import static codechicken.nei.NEIClientConfig.canPerformAction; - +import codechicken.nei.guihook.IContainerInputHandler; import net.minecraft.client.gui.inventory.GuiContainer; -import codechicken.nei.guihook.IContainerInputHandler; +import static codechicken.nei.NEIClientConfig.canPerformAction; public class PopupInputHandler implements IContainerInputHandler { diff --git a/src/main/java/codechicken/nei/PositionedStack.java b/src/main/java/codechicken/nei/PositionedStack.java index af0b062f..b5f15537 100644 --- a/src/main/java/codechicken/nei/PositionedStack.java +++ b/src/main/java/codechicken/nei/PositionedStack.java @@ -1,13 +1,13 @@ package codechicken.nei; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.List; + /** * Simply an {@link ItemStack} with position. Mainly used in the recipe handlers. */ diff --git a/src/main/java/codechicken/nei/PresetsWidget.java b/src/main/java/codechicken/nei/PresetsWidget.java index 55265fd4..16766f85 100644 --- a/src/main/java/codechicken/nei/PresetsWidget.java +++ b/src/main/java/codechicken/nei/PresetsWidget.java @@ -1,6 +1,24 @@ package codechicken.nei; -import static codechicken.nei.NEIClientUtils.translate; +import codechicken.core.CommonUtils; +import codechicken.core.gui.GuiScrollSlot; +import codechicken.lib.gui.GuiDraw; +import codechicken.lib.vec.Rectangle4i; +import codechicken.nei.ItemPanel.ItemPanelSlot; +import codechicken.nei.api.ItemFilter; +import codechicken.nei.recipe.GuiRecipe; +import codechicken.nei.recipe.StackInfo; +import codechicken.nei.util.NBTJson; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSyntaxException; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.item.ItemStack; +import org.apache.commons.io.IOUtils; +import org.lwjgl.input.Keyboard; import java.io.File; import java.io.FileInputStream; @@ -14,28 +32,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.ItemStack; - -import org.apache.commons.io.IOUtils; -import org.lwjgl.input.Keyboard; - -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSyntaxException; - -import codechicken.core.CommonUtils; -import codechicken.core.gui.GuiScrollSlot; -import codechicken.lib.gui.GuiDraw; -import codechicken.lib.vec.Rectangle4i; -import codechicken.nei.ItemPanel.ItemPanelSlot; -import codechicken.nei.api.ItemFilter; -import codechicken.nei.recipe.GuiRecipe; -import codechicken.nei.recipe.StackInfo; -import codechicken.nei.util.NBTJson; -import cpw.mods.fml.common.registry.GameRegistry; +import static codechicken.nei.NEIClientUtils.translate; public class PresetsWidget extends Widget { diff --git a/src/main/java/codechicken/nei/SearchField.java b/src/main/java/codechicken/nei/SearchField.java index c929d40b..be06ab55 100644 --- a/src/main/java/codechicken/nei/SearchField.java +++ b/src/main/java/codechicken/nei/SearchField.java @@ -1,14 +1,5 @@ package codechicken.nei; -import static codechicken.nei.NEIClientConfig.world; - -import java.util.LinkedList; -import java.util.List; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; - -import net.minecraft.util.EnumChatFormatting; - import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList.AnyMultiItemFilter; import codechicken.nei.ItemList.EverythingItemFilter; @@ -17,6 +8,14 @@ import codechicken.nei.api.API; import codechicken.nei.api.ItemFilter; import codechicken.nei.api.ItemFilter.ItemFilterProvider; import codechicken.nei.util.TextHistory; +import net.minecraft.util.EnumChatFormatting; + +import java.util.LinkedList; +import java.util.List; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; + +import static codechicken.nei.NEIClientConfig.world; public class SearchField extends TextField implements ItemFilterProvider { diff --git a/src/main/java/codechicken/nei/ServerHandler.java b/src/main/java/codechicken/nei/ServerHandler.java index 1a10c793..30694f81 100644 --- a/src/main/java/codechicken/nei/ServerHandler.java +++ b/src/main/java/codechicken/nei/ServerHandler.java @@ -1,13 +1,5 @@ package codechicken.nei; -import java.util.List; - -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.world.WorldEvent; - import codechicken.core.CommonUtils; import codechicken.lib.packet.PacketCustom; import cpw.mods.fml.common.FMLCommonHandler; @@ -18,6 +10,13 @@ import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.world.WorldEvent; + +import java.util.List; public class ServerHandler { diff --git a/src/main/java/codechicken/nei/SpawnerRenderer.java b/src/main/java/codechicken/nei/SpawnerRenderer.java index 1bda171a..c3b50678 100644 --- a/src/main/java/codechicken/nei/SpawnerRenderer.java +++ b/src/main/java/codechicken/nei/SpawnerRenderer.java @@ -1,5 +1,7 @@ package codechicken.nei; +import codechicken.core.ClientUtils; +import codechicken.lib.render.CCRenderState; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -11,13 +13,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import codechicken.core.ClientUtils; -import codechicken.lib.render.CCRenderState; - public class SpawnerRenderer implements IItemRenderer { @Override diff --git a/src/main/java/codechicken/nei/SubsetWidget.java b/src/main/java/codechicken/nei/SubsetWidget.java index 9c12d463..4686ec80 100644 --- a/src/main/java/codechicken/nei/SubsetWidget.java +++ b/src/main/java/codechicken/nei/SubsetWidget.java @@ -1,27 +1,5 @@ package codechicken.nei; -import static codechicken.nei.NEIClientUtils.translate; - -import java.awt.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.regex.Pattern; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.EnumChatFormatting; - import codechicken.core.gui.GuiScrollSlot; import codechicken.lib.gui.GuiDraw; import codechicken.lib.vec.Rectangle4i; @@ -34,6 +12,28 @@ import codechicken.nei.api.ItemFilter; import codechicken.nei.api.ItemFilter.ItemFilterProvider; import codechicken.nei.api.ItemInfo; import codechicken.nei.guihook.GuiContainerManager; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.EnumChatFormatting; +import java.awt.Point; + + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.regex.Pattern; + +import static codechicken.nei.NEIClientUtils.translate; public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoadedCallback, ISearchProvider { diff --git a/src/main/java/codechicken/nei/TextField.java b/src/main/java/codechicken/nei/TextField.java index e7bc956b..9ae4fb83 100644 --- a/src/main/java/codechicken/nei/TextField.java +++ b/src/main/java/codechicken/nei/TextField.java @@ -2,7 +2,6 @@ package codechicken.nei; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; - import org.lwjgl.input.Keyboard; public abstract class TextField extends Widget { diff --git a/src/main/java/codechicken/nei/ThreadOperationTimer.java b/src/main/java/codechicken/nei/ThreadOperationTimer.java index 7727566b..e0e6979a 100644 --- a/src/main/java/codechicken/nei/ThreadOperationTimer.java +++ b/src/main/java/codechicken/nei/ThreadOperationTimer.java @@ -1,7 +1,6 @@ package codechicken.nei; import com.google.common.base.Objects; - import cpw.mods.fml.common.FMLCommonHandler; public class ThreadOperationTimer extends Thread { diff --git a/src/main/java/codechicken/nei/Widget.java b/src/main/java/codechicken/nei/Widget.java index 08967c3b..afb5970e 100644 --- a/src/main/java/codechicken/nei/Widget.java +++ b/src/main/java/codechicken/nei/Widget.java @@ -1,10 +1,9 @@ package codechicken.nei; -import java.util.List; - +import codechicken.lib.vec.Rectangle4i; import net.minecraft.item.ItemStack; -import codechicken.lib.vec.Rectangle4i; +import java.util.List; public abstract class Widget { diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index 40700eac..9b4beb40 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -1,5 +1,7 @@ package codechicken.nei; +import codechicken.lib.math.MathHelper; +import codechicken.nei.KeyManager.IKeyStateTracker; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.Entity; @@ -11,12 +13,8 @@ import net.minecraft.world.SpawnerAnimals; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; - import org.lwjgl.opengl.GL11; -import codechicken.lib.math.MathHelper; -import codechicken.nei.KeyManager.IKeyStateTracker; - public class WorldOverlayRenderer implements IKeyStateTracker { public static int chunkOverlay = 0; diff --git a/src/main/java/codechicken/nei/api/API.java b/src/main/java/codechicken/nei/api/API.java index 8f8b0130..d518c048 100644 --- a/src/main/java/codechicken/nei/api/API.java +++ b/src/main/java/codechicken/nei/api/API.java @@ -1,19 +1,5 @@ package codechicken.nei.api; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; - -import com.google.common.collect.Sets; - import codechicken.nei.BookmarkContainerInfo; import codechicken.nei.ItemList; import codechicken.nei.ItemSorter; @@ -39,6 +25,17 @@ import codechicken.nei.recipe.IUsageHandler; import codechicken.nei.recipe.RecipeCatalysts; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.StackInfo; +import com.google.common.collect.Sets; +import net.minecraft.block.Block; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; + +import java.util.Collections; +import java.util.Comparator; +import java.util.List; /** * This is the main class that handles item property configuration. WARNING: DO NOT access this class until the world diff --git a/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java b/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java index e0397221..687626f9 100644 --- a/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java +++ b/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java @@ -1,14 +1,12 @@ package codechicken.nei.api; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.inventory.Slot; - -import org.lwjgl.opengl.GL11; - import codechicken.nei.PositionedStack; import codechicken.nei.guihook.GuiContainerManager; +import net.minecraft.inventory.Slot; +import org.lwjgl.opengl.GL11; + +import java.util.ArrayList; +import java.util.List; public class DefaultOverlayRenderer implements IRecipeOverlayRenderer { diff --git a/src/main/java/codechicken/nei/api/GuiInfo.java b/src/main/java/codechicken/nei/api/GuiInfo.java index f09d2806..0961c5aa 100644 --- a/src/main/java/codechicken/nei/api/GuiInfo.java +++ b/src/main/java/codechicken/nei/api/GuiInfo.java @@ -1,14 +1,5 @@ package codechicken.nei.api; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiContainerCreative; - import codechicken.lib.vec.Rectangle4i; import codechicken.nei.NEIChestGuiHandler; import codechicken.nei.NEICreativeGuiHandler; @@ -18,6 +9,14 @@ import codechicken.nei.recipe.CheatItemHandler; import codechicken.nei.recipe.FillFluidContainerHandler; import codechicken.nei.recipe.GuiRecipeCatalyst; import codechicken.nei.recipe.SearchInputDropHandler; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.inventory.GuiContainerCreative; + +import java.util.HashSet; +import java.util.LinkedList; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantReadWriteLock; public class GuiInfo { diff --git a/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java b/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java index a08eb6c7..24b19e5a 100644 --- a/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java +++ b/src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java @@ -1,10 +1,10 @@ package codechicken.nei.api; -import java.util.ArrayList; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; +import java.util.ArrayList; + public interface IBookmarkContainerHandler { void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList realItems); diff --git a/src/main/java/codechicken/nei/api/IHighlightHandler.java b/src/main/java/codechicken/nei/api/IHighlightHandler.java index e93ff30e..0171325c 100644 --- a/src/main/java/codechicken/nei/api/IHighlightHandler.java +++ b/src/main/java/codechicken/nei/api/IHighlightHandler.java @@ -1,12 +1,12 @@ package codechicken.nei.api; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import java.util.List; + public interface IHighlightHandler { public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop); diff --git a/src/main/java/codechicken/nei/api/INEIGuiAdapter.java b/src/main/java/codechicken/nei/api/INEIGuiAdapter.java index ab12e41b..29adcdae 100644 --- a/src/main/java/codechicken/nei/api/INEIGuiAdapter.java +++ b/src/main/java/codechicken/nei/api/INEIGuiAdapter.java @@ -1,14 +1,13 @@ package codechicken.nei.api; -import java.util.Collections; -import java.util.List; -import java.util.regex.Pattern; - +import codechicken.nei.VisiblityData; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import codechicken.nei.VisiblityData; +import java.util.Collections; +import java.util.List; +import java.util.regex.Pattern; /** * Lets you just override those things you want to diff --git a/src/main/java/codechicken/nei/api/INEIGuiHandler.java b/src/main/java/codechicken/nei/api/INEIGuiHandler.java index b6af67d8..d5e47b1d 100644 --- a/src/main/java/codechicken/nei/api/INEIGuiHandler.java +++ b/src/main/java/codechicken/nei/api/INEIGuiHandler.java @@ -1,11 +1,10 @@ package codechicken.nei.api; -import java.util.List; - +import codechicken.nei.VisiblityData; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import codechicken.nei.VisiblityData; +import java.util.List; /** * If this is implemented on a gui, it will be automatically registered diff --git a/src/main/java/codechicken/nei/api/IOverlayHandler.java b/src/main/java/codechicken/nei/api/IOverlayHandler.java index 68e574e1..80625eb8 100644 --- a/src/main/java/codechicken/nei/api/IOverlayHandler.java +++ b/src/main/java/codechicken/nei/api/IOverlayHandler.java @@ -1,8 +1,7 @@ package codechicken.nei.api; -import net.minecraft.client.gui.inventory.GuiContainer; - import codechicken.nei.recipe.IRecipeHandler; +import net.minecraft.client.gui.inventory.GuiContainer; public interface IOverlayHandler { diff --git a/src/main/java/codechicken/nei/api/IRecipeOverlayRenderer.java b/src/main/java/codechicken/nei/api/IRecipeOverlayRenderer.java index ebbdde9b..e80349cc 100644 --- a/src/main/java/codechicken/nei/api/IRecipeOverlayRenderer.java +++ b/src/main/java/codechicken/nei/api/IRecipeOverlayRenderer.java @@ -1,8 +1,7 @@ package codechicken.nei.api; -import net.minecraft.inventory.Slot; - import codechicken.nei.guihook.GuiContainerManager; +import net.minecraft.inventory.Slot; public interface IRecipeOverlayRenderer { diff --git a/src/main/java/codechicken/nei/api/IStackPositioner.java b/src/main/java/codechicken/nei/api/IStackPositioner.java index 3e24db92..3888c3d4 100644 --- a/src/main/java/codechicken/nei/api/IStackPositioner.java +++ b/src/main/java/codechicken/nei/api/IStackPositioner.java @@ -1,9 +1,9 @@ package codechicken.nei.api; -import java.util.ArrayList; - import codechicken.nei.PositionedStack; +import java.util.ArrayList; + /** * For repositioning recipes in overlay renderers. * diff --git a/src/main/java/codechicken/nei/api/ItemInfo.java b/src/main/java/codechicken/nei/api/ItemInfo.java index 4accd9c2..7003e138 100644 --- a/src/main/java/codechicken/nei/api/ItemInfo.java +++ b/src/main/java/codechicken/nei/api/ItemInfo.java @@ -1,13 +1,26 @@ package codechicken.nei.api; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; - +import codechicken.core.featurehack.GameDataManipulator; +import codechicken.nei.InfiniteStackSizeHandler; +import codechicken.nei.InfiniteToolHandler; +import codechicken.nei.ItemList; +import codechicken.nei.ItemMobSpawner; +import codechicken.nei.ItemStackMap; +import codechicken.nei.ItemStackSet; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.PopupInputHandler; +import codechicken.nei.config.ArrayDumper; +import codechicken.nei.config.HandlerDumper; +import codechicken.nei.config.ItemPanelDumper; +import codechicken.nei.config.RegistryDumper; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.recipe.BrewingRecipeHandler; +import codechicken.nei.recipe.RecipeItemInputHandler; +import com.google.common.collect.ArrayListMultimap; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.ModContainer; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; @@ -39,28 +52,13 @@ import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.IShearable; import net.minecraftforge.oredict.OreDictionary; -import com.google.common.collect.ArrayListMultimap; - -import codechicken.core.featurehack.GameDataManipulator; -import codechicken.nei.InfiniteStackSizeHandler; -import codechicken.nei.InfiniteToolHandler; -import codechicken.nei.ItemList; -import codechicken.nei.ItemMobSpawner; -import codechicken.nei.ItemStackMap; -import codechicken.nei.ItemStackSet; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.PopupInputHandler; -import codechicken.nei.config.ArrayDumper; -import codechicken.nei.config.HandlerDumper; -import codechicken.nei.config.ItemPanelDumper; -import codechicken.nei.config.RegistryDumper; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.recipe.BrewingRecipeHandler; -import codechicken.nei.recipe.RecipeItemInputHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; /** * This is an internal class for storing information about items, to be accessed by the API diff --git a/src/main/java/codechicken/nei/api/LayoutStyle.java b/src/main/java/codechicken/nei/api/LayoutStyle.java index 5f570e91..d770cfb1 100644 --- a/src/main/java/codechicken/nei/api/LayoutStyle.java +++ b/src/main/java/codechicken/nei/api/LayoutStyle.java @@ -1,10 +1,9 @@ package codechicken.nei.api; -import net.minecraft.client.gui.inventory.GuiContainer; - import codechicken.nei.Button; import codechicken.nei.VisiblityData; import codechicken.nei.guihook.GuiContainerManager; +import net.minecraft.client.gui.inventory.GuiContainer; public abstract class LayoutStyle { diff --git a/src/main/java/codechicken/nei/api/NEIInfo.java b/src/main/java/codechicken/nei/api/NEIInfo.java index a2549cd5..4586f6d7 100644 --- a/src/main/java/codechicken/nei/api/NEIInfo.java +++ b/src/main/java/codechicken/nei/api/NEIInfo.java @@ -1,11 +1,10 @@ package codechicken.nei.api; -import java.util.LinkedList; - -import net.minecraft.world.World; - import codechicken.nei.NEIClientConfig; import codechicken.nei.config.OptionCycled; +import net.minecraft.world.World; + +import java.util.LinkedList; public class NEIInfo { diff --git a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java index 2cf5d8aa..2c2436f5 100644 --- a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java +++ b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java @@ -1,12 +1,5 @@ package codechicken.nei.api; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Mouse; - import codechicken.nei.ItemPanels; import codechicken.nei.LayoutManager; import codechicken.nei.NEIClientConfig; @@ -15,6 +8,11 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import org.lwjgl.input.Mouse; + +import java.util.List; public abstract class ShortcutInputHandler { diff --git a/src/main/java/codechicken/nei/api/TaggedInventoryArea.java b/src/main/java/codechicken/nei/api/TaggedInventoryArea.java index 818e01eb..3605e479 100644 --- a/src/main/java/codechicken/nei/api/TaggedInventoryArea.java +++ b/src/main/java/codechicken/nei/api/TaggedInventoryArea.java @@ -1,12 +1,12 @@ package codechicken.nei.api; -import java.util.HashSet; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import java.util.HashSet; + public class TaggedInventoryArea { public final HashSet slots = new HashSet<>(); diff --git a/src/main/java/codechicken/nei/asm/GuiContainerManagerAPITransformer.java b/src/main/java/codechicken/nei/asm/GuiContainerManagerAPITransformer.java index 199f5e9a..3cb46b38 100644 --- a/src/main/java/codechicken/nei/asm/GuiContainerManagerAPITransformer.java +++ b/src/main/java/codechicken/nei/asm/GuiContainerManagerAPITransformer.java @@ -1,12 +1,11 @@ package codechicken.nei.asm; -import static org.objectweb.asm.Opcodes.POP; -import static org.objectweb.asm.Opcodes.PUTSTATIC; - +import codechicken.lib.asm.ASMHelper; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.MethodVisitor; -import codechicken.lib.asm.ASMHelper; +import static org.objectweb.asm.Opcodes.POP; +import static org.objectweb.asm.Opcodes.PUTSTATIC; public class GuiContainerManagerAPITransformer extends ClassVisitor { diff --git a/src/main/java/codechicken/nei/asm/NEICorePlugin.java b/src/main/java/codechicken/nei/asm/NEICorePlugin.java index f5f5e638..566df938 100644 --- a/src/main/java/codechicken/nei/asm/NEICorePlugin.java +++ b/src/main/java/codechicken/nei/asm/NEICorePlugin.java @@ -1,8 +1,5 @@ package codechicken.nei.asm; -import java.io.File; -import java.util.Map; - import codechicken.core.launch.CodeChickenCorePlugin; import codechicken.lib.asm.ASMInit; import cpw.mods.fml.relauncher.IFMLCallHook; @@ -10,6 +7,9 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions; +import java.io.File; +import java.util.Map; + @TransformerExclusions(value = { "codechicken.nei.asm" }) @MCVersion("1.7.10") public class NEICorePlugin implements IFMLLoadingPlugin, IFMLCallHook { diff --git a/src/main/java/codechicken/nei/asm/NEITransformer.java b/src/main/java/codechicken/nei/asm/NEITransformer.java index 973c68e4..fd283e1c 100644 --- a/src/main/java/codechicken/nei/asm/NEITransformer.java +++ b/src/main/java/codechicken/nei/asm/NEITransformer.java @@ -1,34 +1,5 @@ package codechicken.nei.asm; -import static codechicken.lib.asm.InsnComparator.findN; -import static codechicken.lib.asm.InsnComparator.findOnce; -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.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; - -import net.minecraft.launchwrapper.IClassTransformer; - -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Type; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.InsnList; -import org.objectweb.asm.tree.InsnNode; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.VarInsnNode; - import codechicken.lib.asm.ASMBlock; import codechicken.lib.asm.ASMHelper; import codechicken.lib.asm.ASMInit; @@ -43,6 +14,33 @@ import codechicken.lib.asm.ModularASMTransformer.MethodTransformer; import codechicken.lib.asm.ModularASMTransformer.MethodWriter; import codechicken.lib.asm.ObfMapping; import cpw.mods.fml.relauncher.FMLLaunchHandler; +import net.minecraft.launchwrapper.IClassTransformer; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Type; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.FieldInsnNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.InsnNode; +import org.objectweb.asm.tree.MethodNode; +import org.objectweb.asm.tree.VarInsnNode; + +import java.util.Map; + +import static codechicken.lib.asm.InsnComparator.findN; +import static codechicken.lib.asm.InsnComparator.findOnce; +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.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; public class NEITransformer implements IClassTransformer { diff --git a/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java b/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java index 35930acc..a6924a1a 100644 --- a/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java +++ b/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java @@ -1,5 +1,11 @@ package codechicken.nei.asm; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; + import static org.objectweb.asm.Opcodes.ACC_FINAL; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; import static org.objectweb.asm.Opcodes.ACC_STATIC; @@ -18,12 +24,6 @@ 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; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; - /** * Code without this patch * diff --git a/src/main/java/codechicken/nei/config/ConfigSet.java b/src/main/java/codechicken/nei/config/ConfigSet.java index 471adfac..e52ab3c5 100644 --- a/src/main/java/codechicken/nei/config/ConfigSet.java +++ b/src/main/java/codechicken/nei/config/ConfigSet.java @@ -1,11 +1,10 @@ package codechicken.nei.config; -import java.io.File; - -import net.minecraft.nbt.NBTTagCompound; - import codechicken.lib.config.ConfigTagParent; import codechicken.nei.NEIServerUtils; +import net.minecraft.nbt.NBTTagCompound; + +import java.io.File; public class ConfigSet { diff --git a/src/main/java/codechicken/nei/config/DataDumper.java b/src/main/java/codechicken/nei/config/DataDumper.java index 918e06cc..901694b7 100644 --- a/src/main/java/codechicken/nei/config/DataDumper.java +++ b/src/main/java/codechicken/nei/config/DataDumper.java @@ -1,22 +1,20 @@ package codechicken.nei.config; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.drawStringC; - -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; - -import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.util.IChatComponent; - -import org.lwjgl.opengl.GL11; - import codechicken.core.CommonUtils; import codechicken.lib.vec.Rectangle4i; import codechicken.nei.LayoutManager; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.IChatComponent; +import org.lwjgl.opengl.GL11; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; + +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.drawStringC; public abstract class DataDumper extends Option { diff --git a/src/main/java/codechicken/nei/config/GuiHighlightTips.java b/src/main/java/codechicken/nei/config/GuiHighlightTips.java index f7762303..4655131a 100644 --- a/src/main/java/codechicken/nei/config/GuiHighlightTips.java +++ b/src/main/java/codechicken/nei/config/GuiHighlightTips.java @@ -1,25 +1,26 @@ package codechicken.nei.config; -import static codechicken.lib.gui.GuiDraw.displaySize; -import static codechicken.lib.gui.GuiDraw.getMousePosition; -import static codechicken.nei.NEIClientUtils.translate; - -import java.awt.*; -import java.util.Arrays; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; - -import org.lwjgl.input.Keyboard; - import codechicken.core.gui.GuiCCButton; import codechicken.core.gui.GuiScreenWidget; import codechicken.lib.math.MathHelper; import codechicken.lib.vec.Rectangle4i; import codechicken.nei.HUDRenderer; +import net.minecraft.client.Minecraft; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import org.lwjgl.input.Keyboard; +import java.awt.Point; +import java.awt.Dimension; + + + +import java.util.Arrays; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.displaySize; +import static codechicken.lib.gui.GuiDraw.getMousePosition; +import static codechicken.nei.NEIClientUtils.translate; public class GuiHighlightTips extends GuiScreenWidget { diff --git a/src/main/java/codechicken/nei/config/GuiItemIconDumper.java b/src/main/java/codechicken/nei/config/GuiItemIconDumper.java index 93c13363..04e0e600 100644 --- a/src/main/java/codechicken/nei/config/GuiItemIconDumper.java +++ b/src/main/java/codechicken/nei/config/GuiItemIconDumper.java @@ -1,15 +1,11 @@ package codechicken.nei.config; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.nio.IntBuffer; -import java.util.ArrayList; -import java.util.Arrays; - -import javax.imageio.ImageIO; - +import codechicken.core.CommonUtils; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.ItemPanels; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIClientUtils; +import codechicken.nei.guihook.GuiContainerManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.OpenGlHelper; @@ -20,18 +16,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; - import org.lwjgl.BufferUtils; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import java.awt.Dimension; -import codechicken.core.CommonUtils; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.ItemPanels; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIClientUtils; -import codechicken.nei.guihook.GuiContainerManager; +import javax.imageio.ImageIO; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.IntBuffer; +import java.util.ArrayList; +import java.util.Arrays; public class GuiItemIconDumper extends GuiScreen { diff --git a/src/main/java/codechicken/nei/config/GuiItemSorter.java b/src/main/java/codechicken/nei/config/GuiItemSorter.java index 635055e6..4fc02513 100644 --- a/src/main/java/codechicken/nei/config/GuiItemSorter.java +++ b/src/main/java/codechicken/nei/config/GuiItemSorter.java @@ -1,20 +1,20 @@ package codechicken.nei.config; -import static codechicken.lib.gui.GuiDraw.drawStringC; -import static codechicken.lib.gui.GuiDraw.getMousePosition; - -import java.awt.*; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.GuiScreen; - -import org.lwjgl.opengl.GL11; - import codechicken.lib.math.MathHelper; import codechicken.nei.ItemSorter; import codechicken.nei.ItemSorter.SortEntry; import codechicken.nei.LayoutManager; +import net.minecraft.client.gui.GuiScreen; +import org.lwjgl.opengl.GL11; +import java.awt.Rectangle; + + + +import java.util.ArrayList; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.drawStringC; +import static codechicken.lib.gui.GuiDraw.getMousePosition; public class GuiItemSorter extends GuiOptionPane { diff --git a/src/main/java/codechicken/nei/config/GuiOptionList.java b/src/main/java/codechicken/nei/config/GuiOptionList.java index 34468f6e..256d2051 100644 --- a/src/main/java/codechicken/nei/config/GuiOptionList.java +++ b/src/main/java/codechicken/nei/config/GuiOptionList.java @@ -1,28 +1,29 @@ package codechicken.nei.config; -import static codechicken.lib.gui.GuiDraw.drawMultilineTip; -import static codechicken.lib.gui.GuiDraw.drawStringC; -import static codechicken.lib.gui.GuiDraw.fontRenderer; -import static codechicken.lib.gui.GuiDraw.getMousePosition; -import static net.minecraft.util.StatCollector.translateToLocal; - -import java.awt.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - import codechicken.core.gui.GuiCCButton; import codechicken.core.gui.GuiScreenWidget; import codechicken.core.gui.GuiScrollSlot; import codechicken.lib.vec.Rectangle4i; import codechicken.nei.LayoutManager; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.awt.Rectangle; +import java.awt.Dimension; +import java.awt.Point; + +import static codechicken.lib.gui.GuiDraw.drawMultilineTip; +import static codechicken.lib.gui.GuiDraw.drawStringC; +import static codechicken.lib.gui.GuiDraw.fontRenderer; +import static codechicken.lib.gui.GuiDraw.getMousePosition; +import static net.minecraft.util.StatCollector.translateToLocal; public class GuiOptionList extends GuiScreenWidget { diff --git a/src/main/java/codechicken/nei/config/GuiOptionPane.java b/src/main/java/codechicken/nei/config/GuiOptionPane.java index ca467b58..e06901c4 100644 --- a/src/main/java/codechicken/nei/config/GuiOptionPane.java +++ b/src/main/java/codechicken/nei/config/GuiOptionPane.java @@ -1,22 +1,22 @@ package codechicken.nei.config; +import codechicken.core.gui.GuiCCButton; +import codechicken.core.gui.GuiScreenWidget; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import org.lwjgl.input.Keyboard; +import java.awt.Rectangle; +import java.awt.Point; + + +import java.util.LinkedList; +import java.util.List; + import static codechicken.lib.gui.GuiDraw.drawMultilineTip; import static codechicken.lib.gui.GuiDraw.fontRenderer; import static codechicken.lib.gui.GuiDraw.getMousePosition; import static net.minecraft.util.StatCollector.translateToLocal; -import java.awt.*; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; - -import org.lwjgl.input.Keyboard; - -import codechicken.core.gui.GuiCCButton; -import codechicken.core.gui.GuiScreenWidget; - public abstract class GuiOptionPane extends GuiScreenWidget { public class ScrollPane extends OptionScrollPane { diff --git a/src/main/java/codechicken/nei/config/GuiPanelSettings.java b/src/main/java/codechicken/nei/config/GuiPanelSettings.java index f534514b..ae8f9729 100644 --- a/src/main/java/codechicken/nei/config/GuiPanelSettings.java +++ b/src/main/java/codechicken/nei/config/GuiPanelSettings.java @@ -1,24 +1,23 @@ package codechicken.nei.config; -import static codechicken.lib.gui.GuiDraw.getMousePosition; - -import java.awt.*; -import java.util.ArrayList; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import codechicken.core.gui.GuiScreenWidget; import codechicken.lib.render.CCRenderState; import codechicken.lib.vec.Rectangle4i; import codechicken.nei.ItemPanels; import codechicken.nei.ItemsGrid; import codechicken.nei.guihook.GuiContainerManager; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; +import java.awt.Point; + + +import java.util.ArrayList; + +import static codechicken.lib.gui.GuiDraw.getMousePosition; public class GuiPanelSettings extends GuiScreenWidget { diff --git a/src/main/java/codechicken/nei/config/HandlerDumper.java b/src/main/java/codechicken/nei/config/HandlerDumper.java index 13d57645..224ba816 100644 --- a/src/main/java/codechicken/nei/config/HandlerDumper.java +++ b/src/main/java/codechicken/nei/config/HandlerDumper.java @@ -1,17 +1,5 @@ package codechicken.nei.config; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.LinkedList; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentTranslation; - -import org.apache.commons.io.IOUtils; - -import com.google.common.base.Objects; - import codechicken.nei.NEIClientConfig; import codechicken.nei.recipe.GuiRecipeTab; import codechicken.nei.recipe.GuiUsageRecipe; @@ -19,6 +7,15 @@ import codechicken.nei.recipe.HandlerInfo; import codechicken.nei.recipe.IRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler; import codechicken.nei.util.NBTJson; +import com.google.common.base.Objects; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentTranslation; +import org.apache.commons.io.IOUtils; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.LinkedList; public class HandlerDumper extends DataDumper { diff --git a/src/main/java/codechicken/nei/config/IMCHandler.java b/src/main/java/codechicken/nei/config/IMCHandler.java index 22c361b8..457d798e 100644 --- a/src/main/java/codechicken/nei/config/IMCHandler.java +++ b/src/main/java/codechicken/nei/config/IMCHandler.java @@ -1,14 +1,5 @@ package codechicken.nei.config; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import codechicken.core.CommonUtils; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIServerUtils; @@ -20,6 +11,14 @@ import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public class IMCHandler { diff --git a/src/main/java/codechicken/nei/config/ItemPanelDumper.java b/src/main/java/codechicken/nei/config/ItemPanelDumper.java index f18dce7e..e059f7e6 100644 --- a/src/main/java/codechicken/nei/config/ItemPanelDumper.java +++ b/src/main/java/codechicken/nei/config/ItemPanelDumper.java @@ -1,11 +1,10 @@ package codechicken.nei.config; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.LinkedList; - +import codechicken.lib.inventory.InventoryUtils; +import codechicken.lib.vec.Rectangle4i; +import codechicken.nei.ItemPanels; +import codechicken.nei.NEIClientUtils; +import codechicken.nei.guihook.GuiContainerManager; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,11 +14,11 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; -import codechicken.lib.inventory.InventoryUtils; -import codechicken.lib.vec.Rectangle4i; -import codechicken.nei.ItemPanels; -import codechicken.nei.NEIClientUtils; -import codechicken.nei.guihook.GuiContainerManager; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.LinkedList; public class ItemPanelDumper extends DataDumper { diff --git a/src/main/java/codechicken/nei/config/Option.java b/src/main/java/codechicken/nei/config/Option.java index 89a7e337..9e33431a 100644 --- a/src/main/java/codechicken/nei/config/Option.java +++ b/src/main/java/codechicken/nei/config/Option.java @@ -1,14 +1,13 @@ package codechicken.nei.config; -import java.util.List; - +import codechicken.lib.config.ConfigTag; +import codechicken.nei.config.GuiOptionList.OptionScrollSlot; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import codechicken.lib.config.ConfigTag; -import codechicken.nei.config.GuiOptionList.OptionScrollSlot; +import java.util.List; public abstract class Option { diff --git a/src/main/java/codechicken/nei/config/OptionButton.java b/src/main/java/codechicken/nei/config/OptionButton.java index 89f06798..2d73eb7c 100644 --- a/src/main/java/codechicken/nei/config/OptionButton.java +++ b/src/main/java/codechicken/nei/config/OptionButton.java @@ -1,21 +1,20 @@ package codechicken.nei.config; +import codechicken.nei.LayoutManager; +import codechicken.nei.NEIClientUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + + +import java.awt.Rectangle; +import java.util.List; + import static codechicken.lib.gui.GuiDraw.changeTexture; import static codechicken.lib.gui.GuiDraw.drawString; import static codechicken.lib.gui.GuiDraw.drawStringC; import static codechicken.lib.gui.GuiDraw.getStringWidth; -import java.awt.*; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import codechicken.nei.LayoutManager; -import codechicken.nei.NEIClientUtils; - public abstract class OptionButton extends Option { protected static final ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png"); diff --git a/src/main/java/codechicken/nei/config/OptionKeyBind.java b/src/main/java/codechicken/nei/config/OptionKeyBind.java index 3e93d983..75b9b300 100644 --- a/src/main/java/codechicken/nei/config/OptionKeyBind.java +++ b/src/main/java/codechicken/nei/config/OptionKeyBind.java @@ -1,14 +1,14 @@ package codechicken.nei.config; -import static codechicken.lib.gui.GuiDraw.drawRect; -import static codechicken.lib.gui.GuiDraw.drawStringC; - -import java.awt.*; - -import org.lwjgl.input.Keyboard; - import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; +import org.lwjgl.input.Keyboard; +import java.awt.Rectangle; + + + +import static codechicken.lib.gui.GuiDraw.drawRect; +import static codechicken.lib.gui.GuiDraw.drawStringC; public class OptionKeyBind extends OptionButton { diff --git a/src/main/java/codechicken/nei/config/OptionList.java b/src/main/java/codechicken/nei/config/OptionList.java index 468db24e..bce86643 100644 --- a/src/main/java/codechicken/nei/config/OptionList.java +++ b/src/main/java/codechicken/nei/config/OptionList.java @@ -1,13 +1,12 @@ package codechicken.nei.config; -import java.util.ArrayList; -import java.util.HashMap; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; - import codechicken.nei.NEIClientConfig; import codechicken.nei.config.GuiOptionList.OptionScrollSlot; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; + +import java.util.ArrayList; +import java.util.HashMap; public class OptionList extends OptionButton { diff --git a/src/main/java/codechicken/nei/config/OptionOpenGui.java b/src/main/java/codechicken/nei/config/OptionOpenGui.java index b5778090..355e1be8 100644 --- a/src/main/java/codechicken/nei/config/OptionOpenGui.java +++ b/src/main/java/codechicken/nei/config/OptionOpenGui.java @@ -1,10 +1,9 @@ package codechicken.nei.config; +import codechicken.nei.NEIClientConfig; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import codechicken.nei.NEIClientConfig; - public class OptionOpenGui extends OptionButton { public final Class guiClass; diff --git a/src/main/java/codechicken/nei/config/OptionScrollPane.java b/src/main/java/codechicken/nei/config/OptionScrollPane.java index 22c742cf..15130800 100644 --- a/src/main/java/codechicken/nei/config/OptionScrollPane.java +++ b/src/main/java/codechicken/nei/config/OptionScrollPane.java @@ -1,14 +1,14 @@ package codechicken.nei.config; -import java.awt.*; - +import codechicken.core.gui.GuiScrollPane; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; - import org.lwjgl.opengl.GL11; +import java.awt.Dimension; +import java.awt.Rectangle; + -import codechicken.core.gui.GuiScrollPane; public abstract class OptionScrollPane extends GuiScrollPane { diff --git a/src/main/java/codechicken/nei/config/OptionStringSet.java b/src/main/java/codechicken/nei/config/OptionStringSet.java index 9afa3196..7c99b972 100644 --- a/src/main/java/codechicken/nei/config/OptionStringSet.java +++ b/src/main/java/codechicken/nei/config/OptionStringSet.java @@ -1,6 +1,9 @@ package codechicken.nei.config; -import static codechicken.lib.gui.GuiDraw.drawString; +import codechicken.lib.vec.Rectangle4i; +import codechicken.nei.LayoutManager; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; import java.util.Arrays; import java.util.HashMap; @@ -8,11 +11,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; - -import codechicken.lib.vec.Rectangle4i; -import codechicken.nei.LayoutManager; +import static codechicken.lib.gui.GuiDraw.drawString; public abstract class OptionStringSet extends Option { diff --git a/src/main/java/codechicken/nei/config/OptionTextField.java b/src/main/java/codechicken/nei/config/OptionTextField.java index 981a85b7..18f0ea7c 100644 --- a/src/main/java/codechicken/nei/config/OptionTextField.java +++ b/src/main/java/codechicken/nei/config/OptionTextField.java @@ -1,14 +1,14 @@ package codechicken.nei.config; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.getStringWidth; - -import java.util.List; - import codechicken.lib.vec.Rectangle4i; import codechicken.nei.TextField; import codechicken.nei.config.GuiOptionList.OptionScrollSlot; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.getStringWidth; + public class OptionTextField extends Option { private boolean focused = false; diff --git a/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java b/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java index 0ba7007e..82bdcfe2 100644 --- a/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java +++ b/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java @@ -1,11 +1,12 @@ package codechicken.nei.config; -import java.awt.*; - import codechicken.nei.Image; import codechicken.nei.LayoutManager; import codechicken.nei.drawable.DrawableBuilder; import codechicken.nei.drawable.DrawableResource; +import java.awt.Rectangle; + + public class OptionToggleButtonBoubs extends OptionButton { diff --git a/src/main/java/codechicken/nei/config/OptionUtilities.java b/src/main/java/codechicken/nei/config/OptionUtilities.java index 236b20a8..0edbed7c 100644 --- a/src/main/java/codechicken/nei/config/OptionUtilities.java +++ b/src/main/java/codechicken/nei/config/OptionUtilities.java @@ -1,18 +1,16 @@ package codechicken.nei.config; +import codechicken.nei.Image; +import codechicken.nei.LayoutManager; +import codechicken.nei.guihook.GuiContainerManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.enchantment.Enchantment; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; - import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import codechicken.nei.Image; -import codechicken.nei.LayoutManager; -import codechicken.nei.guihook.GuiContainerManager; - public class OptionUtilities extends OptionStringSet { public OptionUtilities(String name) { diff --git a/src/main/java/codechicken/nei/config/RegistryDumper.java b/src/main/java/codechicken/nei/config/RegistryDumper.java index 5e0085eb..2dbea231 100644 --- a/src/main/java/codechicken/nei/config/RegistryDumper.java +++ b/src/main/java/codechicken/nei/config/RegistryDumper.java @@ -1,9 +1,9 @@ package codechicken.nei.config; -import java.util.LinkedList; - import net.minecraft.util.RegistryNamespaced; +import java.util.LinkedList; + public abstract class RegistryDumper extends DataDumper { public RegistryDumper(String name) { diff --git a/src/main/java/codechicken/nei/drawable/DrawableResource.java b/src/main/java/codechicken/nei/drawable/DrawableResource.java index 7686fa74..0272d02f 100644 --- a/src/main/java/codechicken/nei/drawable/DrawableResource.java +++ b/src/main/java/codechicken/nei/drawable/DrawableResource.java @@ -1,11 +1,10 @@ package codechicken.nei.drawable; +import codechicken.nei.Image; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.util.ResourceLocation; -import codechicken.nei.Image; - public class DrawableResource extends Image { private final ResourceLocation resourceLocation; diff --git a/src/main/java/codechicken/nei/drawable/GuiElementDuex.java b/src/main/java/codechicken/nei/drawable/GuiElementDuex.java index 00a7627e..e6309e7f 100644 --- a/src/main/java/codechicken/nei/drawable/GuiElementDuex.java +++ b/src/main/java/codechicken/nei/drawable/GuiElementDuex.java @@ -1,11 +1,9 @@ package codechicken.nei.drawable; -import net.minecraft.client.gui.GuiScreen; - -import org.lwjgl.opengl.GL11; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; +import org.lwjgl.opengl.GL11; /* * Taken from Mantle 1.12-1.3.3.49 under the MIT License The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights diff --git a/src/main/java/codechicken/nei/drawable/GuiElementScalable.java b/src/main/java/codechicken/nei/drawable/GuiElementScalable.java index bb02bf50..3ab0540c 100644 --- a/src/main/java/codechicken/nei/drawable/GuiElementScalable.java +++ b/src/main/java/codechicken/nei/drawable/GuiElementScalable.java @@ -1,9 +1,8 @@ package codechicken.nei.drawable; -import net.minecraft.client.gui.GuiScreen; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.gui.GuiScreen; /* * Taken from Mantle 1.12-1.3.3.49 under the MIT License The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights diff --git a/src/main/java/codechicken/nei/event/NEIConfigsLoadedEvent.java b/src/main/java/codechicken/nei/event/NEIConfigsLoadedEvent.java index cff68282..487c5486 100644 --- a/src/main/java/codechicken/nei/event/NEIConfigsLoadedEvent.java +++ b/src/main/java/codechicken/nei/event/NEIConfigsLoadedEvent.java @@ -1,9 +1,8 @@ package codechicken.nei.event; -import net.minecraftforge.common.MinecraftForge; - import codechicken.nei.api.IConfigureNEI; import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.common.MinecraftForge; /** * Event is posted from NEI Plugin Loader Thread after all {@link IConfigureNEI} were loaded. diff --git a/src/main/java/codechicken/nei/event/NEIRegisterHandlerInfosEvent.java b/src/main/java/codechicken/nei/event/NEIRegisterHandlerInfosEvent.java index 8f40546d..b0c6d96b 100644 --- a/src/main/java/codechicken/nei/event/NEIRegisterHandlerInfosEvent.java +++ b/src/main/java/codechicken/nei/event/NEIRegisterHandlerInfosEvent.java @@ -1,14 +1,13 @@ package codechicken.nei.event; -import java.util.function.Consumer; - -import net.minecraftforge.common.MinecraftForge; - import codechicken.nei.NEIClientConfig; import codechicken.nei.recipe.GuiRecipeTab; import codechicken.nei.recipe.HandlerInfo; import codechicken.nei.recipe.IRecipeHandler; import cpw.mods.fml.common.eventhandler.Event; +import net.minecraftforge.common.MinecraftForge; + +import java.util.function.Consumer; /** * Event is posted every time the handler infos got registered or reloaded. During it, you can safely register your diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java index 12549170..e6b49295 100644 --- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java +++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java @@ -1,21 +1,9 @@ package codechicken.nei.guihook; -import static codechicken.lib.gui.GuiDraw.drawMultilineTip; -import static codechicken.lib.gui.GuiDraw.fontRenderer; -import static codechicken.lib.gui.GuiDraw.getMousePosition; -import static codechicken.lib.gui.GuiDraw.renderEngine; - -import java.awt.*; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.regex.Pattern; - -import javax.annotation.Nullable; - +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIClientUtils; +import codechicken.nei.recipe.StackInfo; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -27,16 +15,25 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.fluids.FluidStack; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import java.awt.Point; +import javax.annotation.Nullable; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIClientUtils; -import codechicken.nei.recipe.StackInfo; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.regex.Pattern; + +import static codechicken.lib.gui.GuiDraw.drawMultilineTip; +import static codechicken.lib.gui.GuiDraw.fontRenderer; +import static codechicken.lib.gui.GuiDraw.getMousePosition; +import static codechicken.lib.gui.GuiDraw.renderEngine; public class GuiContainerManager { diff --git a/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java b/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java index e12d1b36..b3779eea 100644 --- a/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java +++ b/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java @@ -1,10 +1,10 @@ package codechicken.nei.guihook; -import java.util.List; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; +import java.util.List; + public interface IContainerDrawHandler { /** diff --git a/src/main/java/codechicken/nei/guihook/IContainerInputHandler.java b/src/main/java/codechicken/nei/guihook/IContainerInputHandler.java index b12f9ee3..174a860f 100644 --- a/src/main/java/codechicken/nei/guihook/IContainerInputHandler.java +++ b/src/main/java/codechicken/nei/guihook/IContainerInputHandler.java @@ -1,7 +1,6 @@ package codechicken.nei.guihook; import net.minecraft.client.gui.inventory.GuiContainer; - import org.lwjgl.input.Keyboard; public interface IContainerInputHandler { diff --git a/src/main/java/codechicken/nei/guihook/IContainerTooltipHandler.java b/src/main/java/codechicken/nei/guihook/IContainerTooltipHandler.java index d58f3461..b3e2d444 100644 --- a/src/main/java/codechicken/nei/guihook/IContainerTooltipHandler.java +++ b/src/main/java/codechicken/nei/guihook/IContainerTooltipHandler.java @@ -1,10 +1,10 @@ package codechicken.nei.guihook; -import java.util.List; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; +import java.util.List; + /** * If this interface is implemented by a GuiContainer then it will be the first handler delegated to but * handleItmeDisplayName will not be called diff --git a/src/main/java/codechicken/nei/recipe/BookmarkRecipeId.java b/src/main/java/codechicken/nei/recipe/BookmarkRecipeId.java index b10b23c3..a7c5f242 100644 --- a/src/main/java/codechicken/nei/recipe/BookmarkRecipeId.java +++ b/src/main/java/codechicken/nei/recipe/BookmarkRecipeId.java @@ -1,18 +1,16 @@ package codechicken.nei.recipe; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - +import codechicken.nei.PositionedStack; +import codechicken.nei.util.NBTJson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; -import codechicken.nei.PositionedStack; -import codechicken.nei.util.NBTJson; +import java.util.ArrayList; +import java.util.List; public class BookmarkRecipeId { diff --git a/src/main/java/codechicken/nei/recipe/BrewingOverlayHandler.java b/src/main/java/codechicken/nei/recipe/BrewingOverlayHandler.java index 4e5b09f5..96c58dd6 100644 --- a/src/main/java/codechicken/nei/recipe/BrewingOverlayHandler.java +++ b/src/main/java/codechicken/nei/recipe/BrewingOverlayHandler.java @@ -1,11 +1,10 @@ package codechicken.nei.recipe; -import java.util.List; - +import codechicken.nei.PositionedStack; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; -import codechicken.nei.PositionedStack; +import java.util.List; public class BrewingOverlayHandler extends DefaultOverlayHandler { diff --git a/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java b/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java index 9fb66e59..34e87160 100644 --- a/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java @@ -1,14 +1,10 @@ package codechicken.nei.recipe; -import static net.minecraft.init.Items.potionitem; - -import java.awt.*; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.TreeSet; -import java.util.stream.Collectors; - +import codechicken.nei.ItemStackSet; +import codechicken.nei.NEIClientUtils; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.api.API; import net.minecraft.client.gui.inventory.GuiBrewingStand; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemPotion; @@ -16,12 +12,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionHelper; +import java.awt.Rectangle; -import codechicken.nei.ItemStackSet; -import codechicken.nei.NEIClientUtils; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.API; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.TreeSet; +import java.util.stream.Collectors; + +import static net.minecraft.init.Items.potionitem; public class BrewingRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/codechicken/nei/recipe/CatalystInfoList.java b/src/main/java/codechicken/nei/recipe/CatalystInfoList.java index 255dec19..2a21bfbd 100644 --- a/src/main/java/codechicken/nei/recipe/CatalystInfoList.java +++ b/src/main/java/codechicken/nei/recipe/CatalystInfoList.java @@ -1,17 +1,14 @@ package codechicken.nei.recipe; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; - -import com.google.common.collect.ForwardingList; - import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIServerUtils; +import com.google.common.collect.ForwardingList; +import net.minecraft.item.ItemStack; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; // Do not directly extend ArrayList, see Effective Java Item 16 public class CatalystInfoList extends ForwardingList { diff --git a/src/main/java/codechicken/nei/recipe/CheatItemHandler.java b/src/main/java/codechicken/nei/recipe/CheatItemHandler.java index 02e6247a..cd1ae497 100644 --- a/src/main/java/codechicken/nei/recipe/CheatItemHandler.java +++ b/src/main/java/codechicken/nei/recipe/CheatItemHandler.java @@ -1,14 +1,13 @@ package codechicken.nei.recipe; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - import codechicken.nei.NEICPH; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; import codechicken.nei.NEIServerUtils; import codechicken.nei.api.INEIGuiAdapter; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class CheatItemHandler extends INEIGuiAdapter { diff --git a/src/main/java/codechicken/nei/recipe/ContainerRecipe.java b/src/main/java/codechicken/nei/recipe/ContainerRecipe.java index 9859f064..af53027d 100644 --- a/src/main/java/codechicken/nei/recipe/ContainerRecipe.java +++ b/src/main/java/codechicken/nei/recipe/ContainerRecipe.java @@ -1,13 +1,12 @@ package codechicken.nei.recipe; +import codechicken.nei.PositionedStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import codechicken.nei.PositionedStack; - public class ContainerRecipe extends Container { private class RecipeInventory implements IInventory { diff --git a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java index 7f7ecab7..60972d3e 100644 --- a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java +++ b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java @@ -1,5 +1,14 @@ package codechicken.nei.recipe; +import codechicken.lib.inventory.InventoryUtils; +import codechicken.nei.FastTransferManager; +import codechicken.nei.PositionedStack; +import codechicken.nei.api.IOverlayHandler; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -7,16 +16,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import codechicken.lib.inventory.InventoryUtils; -import codechicken.nei.FastTransferManager; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; - @SuppressWarnings("rawtypes, unchecked") public class DefaultOverlayHandler implements IOverlayHandler { diff --git a/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java b/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java index 28e59afe..9d0e78a0 100644 --- a/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java +++ b/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java @@ -1,15 +1,14 @@ package codechicken.nei.recipe; +import codechicken.nei.ItemPanel.ItemPanelSlot; +import codechicken.nei.ItemPanels; +import codechicken.nei.api.INEIGuiAdapter; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; -import codechicken.nei.ItemPanel.ItemPanelSlot; -import codechicken.nei.ItemPanels; -import codechicken.nei.api.INEIGuiAdapter; - public class FillFluidContainerHandler extends INEIGuiAdapter { @Override diff --git a/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java b/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java index fd9805e9..22517fee 100644 --- a/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java @@ -1,23 +1,23 @@ package codechicken.nei.recipe; -import java.awt.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; - -import net.minecraft.init.Items; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.RecipeFireworks; - import codechicken.lib.gui.GuiDraw; import codechicken.nei.InventoryCraftingDummy; import codechicken.nei.NEIClientUtils; import codechicken.nei.PositionedStack; import codechicken.nei.guihook.GuiContainerManager; +import net.minecraft.init.Items; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.RecipeFireworks; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.awt.Rectangle; +import java.awt.Point; public class FireworkRecipeHandler extends ShapelessRecipeHandler { public class CachedFireworkRecipe extends CachedShapelessRecipe { diff --git a/src/main/java/codechicken/nei/recipe/FuelRecipeHandler.java b/src/main/java/codechicken/nei/recipe/FuelRecipeHandler.java index 4fc3d62c..e72f2cec 100644 --- a/src/main/java/codechicken/nei/recipe/FuelRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/FuelRecipeHandler.java @@ -1,18 +1,17 @@ package codechicken.nei.recipe; -import static codechicken.nei.NEIClientUtils.translate; +import codechicken.nei.NEIClientUtils; +import codechicken.nei.PositionedStack; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Map; import java.util.stream.Collectors; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; - -import codechicken.nei.NEIClientUtils; -import codechicken.nei.PositionedStack; +import static codechicken.nei.NEIClientUtils.translate; public class FuelRecipeHandler extends FurnaceRecipeHandler { diff --git a/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java b/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java index fce00f82..8b24a566 100644 --- a/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java @@ -1,21 +1,21 @@ package codechicken.nei.recipe; -import java.awt.*; +import codechicken.nei.NEIClientUtils; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.inventory.GuiFurnace; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; +import java.awt.Rectangle; + + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiFurnace; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; - -import codechicken.nei.NEIClientUtils; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; - public class FurnaceRecipeHandler extends TemplateRecipeHandler { public class SmeltingPair extends CachedRecipe { diff --git a/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java b/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java index 12206d49..8b583653 100644 --- a/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java @@ -1,21 +1,20 @@ package codechicken.nei.recipe; -import static codechicken.lib.gui.GuiDraw.getMousePosition; - -import java.awt.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.ItemStack; - import codechicken.nei.ItemPanel.ItemPanelSlot; import codechicken.nei.ItemPanels; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; import codechicken.nei.PositionedStack; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; + + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.getMousePosition; public class GuiCraftingRecipe extends GuiRecipe { diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java index c886635b..db3e34e4 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java @@ -1,29 +1,5 @@ package codechicken.nei.recipe; -import static codechicken.lib.gui.GuiDraw.fontRenderer; - -import java.awt.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.regex.Matcher; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - import codechicken.lib.gui.GuiDraw; import codechicken.nei.GuiNEIButton; import codechicken.nei.LayoutManager; @@ -43,6 +19,30 @@ import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerTooltipHandler; import codechicken.nei.guihook.IGuiClientSide; import codechicken.nei.guihook.IGuiHandleMouseWheel; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; +import java.awt.Rectangle; +import java.awt.Point; + + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.regex.Matcher; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static codechicken.lib.gui.GuiDraw.fontRenderer; public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOverlay, IGuiClientSide, IGuiHandleMouseWheel, IContainerTooltipHandler, INEIGuiHandler { diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java b/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java index 84a6a43a..ada1842f 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java @@ -1,14 +1,12 @@ package codechicken.nei.recipe; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.util.Rectangle; - import codechicken.nei.api.INEIGuiAdapter; import codechicken.nei.drawable.GuiElementDuex; import codechicken.nei.drawable.GuiElementScalable; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.util.Rectangle; public class GuiRecipeCatalyst extends INEIGuiAdapter { diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java b/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java index a3d0d5cd..e9654086 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java @@ -1,5 +1,23 @@ package codechicken.nei.recipe; +import codechicken.lib.gui.GuiDraw; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.Widget; +import codechicken.nei.drawable.DrawableResource; +import codechicken.nei.event.NEIRegisterHandlerInfosEvent; +import codechicken.nei.guihook.GuiContainerManager; +import cpw.mods.fml.common.Loader; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.MinecraftForge; +import org.apache.commons.csv.CSVFormat; +import org.apache.commons.csv.CSVParser; +import org.apache.commons.csv.CSVRecord; +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -15,26 +33,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraftforge.common.MinecraftForge; - -import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVParser; -import org.apache.commons.csv.CSVRecord; -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.Widget; -import codechicken.nei.drawable.DrawableResource; -import codechicken.nei.event.NEIRegisterHandlerInfosEvent; -import codechicken.nei.guihook.GuiContainerManager; -import cpw.mods.fml.common.Loader; - public abstract class GuiRecipeTab extends Widget { public static HandlerInfo DEFAULT_HANDLER_INFO = getDefaultHandlerInfo(); diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeTabs.java b/src/main/java/codechicken/nei/recipe/GuiRecipeTabs.java index b2302f16..0cec4db9 100644 --- a/src/main/java/codechicken/nei/recipe/GuiRecipeTabs.java +++ b/src/main/java/codechicken/nei/recipe/GuiRecipeTabs.java @@ -1,14 +1,16 @@ package codechicken.nei.recipe; -import static codechicken.lib.gui.GuiDraw.getMousePosition; - -import java.awt.*; -import java.util.ArrayList; -import java.util.List; - import codechicken.nei.Button; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; +import java.awt.Rectangle; +import java.awt.Point; + + +import java.util.ArrayList; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.getMousePosition; public class GuiRecipeTabs { diff --git a/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java b/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java index 9a1b6666..0ae29834 100644 --- a/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java +++ b/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java @@ -1,12 +1,11 @@ package codechicken.nei.recipe; -import java.util.ArrayList; -import java.util.Arrays; - -import net.minecraft.client.Minecraft; - import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; +import net.minecraft.client.Minecraft; + +import java.util.ArrayList; +import java.util.Arrays; public class GuiUsageRecipe extends GuiRecipe { diff --git a/src/main/java/codechicken/nei/recipe/HandlerInfo.java b/src/main/java/codechicken/nei/recipe/HandlerInfo.java index a616c5f6..829e51ec 100644 --- a/src/main/java/codechicken/nei/recipe/HandlerInfo.java +++ b/src/main/java/codechicken/nei/recipe/HandlerInfo.java @@ -1,12 +1,11 @@ package codechicken.nei.recipe; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIServerUtils; import codechicken.nei.drawable.DrawableBuilder; import codechicken.nei.drawable.DrawableResource; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; public class HandlerInfo { diff --git a/src/main/java/codechicken/nei/recipe/IRecipeHandler.java b/src/main/java/codechicken/nei/recipe/IRecipeHandler.java index 76fb41aa..55825c8a 100644 --- a/src/main/java/codechicken/nei/recipe/IRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/IRecipeHandler.java @@ -1,16 +1,14 @@ package codechicken.nei.recipe; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; - -import org.lwjgl.input.Keyboard; - import codechicken.nei.PositionedStack; import codechicken.nei.api.IOverlayHandler; import codechicken.nei.api.IRecipeOverlayRenderer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; + +import java.util.List; /** * Do not implement this. Implement one of it's subinterfaces, either {@link ICraftingHandler} or {@link IUsageHandler} diff --git a/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java b/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java index 4da62de1..9ef0045f 100644 --- a/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java @@ -1,17 +1,5 @@ package codechicken.nei.recipe; -import static codechicken.lib.gui.GuiDraw.drawString; -import static codechicken.lib.gui.GuiDraw.getStringWidth; - -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; - import codechicken.core.TaskProfiler; import codechicken.core.TaskProfiler.ProfilerResult; import codechicken.nei.NEIClientConfig; @@ -19,6 +7,17 @@ import codechicken.nei.NEIClientUtils; import codechicken.nei.PositionedStack; import codechicken.nei.api.IOverlayHandler; import codechicken.nei.api.IRecipeOverlayRenderer; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; + +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import static codechicken.lib.gui.GuiDraw.drawString; +import static codechicken.lib.gui.GuiDraw.getStringWidth; public class ProfilerRecipeHandler implements ICraftingHandler, IUsageHandler { diff --git a/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java b/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java index 883d500c..e739e083 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java +++ b/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java @@ -1,5 +1,15 @@ package codechicken.nei.recipe; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import com.google.common.base.Objects; +import cpw.mods.fml.common.Loader; +import net.minecraft.item.ItemStack; +import org.apache.commons.csv.CSVFormat; +import org.apache.commons.csv.CSVParser; +import org.apache.commons.csv.CSVRecord; + import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; @@ -18,19 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.minecraft.item.ItemStack; - -import org.apache.commons.csv.CSVFormat; -import org.apache.commons.csv.CSVParser; -import org.apache.commons.csv.CSVRecord; - -import com.google.common.base.Objects; - -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import cpw.mods.fml.common.Loader; - public class RecipeCatalysts { private static final Map catalystsAdderFromAPI = new HashMap<>(); diff --git a/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java b/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java index bb837a28..3a6440b2 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java +++ b/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java @@ -1,20 +1,19 @@ package codechicken.nei.recipe; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.function.Function; -import java.util.stream.Collectors; - +import codechicken.core.TaskProfiler; +import codechicken.nei.ItemList; +import codechicken.nei.NEIClientConfig; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; -import codechicken.core.TaskProfiler; -import codechicken.nei.ItemList; -import codechicken.nei.NEIClientConfig; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.function.Function; +import java.util.stream.Collectors; class RecipeHandlerQuery { diff --git a/src/main/java/codechicken/nei/recipe/RecipeInfo.java b/src/main/java/codechicken/nei/recipe/RecipeInfo.java index 75ad591f..7283bb40 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeInfo.java +++ b/src/main/java/codechicken/nei/recipe/RecipeInfo.java @@ -1,19 +1,17 @@ package codechicken.nei.recipe; -import java.util.HashMap; - +import codechicken.nei.OffsetPositioner; +import codechicken.nei.api.API; +import codechicken.nei.api.IOverlayHandler; +import codechicken.nei.api.IStackPositioner; +import com.google.common.base.Objects; import net.minecraft.client.gui.inventory.GuiBrewingStand; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiCrafting; import net.minecraft.client.gui.inventory.GuiFurnace; import net.minecraft.client.gui.inventory.GuiInventory; -import com.google.common.base.Objects; - -import codechicken.nei.OffsetPositioner; -import codechicken.nei.api.API; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IStackPositioner; +import java.util.HashMap; public class RecipeInfo { diff --git a/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java b/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java index 7f45335c..70bd3ce8 100644 --- a/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java +++ b/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java @@ -1,12 +1,11 @@ package codechicken.nei.recipe; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.item.ItemStack; - import codechicken.nei.ItemPanels; import codechicken.nei.api.ShortcutInputHandler; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; public class RecipeItemInputHandler implements IContainerInputHandler { diff --git a/src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java b/src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java index 17d81fae..5798bb70 100644 --- a/src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java +++ b/src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java @@ -1,12 +1,11 @@ package codechicken.nei.recipe; -import static codechicken.nei.LayoutManager.searchField; - +import codechicken.nei.api.INEIGuiAdapter; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -import codechicken.nei.api.INEIGuiAdapter; +import static codechicken.nei.LayoutManager.searchField; public class SearchInputDropHandler extends INEIGuiAdapter { diff --git a/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java b/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java index 7a900c1c..0930ff25 100644 --- a/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java @@ -1,18 +1,5 @@ package codechicken.nei.recipe; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiCrafting; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; -import net.minecraftforge.oredict.ShapedOreRecipe; - import codechicken.core.ReflectionManager; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; @@ -22,6 +9,18 @@ import codechicken.nei.api.DefaultOverlayRenderer; import codechicken.nei.api.IOverlayHandler; import codechicken.nei.api.IRecipeOverlayRenderer; import codechicken.nei.api.IStackPositioner; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.inventory.GuiCrafting; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraftforge.oredict.ShapedOreRecipe; +import java.awt.Rectangle; + +import java.util.ArrayList; +import java.util.List; public class ShapedRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/codechicken/nei/recipe/ShapelessRecipeHandler.java b/src/main/java/codechicken/nei/recipe/ShapelessRecipeHandler.java index 195d632d..3bea109a 100644 --- a/src/main/java/codechicken/nei/recipe/ShapelessRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/ShapelessRecipeHandler.java @@ -1,19 +1,18 @@ package codechicken.nei.recipe; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import codechicken.nei.NEIClientConfig; +import codechicken.nei.NEIClientUtils; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraftforge.oredict.ShapelessOreRecipe; -import codechicken.nei.NEIClientConfig; -import codechicken.nei.NEIClientUtils; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class ShapelessRecipeHandler extends ShapedRecipeHandler { diff --git a/src/main/java/codechicken/nei/recipe/StackInfo.java b/src/main/java/codechicken/nei/recipe/StackInfo.java index b1164aec..3638fb73 100644 --- a/src/main/java/codechicken/nei/recipe/StackInfo.java +++ b/src/main/java/codechicken/nei/recipe/StackInfo.java @@ -1,5 +1,16 @@ package codechicken.nei.recipe; +import codechicken.nei.NEIClientConfig; +import codechicken.nei.api.IStackStringifyHandler; +import codechicken.nei.recipe.stackinfo.DefaultStackStringifyHandler; +import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.fluids.FluidStack; +import org.apache.commons.io.IOUtils; + import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -11,19 +22,6 @@ import java.util.HashMap; import java.util.List; import java.util.WeakHashMap; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.fluids.FluidStack; - -import org.apache.commons.io.IOUtils; - -import codechicken.nei.NEIClientConfig; -import codechicken.nei.api.IStackStringifyHandler; -import codechicken.nei.recipe.stackinfo.DefaultStackStringifyHandler; -import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler; - public class StackInfo { public static final ArrayList stackStringifyHandlers = new ArrayList<>(); diff --git a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java index 75d07a8f..d63d8e89 100644 --- a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java +++ b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java @@ -1,36 +1,5 @@ package codechicken.nei.recipe; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; -import static codechicken.lib.gui.GuiDraw.getMousePosition; - -import java.awt.*; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.Random; -import java.util.Set; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.locks.ReentrantLock; -import java.util.stream.Collectors; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.inventory.Container; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntityFurnace; - -import org.lwjgl.opengl.GL11; - -import com.google.common.base.Stopwatch; - import codechicken.lib.vec.Rectangle4i; import codechicken.nei.ItemList; import codechicken.nei.NEIClientConfig; @@ -44,6 +13,36 @@ import codechicken.nei.api.IStackPositioner; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; import codechicken.nei.guihook.IContainerTooltipHandler; +import com.google.common.base.Stopwatch; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.inventory.Container; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntityFurnace; +import org.lwjgl.opengl.GL11; +import java.awt.Rectangle; +import java.awt.Point; + + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.locks.ReentrantLock; +import java.util.stream.Collectors; + +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; +import static codechicken.lib.gui.GuiDraw.getMousePosition; /** * A Template Recipe Handler! How about that. Because it was sooo hard, and more seriously required lots of copied code diff --git a/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java b/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java index a1b6de9b..6579b497 100644 --- a/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java +++ b/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java @@ -1,5 +1,7 @@ package codechicken.nei.recipe.stackinfo; +import codechicken.nei.api.IStackStringifyHandler; +import cpw.mods.fml.common.registry.GameData; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -7,9 +9,6 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; -import codechicken.nei.api.IStackStringifyHandler; -import cpw.mods.fml.common.registry.GameData; - public class DefaultStackStringifyHandler implements IStackStringifyHandler { public NBTTagCompound convertItemStackToNBT(ItemStack stack, boolean saveStackSize) { diff --git a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java index abcd72b2..5b972e7e 100644 --- a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java +++ b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java @@ -1,14 +1,13 @@ package codechicken.nei.recipe.stackinfo; -import java.lang.reflect.Method; - +import codechicken.nei.api.IStackStringifyHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import codechicken.nei.api.IStackStringifyHandler; +import java.lang.reflect.Method; public class GTFluidStackStringifyHandler implements IStackStringifyHandler { diff --git a/src/main/java/codechicken/nei/util/NBTHelper.java b/src/main/java/codechicken/nei/util/NBTHelper.java index 0f2e28f9..a1fe7c1d 100644 --- a/src/main/java/codechicken/nei/util/NBTHelper.java +++ b/src/main/java/codechicken/nei/util/NBTHelper.java @@ -1,13 +1,12 @@ package codechicken.nei.util; -import java.util.Set; - -import javax.annotation.Nullable; - import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import javax.annotation.Nullable; +import java.util.Set; + public class NBTHelper { /* diff --git a/src/main/java/codechicken/nei/util/NBTJson.java b/src/main/java/codechicken/nei/util/NBTJson.java index 8adcd459..aa31439e 100644 --- a/src/main/java/codechicken/nei/util/NBTJson.java +++ b/src/main/java/codechicken/nei/util/NBTJson.java @@ -1,11 +1,9 @@ package codechicken.nei.util; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonPrimitive; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagByteArray; @@ -19,10 +17,11 @@ import net.minecraft.nbt.NBTTagLong; import net.minecraft.nbt.NBTTagShort; import net.minecraft.nbt.NBTTagString; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonPrimitive; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class NBTJson {