diff --git a/libs/industrialcraft-2-2.2.807-experimental-dev.jar b/libs/industrialcraft-2-2.2.827-experimental-dev.jar similarity index 77% rename from libs/industrialcraft-2-2.2.807-experimental-dev.jar rename to libs/industrialcraft-2-2.2.827-experimental-dev.jar index c151f55..b2b47e3 100644 Binary files a/libs/industrialcraft-2-2.2.807-experimental-dev.jar and b/libs/industrialcraft-2-2.2.827-experimental-dev.jar differ diff --git a/src/api/java/baubles/api/package-info.java b/src/api/java/baubles/api/package-info.java index 4405712..1cbc8d8 100644 --- a/src/api/java/baubles/api/package-info.java +++ b/src/api/java/baubles/api/package-info.java @@ -1,2 +1,3 @@ //@API(apiVersion = "1.7.10-1.0.1.5", owner = "Baubles", provides = "Baubles|API") package baubles.api; +import cpw.mods.fml.common.API; diff --git a/src/api/java/ic2/api/Direction.java b/src/api/java/ic2/api/Direction.java index 1563e51..b550ca3 100644 --- a/src/api/java/ic2/api/Direction.java +++ b/src/api/java/ic2/api/Direction.java @@ -1,12 +1,13 @@ package ic2.api; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - import java.util.EnumSet; import java.util.Set; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import net.minecraftforge.common.util.ForgeDirection; + /** * Represents the 6 possible directions along the axis of a block. */ diff --git a/src/api/java/ic2/api/crops/CropCard.java b/src/api/java/ic2/api/crops/CropCard.java index 8797fa2..1d2b640 100644 --- a/src/api/java/ic2/api/crops/CropCard.java +++ b/src/api/java/ic2/api/crops/CropCard.java @@ -1,9 +1,5 @@ package ic2.api.crops; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -11,6 +7,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ModContainer; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + /** * Base agriculture crop. * diff --git a/src/api/java/ic2/api/crops/Crops.java b/src/api/java/ic2/api/crops/Crops.java index 6ee5a14..a11059a 100644 --- a/src/api/java/ic2/api/crops/Crops.java +++ b/src/api/java/ic2/api/crops/Crops.java @@ -1,13 +1,15 @@ package ic2.api.crops; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Collection; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.common.BiomeDictionary.Type; -import java.util.Collection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import net.minecraftforge.common.BiomeDictionary.Type; /** * General management of the crop system. diff --git a/src/api/java/ic2/api/crops/package-info.java b/src/api/java/ic2/api/crops/package-info.java index 056d832..04b8253 100644 --- a/src/api/java/ic2/api/crops/package-info.java +++ b/src/api/java/ic2/api/crops/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.crops; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.crops; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/energy/IEnergyNet.java b/src/api/java/ic2/api/energy/IEnergyNet.java index 0340223..8f656e5 100644 --- a/src/api/java/ic2/api/energy/IEnergyNet.java +++ b/src/api/java/ic2/api/energy/IEnergyNet.java @@ -2,6 +2,7 @@ package ic2.api.energy; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + import net.minecraftforge.common.util.ForgeDirection; /** diff --git a/src/api/java/ic2/api/energy/event/EnergyTileEvent.java b/src/api/java/ic2/api/energy/event/EnergyTileEvent.java index aeee0cd..86b8dc2 100644 --- a/src/api/java/ic2/api/energy/event/EnergyTileEvent.java +++ b/src/api/java/ic2/api/energy/event/EnergyTileEvent.java @@ -1,9 +1,11 @@ package ic2.api.energy.event; -import ic2.api.energy.tile.IEnergyTile; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.event.world.WorldEvent; +import ic2.api.energy.tile.IEnergyTile; + /** * Base class for energy net events, don't use it directly. * diff --git a/src/api/java/ic2/api/energy/event/package-info.java b/src/api/java/ic2/api/energy/event/package-info.java index 9f58976..40db6f8 100644 --- a/src/api/java/ic2/api/energy/event/package-info.java +++ b/src/api/java/ic2/api/energy/event/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.energy.event; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.energy.event; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/energy/package-info.java b/src/api/java/ic2/api/energy/package-info.java index def56c5..81d0bfe 100644 --- a/src/api/java/ic2/api/energy/package-info.java +++ b/src/api/java/ic2/api/energy/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.energy; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.energy; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/energy/prefab/BasicSink.java b/src/api/java/ic2/api/energy/prefab/BasicSink.java index ecf3b04..48de061 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSink.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSink.java @@ -1,16 +1,19 @@ package ic2.api.energy.prefab; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + import cpw.mods.fml.common.FMLCommonHandler; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; + import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; import ic2.api.energy.tile.IEnergySink; import ic2.api.info.Info; import ic2.api.item.ElectricItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; /** * BasicSink is a simple adapter to provide an ic2 energy sink. diff --git a/src/api/java/ic2/api/energy/prefab/BasicSource.java b/src/api/java/ic2/api/energy/prefab/BasicSource.java index 01cdb07..011e8cd 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSource.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSource.java @@ -1,17 +1,20 @@ package ic2.api.energy.prefab; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; + import cpw.mods.fml.common.FMLCommonHandler; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; + import ic2.api.energy.EnergyNet; import ic2.api.energy.event.EnergyTileLoadEvent; import ic2.api.energy.event.EnergyTileUnloadEvent; import ic2.api.energy.tile.IEnergySource; import ic2.api.info.Info; import ic2.api.item.ElectricItem; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; /** * BasicSource is a simple adapter to provide an ic2 energy source. diff --git a/src/api/java/ic2/api/energy/prefab/package-info.java b/src/api/java/ic2/api/energy/prefab/package-info.java index c6cd5e0..c38f7e0 100644 --- a/src/api/java/ic2/api/energy/prefab/package-info.java +++ b/src/api/java/ic2/api/energy/prefab/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.energy.prefab; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.energy.prefab; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java index 5ee2c6d..1735ff5 100644 --- a/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java +++ b/src/api/java/ic2/api/energy/tile/IEnergyAcceptor.java @@ -1,6 +1,7 @@ package ic2.api.energy.tile; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; /** diff --git a/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java index 5ddc798..013865e 100644 --- a/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java +++ b/src/api/java/ic2/api/energy/tile/IEnergyEmitter.java @@ -1,6 +1,7 @@ package ic2.api.energy.tile; import net.minecraft.tileentity.TileEntity; + import net.minecraftforge.common.util.ForgeDirection; /** diff --git a/src/api/java/ic2/api/energy/tile/IMetaDelegate.java b/src/api/java/ic2/api/energy/tile/IMetaDelegate.java index f5a40fe..f7319d0 100644 --- a/src/api/java/ic2/api/energy/tile/IMetaDelegate.java +++ b/src/api/java/ic2/api/energy/tile/IMetaDelegate.java @@ -1,9 +1,9 @@ package ic2.api.energy.tile; -import net.minecraft.tileentity.TileEntity; - import java.util.List; +import net.minecraft.tileentity.TileEntity; + /** * Interface for grouping multi-block structures to a single energy net delegate. * diff --git a/src/api/java/ic2/api/energy/tile/package-info.java b/src/api/java/ic2/api/energy/tile/package-info.java index f37161d..3c60323 100644 --- a/src/api/java/ic2/api/energy/tile/package-info.java +++ b/src/api/java/ic2/api/energy/tile/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.energy.tile; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.energy.tile; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/event/ExplosionEvent.java b/src/api/java/ic2/api/event/ExplosionEvent.java index e22a900..c2df419 100644 --- a/src/api/java/ic2/api/event/ExplosionEvent.java +++ b/src/api/java/ic2/api/event/ExplosionEvent.java @@ -1,9 +1,11 @@ package ic2.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; + +import cpw.mods.fml.common.eventhandler.Cancelable; + import net.minecraftforge.event.world.WorldEvent; @Cancelable diff --git a/src/api/java/ic2/api/event/LaserEvent.java b/src/api/java/ic2/api/event/LaserEvent.java index e61eee1..6d5ea28 100644 --- a/src/api/java/ic2/api/event/LaserEvent.java +++ b/src/api/java/ic2/api/event/LaserEvent.java @@ -1,10 +1,12 @@ package ic2.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.world.World; + +import cpw.mods.fml.common.eventhandler.Cancelable; + import net.minecraftforge.event.world.WorldEvent; /** diff --git a/src/api/java/ic2/api/event/PaintEvent.java b/src/api/java/ic2/api/event/PaintEvent.java index 856c3fe..c6565c2 100644 --- a/src/api/java/ic2/api/event/PaintEvent.java +++ b/src/api/java/ic2/api/event/PaintEvent.java @@ -1,7 +1,9 @@ package ic2.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.world.World; + +import cpw.mods.fml.common.eventhandler.Cancelable; + import net.minecraftforge.event.world.WorldEvent; @Cancelable diff --git a/src/api/java/ic2/api/event/RetextureEvent.java b/src/api/java/ic2/api/event/RetextureEvent.java index a5ef3d9..d530578 100644 --- a/src/api/java/ic2/api/event/RetextureEvent.java +++ b/src/api/java/ic2/api/event/RetextureEvent.java @@ -1,8 +1,10 @@ package ic2.api.event; -import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.block.Block; import net.minecraft.world.World; + +import cpw.mods.fml.common.eventhandler.Cancelable; + import net.minecraftforge.event.world.WorldEvent; @Cancelable diff --git a/src/api/java/ic2/api/event/package-info.java b/src/api/java/ic2/api/event/package-info.java index 813488d..d331b92 100644 --- a/src/api/java/ic2/api/event/package-info.java +++ b/src/api/java/ic2/api/event/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.event; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.event; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/info/Info.java b/src/api/java/ic2/api/info/Info.java index b62c56f..f8e30ad 100644 --- a/src/api/java/ic2/api/info/Info.java +++ b/src/api/java/ic2/api/info/Info.java @@ -1,9 +1,10 @@ package ic2.api.info; +import net.minecraft.potion.Potion; +import net.minecraft.util.DamageSource; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderState; -import net.minecraft.potion.Potion; -import net.minecraft.util.DamageSource; public class Info { public static IEnergyValueProvider itemEnergy; diff --git a/src/api/java/ic2/api/info/package-info.java b/src/api/java/ic2/api/info/package-info.java index f8a0105..59936e5 100644 --- a/src/api/java/ic2/api/info/package-info.java +++ b/src/api/java/ic2/api/info/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.info; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.info; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/item/ElectricItem.java b/src/api/java/ic2/api/item/ElectricItem.java index 4d33776..19e5fc1 100644 --- a/src/api/java/ic2/api/item/ElectricItem.java +++ b/src/api/java/ic2/api/item/ElectricItem.java @@ -1,10 +1,10 @@ package ic2.api.item; -import net.minecraft.item.ItemStack; - import java.util.ArrayList; import java.util.List; +import net.minecraft.item.ItemStack; + /** * Allows for charging, discharging and using electric items (IElectricItem). */ diff --git a/src/api/java/ic2/api/item/IItemHudInfo.java b/src/api/java/ic2/api/item/IItemHudInfo.java index dd6888d..da97318 100644 --- a/src/api/java/ic2/api/item/IItemHudInfo.java +++ b/src/api/java/ic2/api/item/IItemHudInfo.java @@ -1,9 +1,9 @@ package ic2.api.item; -import net.minecraft.item.ItemStack; - import java.util.List; +import net.minecraft.item.ItemStack; + public interface IItemHudInfo { /* Add Info to Nano- and Quantum-Suit Helm Hud diff --git a/src/api/java/ic2/api/item/ILatheItem.java b/src/api/java/ic2/api/item/ILatheItem.java index cd38d05..45988c4 100644 --- a/src/api/java/ic2/api/item/ILatheItem.java +++ b/src/api/java/ic2/api/item/ILatheItem.java @@ -1,9 +1,10 @@ package ic2.api.item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; /** * Interface used for Items that can be processed in the Turning Table diff --git a/src/api/java/ic2/api/item/ItemWrapper.java b/src/api/java/ic2/api/item/ItemWrapper.java index c2592bd..58f8073 100644 --- a/src/api/java/ic2/api/item/ItemWrapper.java +++ b/src/api/java/ic2/api/item/ItemWrapper.java @@ -1,11 +1,12 @@ package ic2.api.item; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Multimap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; + /** * Wrapper for inserting interfaces into items you don't own. * diff --git a/src/api/java/ic2/api/item/package-info.java b/src/api/java/ic2/api/item/package-info.java index 3709846..44ecdce 100644 --- a/src/api/java/ic2/api/item/package-info.java +++ b/src/api/java/ic2/api/item/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.item; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.item; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/network/NetworkHelper.java b/src/api/java/ic2/api/network/NetworkHelper.java index 956db36..a91d03a 100644 --- a/src/api/java/ic2/api/network/NetworkHelper.java +++ b/src/api/java/ic2/api/network/NetworkHelper.java @@ -1,11 +1,11 @@ package ic2.api.network; +import java.lang.reflect.Method; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import java.lang.reflect.Method; - /** * Provides methods to initiate events and synchronize tile entity fields in SMP. * diff --git a/src/api/java/ic2/api/network/package-info.java b/src/api/java/ic2/api/network/package-info.java index 7792609..25ea29e 100644 --- a/src/api/java/ic2/api/network/package-info.java +++ b/src/api/java/ic2/api/network/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.network; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.network; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/package-info.java b/src/api/java/ic2/api/package-info.java index e8e304f..e6f1522 100644 --- a/src/api/java/ic2/api/package-info.java +++ b/src/api/java/ic2/api/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/reactor/package-info.java b/src/api/java/ic2/api/reactor/package-info.java index acab820..5194aee 100644 --- a/src/api/java/ic2/api/reactor/package-info.java +++ b/src/api/java/ic2/api/reactor/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.reactor; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.reactor; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java index ca279b1..415b3c3 100644 --- a/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java +++ b/src/api/java/ic2/api/recipe/ICannerBottleRecipeManager.java @@ -1,9 +1,9 @@ package ic2.api.recipe; -import net.minecraft.item.ItemStack; - import java.util.Map; +import net.minecraft.item.ItemStack; + public interface ICannerBottleRecipeManager { /** * Adds a recipe to the machine. diff --git a/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java index a4669c3..5eba1b6 100644 --- a/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java +++ b/src/api/java/ic2/api/recipe/ICannerEnrichRecipeManager.java @@ -1,10 +1,11 @@ package ic2.api.recipe; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import java.util.Map; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + public interface ICannerEnrichRecipeManager { /** * Adds a recipe to the machine. diff --git a/src/api/java/ic2/api/recipe/IFluidHeatManager.java b/src/api/java/ic2/api/recipe/IFluidHeatManager.java index 65a8da3..7ddecdc 100644 --- a/src/api/java/ic2/api/recipe/IFluidHeatManager.java +++ b/src/api/java/ic2/api/recipe/IFluidHeatManager.java @@ -1,9 +1,9 @@ package ic2.api.recipe; -import net.minecraftforge.fluids.Fluid; - import java.util.Map; +import net.minecraftforge.fluids.Fluid; + public interface IFluidHeatManager extends ILiquidAcceptManager { /** diff --git a/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java b/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java index 85c7dc8..4f377b9 100644 --- a/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java +++ b/src/api/java/ic2/api/recipe/ILiquidAcceptManager.java @@ -1,9 +1,9 @@ package ic2.api.recipe; -import net.minecraftforge.fluids.Fluid; - import java.util.Set; +import net.minecraftforge.fluids.Fluid; + public interface ILiquidAcceptManager { boolean acceptsFluid(Fluid fluid); Set getAcceptedFluids(); diff --git a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java index e144e7d..68decbb 100644 --- a/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java +++ b/src/api/java/ic2/api/recipe/ILiquidHeatExchangerManager.java @@ -1,9 +1,9 @@ package ic2.api.recipe; -import net.minecraftforge.fluids.Fluid; - import java.util.Map; +import net.minecraftforge.fluids.Fluid; + public interface ILiquidHeatExchangerManager extends ILiquidAcceptManager { /** diff --git a/src/api/java/ic2/api/recipe/IListRecipeManager.java b/src/api/java/ic2/api/recipe/IListRecipeManager.java index e9edd93..adc2291 100644 --- a/src/api/java/ic2/api/recipe/IListRecipeManager.java +++ b/src/api/java/ic2/api/recipe/IListRecipeManager.java @@ -1,9 +1,9 @@ package ic2.api.recipe; -import net.minecraft.item.ItemStack; - import java.util.List; +import net.minecraft.item.ItemStack; + /** * Recipe manager interface for basic lists. * diff --git a/src/api/java/ic2/api/recipe/IMachineRecipeManager.java b/src/api/java/ic2/api/recipe/IMachineRecipeManager.java index 7a5dc4e..d2d4382 100644 --- a/src/api/java/ic2/api/recipe/IMachineRecipeManager.java +++ b/src/api/java/ic2/api/recipe/IMachineRecipeManager.java @@ -1,10 +1,10 @@ package ic2.api.recipe; +import java.util.Map; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import java.util.Map; - /** * Recipe manager interface for basic machines. * diff --git a/src/api/java/ic2/api/recipe/IPatternStorage.java b/src/api/java/ic2/api/recipe/IPatternStorage.java index a907a49..c9dbd8d 100644 --- a/src/api/java/ic2/api/recipe/IPatternStorage.java +++ b/src/api/java/ic2/api/recipe/IPatternStorage.java @@ -1,9 +1,9 @@ package ic2.api.recipe; -import net.minecraft.item.ItemStack; - import java.util.List; +import net.minecraft.item.ItemStack; + public interface IPatternStorage { boolean addPattern(ItemStack itemstack); diff --git a/src/api/java/ic2/api/recipe/IRecipeInput.java b/src/api/java/ic2/api/recipe/IRecipeInput.java index 2e27f18..0c842d6 100644 --- a/src/api/java/ic2/api/recipe/IRecipeInput.java +++ b/src/api/java/ic2/api/recipe/IRecipeInput.java @@ -1,9 +1,9 @@ package ic2.api.recipe; -import net.minecraft.item.ItemStack; - import java.util.List; +import net.minecraft.item.ItemStack; + public interface IRecipeInput { /** * Check if subject matches this recipe input, ignoring the amount. diff --git a/src/api/java/ic2/api/recipe/IScrapboxManager.java b/src/api/java/ic2/api/recipe/IScrapboxManager.java index 307d299..41b694d 100644 --- a/src/api/java/ic2/api/recipe/IScrapboxManager.java +++ b/src/api/java/ic2/api/recipe/IScrapboxManager.java @@ -1,9 +1,9 @@ package ic2.api.recipe; -import net.minecraft.item.ItemStack; - import java.util.Map; +import net.minecraft.item.ItemStack; + public interface IScrapboxManager { void addDrop(ItemStack drop, float rawChance); diff --git a/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java index a5ee9de..87c3427 100644 --- a/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java +++ b/src/api/java/ic2/api/recipe/ISemiFluidFuelManager.java @@ -1,9 +1,9 @@ package ic2.api.recipe; -import net.minecraftforge.fluids.Fluid; - import java.util.Map; +import net.minecraftforge.fluids.Fluid; + public interface ISemiFluidFuelManager extends ILiquidAcceptManager { /** diff --git a/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java index b5956c2..103d293 100644 --- a/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java +++ b/src/api/java/ic2/api/recipe/RecipeInputFluidContainer.java @@ -1,14 +1,15 @@ package ic2.api.recipe; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.item.ItemStack; + import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; -import java.util.ArrayList; -import java.util.List; - public class RecipeInputFluidContainer implements IRecipeInput { public RecipeInputFluidContainer(Fluid fluid) { this(fluid, FluidContainerRegistry.BUCKET_VOLUME); diff --git a/src/api/java/ic2/api/recipe/RecipeInputItemStack.java b/src/api/java/ic2/api/recipe/RecipeInputItemStack.java index 0cab277..84f86ea 100644 --- a/src/api/java/ic2/api/recipe/RecipeInputItemStack.java +++ b/src/api/java/ic2/api/recipe/RecipeInputItemStack.java @@ -1,11 +1,12 @@ package ic2.api.recipe; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import java.util.Arrays; import java.util.List; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + public class RecipeInputItemStack implements IRecipeInput { public RecipeInputItemStack(ItemStack aInput) { this(aInput, aInput.stackSize); diff --git a/src/api/java/ic2/api/recipe/RecipeInputOreDict.java b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java index 63cc4ae..e6e4695 100644 --- a/src/api/java/ic2/api/recipe/RecipeInputOreDict.java +++ b/src/api/java/ic2/api/recipe/RecipeInputOreDict.java @@ -1,13 +1,14 @@ package ic2.api.recipe; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.oredict.OreDictionary; + public class RecipeInputOreDict implements IRecipeInput { public RecipeInputOreDict(String input1) { this(input1, 1); diff --git a/src/api/java/ic2/api/recipe/RecipeOutput.java b/src/api/java/ic2/api/recipe/RecipeOutput.java index 94937be..80ad5fb 100644 --- a/src/api/java/ic2/api/recipe/RecipeOutput.java +++ b/src/api/java/ic2/api/recipe/RecipeOutput.java @@ -1,12 +1,12 @@ package ic2.api.recipe; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import java.util.Arrays; import java.util.Iterator; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + public final class RecipeOutput { public RecipeOutput(NBTTagCompound metadata1, List items1) { assert !items1.contains(null); diff --git a/src/api/java/ic2/api/recipe/package-info.java b/src/api/java/ic2/api/recipe/package-info.java index ad39968..44e70e7 100644 --- a/src/api/java/ic2/api/recipe/package-info.java +++ b/src/api/java/ic2/api/recipe/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.recipe; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.recipe; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/tile/ExplosionWhitelist.java b/src/api/java/ic2/api/tile/ExplosionWhitelist.java index aad8bce..fa4a474 100644 --- a/src/api/java/ic2/api/tile/ExplosionWhitelist.java +++ b/src/api/java/ic2/api/tile/ExplosionWhitelist.java @@ -1,10 +1,10 @@ package ic2.api.tile; -import net.minecraft.block.Block; - import java.util.HashSet; import java.util.Set; +import net.minecraft.block.Block; + /** * Blocks on this whitelist will not resist an explosion but won't be destroyed. * diff --git a/src/api/java/ic2/api/tile/package-info.java b/src/api/java/ic2/api/tile/package-info.java index 1c753d5..5ebc76e 100644 --- a/src/api/java/ic2/api/tile/package-info.java +++ b/src/api/java/ic2/api/tile/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.tile; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.tile; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/ic2/api/util/package-info.java b/src/api/java/ic2/api/util/package-info.java index 88d29d6..4dd2d93 100644 --- a/src/api/java/ic2/api/util/package-info.java +++ b/src/api/java/ic2/api/util/package-info.java @@ -1,2 +1,4 @@ -//@API(apiVersion="1.0", owner="IC2", provides="IC2API") -//package ic2.api.util; +@API(apiVersion="1.0", owner="IC2", provides="IC2API") +package ic2.api.util; +import cpw.mods.fml.common.API; + diff --git a/src/api/java/thaumcraft/api/IArchitect.java b/src/api/java/thaumcraft/api/IArchitect.java index 41f2e82..c733af5 100644 --- a/src/api/java/thaumcraft/api/IArchitect.java +++ b/src/api/java/thaumcraft/api/IArchitect.java @@ -1,11 +1,11 @@ package thaumcraft.api; +import java.util.ArrayList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import java.util.ArrayList; - public interface IArchitect { /** diff --git a/src/api/java/thaumcraft/api/ItemApi.java b/src/api/java/thaumcraft/api/ItemApi.java index 8501850..25dda28 100644 --- a/src/api/java/thaumcraft/api/ItemApi.java +++ b/src/api/java/thaumcraft/api/ItemApi.java @@ -1,9 +1,9 @@ package thaumcraft.api; -import cpw.mods.fml.common.FMLLog; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.FMLLog; /** * @author Azanor diff --git a/src/api/java/thaumcraft/api/ThaumcraftApi.java b/src/api/java/thaumcraft/api/ThaumcraftApi.java index aebaa36..fbf7880 100644 --- a/src/api/java/thaumcraft/api/ThaumcraftApi.java +++ b/src/api/java/thaumcraft/api/ThaumcraftApi.java @@ -1,5 +1,11 @@ package thaumcraft.api; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; + import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; @@ -11,17 +17,19 @@ import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.*; +import thaumcraft.api.crafting.CrucibleRecipe; +import thaumcraft.api.crafting.InfusionEnchantmentRecipe; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.crafting.ShapedArcaneRecipe; +import thaumcraft.api.crafting.ShapelessArcaneRecipe; import thaumcraft.api.internal.DummyInternalMethodHandler; import thaumcraft.api.internal.IInternalMethodHandler; import thaumcraft.api.internal.WeightedRandomLoot; -import thaumcraft.api.research.*; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; +import thaumcraft.api.research.IScanEventHandler; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchCategoryList; +import thaumcraft.api.research.ResearchItem; +import thaumcraft.api.research.ResearchPage; /** diff --git a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java index b03e943..77d5588 100644 --- a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java +++ b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java @@ -1,5 +1,8 @@ package thaumcraft.api; +import java.util.HashMap; +import java.util.Iterator; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -16,9 +19,6 @@ import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IEssentiaTransport; -import java.util.HashMap; -import java.util.Iterator; - public class ThaumcraftApiHelper { public static AspectList cullTags(AspectList temp) { diff --git a/src/api/java/thaumcraft/api/aspects/Aspect.java b/src/api/java/thaumcraft/api/aspects/Aspect.java index 7c884f1..0ea13f5 100644 --- a/src/api/java/thaumcraft/api/aspects/Aspect.java +++ b/src/api/java/thaumcraft/api/aspects/Aspect.java @@ -1,13 +1,14 @@ package thaumcraft.api.aspects; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import org.apache.commons.lang3.text.WordUtils; - import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashMap; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +import org.apache.commons.lang3.text.WordUtils; + public class Aspect { String tag; diff --git a/src/api/java/thaumcraft/api/aspects/AspectList.java b/src/api/java/thaumcraft/api/aspects/AspectList.java index c7e50cc..b578141 100644 --- a/src/api/java/thaumcraft/api/aspects/AspectList.java +++ b/src/api/java/thaumcraft/api/aspects/AspectList.java @@ -1,13 +1,13 @@ package thaumcraft.api.aspects; +import java.io.Serializable; +import java.util.LinkedHashMap; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import thaumcraft.api.ThaumcraftApiHelper; -import java.io.Serializable; -import java.util.LinkedHashMap; - public class AspectList implements Serializable { public LinkedHashMap aspects = new LinkedHashMap();//aspects associated with this object diff --git a/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java b/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java index a137134..f22d8ce 100644 --- a/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java +++ b/src/api/java/thaumcraft/api/aspects/AspectSourceHelper.java @@ -1,10 +1,10 @@ package thaumcraft.api.aspects; -import cpw.mods.fml.common.FMLLog; +import java.lang.reflect.Method; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; - -import java.lang.reflect.Method; +import cpw.mods.fml.common.FMLLog; public class AspectSourceHelper { diff --git a/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java b/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java index f92a7de..6a82c0e 100644 --- a/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java +++ b/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java @@ -1,6 +1,7 @@ package thaumcraft.api.aspects; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; /** * diff --git a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java index 3ff5b29..595b6e5 100644 --- a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java +++ b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java @@ -1,13 +1,13 @@ package thaumcraft.api.crafting; +import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import java.util.ArrayList; - public class CrucibleRecipe { private ItemStack recipeOutput; diff --git a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java index 27f6e66..bdc5f50 100644 --- a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java +++ b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java @@ -1,5 +1,9 @@ package thaumcraft.api.crafting; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; + import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.player.EntityPlayer; @@ -9,10 +13,6 @@ import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; - public class InfusionEnchantmentRecipe { diff --git a/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java index 0e62385..d786b81 100644 --- a/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java +++ b/src/api/java/thaumcraft/api/crafting/InfusionRecipe.java @@ -1,5 +1,7 @@ package thaumcraft.api.crafting; +import java.util.ArrayList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -7,8 +9,6 @@ import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; -import java.util.ArrayList; - public class InfusionRecipe { protected AspectList aspects; diff --git a/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java index c837ef7..1490110 100644 --- a/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java +++ b/src/api/java/thaumcraft/api/crafting/ShapedArcaneRecipe.java @@ -1,5 +1,8 @@ package thaumcraft.api.crafting; +import java.util.ArrayList; +import java.util.HashMap; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -10,9 +13,6 @@ import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; -import java.util.ArrayList; -import java.util.HashMap; - public class ShapedArcaneRecipe implements IArcaneRecipe { //Added in for future ease of change, but hard coded for now. diff --git a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java index 925df97..3b1eaeb 100644 --- a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java +++ b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java @@ -1,5 +1,8 @@ package thaumcraft.api.crafting; +import java.util.ArrayList; +import java.util.Iterator; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -10,9 +13,6 @@ import net.minecraftforge.oredict.OreDictionary; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; -import java.util.ArrayList; -import java.util.Iterator; - public class ShapelessArcaneRecipe implements IArcaneRecipe { private ItemStack output = null; diff --git a/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java index 130250e..4ac6ee7 100644 --- a/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java +++ b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java @@ -1,10 +1,10 @@ package thaumcraft.api.internal; +import java.util.ArrayList; + import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandom; -import java.util.ArrayList; - public class WeightedRandomLoot extends WeightedRandom.Item { diff --git a/src/api/java/thaumcraft/api/package-info.java b/src/api/java/thaumcraft/api/package-info.java index 35b06e1..7e1c4b7 100644 --- a/src/api/java/thaumcraft/api/package-info.java +++ b/src/api/java/thaumcraft/api/package-info.java @@ -1,3 +1,4 @@ //@API(owner = "Thaumcraft", apiVersion = "4.2.2.0", provides = "Thaumcraft|API") //package thaumcraft.api; +import cpw.mods.fml.common.API; diff --git a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java index 9b0469f..b950de0 100644 --- a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java +++ b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java @@ -1,7 +1,5 @@ package thaumcraft.api.potions; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -9,6 +7,8 @@ import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; import thaumcraft.api.damagesource.DamageSourceThaumcraft; import thaumcraft.api.entities.ITaintedMob; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PotionFluxTaint extends Potion { diff --git a/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java index 611ab61..cd7fc18 100644 --- a/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java +++ b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java @@ -1,11 +1,11 @@ package thaumcraft.api.potions; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PotionVisExhaust extends Potion { diff --git a/src/api/java/thaumcraft/api/research/ResearchCategories.java b/src/api/java/thaumcraft/api/research/ResearchCategories.java index d249b7a..82309b3 100644 --- a/src/api/java/thaumcraft/api/research/ResearchCategories.java +++ b/src/api/java/thaumcraft/api/research/ResearchCategories.java @@ -1,13 +1,15 @@ package thaumcraft.api.research; -import cpw.mods.fml.common.FMLLog; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import org.apache.logging.log4j.Level; - import java.util.Collection; import java.util.LinkedHashMap; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +import org.apache.logging.log4j.Level; + +import cpw.mods.fml.common.FMLLog; + public class ResearchCategories { //Research diff --git a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java index d6fcdaa..7eed010 100644 --- a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java +++ b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java @@ -1,10 +1,10 @@ package thaumcraft.api.research; -import net.minecraft.util.ResourceLocation; - import java.util.HashMap; import java.util.Map; +import net.minecraft.util.ResourceLocation; + public class ResearchCategoryList { /** Is the smallest column used on the GUI. */ diff --git a/src/api/java/thaumcraft/api/research/ResearchPage.java b/src/api/java/thaumcraft/api/research/ResearchPage.java index 300633b..fdada84 100644 --- a/src/api/java/thaumcraft/api/research/ResearchPage.java +++ b/src/api/java/thaumcraft/api/research/ResearchPage.java @@ -1,5 +1,7 @@ package thaumcraft.api.research; +import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.IRecipe; @@ -11,8 +13,6 @@ import thaumcraft.api.crafting.IArcaneRecipe; import thaumcraft.api.crafting.InfusionEnchantmentRecipe; import thaumcraft.api.crafting.InfusionRecipe; -import java.util.List; - public class ResearchPage { public static enum PageType { diff --git a/src/api/java/thaumcraft/api/visnet/TileVisNode.java b/src/api/java/thaumcraft/api/visnet/TileVisNode.java index 5a51e97..204879e 100644 --- a/src/api/java/thaumcraft/api/visnet/TileVisNode.java +++ b/src/api/java/thaumcraft/api/visnet/TileVisNode.java @@ -1,13 +1,13 @@ package thaumcraft.api.visnet; -import thaumcraft.api.TileThaumcraft; -import thaumcraft.api.WorldCoordinates; -import thaumcraft.api.aspects.Aspect; - import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.HashMap; +import thaumcraft.api.TileThaumcraft; +import thaumcraft.api.WorldCoordinates; +import thaumcraft.api.aspects.Aspect; + /** * @author Azanor * diff --git a/src/api/java/thaumcraft/api/visnet/VisNetHandler.java b/src/api/java/thaumcraft/api/visnet/VisNetHandler.java index 29a8d92..7ac4c69 100644 --- a/src/api/java/thaumcraft/api/visnet/VisNetHandler.java +++ b/src/api/java/thaumcraft/api/visnet/VisNetHandler.java @@ -1,5 +1,9 @@ package thaumcraft.api.visnet; +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.HashMap; + import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.util.Vec3; @@ -9,10 +13,6 @@ import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.WorldCoordinates; import thaumcraft.api.aspects.Aspect; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.HashMap; - public class VisNetHandler { // NODE DRAINING diff --git a/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java b/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java index b30046d..5c4269e 100644 --- a/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java +++ b/src/api/java/thaumcraft/api/wands/FocusUpgradeType.java @@ -2,7 +2,9 @@ package thaumcraft.api.wands; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; + import org.apache.logging.log4j.LogManager; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java index 5d80815..e8938e9 100644 --- a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java +++ b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java @@ -1,7 +1,9 @@ package thaumcraft.api.wands; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.text.DecimalFormat; +import java.util.LinkedHashMap; +import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -16,10 +18,8 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; - -import java.text.DecimalFormat; -import java.util.LinkedHashMap; -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemFocusBasic extends Item { diff --git a/src/api/java/thaumcraft/api/wands/WandCap.java b/src/api/java/thaumcraft/api/wands/WandCap.java index 273f01d..17b4581 100644 --- a/src/api/java/thaumcraft/api/wands/WandCap.java +++ b/src/api/java/thaumcraft/api/wands/WandCap.java @@ -1,12 +1,12 @@ package thaumcraft.api.wands; +import java.util.LinkedHashMap; +import java.util.List; + import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import thaumcraft.api.aspects.Aspect; -import java.util.LinkedHashMap; -import java.util.List; - /** * This class is used to keep the material information for the various caps. * It is also used to generate the wand recipes ingame. diff --git a/src/api/java/thaumcraft/api/wands/WandRod.java b/src/api/java/thaumcraft/api/wands/WandRod.java index f319595..85954e4 100644 --- a/src/api/java/thaumcraft/api/wands/WandRod.java +++ b/src/api/java/thaumcraft/api/wands/WandRod.java @@ -1,10 +1,10 @@ package thaumcraft.api.wands; +import java.util.LinkedHashMap; + import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import java.util.LinkedHashMap; - /** * * @author Azanor diff --git a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java index eb91db1..7224e12 100644 --- a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java +++ b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java @@ -1,14 +1,14 @@ package thaumcraft.api.wands; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - /** * This class serves a similar function to IWandable in that it allows wands to interact * with object in the world. In this case it is most useful for adding interaction with non-mod diff --git a/src/main/java/emt/EMT.java b/src/main/java/emt/EMT.java index 909f26a..966dd3c 100644 --- a/src/main/java/emt/EMT.java +++ b/src/main/java/emt/EMT.java @@ -14,13 +14,15 @@ import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; import emt.command.CommandOutputs; import emt.init.EMTEntities; -import emt.init.EMTResearches; import emt.init.Registry; +import emt.init.EMTResearches; import emt.network.PacketEMTKeys; import emt.proxy.CommonProxy; import emt.util.*; import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.oredict.OreDictionary; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/emt/block/BlockBaseContainer.java b/src/main/java/emt/block/BlockBaseContainer.java index 05a5401..29cfad4 100644 --- a/src/main/java/emt/block/BlockBaseContainer.java +++ b/src/main/java/emt/block/BlockBaseContainer.java @@ -7,6 +7,7 @@ import emt.EMT; import emt.tile.TileEntityEMT; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/emt/block/BlockElectricCloud.java b/src/main/java/emt/block/BlockElectricCloud.java index cc5fa97..2f93480 100644 --- a/src/main/java/emt/block/BlockElectricCloud.java +++ b/src/main/java/emt/block/BlockElectricCloud.java @@ -1,11 +1,19 @@ package emt.block; +import java.util.List; +import java.util.Random; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.tile.TileElectricCloud; import net.minecraft.block.material.Material; +import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; @@ -13,8 +21,10 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.fx.particles.FXSparkle; - -import java.util.Random; +import thaumcraft.client.fx.particles.FXWisp; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.lib.world.ThaumcraftWorldGenerator; +import thaumcraft.common.tiles.TileNitor; public class BlockElectricCloud extends BlockBase { public IIcon icon; diff --git a/src/main/java/emt/block/BlockEssentiaGenerators.java b/src/main/java/emt/block/BlockEssentiaGenerators.java index f4d610a..05ceafa 100644 --- a/src/main/java/emt/block/BlockEssentiaGenerators.java +++ b/src/main/java/emt/block/BlockEssentiaGenerators.java @@ -17,6 +17,8 @@ import net.minecraft.world.World; import java.util.List; import java.util.Random; +import org.lwjgl.opengl.GL11; + public class BlockEssentiaGenerators extends BlockBaseContainer { public BlockEssentiaGenerators(String name) { diff --git a/src/main/java/emt/block/BlockMachines.java b/src/main/java/emt/block/BlockMachines.java index cf101c7..9a408f9 100644 --- a/src/main/java/emt/block/BlockMachines.java +++ b/src/main/java/emt/block/BlockMachines.java @@ -1,11 +1,10 @@ package emt.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import emt.EMT; -import emt.tile.TileEntityEtherealMacerator; -import emt.tile.TileEntityIndustrialWandRecharge; import ic2.api.item.IC2Items; + +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -18,9 +17,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import emt.EMT; +import emt.tile.TileEntityEtherealMacerator; +import emt.tile.TileEntityIndustrialWandRecharge; public class BlockMachines extends BlockBaseContainer { diff --git a/src/main/java/emt/block/BlockPortableNode.java b/src/main/java/emt/block/BlockPortableNode.java index a9d4794..9004a44 100644 --- a/src/main/java/emt/block/BlockPortableNode.java +++ b/src/main/java/emt/block/BlockPortableNode.java @@ -5,14 +5,18 @@ import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.tile.TileEntityPortableNode; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.Explosion; import net.minecraft.world.World; import thaumcraft.common.blocks.BlockAiry; +import java.util.List; import java.util.Random; public class BlockPortableNode extends BlockAiry { diff --git a/src/main/java/emt/block/BlockSolars.java b/src/main/java/emt/block/BlockSolars.java index 835e4b6..671be04 100644 --- a/src/main/java/emt/block/BlockSolars.java +++ b/src/main/java/emt/block/BlockSolars.java @@ -3,6 +3,8 @@ package emt.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.block.BlockBaseContainer.IconSet; +import emt.tile.TileEntityEMT; import emt.tile.solar.air.TileEntityAirSolar; import emt.tile.solar.air.TileEntityDoubleAirSolar; import emt.tile.solar.air.TileEntityTripleAirSolar; @@ -32,6 +34,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import java.util.List; diff --git a/src/main/java/emt/client/EMTKeys.java b/src/main/java/emt/client/EMTKeys.java index 85877dd..762745a 100644 --- a/src/main/java/emt/client/EMTKeys.java +++ b/src/main/java/emt/client/EMTKeys.java @@ -1,9 +1,16 @@ package emt.client; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import org.lwjgl.input.Keyboard; + import cpw.mods.fml.client.registry.ClientRegistry; import emt.util.EMTTextHelper; import net.minecraft.client.settings.KeyBinding; -import org.lwjgl.input.Keyboard; public class EMTKeys { public static KeyBinding keyUnequip; diff --git a/src/main/java/emt/client/gui/GuiEtherealMacerator.java b/src/main/java/emt/client/gui/GuiEtherealMacerator.java index 2d3dcdb..3a989eb 100644 --- a/src/main/java/emt/client/gui/GuiEtherealMacerator.java +++ b/src/main/java/emt/client/gui/GuiEtherealMacerator.java @@ -1,15 +1,16 @@ package emt.client.gui; -import emt.EMT; -import emt.client.gui.container.ContainerEtheralMacerator; -import emt.tile.TileEntityEtherealMacerator; -import emt.util.EMTTextHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import emt.EMT; +import emt.client.gui.container.ContainerEtheralMacerator; +import emt.tile.TileEntityEtherealMacerator; +import emt.util.EMTTextHelper; + public class GuiEtherealMacerator extends GuiContainer { public GuiEtherealMacerator(InventoryPlayer inventory, TileEntityEtherealMacerator te) { diff --git a/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java b/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java index a4cc547..5529b0d 100644 --- a/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java +++ b/src/main/java/emt/client/gui/GuiIndustrialWandRecharger.java @@ -1,15 +1,16 @@ package emt.client.gui; -import emt.EMT; -import emt.client.gui.container.ContainerIndustrialWandRecharge; -import emt.tile.TileEntityIndustrialWandRecharge; -import emt.util.EMTTextHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import emt.EMT; +import emt.client.gui.container.ContainerIndustrialWandRecharge; +import emt.tile.TileEntityIndustrialWandRecharge; +import emt.util.EMTTextHelper; + public class GuiIndustrialWandRecharger extends GuiContainer { public GuiIndustrialWandRecharger(InventoryPlayer inventory, TileEntityIndustrialWandRecharge te) { diff --git a/src/main/java/emt/client/gui/config/EMTGuiConfig.java b/src/main/java/emt/client/gui/config/EMTGuiConfig.java index f991f19..5d7bf80 100644 --- a/src/main/java/emt/client/gui/config/EMTGuiConfig.java +++ b/src/main/java/emt/client/gui/config/EMTGuiConfig.java @@ -8,12 +8,12 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; +import static emt.util.EMTConfigHandler.*; + import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static emt.util.EMTConfigHandler.*; - public class EMTGuiConfig extends GuiConfig { public EMTGuiConfig(GuiScreen parentScreen) { diff --git a/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java b/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java index 6aa26b3..cb7d8db 100644 --- a/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java +++ b/src/main/java/emt/client/gui/container/ContainerIndustrialWandRecharge.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.FurnaceRecipes; public class ContainerIndustrialWandRecharge extends Container { diff --git a/src/main/java/emt/client/model/ModelSpecialArmor.java b/src/main/java/emt/client/model/ModelSpecialArmor.java index f475018..6a380f3 100644 --- a/src/main/java/emt/client/model/ModelSpecialArmor.java +++ b/src/main/java/emt/client/model/ModelSpecialArmor.java @@ -2,11 +2,17 @@ package emt.client.model; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBow; +import net.minecraft.util.MathHelper; + +import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ModelSpecialArmor extends ModelBiped { diff --git a/src/main/java/emt/client/model/ModelWings.java b/src/main/java/emt/client/model/ModelWings.java index b2d215c..913d637 100644 --- a/src/main/java/emt/client/model/ModelWings.java +++ b/src/main/java/emt/client/model/ModelWings.java @@ -1,8 +1,10 @@ package emt.client.model; +import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; +import net.minecraft.util.MathHelper; public class ModelWings extends ModelBiped { diff --git a/src/main/java/emt/client/renderer/RenderLaser.java b/src/main/java/emt/client/renderer/RenderLaser.java index 23524ad..854b057 100644 --- a/src/main/java/emt/client/renderer/RenderLaser.java +++ b/src/main/java/emt/client/renderer/RenderLaser.java @@ -1,7 +1,5 @@ package emt.client.renderer; -import emt.EMT; -import emt.entity.EntityLaser; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; @@ -9,6 +7,9 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import emt.EMT; +import emt.entity.EntityLaser; + public class RenderLaser extends Render { private static final ResourceLocation laserTexture = new ResourceLocation(EMT.TEXTURE_PATH, "textures/models/lasermodel.png"); diff --git a/src/main/java/emt/client/renderer/RenderShield.java b/src/main/java/emt/client/renderer/RenderShield.java index 65c1fc9..94437c7 100644 --- a/src/main/java/emt/client/renderer/RenderShield.java +++ b/src/main/java/emt/client/renderer/RenderShield.java @@ -1,18 +1,21 @@ package emt.client.renderer; +import static org.lwjgl.opengl.GL11.*; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import emt.EMT; +import emt.entity.EntityLaser; import emt.entity.EntityShield; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import static org.lwjgl.opengl.GL11.*; public class RenderShield extends Render { private static final ResourceLocation shieldTexture = new ResourceLocation(EMT.TEXTURE_PATH, "textures/models/shield.png"); diff --git a/src/main/java/emt/command/CommandOutputs.java b/src/main/java/emt/command/CommandOutputs.java index 26da6d5..0b02bc2 100644 --- a/src/main/java/emt/command/CommandOutputs.java +++ b/src/main/java/emt/command/CommandOutputs.java @@ -1,7 +1,5 @@ package emt.command; -import emt.util.EMTEssentiasOutputs; -import emt.util.EMTTextHelper; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; @@ -15,6 +13,9 @@ import thaumcraft.api.aspects.Aspect; import java.util.Collection; import java.util.List; +import emt.util.EMTEssentiasOutputs; +import emt.util.EMTTextHelper; + public class CommandOutputs extends CommandBase { public String text; diff --git a/src/main/java/emt/entity/EntityArcher.java b/src/main/java/emt/entity/EntityArcher.java index af8fb8e..79f8fff 100644 --- a/src/main/java/emt/entity/EntityArcher.java +++ b/src/main/java/emt/entity/EntityArcher.java @@ -14,6 +14,7 @@ import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/emt/entity/EntityEnergyBall.java b/src/main/java/emt/entity/EntityEnergyBall.java index f39fe69..49bfec4 100644 --- a/src/main/java/emt/entity/EntityEnergyBall.java +++ b/src/main/java/emt/entity/EntityEnergyBall.java @@ -1,14 +1,23 @@ package emt.entity; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import emt.util.EMTRandomHelper.Bolt; +import emt.util.EMTRandomHelper.Point; import io.netty.buffer.ByteBuf; +import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; +import net.minecraft.entity.projectile.EntityFireball; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; @@ -17,8 +26,6 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import thaumcraft.common.Thaumcraft; -import java.util.ArrayList; - public class EntityEnergyBall extends Entity implements IProjectile, IEntityAdditionalSpawnData { public static final int RADIUS = 8; public static final int MAX_TICKS_IN_TILE = 60; diff --git a/src/main/java/emt/entity/EntityLaser.java b/src/main/java/emt/entity/EntityLaser.java index d254ca1..d93625f 100644 --- a/src/main/java/emt/entity/EntityLaser.java +++ b/src/main/java/emt/entity/EntityLaser.java @@ -1,14 +1,17 @@ package emt.entity; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.common.registry.IThrowableEntity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; diff --git a/src/main/java/emt/entity/EntityShield.java b/src/main/java/emt/entity/EntityShield.java index 1124e24..ac8d6b0 100644 --- a/src/main/java/emt/entity/EntityShield.java +++ b/src/main/java/emt/entity/EntityShield.java @@ -1,11 +1,19 @@ package emt.entity; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import ic2.core.IC2; +import net.minecraft.client.Minecraft; +import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; +import net.minecraft.entity.IProjectile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class EntityShield extends Entity { diff --git a/src/main/java/emt/init/EMTBlocks.java b/src/main/java/emt/init/EMTBlocks.java index ca9c902..9d58c40 100644 --- a/src/main/java/emt/init/EMTBlocks.java +++ b/src/main/java/emt/init/EMTBlocks.java @@ -1,18 +1,27 @@ package emt.init; import cpw.mods.fml.common.registry.GameRegistry; -import emt.block.*; +import emt.block.BlockElectricCloud; +import emt.block.BlockEssentiaGenerators; +import emt.block.BlockMachines; +import emt.block.BlockPortableNode; +import emt.block.BlockShield; +import emt.block.BlockSolars; import emt.item.block.ItemBlockElectricCloud; +import emt.item.block.ItemBlockEssentiaGenerator; import emt.item.block.ItemBlockEssentiaGenerators; import emt.item.block.ItemBlockMachines; import emt.item.block.ItemBlockSolars; import ic2.api.item.IC2Items; import net.minecraft.block.Block; +import net.minecraft.block.Block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import static thaumcraft.api.ThaumcraftApi.*; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; -import static thaumcraft.api.ThaumcraftApi.registerObjectTag; - public class EMTBlocks { public static Block portableNode, essentiaGens, shield, emtSolars, emtMachines, emtSolars2, electricCloud; diff --git a/src/main/java/emt/init/EMTEntities.java b/src/main/java/emt/init/EMTEntities.java index 48c8914..8c6eb7c 100644 --- a/src/main/java/emt/init/EMTEntities.java +++ b/src/main/java/emt/init/EMTEntities.java @@ -9,6 +9,7 @@ import emt.entity.EntityShield; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList.EntityEggInfo; +import net.minecraft.entity.EntityLiving; public class EMTEntities { diff --git a/src/main/java/emt/init/EMTItems.java b/src/main/java/emt/init/EMTItems.java index 8aca1fb..f938840 100644 --- a/src/main/java/emt/init/EMTItems.java +++ b/src/main/java/emt/init/EMTItems.java @@ -1,5 +1,6 @@ package emt.init; +import ic2.core.init.InternalName; import cpw.mods.fml.common.registry.GameRegistry; import emt.EMT; import emt.item.ItemElectricScribingTools; @@ -18,7 +19,12 @@ import emt.item.armor.wings.ItemFeatherWing; import emt.item.armor.wings.ItemNanoWing; import emt.item.armor.wings.ItemQuantumWing; import emt.item.armor.wings.ItemThaumiumReinforcedWing; -import emt.item.focus.*; +import emt.item.focus.ItemChargeFocus; +import emt.item.focus.ItemChristmasFocus; +import emt.item.focus.ItemExplosionFocus; +import emt.item.focus.ItemEnergyBallFocus; +import emt.item.focus.ItemShieldFocus; +import emt.item.focus.ItemWandChargingFocus; import emt.item.tool.ItemElectricHoeGrowth; import emt.item.tool.ItemElectricThorHammer; import emt.item.tool.ItemThorHammer; @@ -31,7 +37,8 @@ import emt.item.tool.drill.ItemThaumiumDrill; import emt.item.tool.omnitool.ItemOmnitoolDiamond; import emt.item.tool.omnitool.ItemOmnitoolIron; import emt.item.tool.omnitool.ItemOmnitoolThaumium; -import ic2.core.init.InternalName; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; diff --git a/src/main/java/emt/init/EMTRecipes.java b/src/main/java/emt/init/EMTRecipes.java index 9856c23..e52f53b 100644 --- a/src/main/java/emt/init/EMTRecipes.java +++ b/src/main/java/emt/init/EMTRecipes.java @@ -1,36 +1,45 @@ package emt.init; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTCraftingAspects; import emt.util.EMTResearchAspects; + +import static emt.util.EMTRandomHelper.*; +import ic2.api.item.ElectricItem; import ic2.api.item.IC2Items; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeInputItemStack; import ic2.api.recipe.Recipes; import ic2.core.BasicMachineRecipeManager; import ic2.core.Ic2Items; +import ic2.core.item.ItemFluidCell; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import static thaumcraft.api.ThaumcraftApi.*; +import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.CrucibleRecipe; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.crafting.ShapedArcaneRecipe; import thaumcraft.api.crafting.ShapelessArcaneRecipe; +import thaumcraft.common.blocks.ItemJarFilled; import thaumcraft.common.blocks.ItemJarNode; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; import java.util.Iterator; -import static emt.util.EMTRandomHelper.getChargedItem; -import static thaumcraft.api.ThaumcraftApi.*; - public class EMTRecipes { public static ItemStack uuMCell = new ItemStack(EMTItems.itemEMTItems, 1, 15); diff --git a/src/main/java/emt/init/EMTResearches.java b/src/main/java/emt/init/EMTResearches.java index 00c31d4..a2f5e6e 100644 --- a/src/main/java/emt/init/EMTResearches.java +++ b/src/main/java/emt/init/EMTResearches.java @@ -1,13 +1,16 @@ package emt.init; import emt.EMT; +import emt.client.EMTKeys; import emt.util.EMTConfigHandler; import emt.util.EMTResearchAspects; import emt.util.EMTResearchItem; import ic2.api.item.IC2Items; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; public class EMTResearches { diff --git a/src/main/java/emt/init/EMTTiles.java b/src/main/java/emt/init/EMTTiles.java index b639426..425e5e9 100644 --- a/src/main/java/emt/init/EMTTiles.java +++ b/src/main/java/emt/init/EMTTiles.java @@ -5,7 +5,11 @@ import emt.tile.TileElectricCloud; import emt.tile.TileEntityEtherealMacerator; import emt.tile.TileEntityIndustrialWandRecharge; import emt.tile.TileEntityPortableNode; -import emt.tile.generator.*; +import emt.tile.generator.TileEntityAerGenerator; +import emt.tile.generator.TileEntityArborGenerator; +import emt.tile.generator.TileEntityAuramGenerator; +import emt.tile.generator.TileEntityIgnisGenerator; +import emt.tile.generator.TileEntityPotentiaGenerator; import emt.tile.solar.air.TileEntityAirSolar; import emt.tile.solar.air.TileEntityDoubleAirSolar; import emt.tile.solar.air.TileEntityTripleAirSolar; diff --git a/src/main/java/emt/item/ItemBase.java b/src/main/java/emt/item/ItemBase.java index f55e430..75ebaff 100644 --- a/src/main/java/emt/item/ItemBase.java +++ b/src/main/java/emt/item/ItemBase.java @@ -1,5 +1,6 @@ package emt.item; +import emt.EMT; import emt.EMT; import emt.util.EMTTextHelper; import net.minecraft.item.Item; diff --git a/src/main/java/emt/item/ItemMaterials.java b/src/main/java/emt/item/ItemMaterials.java index 276abf5..1c57a3e 100644 --- a/src/main/java/emt/item/ItemMaterials.java +++ b/src/main/java/emt/item/ItemMaterials.java @@ -3,12 +3,14 @@ package emt.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.EMT; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -21,6 +23,7 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowNockEvent; +import net.minecraftforge.oredict.OreDictionary; import thaumcraft.common.config.Config; import thaumcraft.common.lib.utils.InventoryUtils; diff --git a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java index 15dcf46..9117d15 100644 --- a/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java +++ b/src/main/java/emt/item/armor/boots/ItemElectricBootsTraveller.java @@ -4,6 +4,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; diff --git a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java index 15ac2b9..7976050 100644 --- a/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java +++ b/src/main/java/emt/item/armor/chestplate/ItemInfusedQuantumChestplate.java @@ -1,41 +1,71 @@ package emt.item.armor.chestplate; +import cpw.mods.fml.common.eventhandler.EventBus; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.EMT; import emt.client.model.ModelSpecialArmor; +import emt.client.model.ModelWings; import emt.init.EMTItems; +import emt.item.armor.wings.ItemNanoWing; +import emt.item.armor.wings.ItemQuantumWing; import emt.util.EMTConfigHandler; +import emt.util.EMTRandomHelper; +import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IC2Items; +import ic2.api.item.IElectricItemManager; import ic2.core.IC2; +import ic2.core.IC2Achievements; +import ic2.core.IC2Potion; +import ic2.core.Ic2Items; +import ic2.core.Platform; +import ic2.core.audio.AudioManager; import ic2.core.audio.AudioSource; import ic2.core.audio.PositionSpec; import ic2.core.init.InternalName; +import ic2.core.init.MainConfig; +import ic2.core.item.ItemTinCan; import ic2.core.item.armor.ItemArmorElectric; +import ic2.core.util.ConfigUtil; +import ic2.core.util.Keyboard; import ic2.core.util.StackUtil; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.DamageSource; +import net.minecraft.util.FoodStats; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.common.ISpecialArmor.ArmorProperties; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingFallEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - public class ItemInfusedQuantumChestplate extends ItemArmorElectric { public final byte NONE = 0; diff --git a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java index c2be109..31aa842 100644 --- a/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemElectricGoggles.java @@ -3,6 +3,7 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; import ic2.api.item.ElectricItem; diff --git a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java index 3ed7f03..43c03b9 100644 --- a/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemNanoGoggles.java @@ -3,6 +3,7 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java index 4bd3d58..03fe2e1 100644 --- a/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java +++ b/src/main/java/emt/item/armor/goggles/ItemQuantumGoggles.java @@ -3,6 +3,7 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java index e9f54dc..9f66c25 100644 --- a/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java +++ b/src/main/java/emt/item/armor/goggles/ItemSolarHelmetRevealing.java @@ -3,6 +3,7 @@ package emt.item.armor.goggles; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.EMT; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; diff --git a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java index 7208cb9..1840308 100644 --- a/src/main/java/emt/item/armor/wings/ItemFeatherWing.java +++ b/src/main/java/emt/item/armor/wings/ItemFeatherWing.java @@ -1,13 +1,17 @@ package emt.item.armor.wings; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import emt.EMT; -import emt.client.model.ModelWings; -import emt.util.EMTConfigHandler; +import java.util.Random; + import ic2.api.item.ElectricItem; import ic2.core.IC2; import ic2.core.util.StackUtil; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import emt.EMT; +import emt.EMT; +import emt.client.model.ModelWings; +import emt.util.EMTConfigHandler; +import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -16,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; public class ItemFeatherWing extends ItemArmor { diff --git a/src/main/java/emt/item/armor/wings/ItemNanoWing.java b/src/main/java/emt/item/armor/wings/ItemNanoWing.java index 0773e3f..2ccbdee 100644 --- a/src/main/java/emt/item/armor/wings/ItemNanoWing.java +++ b/src/main/java/emt/item/armor/wings/ItemNanoWing.java @@ -3,10 +3,13 @@ package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.EMT; +import emt.item.armor.wings.ItemThaumiumReinforcedWing; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.item.IMetalArmor; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; diff --git a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java index c0b22fe..d6b730d 100644 --- a/src/main/java/emt/item/armor/wings/ItemQuantumWing.java +++ b/src/main/java/emt/item/armor/wings/ItemQuantumWing.java @@ -3,10 +3,15 @@ package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.util.EMTConfigHandler; +import ic2.api.item.ElectricItem; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; import net.minecraft.world.World; public class ItemQuantumWing extends ItemNanoWing { diff --git a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java index 99f25f4..dbffd6a 100644 --- a/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java +++ b/src/main/java/emt/item/armor/wings/ItemThaumiumReinforcedWing.java @@ -3,15 +3,21 @@ package emt.item.armor.wings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; +import emt.EMT; +import emt.util.EMTConfigHandler; import emt.util.EMTTextHelper; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import thaumcraft.api.IRepairable; import thaumcraft.api.IVisDiscountGear; import thaumcraft.api.aspects.Aspect; +import ic2.core.IC2; +import ic2.core.util.StackUtil; import java.util.List; diff --git a/src/main/java/emt/item/block/ItemBlockElectricCloud.java b/src/main/java/emt/item/block/ItemBlockElectricCloud.java index cbf462d..767c6ef 100644 --- a/src/main/java/emt/item/block/ItemBlockElectricCloud.java +++ b/src/main/java/emt/item/block/ItemBlockElectricCloud.java @@ -4,6 +4,7 @@ import emt.EMT; import emt.util.EMTTextHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; diff --git a/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java b/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java index 5b4c621..3f33021 100644 --- a/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java +++ b/src/main/java/emt/item/block/ItemBlockEssentiaGenerator.java @@ -1,7 +1,11 @@ package emt.item.block; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +import java.util.List; public class ItemBlockEssentiaGenerator extends ItemBlock { diff --git a/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java index 63b6eda..c1fb5fd 100644 --- a/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java +++ b/src/main/java/emt/item/block/ItemBlockEssentiaGenerators.java @@ -1,9 +1,19 @@ package emt.item.block; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import java.util.List; + +import emt.tile.generator.TileEntityAerGenerator; +import emt.tile.generator.TileEntityArborGenerator; +import emt.tile.generator.TileEntityAuramGenerator; +import emt.tile.generator.TileEntityIgnisGenerator; +import emt.tile.generator.TileEntityPotentiaGenerator; +import emt.util.EMTConfigHandler; + public class ItemBlockEssentiaGenerators extends ItemBlock { public ItemBlockEssentiaGenerators(Block id) { diff --git a/src/main/java/emt/item/block/ItemBlockSolars.java b/src/main/java/emt/item/block/ItemBlockSolars.java index 3788a5c..296d7e2 100644 --- a/src/main/java/emt/item/block/ItemBlockSolars.java +++ b/src/main/java/emt/item/block/ItemBlockSolars.java @@ -1,16 +1,18 @@ package emt.item.block; -import emt.block.BlockBaseContainer; -import emt.util.EMTConfigHandler; -import emt.util.EMTTextHelper; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import static emt.util.EMTTextHelper.localize; + import java.util.List; -import static emt.util.EMTTextHelper.localize; +import emt.block.BlockBaseContainer; +import emt.block.BlockSolars; +import emt.util.EMTConfigHandler; +import emt.util.EMTTextHelper; public class ItemBlockSolars extends ItemBlock { diff --git a/src/main/java/emt/item/focus/ItemBaseFocus.java b/src/main/java/emt/item/focus/ItemBaseFocus.java index 6fcdc4a..f0d314e 100644 --- a/src/main/java/emt/item/focus/ItemBaseFocus.java +++ b/src/main/java/emt/item/focus/ItemBaseFocus.java @@ -1,11 +1,9 @@ package emt.item.focus; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import emt.EMT; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; @@ -13,10 +11,15 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.IWandFocus; import thaumcraft.api.wands.ItemFocusBasic; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import emt.EMT; + public abstract class ItemBaseFocus extends ItemFocusBasic { public IIcon ornament; diff --git a/src/main/java/emt/item/focus/ItemChargeFocus.java b/src/main/java/emt/item/focus/ItemChargeFocus.java index 5eed547..4406c56 100644 --- a/src/main/java/emt/item/focus/ItemChargeFocus.java +++ b/src/main/java/emt/item/focus/ItemChargeFocus.java @@ -1,8 +1,11 @@ package emt.item.focus; -import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; + +import java.util.Map.Entry; + +import emt.util.EMTConfigHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; @@ -12,8 +15,6 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; -import java.util.Map.Entry; - public class ItemChargeFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); diff --git a/src/main/java/emt/item/focus/ItemChristmasFocus.java b/src/main/java/emt/item/focus/ItemChristmasFocus.java index 04ca8bf..0ef86f6 100644 --- a/src/main/java/emt/item/focus/ItemChristmasFocus.java +++ b/src/main/java/emt/item/focus/ItemChristmasFocus.java @@ -1,12 +1,18 @@ package emt.item.focus; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import emt.EMT; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.ItemFocusBasic; import thaumcraft.common.items.wands.ItemWandCasting; public class ItemChristmasFocus extends ItemBaseFocus { diff --git a/src/main/java/emt/item/focus/ItemEnergyBallFocus.java b/src/main/java/emt/item/focus/ItemEnergyBallFocus.java index 07d4f0a..cbc5a9e 100644 --- a/src/main/java/emt/item/focus/ItemEnergyBallFocus.java +++ b/src/main/java/emt/item/focus/ItemEnergyBallFocus.java @@ -2,11 +2,18 @@ package emt.item.focus; import emt.entity.EntityEnergyBall; import ic2.api.item.ElectricItem; +import ic2.core.item.armor.ItemArmorElectric; +import ic2.core.item.armor.ItemArmorIC2; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityLargeFireball; +import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.wands.ItemFocusBasic; public class ItemEnergyBallFocus extends ItemBaseFocus { diff --git a/src/main/java/emt/item/focus/ItemExplosionFocus.java b/src/main/java/emt/item/focus/ItemExplosionFocus.java index 8b58a5d..a32baa6 100644 --- a/src/main/java/emt/item/focus/ItemExplosionFocus.java +++ b/src/main/java/emt/item/focus/ItemExplosionFocus.java @@ -3,6 +3,8 @@ package emt.item.focus; import emt.entity.EntityLaser; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/item/focus/ItemShieldFocus.java b/src/main/java/emt/item/focus/ItemShieldFocus.java index 0802bab..4964680 100644 --- a/src/main/java/emt/item/focus/ItemShieldFocus.java +++ b/src/main/java/emt/item/focus/ItemShieldFocus.java @@ -1,18 +1,28 @@ package emt.item.focus; +import java.util.ArrayList; +import java.util.LinkedList; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import emt.EMT; import emt.entity.EntityShield; +import emt.init.EMTBlocks; import ic2.core.IC2; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; -import java.util.LinkedList; - public class ItemShieldFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.ORDER, 5).add(Aspect.WATER, 5).add(Aspect.AIR, 5); diff --git a/src/main/java/emt/item/focus/ItemWandChargingFocus.java b/src/main/java/emt/item/focus/ItemWandChargingFocus.java index 9f31173..584ca5a 100644 --- a/src/main/java/emt/item/focus/ItemWandChargingFocus.java +++ b/src/main/java/emt/item/focus/ItemWandChargingFocus.java @@ -1,5 +1,8 @@ package emt.item.focus; +import java.util.Map.Entry; + +import emt.item.focus.ItemBaseFocus; import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import net.minecraft.entity.player.EntityPlayer; @@ -9,8 +12,6 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.common.items.wands.ItemWandCasting; -import java.util.Map.Entry; - public class ItemWandChargingFocus extends ItemBaseFocus { AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10); diff --git a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java index 7094324..7faad0d 100644 --- a/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java +++ b/src/main/java/emt/item/tool/ItemElectricHoeGrowth.java @@ -8,6 +8,7 @@ import ic2.api.item.IElectricItem; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemHoe; @@ -17,6 +18,7 @@ import net.minecraft.world.World; import thaumcraft.common.Thaumcraft; import thaumcraft.common.blocks.BlockCustomPlant; import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.items.equipment.ItemElementalHoe; import thaumcraft.common.lib.utils.Utils; import java.util.List; diff --git a/src/main/java/emt/item/tool/ItemThorHammerBroken.java b/src/main/java/emt/item/tool/ItemThorHammerBroken.java index ba8de19..a16f7e9 100644 --- a/src/main/java/emt/item/tool/ItemThorHammerBroken.java +++ b/src/main/java/emt/item/tool/ItemThorHammerBroken.java @@ -8,10 +8,13 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemSword; import net.minecraft.util.DamageSource; import net.minecraft.world.World; + import org.lwjgl.input.Keyboard; + import thaumcraft.api.IRepairable; import thaumcraft.common.entities.projectile.EntityAlumentum; diff --git a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java index 329c293..8754a3c 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemDiamondChainsaw.java @@ -7,9 +7,12 @@ import emt.util.EMTConfigHandler; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.core.IC2; +import ic2.core.audio.AudioSource; +import ic2.core.audio.PositionSpec; import ic2.core.util.StackUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockTorch; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; @@ -32,6 +35,7 @@ import net.minecraftforge.event.ForgeEventFactory; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.Random; public class ItemDiamondChainsaw extends ItemAxe implements IElectricItem { diff --git a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java index 81b12e1..e643ae6 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemStreamChainsaw.java @@ -5,8 +5,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import ic2.api.item.ElectricItem; +import ic2.core.IC2; +import ic2.core.audio.AudioSource; +import ic2.core.audio.PositionSpec; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; diff --git a/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java b/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java index 7e1d361..a7e56a2 100644 --- a/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java +++ b/src/main/java/emt/item/tool/chainsaw/ItemThaumiumChainsaw.java @@ -4,8 +4,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import ic2.api.item.ElectricItem; +import ic2.core.IC2; +import ic2.core.audio.AudioSource; +import ic2.core.audio.PositionSpec; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java index c91a894..f276c9f 100644 --- a/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java +++ b/src/main/java/emt/item/tool/drill/ItemThaumiumDrill.java @@ -4,12 +4,14 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import emt.EMT; import emt.util.EMTConfigHandler; +import emt.util.EMTRandomHelper; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; diff --git a/src/main/java/emt/network/PacketEMTKeys.java b/src/main/java/emt/network/PacketEMTKeys.java index 54e766d..be3b05a 100644 --- a/src/main/java/emt/network/PacketEMTKeys.java +++ b/src/main/java/emt/network/PacketEMTKeys.java @@ -1,10 +1,12 @@ package emt.network; +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import emt.init.EMTItems; -import io.netty.buffer.ByteBuf; public class PacketEMTKeys implements IMessage, IMessageHandler { diff --git a/src/main/java/emt/proxy/ClientProxy.java b/src/main/java/emt/proxy/ClientProxy.java index 8feb5d1..b5265b8 100644 --- a/src/main/java/emt/proxy/ClientProxy.java +++ b/src/main/java/emt/proxy/ClientProxy.java @@ -1,5 +1,15 @@ package emt.proxy; +import org.lwjgl.input.Keyboard; + +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderFireball; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.RenderSnowMan; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import emt.client.EMTKeys; import emt.client.renderer.RenderLaser; @@ -8,10 +18,6 @@ import emt.entity.EntityArcher; import emt.entity.EntityEnergyBall; import emt.entity.EntityLaser; import emt.entity.EntityShield; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderSnowMan; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/emt/tile/TileEntityEtherealMacerator.java b/src/main/java/emt/tile/TileEntityEtherealMacerator.java index 43f46e6..f7f3fb3 100644 --- a/src/main/java/emt/tile/TileEntityEtherealMacerator.java +++ b/src/main/java/emt/tile/TileEntityEtherealMacerator.java @@ -1,6 +1,7 @@ package emt.tile; import emt.init.EMTBlocks; +import emt.tile.TileEntityEMT; import emt.util.EMTConfigHandler; import ic2.api.item.IC2Items; import ic2.api.tile.IWrenchable; diff --git a/src/main/java/emt/tile/generator/TileEntityAerGenerator.java b/src/main/java/emt/tile/generator/TileEntityAerGenerator.java index c9310a2..d23dd7a 100644 --- a/src/main/java/emt/tile/generator/TileEntityAerGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityAerGenerator.java @@ -1,5 +1,6 @@ package emt.tile.generator; +import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/tile/generator/TileEntityArborGenerator.java b/src/main/java/emt/tile/generator/TileEntityArborGenerator.java index efca805..8a37c53 100644 --- a/src/main/java/emt/tile/generator/TileEntityArborGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityArborGenerator.java @@ -1,5 +1,6 @@ package emt.tile.generator; +import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java b/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java index 19d4c5c..5fff2d8 100644 --- a/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityAuramGenerator.java @@ -1,5 +1,6 @@ package emt.tile.generator; +import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java index cfa8d0f..0610d06 100644 --- a/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityBaseGenerator.java @@ -1,16 +1,20 @@ package emt.tile.generator; +import java.util.Random; + import emt.tile.TileEntityEMT; +import emt.util.EMTConfigHandler; import ic2.api.energy.prefab.BasicSource; +import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IAspectSource; +import thaumcraft.common.lib.events.EssentiaHandler; import thaumcraft.common.lib.network.PacketHandler; import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource; -import java.util.Random; - public abstract class TileEntityBaseGenerator extends TileEntityEMT { public BasicSource energySource = new BasicSource(this, 1000000000, 3); diff --git a/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java b/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java index 18b7972..471e465 100644 --- a/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityIgnisGenerator.java @@ -1,5 +1,6 @@ package emt.tile.generator; +import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java b/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java index 0f93187..18acbba 100644 --- a/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java +++ b/src/main/java/emt/tile/generator/TileEntityPotentiaGenerator.java @@ -1,6 +1,8 @@ package emt.tile.generator; +import emt.util.EMTConfigHandler; import emt.util.EMTEssentiasOutputs; +import ic2.api.energy.prefab.BasicSource; import thaumcraft.api.aspects.Aspect; public class TileEntityPotentiaGenerator extends TileEntityBaseGenerator { diff --git a/src/main/java/emt/tile/solar/TileEntitySolarBase.java b/src/main/java/emt/tile/solar/TileEntitySolarBase.java index b763d3d..af4bd91 100644 --- a/src/main/java/emt/tile/solar/TileEntitySolarBase.java +++ b/src/main/java/emt/tile/solar/TileEntitySolarBase.java @@ -1,6 +1,5 @@ package emt.tile.solar; -import emt.tile.TileEntityEMT; import ic2.api.energy.prefab.BasicSource; import ic2.api.tile.IWrenchable; import net.minecraft.entity.player.EntityPlayer; @@ -8,6 +7,8 @@ import net.minecraft.nbt.NBTTagCompound; import java.util.Random; +import emt.tile.TileEntityEMT; + public abstract class TileEntitySolarBase extends TileEntityEMT implements IWrenchable { public BasicSource energySource; diff --git a/src/main/java/emt/util/EMTClientEventHandler.java b/src/main/java/emt/util/EMTClientEventHandler.java index e815af4..c6bc747 100644 --- a/src/main/java/emt/util/EMTClientEventHandler.java +++ b/src/main/java/emt/util/EMTClientEventHandler.java @@ -8,9 +8,12 @@ import emt.EMT; import emt.client.EMTKeys; import emt.init.EMTItems; import emt.network.PacketEMTKeys; +import ic2.api.item.IC2Items; import ic2.core.IC2; +import ic2.core.Ic2Items; import ic2.core.audio.AudioSource; import ic2.core.audio.PositionSpec; +import ic2.core.item.tool.ItemElectricToolChainsaw; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/emt/util/EMTCreativeTab.java b/src/main/java/emt/util/EMTCreativeTab.java index f4adcd6..42f58c9 100644 --- a/src/main/java/emt/util/EMTCreativeTab.java +++ b/src/main/java/emt/util/EMTCreativeTab.java @@ -1,8 +1,10 @@ package emt.util; +import emt.init.EMTBlocks; import emt.init.EMTItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class EMTCreativeTab extends CreativeTabs { diff --git a/src/main/java/emt/util/EMTEventHandler.java b/src/main/java/emt/util/EMTEventHandler.java index a657ba9..831dab3 100644 --- a/src/main/java/emt/util/EMTEventHandler.java +++ b/src/main/java/emt/util/EMTEventHandler.java @@ -1,27 +1,41 @@ package emt.util; +import java.util.Random; + import baubles.api.BaublesApi; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import emt.EMT; +import emt.client.EMTKeys; import emt.init.EMTBlocks; import emt.init.EMTItems; import emt.item.armor.wings.ItemFeatherWing; +import emt.network.PacketEMTKeys; +import emt.proxy.ClientProxy; import ic2.api.item.ElectricItem; import net.minecraft.block.Block; import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; +import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.config.ConfigItems; import thaumcraft.common.entities.monster.EntityTaintChicken; public class EMTEventHandler { diff --git a/src/main/java/emt/util/EMTRandomHelper.java b/src/main/java/emt/util/EMTRandomHelper.java index 865527d..aee862a 100644 --- a/src/main/java/emt/util/EMTRandomHelper.java +++ b/src/main/java/emt/util/EMTRandomHelper.java @@ -1,10 +1,19 @@ package emt.util; import ic2.api.item.ElectricItem; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.event.ForgeEventFactory; import java.util.ArrayList; +import java.util.Locale; import java.util.Random; public class EMTRandomHelper {