diff --git a/src/main/java/taintedmagic/client/ClientProxy.java b/src/main/java/taintedmagic/client/ClientProxy.java index eb4456e..1499c81 100644 --- a/src/main/java/taintedmagic/client/ClientProxy.java +++ b/src/main/java/taintedmagic/client/ClientProxy.java @@ -6,6 +6,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.client.registry.RenderingRegistry; import taintedmagic.client.handler.HUDHandler; import taintedmagic.client.renderer.RenderEntityHomingShard; import taintedmagic.client.renderer.RenderEntityTaintBubble; @@ -20,7 +21,6 @@ import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.fx.particles.FXWisp; import thaumcraft.client.renderers.entity.RenderEldritchOrb; import thaumcraft.codechicken.lib.vec.Vector3; -import cpw.mods.fml.client.registry.RenderingRegistry; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/taintedmagic/client/handler/HUDHandler.java b/src/main/java/taintedmagic/client/handler/HUDHandler.java index 5fdcf9b..d499249 100644 --- a/src/main/java/taintedmagic/client/handler/HUDHandler.java +++ b/src/main/java/taintedmagic/client/handler/HUDHandler.java @@ -6,9 +6,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import taintedmagic.common.items.tools.ItemKatana; import taintedmagic.common.items.tools.ItemThaumicDisassembler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class HUDHandler { diff --git a/src/main/java/taintedmagic/client/renderer/RenderItemKatana.java b/src/main/java/taintedmagic/client/renderer/RenderItemKatana.java index 98fce3f..d9d1aff 100644 --- a/src/main/java/taintedmagic/client/renderer/RenderItemKatana.java +++ b/src/main/java/taintedmagic/client/renderer/RenderItemKatana.java @@ -10,11 +10,11 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.items.tools.ItemKatana; import thaumcraft.client.lib.UtilsFX; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class RenderItemKatana implements IItemRenderer { diff --git a/src/main/java/taintedmagic/common/TaintedMagic.java b/src/main/java/taintedmagic/common/TaintedMagic.java index 60d407e..485be87 100644 --- a/src/main/java/taintedmagic/common/TaintedMagic.java +++ b/src/main/java/taintedmagic/common/TaintedMagic.java @@ -10,6 +10,13 @@ import net.minecraftforge.common.util.EnumHelper; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; import taintedmagic.common.handler.ConfigHandler; import taintedmagic.common.handler.TaintedMagicEventHandler; import taintedmagic.common.handler.UpdateHandler; @@ -22,13 +29,6 @@ import taintedmagic.common.registry.ModEntityRegistry; import taintedmagic.common.registry.OreDictionaryRegistry; import taintedmagic.common.registry.RecipeRegistry; import taintedmagic.common.registry.ResearchRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; @Mod( modid = LibStrings.MODID, diff --git a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java index 1d43517..7938d79 100644 --- a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java +++ b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java @@ -17,11 +17,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.registry.BlockRegistry; import thaumcraft.common.config.ConfigBlocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockWarpwoodLeaves extends Block implements IShearable { diff --git a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLog.java b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLog.java index ed58de0..9d8efdc 100644 --- a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLog.java +++ b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLog.java @@ -7,9 +7,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import taintedmagic.common.TaintedMagic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import taintedmagic.common.TaintedMagic; public class BlockWarpwoodLog extends BlockRotatedPillar { diff --git a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java index 7ce48e7..f586ce5 100644 --- a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java +++ b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java @@ -11,11 +11,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.registry.BlockRegistry; import taintedmagic.common.world.WorldGenWarpwoodTree; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockWarpwoodSapling extends BlockSapling { diff --git a/src/main/java/taintedmagic/common/entities/EntityHomingShard.java b/src/main/java/taintedmagic/common/entities/EntityHomingShard.java index 6353fca..f439a72 100644 --- a/src/main/java/taintedmagic/common/entities/EntityHomingShard.java +++ b/src/main/java/taintedmagic/common/entities/EntityHomingShard.java @@ -11,12 +11,12 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import thaumcraft.common.Thaumcraft; -import thaumcraft.common.lib.utils.EntityUtils; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.lib.utils.EntityUtils; /** * this class is based off of EntityHomingShard.class created by as part of Thaumcraft 5 diff --git a/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java b/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java index 92e006b..03e1849 100644 --- a/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java +++ b/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java @@ -21,6 +21,9 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import taintedmagic.api.IBloodlust; import taintedmagic.common.helper.TaintedMagicHelper; import taintedmagic.common.items.wand.foci.ItemFocusMageMace; @@ -35,9 +38,6 @@ import thaumcraft.common.items.equipment.ItemCrimsonSword; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.lib.network.PacketHandler; import thaumcraft.common.lib.network.playerdata.PacketResearchComplete; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class TaintedMagicEventHandler { diff --git a/src/main/java/taintedmagic/common/items/ItemMagicFunguar.java b/src/main/java/taintedmagic/common/items/ItemMagicFunguar.java index 1294caa..4017bc2 100644 --- a/src/main/java/taintedmagic/common/items/ItemMagicFunguar.java +++ b/src/main/java/taintedmagic/common/items/ItemMagicFunguar.java @@ -11,14 +11,14 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.Thaumcraft; import thaumcraft.common.lib.network.PacketHandler; import thaumcraft.common.lib.network.playerdata.PacketAspectPool; import thaumcraft.common.lib.research.ResearchManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemMagicFunguar extends ItemFood { diff --git a/src/main/java/taintedmagic/common/items/ItemMaterial.java b/src/main/java/taintedmagic/common/items/ItemMaterial.java index 89466f9..55e68b1 100644 --- a/src/main/java/taintedmagic/common/items/ItemMaterial.java +++ b/src/main/java/taintedmagic/common/items/ItemMaterial.java @@ -9,9 +9,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import taintedmagic.common.TaintedMagic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import taintedmagic.common.TaintedMagic; public class ItemMaterial extends Item { diff --git a/src/main/java/taintedmagic/common/items/ItemVoidsentBlood.java b/src/main/java/taintedmagic/common/items/ItemVoidsentBlood.java index 14592d0..226462a 100644 --- a/src/main/java/taintedmagic/common/items/ItemVoidsentBlood.java +++ b/src/main/java/taintedmagic/common/items/ItemVoidsentBlood.java @@ -6,11 +6,11 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import taintedmagic.api.RecipeVoidsentBlood; -import taintedmagic.common.TaintedMagic; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import taintedmagic.api.RecipeVoidsentBlood; +import taintedmagic.common.TaintedMagic; public class ItemVoidsentBlood extends Item { diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemShadowFortressArmor.java b/src/main/java/taintedmagic/common/items/equipment/ItemShadowFortressArmor.java index ec8e023..6177d48 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemShadowFortressArmor.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemShadowFortressArmor.java @@ -13,14 +13,14 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.common.ISpecialArmor; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.registry.ItemRegistry; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.IWarpingGear; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.items.armor.ItemFortressArmor; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemShadowFortressArmor extends ItemFortressArmor implements IWarpingGear, IVisDiscountGear, ISpecialArmor { diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidFortressArmor.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidFortressArmor.java index 093a91f..77a25e0 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidFortressArmor.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidFortressArmor.java @@ -12,14 +12,14 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.IWarpingGear; import thaumcraft.api.ItemApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.items.armor.ItemFortressArmor; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemVoidFortressArmor extends ItemFortressArmor implements IWarpingGear, IVisDiscountGear { diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java index 80e3d7c..eb97201 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java @@ -9,12 +9,12 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import thaumcraft.api.IWarpingGear; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.items.armor.ItemGoggles; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemVoidmetalGoggles extends ItemGoggles implements IWarpingGear { diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java index 5880279..f72e0be 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java @@ -14,6 +14,7 @@ import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import taintedmagic.common.TaintedMagic; import taintedmagic.common.registry.ItemRegistry; import thaumcraft.api.IRepairable; @@ -23,7 +24,6 @@ import thaumcraft.api.IWarpingGear; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.Thaumcraft; import thaumcraft.common.items.armor.Hover; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ItemVoidwalkerBoots extends ItemArmor implements IVisDiscountGear, IWarpingGear, IRunicArmor, IRepairable, ISpecialArmor { diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java index 496026e..965eb7e 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java @@ -12,17 +12,17 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.common.lib.PlayerHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import taintedmagic.common.TaintedMagic; import thaumcraft.api.IRunicArmor; import thaumcraft.api.IWarpingGear; import thaumcraft.api.ItemRunic; import thaumcraft.common.Thaumcraft; import thaumcraft.common.items.armor.Hover; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import baubles.common.lib.PlayerHandler; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ItemVoidwalkerSash extends ItemRunic implements IRunicArmor, IWarpingGear, IBauble { diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java b/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java index d8ee681..e8ad6a9 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java @@ -6,12 +6,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.registry.ItemRegistry; import thaumcraft.api.IWarpingGear; import thaumcraft.common.items.armor.ItemGoggles; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemWarpedGoggles extends ItemGoggles implements IWarpingGear { diff --git a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java index a662cd6..95850f8 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java @@ -31,6 +31,9 @@ import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.client.model.ModelKatana; import taintedmagic.client.model.ModelSaya; import taintedmagic.common.TaintedMagic; @@ -41,9 +44,6 @@ import thaumcraft.api.IRepairable; import thaumcraft.api.IWarpingGear; import thaumcraft.common.config.Config; import thaumcraft.common.entities.projectile.EntityExplosiveOrb; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemKatana extends Item implements IWarpingGear, IRepairable { diff --git a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalHoe.java b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalHoe.java index da61cb9..0763453 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalHoe.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalHoe.java @@ -10,11 +10,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import taintedmagic.common.TaintedMagic; import taintedmagic.common.registry.ItemRegistry; import thaumcraft.api.IRepairable; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ItemShadowmetalHoe extends ItemHoe implements IRepairable { diff --git a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java index 3dbf801..9de1cf7 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java @@ -21,12 +21,12 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.WandManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemThaumicDisassembler extends Item { diff --git a/src/main/java/taintedmagic/common/items/wand/ItemWandCap.java b/src/main/java/taintedmagic/common/items/wand/ItemWandCap.java index 3b61cdf..731c1b2 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemWandCap.java +++ b/src/main/java/taintedmagic/common/items/wand/ItemWandCap.java @@ -9,9 +9,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import taintedmagic.common.TaintedMagic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import taintedmagic.common.TaintedMagic; public class ItemWandCap extends Item { diff --git a/src/main/java/taintedmagic/common/items/wand/ItemWandRod.java b/src/main/java/taintedmagic/common/items/wand/ItemWandRod.java index f5139f3..a193cb8 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemWandRod.java +++ b/src/main/java/taintedmagic/common/items/wand/ItemWandRod.java @@ -9,9 +9,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import taintedmagic.common.TaintedMagic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import taintedmagic.common.TaintedMagic; public class ItemWandRod extends Item { diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java index 7b6b151..4e305f4 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusEldritch.java @@ -10,6 +10,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.entities.EntityEldritchOrbAttack; import taintedmagic.common.handler.ConfigHandler; @@ -20,8 +22,6 @@ import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.Thaumcraft; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFocusEldritch extends ItemFocusBasic { diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java index 59f651b..5b3adcf 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java @@ -12,6 +12,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.handler.ConfigHandler; import taintedmagic.common.helper.TaintedMagicHelper; @@ -20,8 +22,6 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.ItemFocusBasic; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFocusMageMace extends ItemFocusBasic { diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java index 444eb43..20155f7 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMeteorology.java @@ -8,6 +8,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -15,8 +17,6 @@ import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.items.wands.WandManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFocusMeteorology extends ItemFocusBasic { diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java index 7b785ab..380eebc 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaint.java @@ -12,6 +12,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.entities.EntityTaintBubble; import taintedmagic.common.handler.ConfigHandler; @@ -23,8 +25,6 @@ import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.config.Config; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.items.wands.WandManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFocusTaint extends ItemFocusBasic { diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java index d8f320f..81e8a45 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintedBlast.java @@ -14,6 +14,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.handler.ConfigHandler; import taintedmagic.common.helper.TaintedMagicHelper; @@ -22,8 +24,6 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFocusTaintedBlast extends ItemFocusBasic { diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java index 69cb980..ced22f5 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTime.java @@ -10,6 +10,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -17,8 +19,6 @@ import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.items.wands.WandManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemFocusTime extends ItemFocusBasic { diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java index e2a00b3..66d1f9d 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java @@ -11,6 +11,8 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import taintedmagic.common.entities.EntityHomingShard; import taintedmagic.common.handler.ConfigHandler; @@ -21,8 +23,6 @@ import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.lib.utils.EntityUtils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * this class is based off of ItemFocusShard.class created by as part of Thaumcraft 5 diff --git a/src/main/java/taintedmagic/common/network/PacketHandler.java b/src/main/java/taintedmagic/common/network/PacketHandler.java index c2f388b..c769199 100644 --- a/src/main/java/taintedmagic/common/network/PacketHandler.java +++ b/src/main/java/taintedmagic/common/network/PacketHandler.java @@ -1,9 +1,9 @@ package taintedmagic.common.network; -import taintedmagic.common.lib.LibStrings; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import taintedmagic.common.lib.LibStrings; public class PacketHandler { diff --git a/src/main/java/taintedmagic/common/registry/BlockRegistry.java b/src/main/java/taintedmagic/common/registry/BlockRegistry.java index d91bb4b..df061ea 100644 --- a/src/main/java/taintedmagic/common/registry/BlockRegistry.java +++ b/src/main/java/taintedmagic/common/registry/BlockRegistry.java @@ -2,6 +2,7 @@ package taintedmagic.common.registry; import net.minecraft.block.Block; +import cpw.mods.fml.common.registry.GameRegistry; import taintedmagic.common.blocks.BlockShadowOre; import taintedmagic.common.blocks.BlockShadowmetal; import taintedmagic.common.blocks.BlockWarpwoodLeaves; @@ -10,7 +11,6 @@ import taintedmagic.common.blocks.BlockWarpwoodPlanks; import taintedmagic.common.blocks.BlockWarpwoodSapling; import taintedmagic.common.items.blocks.ItemBlockShadowOre; import taintedmagic.common.items.blocks.ItemBlockWarpwoodSapling; -import cpw.mods.fml.common.registry.GameRegistry; public class BlockRegistry { diff --git a/src/main/java/taintedmagic/common/registry/ItemRegistry.java b/src/main/java/taintedmagic/common/registry/ItemRegistry.java index 8a41b4e..0b3b711 100644 --- a/src/main/java/taintedmagic/common/registry/ItemRegistry.java +++ b/src/main/java/taintedmagic/common/registry/ItemRegistry.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.common.registry.GameRegistry; import taintedmagic.common.handler.WandUpdateHandler; import taintedmagic.common.items.ItemMagicFunguar; import taintedmagic.common.items.ItemMaterial; @@ -42,7 +43,6 @@ import taintedmagic.common.lib.LibToolMaterials; import thaumcraft.api.wands.StaffRod; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; -import cpw.mods.fml.common.registry.GameRegistry; public class ItemRegistry { diff --git a/src/main/java/taintedmagic/common/registry/ModEntityRegistry.java b/src/main/java/taintedmagic/common/registry/ModEntityRegistry.java index fdf37b8..0fd31d6 100644 --- a/src/main/java/taintedmagic/common/registry/ModEntityRegistry.java +++ b/src/main/java/taintedmagic/common/registry/ModEntityRegistry.java @@ -1,10 +1,10 @@ package taintedmagic.common.registry; +import cpw.mods.fml.common.registry.EntityRegistry; import taintedmagic.common.TaintedMagic; import taintedmagic.common.entities.EntityEldritchOrbAttack; import taintedmagic.common.entities.EntityHomingShard; import taintedmagic.common.entities.EntityTaintBubble; -import cpw.mods.fml.common.registry.EntityRegistry; public class ModEntityRegistry { diff --git a/src/main/java/taintedmagic/common/registry/RecipeRegistry.java b/src/main/java/taintedmagic/common/registry/RecipeRegistry.java index 68700ad..427a07b 100644 --- a/src/main/java/taintedmagic/common/registry/RecipeRegistry.java +++ b/src/main/java/taintedmagic/common/registry/RecipeRegistry.java @@ -8,13 +8,13 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagInt; +import cpw.mods.fml.common.registry.GameRegistry; import thaumcraft.api.ItemApi; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; -import cpw.mods.fml.common.registry.GameRegistry; public class RecipeRegistry { diff --git a/src/main/java/taintedmagic/common/research/TaintedMagicResearchItem.java b/src/main/java/taintedmagic/common/research/TaintedMagicResearchItem.java index 8c55b4a..9475f57 100644 --- a/src/main/java/taintedmagic/common/research/TaintedMagicResearchItem.java +++ b/src/main/java/taintedmagic/common/research/TaintedMagicResearchItem.java @@ -4,12 +4,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import taintedmagic.common.TaintedMagic; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class TaintedMagicResearchItem extends ResearchItem { diff --git a/src/main/java/taintedmagic/common/research/ThaumcraftResearchItem.java b/src/main/java/taintedmagic/common/research/ThaumcraftResearchItem.java index b1581d0..94fbe04 100644 --- a/src/main/java/taintedmagic/common/research/ThaumcraftResearchItem.java +++ b/src/main/java/taintedmagic/common/research/ThaumcraftResearchItem.java @@ -3,13 +3,13 @@ package taintedmagic.common.research; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchCategoryList; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class was created by as part of the Thaumic Exploration mod. It is being distributed as part of