From 47a2ec5babcab6c42d9c74370aca260838a25401 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Tue, 27 Feb 2018 02:26:03 +1000 Subject: $ Organized imports. $ FindBugs fixes. --- .../gtPlusPlus/core/gui/item/GuiBaseBackpack.java | 7 ++++--- .../gtPlusPlus/core/gui/item/GuiBaseGrindle.java | 22 ++++++++-------------- .../gtPlusPlus/core/gui/item/GuiScreenGrindle.java | 18 ++++++++++-------- 3 files changed, 22 insertions(+), 25 deletions(-) (limited to 'src/Java/gtPlusPlus/core/gui/item') diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java index fb42cd7cf5..0ad4b9b51f 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java +++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseBackpack.java @@ -3,9 +3,6 @@ package gtPlusPlus.core.gui.item; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import gtPlusPlus.core.container.Container_BackpackBase; -import gtPlusPlus.core.inventories.BaseInventoryBackpack; -import gtPlusPlus.core.lib.CORE; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.OpenGlHelper; @@ -14,6 +11,10 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; +import gtPlusPlus.core.container.Container_BackpackBase; +import gtPlusPlus.core.inventories.BaseInventoryBackpack; +import gtPlusPlus.core.lib.CORE; + public class GuiBaseBackpack extends GuiContainer { /** x and y size of the inventory window in pixels. Defined as float, passed as int diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java index 11610bcc5f..9272d462df 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java +++ b/src/Java/gtPlusPlus/core/gui/item/GuiBaseGrindle.java @@ -1,29 +1,23 @@ package gtPlusPlus.core.gui.item; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.GT_Utility.ItemNBT; -import gtPlusPlus.core.container.Container_BackpackBase; -import gtPlusPlus.core.container.Container_Grindle; -import gtPlusPlus.core.inventories.BaseInventoryBackpack; -import gtPlusPlus.core.inventories.BaseInventoryGrindle; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.NBTUtils; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.resources.I18n; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.ResourceLocation; +import gregtech.api.util.GT_Utility.ItemNBT; + +import gtPlusPlus.core.container.Container_Grindle; +import gtPlusPlus.core.inventories.BaseInventoryGrindle; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.NBTUtils; + public class GuiBaseGrindle extends GuiContainer { /** The FontRenderer used by GuiScreen */ diff --git a/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java b/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java index bc505ef036..cf94fbbb84 100644 --- a/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java +++ b/src/Java/gtPlusPlus/core/gui/item/GuiScreenGrindle.java @@ -7,14 +7,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.container.Container_Grindle; -import gtPlusPlus.core.inventories.BaseInventoryGrindle; -import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.NBTUtils; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -31,6 +24,15 @@ import net.minecraft.util.ChatAllowedCharacters; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; +import gtPlusPlus.core.container.Container_Grindle; +import gtPlusPlus.core.inventories.BaseInventoryGrindle; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.minecraft.NBTUtils; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; + @SideOnly(Side.CLIENT) public class GuiScreenGrindle extends GuiContainer { private static final Logger logger = LogManager.getLogger(); -- cgit