diff --git a/src/main/java/magicbees/client/gui/ContainerEffectRing.java b/src/main/java/magicbees/client/gui/ContainerEffectRing.java index 56030ec..84d6d41 100644 --- a/src/main/java/magicbees/client/gui/ContainerEffectRing.java +++ b/src/main/java/magicbees/client/gui/ContainerEffectRing.java @@ -1,11 +1,10 @@ package magicbees.client.gui; -import magicbees.itemInventories.InventoryBeeRing; - import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.common.registry.GameRegistry; import forestry.core.gui.ContainerItemInventory; +import magicbees.itemInventories.InventoryBeeRing; public class ContainerEffectRing extends ContainerItemInventory { diff --git a/src/main/java/magicbees/client/gui/GUIEffectRing.java b/src/main/java/magicbees/client/gui/GUIEffectRing.java index 02ea052..5e4fa3c 100644 --- a/src/main/java/magicbees/client/gui/GUIEffectRing.java +++ b/src/main/java/magicbees/client/gui/GUIEffectRing.java @@ -1,8 +1,5 @@ package magicbees.client.gui; -import magicbees.itemInventories.InventoryBeeRing; -import magicbees.main.CommonProxy; - import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; @@ -10,6 +7,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import forestry.core.gui.GuiForestry; +import magicbees.itemInventories.InventoryBeeRing; +import magicbees.main.CommonProxy; public class GUIEffectRing extends GuiForestry { diff --git a/src/main/java/magicbees/client/gui/GUIHandler.java b/src/main/java/magicbees/client/gui/GUIHandler.java index 6513ecc..3a75411 100644 --- a/src/main/java/magicbees/client/gui/GUIHandler.java +++ b/src/main/java/magicbees/client/gui/GUIHandler.java @@ -1,12 +1,10 @@ package magicbees.client.gui; -import magicbees.itemInventories.InventoryBeeRing; -import magicbees.tileentity.TileEntityEffectJar; -import magicbees.tileentity.TileEntityMagicApiary; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; +import magicbees.itemInventories.InventoryBeeRing; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; diff --git a/src/main/java/magicbees/item/ItemBeeRing.java b/src/main/java/magicbees/item/ItemBeeRing.java index 46bdd16..af8b599 100644 --- a/src/main/java/magicbees/item/ItemBeeRing.java +++ b/src/main/java/magicbees/item/ItemBeeRing.java @@ -4,14 +4,6 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import magicbees.bees.BeeManager; -import magicbees.client.gui.UIScreens; -import magicbees.itemInventories.InventoryBeeRing; -import magicbees.main.CommonProxy; -import magicbees.main.MagicBees; -import magicbees.main.utils.TabMagicBees; -import magicbees.tileentity.RingHousing; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -25,6 +17,13 @@ import baubles.common.lib.PlayerHandler; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.IBee; import forestry.api.genetics.IEffectData; +import magicbees.bees.BeeManager; +import magicbees.client.gui.UIScreens; +import magicbees.itemInventories.InventoryBeeRing; +import magicbees.main.CommonProxy; +import magicbees.main.MagicBees; +import magicbees.main.utils.TabMagicBees; +import magicbees.tileentity.RingHousing; public class ItemBeeRing extends Item implements IBauble { diff --git a/src/main/java/magicbees/tileentity/RingHousing.java b/src/main/java/magicbees/tileentity/RingHousing.java index a738589..75c5751 100644 --- a/src/main/java/magicbees/tileentity/RingHousing.java +++ b/src/main/java/magicbees/tileentity/RingHousing.java @@ -4,9 +4,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import magicbees.bees.BeeManager; -import magicbees.itemInventories.InventoryBeeRing; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; @@ -22,6 +19,8 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IErrorLogic; import forestry.api.core.IErrorState; +import magicbees.bees.BeeManager; +import magicbees.itemInventories.InventoryBeeRing; // Class that simulates a BeeHouse using both player data and info from InventoryBeeRing public class RingHousing implements IBeeHousing {