diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index 804009a4..de0fc05e 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -1,33 +1,54 @@ package tconstruct; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.relauncher.Side; +import mantle.lib.TabTools; import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraftforge.common.MinecraftForge; -import org.apache.logging.log4j.*; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.LoggerConfig; import tconstruct.achievements.TAchievements; import tconstruct.client.TControls; -import tconstruct.common.*; +import tconstruct.common.TContent; +import tconstruct.common.TProxyCommon; +import tconstruct.common.TRecipes; +import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.*; -import mantle.lib.TabTools; +import tconstruct.library.crafting.Detailing; +import tconstruct.library.crafting.LiquidCasting; import tconstruct.plugins.PluginController; -import tconstruct.util.*; -import tconstruct.util.config.*; +import tconstruct.util.EnvironmentChecks; +import tconstruct.util.TEventHandler; +import tconstruct.util.TEventHandlerAchievement; +import tconstruct.util.config.DimensionBlacklist; +import tconstruct.util.config.PHConstruct; import tconstruct.util.landmine.behavior.Behavior; import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler; import tconstruct.util.network.packet.PacketPipeline; import tconstruct.util.player.TPlayerHandler; -import tconstruct.worldgen.*; -import tconstruct.worldgen.village.*; +import tconstruct.worldgen.SlimeIslandGen; +import tconstruct.worldgen.TBaseWorldGenerator; +import tconstruct.worldgen.TerrainGenEventHandler; +import tconstruct.worldgen.village.ComponentSmeltery; +import tconstruct.worldgen.village.ComponentToolWorkshop; +import tconstruct.worldgen.village.TVillageTrades; +import tconstruct.worldgen.village.VillageSmelteryHandler; +import tconstruct.worldgen.village.VillageToolStationHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.VillagerRegistry; +import cpw.mods.fml.relauncher.Side; /** TConstruct, the tool mod. * Craft your tools with style, then modify until the original is gone! diff --git a/src/main/java/tconstruct/achievements/TAchievements.java b/src/main/java/tconstruct/achievements/TAchievements.java index 6537def6..27692a73 100644 --- a/src/main/java/tconstruct/achievements/TAchievements.java +++ b/src/main/java/tconstruct/achievements/TAchievements.java @@ -1,6 +1,7 @@ package tconstruct.achievements; import java.util.HashMap; + import net.minecraft.stats.Achievement; import net.minecraft.util.StatCollector; import net.minecraftforge.common.AchievementPage; diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java index b284e4ab..8e846fc0 100644 --- a/src/main/java/tconstruct/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/blocks/BlockLandmine.java @@ -20,7 +20,6 @@ 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.EnumCreatureType; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java index e146da3d..3a782e4a 100644 --- a/src/main/java/tconstruct/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/blocks/ConveyorBase.java @@ -1,7 +1,6 @@ package tconstruct.blocks; import mantle.blocks.MantleBlock; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java index 779044ef..2a7fd8a7 100644 --- a/src/main/java/tconstruct/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/blocks/CraftingSlab.java @@ -2,6 +2,7 @@ package tconstruct.blocks; import java.util.List; +import mantle.blocks.abstracts.InventorySlab; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -23,7 +24,6 @@ import tconstruct.blocks.logic.ToolStationLogic; import tconstruct.common.TProxyCommon; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; -import mantle.blocks.abstracts.InventorySlab; import tconstruct.util.config.PHConstruct; public class CraftingSlab extends InventorySlab diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java index 9d9f9a3c..ae72e9a4 100644 --- a/src/main/java/tconstruct/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/blocks/CraftingStationBlock.java @@ -2,6 +2,7 @@ package tconstruct.blocks; import java.util.List; +import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -17,7 +18,6 @@ import tconstruct.blocks.logic.CraftingStationLogic; import tconstruct.client.block.TableRender; import tconstruct.common.TProxyCommon; import tconstruct.library.TConstructRegistry; -import mantle.blocks.abstracts.InventoryBlock; public class CraftingStationBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index b502c8fe..d52c3b8d 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -2,12 +2,7 @@ package tconstruct.blocks; import java.util.List; -import tconstruct.TConstruct; -import tconstruct.blocks.logic.DryingRackLogic; -import tconstruct.client.block.DryingRackRender; -import tconstruct.library.TConstructRegistry; import mantle.blocks.abstracts.InventoryBlock; -import tconstruct.library.tools.AbilityHelper; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -20,6 +15,11 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import tconstruct.TConstruct; +import tconstruct.blocks.logic.DryingRackLogic; +import tconstruct.client.block.DryingRackRender; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.AbilityHelper; public class DryingRack extends InventoryBlock { diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java index c4d2d963..236e5f84 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/blocks/EquipBlock.java @@ -1,28 +1,29 @@ package tconstruct.blocks; -import tconstruct.blocks.logic.EquipLogic; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; +import java.util.Random; -import java.util.*; - -import cpw.mods.fml.relauncher.*; -import tconstruct.TConstruct; -import tconstruct.blocks.logic.FrypanLogic; -import tconstruct.client.block.FrypanRender; import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.*; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import tconstruct.TConstruct; +import tconstruct.blocks.logic.EquipLogic; +import tconstruct.blocks.logic.FrypanLogic; +import tconstruct.client.block.FrypanRender; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EquipBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java index 109531f0..e3091da1 100644 --- a/src/main/java/tconstruct/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/blocks/FurnaceSlab.java @@ -1,5 +1,8 @@ package tconstruct.blocks; +import mantle.blocks.abstracts.InventorySlab; +import mantle.blocks.iface.IActiveLogic; +import mantle.blocks.iface.IFacingLogic; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -11,9 +14,6 @@ import tconstruct.TConstruct; import tconstruct.blocks.logic.FurnaceLogic; import tconstruct.common.TProxyCommon; import tconstruct.library.TConstructRegistry; -import mantle.blocks.abstracts.InventorySlab; -import mantle.blocks.iface.IActiveLogic; -import mantle.blocks.iface.IFacingLogic; public class FurnaceSlab extends InventorySlab { diff --git a/src/main/java/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/blocks/GlassBlock.java index d23cdedd..12f38917 100644 --- a/src/main/java/tconstruct/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/blocks/GlassBlock.java @@ -1,12 +1,14 @@ package tconstruct.blocks; -import cpw.mods.fml.relauncher.*; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class GlassBlock extends TConstructBlock { diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java index 8670cb38..c2a48483 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnected.java @@ -1,13 +1,13 @@ package tconstruct.blocks; -import java.util.ArrayList; - import mantle.blocks.MantleBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java index 0a71a37f..9d50add1 100644 --- a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java @@ -2,7 +2,6 @@ package tconstruct.blocks; import java.util.List; -import tconstruct.util.config.PHConstruct; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -11,6 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import tconstruct.util.config.PHConstruct; /** @author fuj1n * diff --git a/src/main/java/tconstruct/blocks/GlassPane.java b/src/main/java/tconstruct/blocks/GlassPane.java index 48105174..e1f05e35 100644 --- a/src/main/java/tconstruct/blocks/GlassPane.java +++ b/src/main/java/tconstruct/blocks/GlassPane.java @@ -1,7 +1,7 @@ package tconstruct.blocks; -import tconstruct.library.TConstructRegistry; import net.minecraft.block.material.Material; +import tconstruct.library.TConstructRegistry; public class GlassPane extends PaneBase { diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java index 4ed6078d..3c2a2491 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/blocks/GlassPaneConnected.java @@ -1,10 +1,7 @@ package tconstruct.blocks; -import tconstruct.util.config.PHConstruct; - import java.util.List; -import tconstruct.client.block.PaneConnectedRender; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -14,6 +11,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import tconstruct.client.block.PaneConnectedRender; +import tconstruct.util.config.PHConstruct; public class GlassPaneConnected extends GlassBlockConnected { diff --git a/src/main/java/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/blocks/GlassPaneStained.java index 6e68b854..7d58ba84 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/blocks/GlassPaneStained.java @@ -1,7 +1,7 @@ package tconstruct.blocks; -import tconstruct.library.TConstructRegistry; import net.minecraft.block.material.Material; +import tconstruct.library.TConstructRegistry; public class GlassPaneStained extends PaneBase { diff --git a/src/main/java/tconstruct/blocks/GlueBlock.java b/src/main/java/tconstruct/blocks/GlueBlock.java index bdcbb5a1..a009f24c 100644 --- a/src/main/java/tconstruct/blocks/GlueBlock.java +++ b/src/main/java/tconstruct/blocks/GlueBlock.java @@ -1,6 +1,5 @@ package tconstruct.blocks; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/tconstruct/blocks/GlueFluid.java b/src/main/java/tconstruct/blocks/GlueFluid.java index 3fb0c60f..64f5ed9a 100644 --- a/src/main/java/tconstruct/blocks/GlueFluid.java +++ b/src/main/java/tconstruct/blocks/GlueFluid.java @@ -1,7 +1,5 @@ package tconstruct.blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -12,6 +10,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.Fluid; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class GlueFluid extends BlockFluidFinite { diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java index 7f15d852..b653582a 100644 --- a/src/main/java/tconstruct/blocks/GravelOre.java +++ b/src/main/java/tconstruct/blocks/GravelOre.java @@ -3,16 +3,14 @@ package tconstruct.blocks; import java.util.List; import java.util.Random; -import tconstruct.library.TConstructRegistry; import net.minecraft.block.Block; -import net.minecraft.block.BlockSand; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import tconstruct.library.TConstructRegistry; public class GravelOre extends BlockFalling { diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index e8783acb..60f9b61c 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -2,12 +2,13 @@ package tconstruct.blocks; import java.util.List; +import mantle.blocks.iface.IServantLogic; +import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -25,8 +26,6 @@ import net.minecraftforge.fluids.FluidTankInfo; import tconstruct.blocks.logic.LavaTankLogic; import tconstruct.client.block.TankRender; import tconstruct.library.TConstructRegistry; -import mantle.blocks.iface.IServantLogic; -import mantle.world.WorldHelper; public class LavaTankBlock extends BlockContainer { diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java index 500f24bf..6a6e4b6e 100644 --- a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java @@ -1,7 +1,5 @@ package tconstruct.blocks; -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,9 +9,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidFinite; import net.minecraftforge.fluids.Fluid; -import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class LiquidMetalFinite extends BlockFluidFinite { diff --git a/src/main/java/tconstruct/blocks/MeatBlock.java b/src/main/java/tconstruct/blocks/MeatBlock.java index fd52a9d7..568aca75 100644 --- a/src/main/java/tconstruct/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/blocks/MeatBlock.java @@ -5,7 +5,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockWood; -import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/tconstruct/blocks/MultiBrick.java b/src/main/java/tconstruct/blocks/MultiBrick.java index f8d66e4d..edb8206c 100644 --- a/src/main/java/tconstruct/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/blocks/MultiBrick.java @@ -1,6 +1,5 @@ package tconstruct.blocks; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/blocks/MultiBrickFancy.java index de6b0ffa..51a972eb 100644 --- a/src/main/java/tconstruct/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/blocks/MultiBrickFancy.java @@ -1,6 +1,5 @@ package tconstruct.blocks; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; diff --git a/src/main/java/tconstruct/blocks/PaneBase.java b/src/main/java/tconstruct/blocks/PaneBase.java index cf0f542f..6ae628ac 100644 --- a/src/main/java/tconstruct/blocks/PaneBase.java +++ b/src/main/java/tconstruct/blocks/PaneBase.java @@ -2,7 +2,6 @@ package tconstruct.blocks; import java.util.List; -import tconstruct.client.block.PaneRender; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; @@ -17,6 +16,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import tconstruct.client.block.PaneRender; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/SlimePad.java b/src/main/java/tconstruct/blocks/SlimePad.java index 2dac0b03..0292013b 100644 --- a/src/main/java/tconstruct/blocks/SlimePad.java +++ b/src/main/java/tconstruct/blocks/SlimePad.java @@ -1,7 +1,6 @@ package tconstruct.blocks; import mantle.blocks.MantleBlock; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -13,7 +12,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import tconstruct.client.block.SlimePadRender; -import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tconstruct/blocks/SmelteryBlock.java b/src/main/java/tconstruct/blocks/SmelteryBlock.java index 49eb6a8b..3e7bba79 100644 --- a/src/main/java/tconstruct/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/blocks/SmelteryBlock.java @@ -3,6 +3,11 @@ package tconstruct.blocks; import java.util.List; import java.util.Random; +import mantle.blocks.abstracts.InventoryBlock; +import mantle.blocks.abstracts.MultiServantLogic; +import mantle.blocks.iface.IFacingLogic; +import mantle.blocks.iface.IMasterLogic; +import mantle.blocks.iface.IServantLogic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -15,17 +20,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import tconstruct.TConstruct; -import tconstruct.blocks.logic.AdaptiveSmelteryLogic; import tconstruct.blocks.logic.AdaptiveDrainLogic; +import tconstruct.blocks.logic.AdaptiveSmelteryLogic; import tconstruct.blocks.logic.SmelteryDrainLogic; import tconstruct.blocks.logic.SmelteryLogic; import tconstruct.client.block.SmelteryRender; import tconstruct.library.TConstructRegistry; -import mantle.blocks.abstracts.InventoryBlock; -import mantle.blocks.iface.IFacingLogic; -import mantle.blocks.iface.IMasterLogic; -import mantle.blocks.iface.IServantLogic; -import mantle.blocks.abstracts.MultiServantLogic; import tconstruct.util.config.PHConstruct; public class SmelteryBlock extends InventoryBlock diff --git a/src/main/java/tconstruct/blocks/SoilBlock.java b/src/main/java/tconstruct/blocks/SoilBlock.java index 3b2d49ee..4914b0e5 100644 --- a/src/main/java/tconstruct/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/blocks/SoilBlock.java @@ -1,6 +1,5 @@ package tconstruct.blocks; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index c4feeb4b..ce378280 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -3,14 +3,13 @@ package tconstruct.blocks; import java.util.List; import mantle.blocks.MantleBlock; -import tconstruct.library.TConstructRegistry; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/blocks/ToolStationBlock.java b/src/main/java/tconstruct/blocks/ToolStationBlock.java index e240bf0f..ef187e03 100644 --- a/src/main/java/tconstruct/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/blocks/ToolStationBlock.java @@ -2,9 +2,6 @@ package tconstruct.blocks; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -28,6 +25,8 @@ import tconstruct.client.block.TableRender; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ToolStationBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java index 2167fe36..779ab513 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryComponent.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryComponent.java @@ -3,7 +3,6 @@ package tconstruct.blocks.component; import java.util.ArrayList; import mantle.world.CoordTuple; -import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/blocks/component/SmelteryScan.java b/src/main/java/tconstruct/blocks/component/SmelteryScan.java index f5349486..e99e7306 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryScan.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryScan.java @@ -11,7 +11,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.component.TankLayerScan; diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java index 027889da..bea16041 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -1,15 +1,20 @@ package tconstruct.blocks.logic; import mantle.blocks.abstracts.MultiServantLogic; -import mantle.blocks.iface.*; +import mantle.blocks.iface.IFacingLogic; +import mantle.blocks.iface.IMasterLogic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic//, ISwitchableMaster { diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 939d0b89..8dd8cb7f 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -1,27 +1,40 @@ package tconstruct.blocks.logic; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import mantle.blocks.abstracts.AdaptiveInventoryLogic; -import mantle.blocks.iface.*; +import mantle.blocks.iface.IActiveLogic; +import mantle.blocks.iface.IMasterLogic; +import mantle.blocks.iface.IServantLogic; import mantle.world.CoordTuple; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import tconstruct.TConstruct; -import tconstruct.blocks.component.*; +import tconstruct.blocks.component.SmelteryComponent; +import tconstruct.blocks.component.SmelteryScan; import tconstruct.common.TRepo; import tconstruct.inventory.AdaptiveSmelteryContainer; -import tconstruct.library.component.*; +import tconstruct.library.component.IComponentHolder; +import tconstruct.library.component.LogicComponent; +import tconstruct.library.component.MultiFluidTank; public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IActiveLogic, IMasterLogic, IComponentHolder, IFluidHandler { @@ -583,11 +596,13 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc return true; } - @Override - public void openInventory() { - } + @Override + public void openInventory () + { + } - @Override - public void closeInventory() { - } + @Override + public void closeInventory () + { + } } diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java index 2595002e..48b402b0 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java @@ -2,14 +2,21 @@ package tconstruct.blocks.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidEvent; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; import tconstruct.TConstruct; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.util.IPattern; diff --git a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java index 6f93088f..d8510e2c 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java @@ -1,15 +1,23 @@ package tconstruct.blocks.logic; -import cpw.mods.fml.relauncher.*; import java.util.HashMap; + import mantle.blocks.iface.IActiveLogic; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidEvent; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; import tconstruct.TConstruct; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * @author BluSunrize diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java index 6d42b2f2..2b531d01 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java @@ -2,14 +2,21 @@ package tconstruct.blocks.logic; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidEvent; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; import tconstruct.TConstruct; import tconstruct.library.crafting.CastingRecipe; import tconstruct.library.util.IPattern; diff --git a/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java b/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java index 147ff947..ce8a1875 100644 --- a/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CraftingStationLogic.java @@ -7,15 +7,12 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.world.World; import tconstruct.inventory.CraftingStationContainer; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.ToolCore; public class CraftingStationLogic extends InventoryLogic implements ISidedInventory { diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 0bcdc755..f26160d2 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -1,16 +1,18 @@ package tconstruct.blocks.logic; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import tconstruct.library.crafting.DryingRackRecipes; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class DryingRackLogic extends InventoryLogic { diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java index a0e129c8..cd0f3209 100644 --- a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java @@ -1,14 +1,19 @@ package tconstruct.blocks.logic; -import mantle.blocks.iface.*; +import mantle.blocks.iface.IActiveLogic; +import mantle.blocks.iface.IFacingLogic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import tconstruct.TConstruct; public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, IFluidHandler diff --git a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java index f55a60fe..937e36d5 100644 --- a/src/main/java/tconstruct/blocks/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FrypanLogic.java @@ -1,6 +1,5 @@ package tconstruct.blocks.logic; -import tconstruct.inventory.FrypanContainer; import mantle.blocks.BlockUtils; import mantle.blocks.iface.IActiveLogic; import net.minecraft.block.Block; @@ -19,6 +18,7 @@ import net.minecraft.item.ItemTool; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import tconstruct.inventory.FrypanContainer; import cpw.mods.fml.common.registry.GameRegistry; /* Slots @@ -312,12 +312,14 @@ public class FrypanLogic extends EquipLogic implements IActiveLogic else return true; }*/ - - @Override - public void openInventory() { - } - @Override - public void closeInventory() { - } + @Override + public void openInventory () + { + } + + @Override + public void closeInventory () + { + } } diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index 666befbd..ae7064bc 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -1,24 +1,32 @@ package tconstruct.blocks.logic; -import cpw.mods.fml.common.registry.GameRegistry; import mantle.blocks.BlockUtils; import mantle.blocks.abstracts.InventoryLogic; -import mantle.blocks.iface.*; +import mantle.blocks.iface.IActiveLogic; +import mantle.blocks.iface.IFacingLogic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.inventory.Container; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemTool; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import tconstruct.inventory.FurnaceContainer; +import cpw.mods.fml.common.registry.GameRegistry; /* Slots * 0: Input @@ -352,12 +360,14 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin { return false; } - - @Override - public void openInventory() { - } - @Override - public void closeInventory() { - } + @Override + public void openInventory () + { + } + + @Override + public void closeInventory () + { + } } diff --git a/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java index 98aa3068..28b9c259 100644 --- a/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LandmineExplodeLogic.java @@ -3,12 +3,11 @@ package tconstruct.blocks.logic; import java.util.ArrayList; import java.util.Iterator; -import tconstruct.util.landmine.behavior.Behavior; -import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler; import mantle.world.WorldHelper; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.util.landmine.behavior.Behavior; /** * This logic is designed only for blocks having TileEntityLandmine as their diff --git a/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java b/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java index fc52a990..97fe77d1 100644 --- a/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LandmineSpecialStackLogic.java @@ -3,11 +3,10 @@ package tconstruct.blocks.logic; import java.util.ArrayList; import java.util.Iterator; -import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler; public class LandmineSpecialStackLogic { diff --git a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java index ee2317f6..0905d781 100644 --- a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java @@ -3,10 +3,16 @@ package tconstruct.blocks.logic; import mantle.blocks.abstracts.MultiServantLogic; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class LavaTankLogic extends MultiServantLogic implements IFluidHandler { diff --git a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java index 6ff6a111..5ab129e5 100644 --- a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java @@ -1,7 +1,8 @@ package tconstruct.blocks.logic; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java b/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java index 308b0b1e..f7ccfcdc 100644 --- a/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/blocks/logic/PartBuilderLogic.java @@ -1,10 +1,6 @@ package tconstruct.blocks.logic; -import tconstruct.inventory.PartCrafterChestContainer; -import tconstruct.inventory.PartCrafterContainer; import mantle.blocks.abstracts.InventoryLogic; -import tconstruct.library.crafting.PatternBuilder; -import tconstruct.library.util.IPattern; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; @@ -12,6 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import tconstruct.inventory.PartCrafterChestContainer; +import tconstruct.inventory.PartCrafterContainer; +import tconstruct.library.crafting.PatternBuilder; +import tconstruct.library.util.IPattern; public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { @@ -189,12 +189,14 @@ public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { return false; } - - @Override - public void openInventory() { - } - @Override - public void closeInventory() { - } + @Override + public void openInventory () + { + } + + @Override + public void closeInventory () + { + } } diff --git a/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java b/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java index 6abc783e..7fb428c2 100644 --- a/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java +++ b/src/main/java/tconstruct/blocks/logic/PatternChestLogic.java @@ -1,10 +1,10 @@ package tconstruct.blocks.logic; -import tconstruct.inventory.PatternChestContainer; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.world.World; +import tconstruct.inventory.PatternChestContainer; public class PatternChestLogic extends InventoryLogic { @@ -42,11 +42,13 @@ public class PatternChestLogic extends InventoryLogic return true; } - @Override - public void openInventory() { - } + @Override + public void openInventory () + { + } - @Override - public void closeInventory() { - } + @Override + public void closeInventory () + { + } } diff --git a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java index e42486b8..b5ee6891 100644 --- a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java +++ b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java @@ -1,7 +1,8 @@ package tconstruct.blocks.logic; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java index 9c5f8565..639c4fb9 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -4,11 +4,15 @@ import mantle.blocks.abstracts.MultiServantLogic; import mantle.blocks.iface.IFacingLogic; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandler, IFacingLogic { diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index d3886d3c..cb2d8e58 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -1,35 +1,51 @@ package tconstruct.blocks.logic; -import cpw.mods.fml.common.FMLCommonHandler; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; -import java.util.*; - -import mantle.blocks.abstracts.*; -import mantle.blocks.iface.*; +import mantle.blocks.abstracts.InventoryLogic; +import mantle.blocks.abstracts.MultiServantLogic; +import mantle.blocks.iface.IActiveLogic; +import mantle.blocks.iface.IFacingLogic; +import mantle.blocks.iface.IMasterLogic; +import mantle.blocks.iface.IServantLogic; import mantle.debug.DebugData; import mantle.world.CoordTuple; import net.minecraft.block.Block; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.monster.*; -import net.minecraft.entity.passive.*; -import net.minecraft.entity.player.*; +import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.monster.EntityIronGolem; +import net.minecraft.entity.passive.EntityHorse; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; -import net.minecraft.network.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; import tconstruct.common.TRepo; import tconstruct.inventory.SmelteryContainer; import tconstruct.library.crafting.Smeltery; import tconstruct.util.SmelteryDamageSource; import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.common.FMLCommonHandler; /* Simple class for storing items in the block */ diff --git a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java b/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java index aa1e6402..c5251006 100644 --- a/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/StencilTableLogic.java @@ -1,8 +1,5 @@ package tconstruct.blocks.logic; -import tconstruct.common.TContent; -import tconstruct.common.TRepo; -import tconstruct.inventory.PatternShaperContainer; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -10,6 +7,8 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import tconstruct.common.TRepo; +import tconstruct.inventory.PatternShaperContainer; public class StencilTableLogic extends InventoryLogic implements ISidedInventory { diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java index f50cf097..32812e1b 100644 --- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java @@ -1,14 +1,20 @@ package tconstruct.blocks.logic; -import java.util.*; +import java.util.ArrayList; +import java.util.List; + import mantle.blocks.abstracts.InventoryLogic; -import mantle.blocks.iface.*; -import mantle.world.*; +import mantle.blocks.iface.IMasterLogic; +import mantle.blocks.iface.IServantLogic; +import mantle.world.CoordTuple; +import mantle.world.WorldHelper; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.*; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java index 013302a9..1b5e8e9a 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java @@ -3,8 +3,10 @@ package tconstruct.blocks.logic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; -import net.minecraft.network.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java b/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java index 47f92193..23c14a12 100644 --- a/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java +++ b/src/main/java/tconstruct/blocks/logic/ToolForgeLogic.java @@ -1,13 +1,12 @@ package tconstruct.blocks.logic; -import tconstruct.inventory.ToolForgeContainer; -import tconstruct.library.crafting.ToolBuilder; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import tconstruct.inventory.ToolForgeContainer; +import tconstruct.library.crafting.ToolBuilder; /* Simple class for storing items in the block */ diff --git a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java index 0edb0ed3..74ba7912 100644 --- a/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java +++ b/src/main/java/tconstruct/blocks/logic/ToolStationLogic.java @@ -1,14 +1,14 @@ package tconstruct.blocks.logic; -import tconstruct.inventory.ToolStationContainer; import mantle.blocks.abstracts.InventoryLogic; -import tconstruct.library.crafting.ToolBuilder; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import tconstruct.inventory.ToolStationContainer; +import tconstruct.library.crafting.ToolBuilder; /* Simple class for storing items in the block */ diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index fde6dede..1a946020 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -15,9 +15,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.IPlantable; -import tconstruct.common.TContent; +import net.minecraftforge.common.util.ForgeDirection; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index c21de5c4..c832c533 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -14,7 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.worldgen.SlimeTreeGen; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index 34cc9c3d..22095dbe 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -6,7 +6,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; -import net.minecraft.block.BlockFlower; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index 522bf3e4..f13e0297 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -6,7 +6,6 @@ import java.util.Random; import mantle.blocks.MantleBlock; import mantle.world.WorldHelper; -import tconstruct.library.TConstructRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; import net.minecraft.block.material.Material; @@ -14,12 +13,12 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import tconstruct.library.TConstructRegistry; public class Landmine extends MantleBlock { diff --git a/src/main/java/tconstruct/client/TClientEvents.java b/src/main/java/tconstruct/client/TClientEvents.java index 6ac01257..0fff1019 100644 --- a/src/main/java/tconstruct/client/TClientEvents.java +++ b/src/main/java/tconstruct/client/TClientEvents.java @@ -1,36 +1,33 @@ package tconstruct.client; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.*; - import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.SoundManager; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.*; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.IAttributeInstance; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.potion.*; -import net.minecraft.util.*; -import net.minecraftforge.client.ForgeHooksClient; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.GuiIngameForge; -import net.minecraftforge.client.event.*; +import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.event.sound.SoundLoadEvent; -import net.minecraftforge.fluids.*; import tconstruct.TConstruct; import tconstruct.client.armor.WingModel; -import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.util.player.TPlayerStats; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class TClientEvents diff --git a/src/main/java/tconstruct/client/TClientTickHandler.java b/src/main/java/tconstruct/client/TClientTickHandler.java index c7b3e845..0c55d2c6 100644 --- a/src/main/java/tconstruct/client/TClientTickHandler.java +++ b/src/main/java/tconstruct/client/TClientTickHandler.java @@ -1,14 +1,7 @@ package tconstruct.client; -import java.util.EnumSet; - -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; -import net.minecraft.util.ResourceLocation; -import tconstruct.TConstruct; -import tconstruct.common.TContent; import tconstruct.common.TRepo; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; diff --git a/src/main/java/tconstruct/client/TControls.java b/src/main/java/tconstruct/client/TControls.java index b50c1aac..8c8fa797 100644 --- a/src/main/java/tconstruct/client/TControls.java +++ b/src/main/java/tconstruct/client/TControls.java @@ -1,16 +1,17 @@ package tconstruct.client; -import java.io.*; -import java.util.EnumSet; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; -import cpw.mods.fml.common.gameevent.TickEvent.Type; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.*; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.settings.KeyBinding; import tconstruct.TConstruct; import tconstruct.client.event.EventCloakRender; import tconstruct.client.tabs.TabRegistry; import tconstruct.util.network.packet.PacketDoubleJump; +import cpw.mods.fml.common.gameevent.TickEvent.Type; public class TControls extends TKeyHandler { diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 0747c17a..71f52fa7 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -1,35 +1,56 @@ package tconstruct.client; -import com.google.common.collect.Lists; - -import cpw.mods.fml.client.registry.*; -import cpw.mods.fml.common.registry.*; -import cpw.mods.fml.relauncher.Side; - import java.io.InputStream; -import java.util.*; +import java.util.ArrayList; -import javax.xml.parsers.*; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; import mantle.client.MProxyClient; import mantle.client.block.SmallFontRenderer; -import mantle.client.gui.GuiManual; import mantle.lib.client.MantleClientRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.model.ModelSlime; -import net.minecraft.client.particle.*; -import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.entity.*; +import net.minecraft.client.particle.EntityAuraFX; +import net.minecraft.client.particle.EntityBreakingFX; +import net.minecraft.client.particle.EntityBubbleFX; +import net.minecraft.client.particle.EntityCloudFX; +import net.minecraft.client.particle.EntityCritFX; +import net.minecraft.client.particle.EntityDropParticleFX; +import net.minecraft.client.particle.EntityEnchantmentTableParticleFX; +import net.minecraft.client.particle.EntityExplodeFX; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.particle.EntityFireworkSparkFX; +import net.minecraft.client.particle.EntityFlameFX; +import net.minecraft.client.particle.EntityFootStepFX; +import net.minecraft.client.particle.EntityHeartFX; +import net.minecraft.client.particle.EntityHugeExplodeFX; +import net.minecraft.client.particle.EntityLargeExplodeFX; +import net.minecraft.client.particle.EntityLavaFX; +import net.minecraft.client.particle.EntityNoteFX; +import net.minecraft.client.particle.EntityPortalFX; +import net.minecraft.client.particle.EntityReddustFX; +import net.minecraft.client.particle.EntitySmokeFX; +import net.minecraft.client.particle.EntitySnowShovelFX; +import net.minecraft.client.particle.EntitySpellParticleFX; +import net.minecraft.client.particle.EntitySplashFX; +import net.minecraft.client.particle.EntitySuspendFX; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.settings.*; +import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; -import net.minecraft.util.*; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; @@ -39,27 +60,95 @@ import org.lwjgl.opengl.GL11; import org.w3c.dom.Document; import tconstruct.TConstruct; -import tconstruct.blocks.SlimeExplosive; -import tconstruct.blocks.logic.*; -import tconstruct.client.armor.RenderArmorCast; -import tconstruct.client.block.*; -import tconstruct.client.entity.*; +import tconstruct.blocks.logic.AdaptiveSmelteryLogic; +import tconstruct.blocks.logic.CastingBasinLogic; +import tconstruct.blocks.logic.CastingTableLogic; +import tconstruct.blocks.logic.CraftingStationLogic; +import tconstruct.blocks.logic.DryingRackLogic; +import tconstruct.blocks.logic.FrypanLogic; +import tconstruct.blocks.logic.FurnaceLogic; +import tconstruct.blocks.logic.PartBuilderLogic; +import tconstruct.blocks.logic.PatternChestLogic; +import tconstruct.blocks.logic.SmelteryLogic; +import tconstruct.blocks.logic.StencilTableLogic; +import tconstruct.blocks.logic.TileEntityLandmine; +import tconstruct.blocks.logic.ToolForgeLogic; +import tconstruct.blocks.logic.ToolStationLogic; +import tconstruct.client.block.BarricadeRender; +import tconstruct.client.block.BlockRenderCastingChannel; +import tconstruct.client.block.CastingBasinSpecialRender; +import tconstruct.client.block.CastingTableSpecialRenderer; +import tconstruct.client.block.DryingRackRender; +import tconstruct.client.block.DryingRackSpecialRender; +import tconstruct.client.block.FrypanRender; +import tconstruct.client.block.OreberryRender; +import tconstruct.client.block.PaneConnectedRender; +import tconstruct.client.block.PaneRender; +import tconstruct.client.block.PunjiRender; +import tconstruct.client.block.RenderLandmine; +import tconstruct.client.block.SearedRender; +import tconstruct.client.block.SlimeChannelRender; +import tconstruct.client.block.SlimePadRender; +import tconstruct.client.block.SmelteryRender; +import tconstruct.client.block.TableForgeRender; +import tconstruct.client.block.TableRender; +import tconstruct.client.block.TankAirRender; +import tconstruct.client.block.TankRender; +import tconstruct.client.entity.CartRender; +import tconstruct.client.entity.CrystalRender; +import tconstruct.client.entity.FancyItemRender; +import tconstruct.client.entity.SlimeRender; import tconstruct.client.entity.item.ExplosiveRender; -import tconstruct.client.entity.projectile.*; -import tconstruct.client.gui.*; -import tconstruct.client.pages.*; -import tconstruct.client.tabs.*; -import tconstruct.common.*; -import tconstruct.entity.*; -import tconstruct.entity.item.*; -import tconstruct.entity.projectile.*; +import tconstruct.client.entity.projectile.ArrowRenderCustom; +import tconstruct.client.entity.projectile.DaggerRenderCustom; +import tconstruct.client.entity.projectile.LaunchedItemRender; +import tconstruct.client.gui.AdaptiveSmelteryGui; +import tconstruct.client.gui.ArmorExtendedGui; +import tconstruct.client.gui.CraftingStationGui; +import tconstruct.client.gui.FrypanGui; +import tconstruct.client.gui.FurnaceGui; +import tconstruct.client.gui.GuiLandmine; +import tconstruct.client.gui.KnapsackGui; +import tconstruct.client.gui.PartCrafterGui; +import tconstruct.client.gui.PatternChestGui; +import tconstruct.client.gui.SmelteryGui; +import tconstruct.client.gui.StencilTableGui; +import tconstruct.client.gui.ToolForgeGui; +import tconstruct.client.gui.ToolStationGui; +import tconstruct.client.pages.BlockCastPage; +import tconstruct.client.pages.MaterialPage; +import tconstruct.client.pages.ModifierPage; +import tconstruct.client.pages.ToolPage; +import tconstruct.client.tabs.InventoryTabArmorExtended; +import tconstruct.client.tabs.InventoryTabKnapsack; +import tconstruct.client.tabs.InventoryTabVanilla; +import tconstruct.client.tabs.TabRegistry; +import tconstruct.common.TProxyCommon; +import tconstruct.common.TRepo; +import tconstruct.entity.BlueSlime; +import tconstruct.entity.CartEntity; +import tconstruct.entity.Crystal; +import tconstruct.entity.FancyEntityItem; +import tconstruct.entity.item.EntityLandmineFirework; +import tconstruct.entity.item.ExplosivePrimed; +import tconstruct.entity.projectile.ArrowEntity; +import tconstruct.entity.projectile.DaggerEntity; +import tconstruct.entity.projectile.LaunchedPotion; import tconstruct.inventory.ContainerLandmine; import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.*; +import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.client.ToolGuiElement; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; import tconstruct.util.config.PHConstruct; -import tconstruct.util.player.*; +import tconstruct.util.player.ArmorExtended; +import tconstruct.util.player.KnapsackInventory; + +import com.google.common.collect.Lists; + +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.VillagerRegistry; public class TProxyClient extends TProxyCommon { diff --git a/src/main/java/tconstruct/client/armor/RenderArmorCast.java b/src/main/java/tconstruct/client/armor/RenderArmorCast.java index 7d34b1cd..f1f6ecc3 100644 --- a/src/main/java/tconstruct/client/armor/RenderArmorCast.java +++ b/src/main/java/tconstruct/client/armor/RenderArmorCast.java @@ -1,20 +1,22 @@ package tconstruct.client.armor; -import java.util.*; - -import org.lwjgl.opengl.*; - -import tconstruct.items.ArmorPattern; +import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; + +import tconstruct.items.ArmorPattern; + public class RenderArmorCast implements IItemRenderer { diff --git a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java b/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java index b9199af0..98b5e1ba 100644 --- a/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/client/block/BlockRenderCastingChannel.java @@ -3,7 +3,6 @@ package tconstruct.client.block; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.Item; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.Fluid; @@ -12,7 +11,6 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; import tconstruct.blocks.logic.CastingChannelLogic; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/BreakingFX.java b/src/main/java/tconstruct/client/block/BreakingFX.java index ecf3b7e4..dce16f5f 100644 --- a/src/main/java/tconstruct/client/block/BreakingFX.java +++ b/src/main/java/tconstruct/client/block/BreakingFX.java @@ -1,6 +1,5 @@ package tconstruct.client.block; -import net.minecraft.block.Block; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; diff --git a/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java b/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java index af07007f..dedd99e0 100644 --- a/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java +++ b/src/main/java/tconstruct/client/block/CastingBasinSpecialRender.java @@ -1,14 +1,19 @@ package tconstruct.client.block; -import cpw.mods.fml.relauncher.*; -import net.minecraft.client.renderer.entity.*; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.*; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import org.lwjgl.opengl.GL11; + import tconstruct.blocks.logic.CastingBasinLogic; import tconstruct.entity.FancyEntityItem; import tconstruct.library.ItemBlocklike; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /* Special renderer, only used for drawing tools */ diff --git a/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java b/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java index 5c54e342..53cc1700 100644 --- a/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java +++ b/src/main/java/tconstruct/client/block/CastingTableSpecialRenderer.java @@ -1,14 +1,19 @@ package tconstruct.client.block; -import cpw.mods.fml.relauncher.*; -import net.minecraft.client.renderer.entity.*; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.*; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import org.lwjgl.opengl.GL11; + import tconstruct.blocks.logic.CastingTableLogic; import tconstruct.entity.FancyEntityItem; import tconstruct.library.ItemBlocklike; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /* Special renderer, only used for drawing tools */ diff --git a/src/main/java/tconstruct/client/block/DryingRackRender.java b/src/main/java/tconstruct/client/block/DryingRackRender.java index b0ec3687..31d0d350 100644 --- a/src/main/java/tconstruct/client/block/DryingRackRender.java +++ b/src/main/java/tconstruct/client/block/DryingRackRender.java @@ -8,7 +8,6 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import tconstruct.client.TProxyClient; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java b/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java index bf727c1e..7670a088 100644 --- a/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java +++ b/src/main/java/tconstruct/client/block/DryingRackSpecialRender.java @@ -11,7 +11,6 @@ import org.lwjgl.opengl.GL11; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.entity.FancyEntityItem; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/block/OreberryRender.java b/src/main/java/tconstruct/client/block/OreberryRender.java index b5695d25..aabf6478 100644 --- a/src/main/java/tconstruct/client/block/OreberryRender.java +++ b/src/main/java/tconstruct/client/block/OreberryRender.java @@ -1,9 +1,9 @@ package tconstruct.client.block; -import tconstruct.client.TProxyClient; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import tconstruct.client.TProxyClient; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/PaneConnectedRender.java b/src/main/java/tconstruct/client/block/PaneConnectedRender.java index e6d56f2c..8583b033 100644 --- a/src/main/java/tconstruct/client/block/PaneConnectedRender.java +++ b/src/main/java/tconstruct/client/block/PaneConnectedRender.java @@ -5,9 +5,7 @@ import static net.minecraftforge.common.util.ForgeDirection.NORTH; import static net.minecraftforge.common.util.ForgeDirection.SOUTH; import static net.minecraftforge.common.util.ForgeDirection.WEST; import net.minecraft.block.Block; -import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import tconstruct.blocks.GlassPaneConnected; diff --git a/src/main/java/tconstruct/client/block/PaneRender.java b/src/main/java/tconstruct/client/block/PaneRender.java index af817c5d..d889c45d 100644 --- a/src/main/java/tconstruct/client/block/PaneRender.java +++ b/src/main/java/tconstruct/client/block/PaneRender.java @@ -1,7 +1,5 @@ package tconstruct.client.block; -import tconstruct.blocks.PaneBase; -import tconstruct.client.TProxyClient; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; @@ -10,6 +8,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; +import tconstruct.blocks.PaneBase; +import tconstruct.client.TProxyClient; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/SearedRender.java b/src/main/java/tconstruct/client/block/SearedRender.java index f8fdbc3d..6a411eb1 100644 --- a/src/main/java/tconstruct/client/block/SearedRender.java +++ b/src/main/java/tconstruct/client/block/SearedRender.java @@ -1,16 +1,19 @@ package tconstruct.client.block; -import cpw.mods.fml.client.registry.*; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; import tconstruct.TConstruct; -import tconstruct.blocks.logic.*; +import tconstruct.blocks.logic.CastingBasinLogic; +import tconstruct.blocks.logic.CastingTableLogic; +import tconstruct.blocks.logic.FaucetLogic; import tconstruct.client.TProxyClient; import tconstruct.common.TRepo; import tconstruct.library.crafting.CastingRecipe; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; public class SearedRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/client/block/SlimeChannelRender.java b/src/main/java/tconstruct/client/block/SlimeChannelRender.java index da6f92c9..f861b288 100644 --- a/src/main/java/tconstruct/client/block/SlimeChannelRender.java +++ b/src/main/java/tconstruct/client/block/SlimeChannelRender.java @@ -1,12 +1,12 @@ package tconstruct.client.block; -import tconstruct.client.TProxyClient; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; +import tconstruct.client.TProxyClient; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/SmelteryRender.java b/src/main/java/tconstruct/client/block/SmelteryRender.java index 67e0d875..d825fb60 100644 --- a/src/main/java/tconstruct/client/block/SmelteryRender.java +++ b/src/main/java/tconstruct/client/block/SmelteryRender.java @@ -1,17 +1,16 @@ package tconstruct.client.block; -import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.client.TProxyClient; -import tconstruct.library.crafting.Smeltery; import mantle.blocks.BlockUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import tconstruct.blocks.logic.SmelteryLogic; +import tconstruct.client.TProxyClient; +import tconstruct.library.crafting.Smeltery; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/tconstruct/client/block/TankRender.java b/src/main/java/tconstruct/client/block/TankRender.java index 66d0f24b..2bfadd07 100644 --- a/src/main/java/tconstruct/client/block/TankRender.java +++ b/src/main/java/tconstruct/client/block/TankRender.java @@ -4,7 +4,6 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/tconstruct/client/entity/CartRender.java b/src/main/java/tconstruct/client/entity/CartRender.java index 5496f37f..b5da3fb8 100644 --- a/src/main/java/tconstruct/client/entity/CartRender.java +++ b/src/main/java/tconstruct/client/entity/CartRender.java @@ -1,6 +1,5 @@ package tconstruct.client.entity; -import net.minecraft.block.Block; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/tconstruct/client/entity/CrystalModelSmall.java b/src/main/java/tconstruct/client/entity/CrystalModelSmall.java index b501ef9b..66a1a576 100644 --- a/src/main/java/tconstruct/client/entity/CrystalModelSmall.java +++ b/src/main/java/tconstruct/client/entity/CrystalModelSmall.java @@ -1,8 +1,6 @@ package tconstruct.client.entity; import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; public class CrystalModelSmall extends ModelBase { diff --git a/src/main/java/tconstruct/client/entity/CrystalRender.java b/src/main/java/tconstruct/client/entity/CrystalRender.java index db7b8920..27f45f48 100644 --- a/src/main/java/tconstruct/client/entity/CrystalRender.java +++ b/src/main/java/tconstruct/client/entity/CrystalRender.java @@ -1,11 +1,11 @@ package tconstruct.client.entity; -import tconstruct.entity.Crystal; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.util.ResourceLocation; +import tconstruct.entity.Crystal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index d5d1177b..2c650740 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -1,11 +1,9 @@ package tconstruct.client.entity.item; -import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index c2ab53f5..abcdc5b7 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -5,7 +5,6 @@ import java.util.Random; import mantle.blocks.BlockUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -13,12 +12,10 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java index 6aa2bc9c..41133d43 100644 --- a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -14,7 +14,6 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import tconstruct.entity.projectile.LaunchedPotion; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/event/EventCloakRender.java b/src/main/java/tconstruct/client/event/EventCloakRender.java index 7a872551..fe49e61e 100644 --- a/src/main/java/tconstruct/client/event/EventCloakRender.java +++ b/src/main/java/tconstruct/client/event/EventCloakRender.java @@ -1,19 +1,25 @@ package tconstruct.client.event; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -import java.awt.*; +import java.awt.Graphics; +import java.awt.Image; import java.awt.image.BufferedImage; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.util.ArrayList; +import java.util.HashMap; import javax.swing.ImageIcon; +import mantle.lib.environment.EnvironmentChecks; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraftforge.client.event.RenderPlayerEvent; -import mantle.lib.environment.EnvironmentChecks; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class EventCloakRender { diff --git a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java index 3689a08a..9deae157 100644 --- a/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/AdaptiveSmelteryGui.java @@ -1,25 +1,33 @@ package tconstruct.client.gui; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.*; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; -import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.*; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; import tconstruct.TConstruct; import tconstruct.blocks.component.SmelteryComponent; import tconstruct.blocks.logic.AdaptiveSmelteryLogic; -import tconstruct.inventory.*; +import tconstruct.inventory.ActiveContainer; +import tconstruct.inventory.AdaptiveSmelteryContainer; import tconstruct.library.component.MultiFluidTank; public class AdaptiveSmelteryGui extends NewContainerGui diff --git a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java index dd6b97cc..f92d2e49 100644 --- a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java @@ -6,13 +6,13 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; + import tconstruct.client.tabs.InventoryTabArmorExtended; import tconstruct.client.tabs.TabRegistry; -import tconstruct.common.TContent; import tconstruct.inventory.ArmorExtendedContainer; import tconstruct.util.player.ArmorExtended; diff --git a/src/main/java/tconstruct/client/gui/GuiButtonTool.java b/src/main/java/tconstruct/client/gui/GuiButtonTool.java index 05ac10d4..329056cc 100644 --- a/src/main/java/tconstruct/client/gui/GuiButtonTool.java +++ b/src/main/java/tconstruct/client/gui/GuiButtonTool.java @@ -7,7 +7,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import tconstruct.library.client.ToolGuiElement; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/gui/KnapsackGui.java b/src/main/java/tconstruct/client/gui/KnapsackGui.java index 1dde002c..ab5d6396 100644 --- a/src/main/java/tconstruct/client/gui/KnapsackGui.java +++ b/src/main/java/tconstruct/client/gui/KnapsackGui.java @@ -4,7 +4,9 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.GL11; + import tconstruct.client.tabs.InventoryTabKnapsack; import tconstruct.client.tabs.TabRegistry; import tconstruct.inventory.KnapsackContainer; diff --git a/src/main/java/tconstruct/client/gui/NewContainerGui.java b/src/main/java/tconstruct/client/gui/NewContainerGui.java index 647446ee..9b4557d4 100644 --- a/src/main/java/tconstruct/client/gui/NewContainerGui.java +++ b/src/main/java/tconstruct/client/gui/NewContainerGui.java @@ -26,7 +26,6 @@ import org.lwjgl.opengl.GL12; import tconstruct.inventory.ActiveContainer; import tconstruct.inventory.ActiveSlot; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/gui/SmelteryGui.java b/src/main/java/tconstruct/client/gui/SmelteryGui.java index 596f6267..99de28db 100644 --- a/src/main/java/tconstruct/client/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/client/gui/SmelteryGui.java @@ -1,18 +1,30 @@ package tconstruct.client.gui; -import java.util.*; -import net.minecraft.client.renderer.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.*; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.*; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import tconstruct.TConstruct; import tconstruct.blocks.logic.SmelteryLogic; -import tconstruct.inventory.*; +import tconstruct.inventory.ActiveContainer; +import tconstruct.inventory.SmelteryContainer; import tconstruct.util.network.packet.PacketSmeltery; public class SmelteryGui extends NewContainerGui diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java index 92e7f689..d2f4783d 100644 --- a/src/main/java/tconstruct/client/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/client/gui/StencilTableGui.java @@ -4,9 +4,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; + import tconstruct.TConstruct; import tconstruct.blocks.logic.StencilTableLogic; import tconstruct.common.TRepo; diff --git a/src/main/java/tconstruct/client/gui/ToolForgeGui.java b/src/main/java/tconstruct/client/gui/ToolForgeGui.java index d9dc307a..aa3d4fd8 100644 --- a/src/main/java/tconstruct/client/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/client/gui/ToolForgeGui.java @@ -1,12 +1,12 @@ package tconstruct.client.gui; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import tconstruct.blocks.logic.ToolForgeLogic; import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.client.ToolGuiElement; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.world.World; -import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/client/gui/ToolStationGui.java b/src/main/java/tconstruct/client/gui/ToolStationGui.java index 40d019a5..521796b3 100644 --- a/src/main/java/tconstruct/client/gui/ToolStationGui.java +++ b/src/main/java/tconstruct/client/gui/ToolStationGui.java @@ -1,23 +1,32 @@ package tconstruct.client.gui; -import cpw.mods.fml.relauncher.*; import java.math.RoundingMode; import java.text.DecimalFormat; -import java.util.*; -import net.minecraft.client.gui.*; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; + import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; + import tconstruct.TConstruct; import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.inventory.*; -import tconstruct.library.client.*; +import tconstruct.inventory.ActiveContainer; +import tconstruct.inventory.ToolStationContainer; +import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.client.ToolGuiElement; import tconstruct.library.tools.ToolCore; import tconstruct.util.network.packet.PacketToolStation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class ToolStationGui extends NewContainerGui diff --git a/src/main/java/tconstruct/client/pages/BlockCastPage.java b/src/main/java/tconstruct/client/pages/BlockCastPage.java index fd810870..bb4de149 100644 --- a/src/main/java/tconstruct/client/pages/BlockCastPage.java +++ b/src/main/java/tconstruct/client/pages/BlockCastPage.java @@ -12,8 +12,6 @@ import org.lwjgl.opengl.GL12; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import tconstruct.library.client.TConstructClientRegistry; - public class BlockCastPage extends BookPage { String text; diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index 43145bc3..be95a275 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -12,8 +12,6 @@ import org.lwjgl.opengl.GL12; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import tconstruct.library.client.TConstructClientRegistry; - public class ModifierPage extends BookPage { String type; diff --git a/src/main/java/tconstruct/client/pages/ToolPage.java b/src/main/java/tconstruct/client/pages/ToolPage.java index e08f887d..544d376f 100644 --- a/src/main/java/tconstruct/client/pages/ToolPage.java +++ b/src/main/java/tconstruct/client/pages/ToolPage.java @@ -11,8 +11,6 @@ import org.lwjgl.opengl.GL12; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import tconstruct.library.client.TConstructClientRegistry; - public class ToolPage extends BookPage { String title; diff --git a/src/main/java/tconstruct/client/tabs/AbstractTab.java b/src/main/java/tconstruct/client/tabs/AbstractTab.java index 3e938a28..c57c685c 100644 --- a/src/main/java/tconstruct/client/tabs/AbstractTab.java +++ b/src/main/java/tconstruct/client/tabs/AbstractTab.java @@ -6,6 +6,7 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java b/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java index 8ba476c7..b6cc34f2 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabArmorExtended.java @@ -1,9 +1,8 @@ package tconstruct.client.tabs; -import tconstruct.client.TControls; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import tconstruct.client.TControls; public class InventoryTabArmorExtended extends AbstractTab { diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index e0c03465..94745bca 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -1,10 +1,9 @@ package tconstruct.client.tabs; -import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; + import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiInventory; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/main/java/tconstruct/common/TContent.java b/src/main/java/tconstruct/common/TContent.java index da253de3..3df715d8 100644 --- a/src/main/java/tconstruct/common/TContent.java +++ b/src/main/java/tconstruct/common/TContent.java @@ -1,57 +1,139 @@ package tconstruct.common; +import java.util.HashMap; + import mantle.blocks.BlockUtils; import mantle.items.abstracts.CraftingItem; +import net.minecraft.block.Block; +import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.Material; +import net.minecraft.block.material.MaterialLiquid; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import tconstruct.library.armor.EnumArmorPart; -import tconstruct.library.crafting.ToolBuilder; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.*; - -import java.lang.reflect.Field; -import java.util.*; - -import net.minecraft.block.*; -import net.minecraft.block.material.*; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; -import net.minecraft.item.crafting.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.stats.Achievement; import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.*; +import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.fluids.*; -import net.minecraftforge.fluids.FluidContainerRegistry.*; -import net.minecraftforge.oredict.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import tconstruct.TConstruct; import tconstruct.achievements.TAchievements; -import tconstruct.blocks.*; -import tconstruct.blocks.logic.*; -import tconstruct.blocks.slime.*; -import tconstruct.blocks.traps.*; +import tconstruct.blocks.BlockLandmine; +import tconstruct.blocks.BloodBlock; +import tconstruct.blocks.CastingChannelBlock; +import tconstruct.blocks.ConveyorBase; +import tconstruct.blocks.CraftingSlab; +import tconstruct.blocks.CraftingStationBlock; +import tconstruct.blocks.DryingRack; +import tconstruct.blocks.EquipBlock; +import tconstruct.blocks.FurnaceSlab; +import tconstruct.blocks.GlassBlockConnected; +import tconstruct.blocks.GlassBlockConnectedMeta; +import tconstruct.blocks.GlassPaneConnected; +import tconstruct.blocks.GlassPaneStained; +import tconstruct.blocks.GlueBlock; +import tconstruct.blocks.GlueFluid; +import tconstruct.blocks.GravelOre; +import tconstruct.blocks.LavaTankBlock; +import tconstruct.blocks.MeatBlock; +import tconstruct.blocks.MetalOre; +import tconstruct.blocks.MultiBrick; +import tconstruct.blocks.MultiBrickFancy; +import tconstruct.blocks.OreberryBush; +import tconstruct.blocks.OreberryBushEssence; +import tconstruct.blocks.SearedBlock; +import tconstruct.blocks.SearedSlab; +import tconstruct.blocks.SlabBase; +import tconstruct.blocks.SlimeExplosive; +import tconstruct.blocks.SlimePad; +import tconstruct.blocks.SmelteryBlock; +import tconstruct.blocks.SoilBlock; +import tconstruct.blocks.SpeedBlock; +import tconstruct.blocks.SpeedSlab; +import tconstruct.blocks.StoneLadder; +import tconstruct.blocks.StoneTorch; +import tconstruct.blocks.TConstructFluid; +import tconstruct.blocks.TMetalBlock; +import tconstruct.blocks.TankAirBlock; +import tconstruct.blocks.ToolForgeBlock; +import tconstruct.blocks.ToolStationBlock; +import tconstruct.blocks.WoodRail; +import tconstruct.blocks.slime.SlimeFluid; +import tconstruct.blocks.slime.SlimeGel; +import tconstruct.blocks.slime.SlimeGrass; +import tconstruct.blocks.slime.SlimeLeaves; +import tconstruct.blocks.slime.SlimeSapling; +import tconstruct.blocks.slime.SlimeTallGrass; +import tconstruct.blocks.traps.BarricadeBlock; +import tconstruct.blocks.traps.Punji; import tconstruct.client.StepSoundSlime; -import tconstruct.entity.*; -import tconstruct.entity.item.*; -import tconstruct.entity.projectile.*; -import tconstruct.items.*; -import tconstruct.items.armor.*; -import tconstruct.items.blocks.*; -import tconstruct.items.tools.*; +import tconstruct.entity.BlueSlime; +import tconstruct.entity.Crystal; +import tconstruct.entity.FancyEntityItem; +import tconstruct.entity.item.EntityLandmineFirework; +import tconstruct.entity.item.ExplosivePrimed; +import tconstruct.entity.projectile.ArrowEntity; +import tconstruct.entity.projectile.DaggerEntity; +import tconstruct.entity.projectile.LaunchedPotion; +import tconstruct.items.Bowstring; +import tconstruct.items.DiamondApple; +import tconstruct.items.FilledBucket; +import tconstruct.items.Fletching; +import tconstruct.items.GoldenHead; +import tconstruct.items.Jerky; +import tconstruct.items.Manual; +import tconstruct.items.MaterialItem; +import tconstruct.items.MetalPattern; +import tconstruct.items.OreBerries; +import tconstruct.items.Pattern; +import tconstruct.items.StrangeFood; +import tconstruct.items.TitleIcon; +import tconstruct.items.ToolPart; +import tconstruct.items.ToolPartHidden; +import tconstruct.items.ToolShard; +import tconstruct.items.armor.ArmorBasic; +import tconstruct.items.armor.ExoArmor; +import tconstruct.items.armor.HeartCanister; +import tconstruct.items.armor.Knapsack; +import tconstruct.items.tools.Arrow; +import tconstruct.items.tools.BattleSign; +import tconstruct.items.tools.Battleaxe; +import tconstruct.items.tools.Broadsword; +import tconstruct.items.tools.Chisel; +import tconstruct.items.tools.Cleaver; +import tconstruct.items.tools.Cutlass; +import tconstruct.items.tools.Dagger; +import tconstruct.items.tools.Excavator; +import tconstruct.items.tools.FryingPan; +import tconstruct.items.tools.Hammer; +import tconstruct.items.tools.Hatchet; +import tconstruct.items.tools.Longsword; +import tconstruct.items.tools.LumberAxe; +import tconstruct.items.tools.Mattock; +import tconstruct.items.tools.Pickaxe; +import tconstruct.items.tools.PotionLauncher; +import tconstruct.items.tools.Rapier; +import tconstruct.items.tools.Scythe; +import tconstruct.items.tools.Shortbow; +import tconstruct.items.tools.Shovel; import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.*; -import tconstruct.library.client.FluidRenderProperties.Applications; -import tconstruct.library.crafting.*; -import tconstruct.library.tools.ToolCore; +import tconstruct.library.armor.EnumArmorPart; +import tconstruct.library.crafting.LiquidCasting; +import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.util.IPattern; -import tconstruct.modifiers.tools.*; -import tconstruct.util.*; -import tconstruct.util.config.*; +import tconstruct.util.config.PHConstruct; +import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; public class TContent implements IFuelHandler { diff --git a/src/main/java/tconstruct/common/TProxyCommon.java b/src/main/java/tconstruct/common/TProxyCommon.java index c9121532..cf278dbc 100644 --- a/src/main/java/tconstruct/common/TProxyCommon.java +++ b/src/main/java/tconstruct/common/TProxyCommon.java @@ -1,15 +1,17 @@ package tconstruct.common; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.registry.LanguageRegistry; +import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import tconstruct.TConstruct; import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.inventory.*; -import mantle.blocks.abstracts.InventoryLogic; +import tconstruct.inventory.ArmorExtendedContainer; +import tconstruct.inventory.ContainerLandmine; +import tconstruct.inventory.KnapsackContainer; import tconstruct.util.player.TPlayerStats; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.registry.LanguageRegistry; /** * Common proxy class for InfiTools diff --git a/src/main/java/tconstruct/common/TRecipes.java b/src/main/java/tconstruct/common/TRecipes.java index dcccac16..22bfef6c 100644 --- a/src/main/java/tconstruct/common/TRecipes.java +++ b/src/main/java/tconstruct/common/TRecipes.java @@ -24,18 +24,90 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import tconstruct.TConstruct; -import tconstruct.blocks.logic.*; -import tconstruct.items.blocks.*; +import tconstruct.blocks.logic.AdaptiveDrainLogic; +import tconstruct.blocks.logic.AdaptiveSmelteryLogic; +import tconstruct.blocks.logic.CastingBasinLogic; +import tconstruct.blocks.logic.CastingChannelLogic; +import tconstruct.blocks.logic.CastingTableLogic; +import tconstruct.blocks.logic.CraftingStationLogic; +import tconstruct.blocks.logic.DryingRackLogic; +import tconstruct.blocks.logic.FaucetLogic; +import tconstruct.blocks.logic.FrypanLogic; +import tconstruct.blocks.logic.FurnaceLogic; +import tconstruct.blocks.logic.LavaTankLogic; +import tconstruct.blocks.logic.PartBuilderLogic; +import tconstruct.blocks.logic.PatternChestLogic; +import tconstruct.blocks.logic.SmelteryDrainLogic; +import tconstruct.blocks.logic.SmelteryLogic; +import tconstruct.blocks.logic.StencilTableLogic; +import tconstruct.blocks.logic.TankAirLogic; +import tconstruct.blocks.logic.TileEntityLandmine; +import tconstruct.blocks.logic.ToolForgeLogic; +import tconstruct.blocks.logic.ToolStationLogic; +import tconstruct.items.blocks.BarricadeItem; +import tconstruct.items.blocks.CastingChannelItem; +import tconstruct.items.blocks.CraftedSoilItemBlock; +import tconstruct.items.blocks.CraftingSlabItemBlock; +import tconstruct.items.blocks.GlassBlockItem; +import tconstruct.items.blocks.GlassPaneItem; +import tconstruct.items.blocks.GravelOreItem; +import tconstruct.items.blocks.HamboneItemBlock; +import tconstruct.items.blocks.ItemBlockLandmine; +import tconstruct.items.blocks.LavaTankItemBlock; +import tconstruct.items.blocks.MetadataItemBlock; +import tconstruct.items.blocks.MetalItemBlock; +import tconstruct.items.blocks.MetalOreItemBlock; +import tconstruct.items.blocks.MultiBrickFancyItem; +import tconstruct.items.blocks.MultiBrickItem; +import tconstruct.items.blocks.OreberryBushItem; +import tconstruct.items.blocks.OreberryBushSecondItem; +import tconstruct.items.blocks.SearedSlabItem; +import tconstruct.items.blocks.SearedTableItemBlock; +import tconstruct.items.blocks.SlimeGelItemBlock; +import tconstruct.items.blocks.SlimeGrassItemBlock; +import tconstruct.items.blocks.SlimeLeavesItemBlock; +import tconstruct.items.blocks.SlimeSaplingItemBlock; +import tconstruct.items.blocks.SlimeTallGrassItem; +import tconstruct.items.blocks.SmelteryItemBlock; +import tconstruct.items.blocks.SpeedBlockItem; +import tconstruct.items.blocks.SpeedSlabItem; +import tconstruct.items.blocks.StainedGlassClearItem; +import tconstruct.items.blocks.StainedGlassClearPaneItem; +import tconstruct.items.blocks.ToolStationItemBlock; +import tconstruct.items.blocks.WoolSlab1Item; +import tconstruct.items.blocks.WoolSlab2Item; import tconstruct.library.TConstructRegistry; -import tconstruct.library.armor.ArmorMod; import tconstruct.library.armor.EnumArmorPart; import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.crafting.*; +import tconstruct.library.crafting.Detailing; +import tconstruct.library.crafting.DryingRackRecipes; +import tconstruct.library.crafting.FluidType; +import tconstruct.library.crafting.LiquidCasting; +import tconstruct.library.crafting.PatternBuilder; +import tconstruct.library.crafting.Smeltery; +import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.util.IPattern; +import tconstruct.modifiers.armor.AModDamageBoost; +import tconstruct.modifiers.armor.AModHealthBoost; +import tconstruct.modifiers.armor.AModKnockbackResistance; import tconstruct.modifiers.armor.AModMoveSpeed; -import tconstruct.modifiers.tools.*; -import tconstruct.modifiers.armor.*; - +import tconstruct.modifiers.armor.AModProtection; +import tconstruct.modifiers.tools.ModAntiSpider; +import tconstruct.modifiers.tools.ModAttack; +import tconstruct.modifiers.tools.ModAutoSmelt; +import tconstruct.modifiers.tools.ModBlaze; +import tconstruct.modifiers.tools.ModButtertouch; +import tconstruct.modifiers.tools.ModDurability; +import tconstruct.modifiers.tools.ModExtraModifier; +import tconstruct.modifiers.tools.ModFlux; +import tconstruct.modifiers.tools.ModInteger; +import tconstruct.modifiers.tools.ModLapis; +import tconstruct.modifiers.tools.ModPiston; +import tconstruct.modifiers.tools.ModRedstone; +import tconstruct.modifiers.tools.ModReinforced; +import tconstruct.modifiers.tools.ModRepair; +import tconstruct.modifiers.tools.ModSmite; +import tconstruct.modifiers.tools.TActiveOmniMod; import tconstruct.util.RecipeRemover; import tconstruct.util.TDispenserBehaviorArrow; import tconstruct.util.TDispenserBehaviorSpawnEgg; diff --git a/src/main/java/tconstruct/common/TRepo.java b/src/main/java/tconstruct/common/TRepo.java index bd27c59a..c839507c 100644 --- a/src/main/java/tconstruct/common/TRepo.java +++ b/src/main/java/tconstruct/common/TRepo.java @@ -1,10 +1,5 @@ package tconstruct.common; -import tconstruct.blocks.OreberryBush; -import tconstruct.blocks.slime.SlimeLeaves; -import tconstruct.blocks.slime.SlimeSapling; -import tconstruct.library.tools.ToolCore; -import tconstruct.modifiers.tools.*; import net.minecraft.block.Block; import net.minecraft.block.Block.SoundType; import net.minecraft.block.material.Material; @@ -13,6 +8,13 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import tconstruct.blocks.OreberryBush; +import tconstruct.blocks.slime.SlimeLeaves; +import tconstruct.blocks.slime.SlimeSapling; +import tconstruct.library.tools.ToolCore; +import tconstruct.modifiers.tools.ModAttack; +import tconstruct.modifiers.tools.ModFlux; +import tconstruct.modifiers.tools.ModLapis; public class TRepo { diff --git a/src/main/java/tconstruct/entity/BlueSlime.java b/src/main/java/tconstruct/entity/BlueSlime.java index 0290beb6..b75b94c5 100644 --- a/src/main/java/tconstruct/entity/BlueSlime.java +++ b/src/main/java/tconstruct/entity/BlueSlime.java @@ -21,7 +21,6 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import tconstruct.TConstruct; -import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java index 4418e3a3..f1c0dc51 100644 --- a/src/main/java/tconstruct/entity/CartEntity.java +++ b/src/main/java/tconstruct/entity/CartEntity.java @@ -14,7 +14,6 @@ import net.minecraft.entity.monster.EntityIronGolem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -25,10 +24,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraft.world.WorldServer; - -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; - import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -1463,11 +1458,13 @@ public class CartEntity extends Entity implements IInventory, IEntityAdditionalS return false; } - @Override - public void openInventory() { - } + @Override + public void openInventory () + { + } - @Override - public void closeInventory() { - } + @Override + public void closeInventory () + { + } } diff --git a/src/main/java/tconstruct/entity/FakeBlockEntity.java b/src/main/java/tconstruct/entity/FakeBlockEntity.java index e0024052..037f4e6c 100644 --- a/src/main/java/tconstruct/entity/FakeBlockEntity.java +++ b/src/main/java/tconstruct/entity/FakeBlockEntity.java @@ -4,10 +4,6 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; - import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; public class FakeBlockEntity extends Entity implements IEntityAdditionalSpawnData diff --git a/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java index 58b64f29..31b6b794 100644 --- a/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java +++ b/src/main/java/tconstruct/entity/item/EntityLandmineFirework.java @@ -1,13 +1,13 @@ package tconstruct.entity.item; -import tconstruct.util.DamageSourceFireworkExplode; - -import cpw.mods.fml.relauncher.*; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import tconstruct.util.DamageSourceFireworkExplode; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class EntityLandmineFirework extends Entity { diff --git a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java index c896dad5..417666ff 100644 --- a/src/main/java/tconstruct/entity/projectile/ArrowEntity.java +++ b/src/main/java/tconstruct/entity/projectile/ArrowEntity.java @@ -5,12 +5,9 @@ import io.netty.buffer.ByteBuf; import java.util.List; import java.util.Random; -import tconstruct.TConstruct; -import tconstruct.util.network.packet.PacketPipeline; import net.minecraft.block.Block; import net.minecraft.crash.CrashReport; import net.minecraft.crash.CrashReportCategory; -import net.minecraft.enchantment.EnchantmentThorns; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -30,10 +27,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ReportedException; import net.minecraft.util.Vec3; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; diff --git a/src/main/java/tconstruct/entity/projectile/DaggerEntity.java b/src/main/java/tconstruct/entity/projectile/DaggerEntity.java index 89af1f02..7298d6a1 100644 --- a/src/main/java/tconstruct/entity/projectile/DaggerEntity.java +++ b/src/main/java/tconstruct/entity/projectile/DaggerEntity.java @@ -1,8 +1,5 @@ package tconstruct.entity.projectile; -import tconstruct.items.tools.Dagger; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.ToolCore; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -10,6 +7,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import tconstruct.items.tools.Dagger; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; public class DaggerEntity extends RotatingBase { diff --git a/src/main/java/tconstruct/entity/projectile/LaunchedPotion.java b/src/main/java/tconstruct/entity/projectile/LaunchedPotion.java index 9186fec4..1cb4acd4 100644 --- a/src/main/java/tconstruct/entity/projectile/LaunchedPotion.java +++ b/src/main/java/tconstruct/entity/projectile/LaunchedPotion.java @@ -6,7 +6,6 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; diff --git a/src/main/java/tconstruct/entity/projectile/RotatingBase.java b/src/main/java/tconstruct/entity/projectile/RotatingBase.java index c71793b7..f1739233 100644 --- a/src/main/java/tconstruct/entity/projectile/RotatingBase.java +++ b/src/main/java/tconstruct/entity/projectile/RotatingBase.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import java.util.List; -import tconstruct.library.tools.AbilityHelper; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -16,10 +15,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; - -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; - +import tconstruct.library.tools.AbilityHelper; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; diff --git a/src/main/java/tconstruct/inventory/ArmorExtendedContainer.java b/src/main/java/tconstruct/inventory/ArmorExtendedContainer.java index a4b9225b..dd46d61d 100644 --- a/src/main/java/tconstruct/inventory/ArmorExtendedContainer.java +++ b/src/main/java/tconstruct/inventory/ArmorExtendedContainer.java @@ -1,10 +1,10 @@ package tconstruct.inventory; -import tconstruct.util.player.ArmorExtended; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.util.player.ArmorExtended; public class ArmorExtendedContainer extends ActiveContainer { diff --git a/src/main/java/tconstruct/inventory/ContainerLandmine.java b/src/main/java/tconstruct/inventory/ContainerLandmine.java index a194e786..4170fbb4 100644 --- a/src/main/java/tconstruct/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/inventory/ContainerLandmine.java @@ -4,16 +4,12 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import tconstruct.blocks.logic.TileEntityLandmine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.tileentity.TileEntityFurnace; +import tconstruct.blocks.logic.TileEntityLandmine; /** * diff --git a/src/main/java/tconstruct/inventory/FrypanContainer.java b/src/main/java/tconstruct/inventory/FrypanContainer.java index 5880b7ed..14edf436 100644 --- a/src/main/java/tconstruct/inventory/FrypanContainer.java +++ b/src/main/java/tconstruct/inventory/FrypanContainer.java @@ -1,7 +1,10 @@ package tconstruct.inventory; -import net.minecraft.entity.player.*; -import net.minecraft.inventory.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import tconstruct.blocks.logic.FrypanLogic; diff --git a/src/main/java/tconstruct/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/inventory/InventoryCraftingStation.java index c880f722..0c30c8fb 100644 --- a/src/main/java/tconstruct/inventory/InventoryCraftingStation.java +++ b/src/main/java/tconstruct/inventory/InventoryCraftingStation.java @@ -1,10 +1,10 @@ package tconstruct.inventory; +import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import mantle.blocks.abstracts.InventoryLogic; public class InventoryCraftingStation extends InventoryCrafting { diff --git a/src/main/java/tconstruct/inventory/KnapsackContainer.java b/src/main/java/tconstruct/inventory/KnapsackContainer.java index 8990d9e2..048bb710 100644 --- a/src/main/java/tconstruct/inventory/KnapsackContainer.java +++ b/src/main/java/tconstruct/inventory/KnapsackContainer.java @@ -1,11 +1,11 @@ package tconstruct.inventory; -import tconstruct.util.player.KnapsackInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.util.player.KnapsackInventory; public class KnapsackContainer extends Container { diff --git a/src/main/java/tconstruct/inventory/PartCrafterChestContainer.java b/src/main/java/tconstruct/inventory/PartCrafterChestContainer.java index 343c2f0b..f1c7929f 100644 --- a/src/main/java/tconstruct/inventory/PartCrafterChestContainer.java +++ b/src/main/java/tconstruct/inventory/PartCrafterChestContainer.java @@ -1,12 +1,12 @@ package tconstruct.inventory; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.library.util.IPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.blocks.logic.PartBuilderLogic; +import tconstruct.blocks.logic.PatternChestLogic; +import tconstruct.library.util.IPattern; public class PartCrafterChestContainer extends ActiveContainer { diff --git a/src/main/java/tconstruct/inventory/PartCrafterContainer.java b/src/main/java/tconstruct/inventory/PartCrafterContainer.java index a985b7c4..060707f4 100644 --- a/src/main/java/tconstruct/inventory/PartCrafterContainer.java +++ b/src/main/java/tconstruct/inventory/PartCrafterContainer.java @@ -1,11 +1,11 @@ package tconstruct.inventory; -import tconstruct.blocks.logic.PartBuilderLogic; -import tconstruct.library.util.IPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.blocks.logic.PartBuilderLogic; +import tconstruct.library.util.IPattern; public class PartCrafterContainer extends ActiveContainer { diff --git a/src/main/java/tconstruct/inventory/PatternChestContainer.java b/src/main/java/tconstruct/inventory/PatternChestContainer.java index 9e1562e4..01690041 100644 --- a/src/main/java/tconstruct/inventory/PatternChestContainer.java +++ b/src/main/java/tconstruct/inventory/PatternChestContainer.java @@ -1,12 +1,12 @@ package tconstruct.inventory; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.library.util.IPattern; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.blocks.logic.PatternChestLogic; +import tconstruct.library.util.IPattern; public class PatternChestContainer extends Container { diff --git a/src/main/java/tconstruct/inventory/PatternShaperContainer.java b/src/main/java/tconstruct/inventory/PatternShaperContainer.java index 0c358542..cede75ed 100644 --- a/src/main/java/tconstruct/inventory/PatternShaperContainer.java +++ b/src/main/java/tconstruct/inventory/PatternShaperContainer.java @@ -1,11 +1,11 @@ package tconstruct.inventory; -import tconstruct.blocks.logic.StencilTableLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.blocks.logic.StencilTableLogic; public class PatternShaperContainer extends Container { diff --git a/src/main/java/tconstruct/inventory/SlotBehavedOnly.java b/src/main/java/tconstruct/inventory/SlotBehavedOnly.java index 95463657..f07d5b0c 100644 --- a/src/main/java/tconstruct/inventory/SlotBehavedOnly.java +++ b/src/main/java/tconstruct/inventory/SlotBehavedOnly.java @@ -1,10 +1,9 @@ package tconstruct.inventory; -import tconstruct.util.landmine.behavior.Behavior; -import net.minecraft.block.Block; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.util.landmine.behavior.Behavior; public class SlotBehavedOnly extends Slot { diff --git a/src/main/java/tconstruct/inventory/SlotCanister.java b/src/main/java/tconstruct/inventory/SlotCanister.java index f2b11f21..29e54fb9 100644 --- a/src/main/java/tconstruct/inventory/SlotCanister.java +++ b/src/main/java/tconstruct/inventory/SlotCanister.java @@ -1,10 +1,10 @@ package tconstruct.inventory; -import tconstruct.items.armor.HeartCanister; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import tconstruct.items.armor.HeartCanister; public class SlotCanister extends Slot { diff --git a/src/main/java/tconstruct/inventory/SlotFrypan.java b/src/main/java/tconstruct/inventory/SlotFrypan.java index 15dafc28..d47fd725 100644 --- a/src/main/java/tconstruct/inventory/SlotFrypan.java +++ b/src/main/java/tconstruct/inventory/SlotFrypan.java @@ -1,8 +1,10 @@ package tconstruct.inventory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.*; -import net.minecraft.item.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.achievements.TAchievements; diff --git a/src/main/java/tconstruct/inventory/SlotKnapsack.java b/src/main/java/tconstruct/inventory/SlotKnapsack.java index c6eceec1..8fe92c8a 100644 --- a/src/main/java/tconstruct/inventory/SlotKnapsack.java +++ b/src/main/java/tconstruct/inventory/SlotKnapsack.java @@ -1,10 +1,10 @@ package tconstruct.inventory; -import tconstruct.items.armor.Knapsack; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import tconstruct.items.armor.Knapsack; public class SlotKnapsack extends Slot { diff --git a/src/main/java/tconstruct/inventory/SlotPattern.java b/src/main/java/tconstruct/inventory/SlotPattern.java index cab1c6a2..ddc0abbe 100644 --- a/src/main/java/tconstruct/inventory/SlotPattern.java +++ b/src/main/java/tconstruct/inventory/SlotPattern.java @@ -1,9 +1,9 @@ package tconstruct.inventory; -import tconstruct.library.util.IPattern; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.library.util.IPattern; public class SlotPattern extends Slot { diff --git a/src/main/java/tconstruct/inventory/SlotTool.java b/src/main/java/tconstruct/inventory/SlotTool.java index 0421ebec..8bd6de42 100644 --- a/src/main/java/tconstruct/inventory/SlotTool.java +++ b/src/main/java/tconstruct/inventory/SlotTool.java @@ -1,8 +1,10 @@ package tconstruct.inventory; import java.util.Random; + import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/tconstruct/inventory/SlotToolForge.java b/src/main/java/tconstruct/inventory/SlotToolForge.java index 299b5c59..33a0e45d 100644 --- a/src/main/java/tconstruct/inventory/SlotToolForge.java +++ b/src/main/java/tconstruct/inventory/SlotToolForge.java @@ -1,16 +1,14 @@ package tconstruct.inventory; -import net.minecraftforge.common.MinecraftForge; -import tconstruct.library.event.ToolCraftedEvent; - import java.util.Random; -import tconstruct.library.tools.ToolCore; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.MinecraftForge; +import tconstruct.library.event.ToolCraftedEvent; +import tconstruct.library.tools.ToolCore; public class SlotToolForge extends SlotTool { diff --git a/src/main/java/tconstruct/inventory/SmelteryContainer.java b/src/main/java/tconstruct/inventory/SmelteryContainer.java index 3b948557..d5a55d44 100644 --- a/src/main/java/tconstruct/inventory/SmelteryContainer.java +++ b/src/main/java/tconstruct/inventory/SmelteryContainer.java @@ -1,10 +1,10 @@ package tconstruct.inventory; -import tconstruct.blocks.logic.SmelteryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import tconstruct.blocks.logic.SmelteryLogic; public class SmelteryContainer extends ActiveContainer { diff --git a/src/main/java/tconstruct/inventory/ToolForgeContainer.java b/src/main/java/tconstruct/inventory/ToolForgeContainer.java index 3040801b..20ee458c 100644 --- a/src/main/java/tconstruct/inventory/ToolForgeContainer.java +++ b/src/main/java/tconstruct/inventory/ToolForgeContainer.java @@ -1,12 +1,12 @@ package tconstruct.inventory; -import tconstruct.blocks.logic.ToolForgeLogic; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.library.tools.ToolCore; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.blocks.logic.ToolForgeLogic; +import tconstruct.blocks.logic.ToolStationLogic; +import tconstruct.library.tools.ToolCore; public class ToolForgeContainer extends ToolStationContainer { diff --git a/src/main/java/tconstruct/inventory/ToolStationContainer.java b/src/main/java/tconstruct/inventory/ToolStationContainer.java index 693b52dc..182cea9d 100644 --- a/src/main/java/tconstruct/inventory/ToolStationContainer.java +++ b/src/main/java/tconstruct/inventory/ToolStationContainer.java @@ -2,14 +2,13 @@ package tconstruct.inventory; import java.util.Random; -import tconstruct.blocks.logic.ToolStationLogic; -import tconstruct.library.tools.ToolCore; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.blocks.logic.ToolStationLogic; +import tconstruct.library.tools.ToolCore; public class ToolStationContainer extends ActiveContainer { diff --git a/src/main/java/tconstruct/items/ArmorPattern.java b/src/main/java/tconstruct/items/ArmorPattern.java index 7e1d48ed..bebaeceb 100644 --- a/src/main/java/tconstruct/items/ArmorPattern.java +++ b/src/main/java/tconstruct/items/ArmorPattern.java @@ -2,15 +2,16 @@ package tconstruct.items; import java.util.List; -import cpw.mods.fml.relauncher.*; -import tconstruct.library.ItemBlocklike; -import tconstruct.library.TConstructRegistry; import mantle.items.abstracts.CraftingItem; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import tconstruct.library.ItemBlocklike; +import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ArmorPattern extends CraftingItem implements ItemBlocklike { diff --git a/src/main/java/tconstruct/items/Bowstring.java b/src/main/java/tconstruct/items/Bowstring.java index 89cf1090..a6605b8d 100644 --- a/src/main/java/tconstruct/items/Bowstring.java +++ b/src/main/java/tconstruct/items/Bowstring.java @@ -2,14 +2,14 @@ package tconstruct.items; import java.util.List; -import cpw.mods.fml.common.Loader; -import tconstruct.common.TRepo; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.util.IToolPart; import mantle.items.abstracts.CraftingItem; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; +import tconstruct.common.TRepo; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.util.IToolPart; +import cpw.mods.fml.common.Loader; public class Bowstring extends CraftingItem implements IToolPart { diff --git a/src/main/java/tconstruct/items/FilledBucket.java b/src/main/java/tconstruct/items/FilledBucket.java index 05ada1d2..6879cc63 100644 --- a/src/main/java/tconstruct/items/FilledBucket.java +++ b/src/main/java/tconstruct/items/FilledBucket.java @@ -3,10 +3,6 @@ package tconstruct.items; import java.util.List; import mantle.world.WorldHelper; -import net.minecraftforge.fluids.BlockFluidFinite; -import tconstruct.TConstruct; -import tconstruct.blocks.logic.LiquidTextureLogic; -import tconstruct.common.TRepo; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -19,6 +15,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraftforge.fluids.BlockFluidFinite; +import tconstruct.TConstruct; +import tconstruct.common.TRepo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/Fletching.java b/src/main/java/tconstruct/items/Fletching.java index 65ecf569..96368c08 100644 --- a/src/main/java/tconstruct/items/Fletching.java +++ b/src/main/java/tconstruct/items/Fletching.java @@ -1,9 +1,9 @@ package tconstruct.items; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.util.IToolPart; import mantle.items.abstracts.CraftingItem; import net.minecraft.item.ItemStack; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.util.IToolPart; public class Fletching extends CraftingItem implements IToolPart { diff --git a/src/main/java/tconstruct/items/GoldenHead.java b/src/main/java/tconstruct/items/GoldenHead.java index 483b6a1e..609a9ab6 100644 --- a/src/main/java/tconstruct/items/GoldenHead.java +++ b/src/main/java/tconstruct/items/GoldenHead.java @@ -11,8 +11,8 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.world.World; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/Manual.java b/src/main/java/tconstruct/items/Manual.java index a10bb3b5..d4bc687c 100644 --- a/src/main/java/tconstruct/items/Manual.java +++ b/src/main/java/tconstruct/items/Manual.java @@ -1,16 +1,15 @@ package tconstruct.items; -import tconstruct.achievements.TAchievements; -import tconstruct.library.TConstructRegistry; - import java.util.List; -import tconstruct.TConstruct; import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import tconstruct.TConstruct; +import tconstruct.achievements.TAchievements; +import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/MaterialItem.java b/src/main/java/tconstruct/items/MaterialItem.java index 8fb20f60..5f4b5870 100644 --- a/src/main/java/tconstruct/items/MaterialItem.java +++ b/src/main/java/tconstruct/items/MaterialItem.java @@ -1,7 +1,7 @@ package tconstruct.items; -import tconstruct.library.TConstructRegistry; import mantle.items.abstracts.CraftingItem; +import tconstruct.library.TConstructRegistry; public class MaterialItem extends CraftingItem { diff --git a/src/main/java/tconstruct/items/MetalPattern.java b/src/main/java/tconstruct/items/MetalPattern.java index cea8b27c..1cbc52eb 100644 --- a/src/main/java/tconstruct/items/MetalPattern.java +++ b/src/main/java/tconstruct/items/MetalPattern.java @@ -2,7 +2,6 @@ package tconstruct.items; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/items/OreBerries.java b/src/main/java/tconstruct/items/OreBerries.java index 758cbf33..a1774403 100644 --- a/src/main/java/tconstruct/items/OreBerries.java +++ b/src/main/java/tconstruct/items/OreBerries.java @@ -2,14 +2,14 @@ package tconstruct.items; import java.util.List; -import tconstruct.library.TConstructRegistry; import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/Pattern.java b/src/main/java/tconstruct/items/Pattern.java index c155d198..81c63faa 100644 --- a/src/main/java/tconstruct/items/Pattern.java +++ b/src/main/java/tconstruct/items/Pattern.java @@ -1,7 +1,5 @@ package tconstruct.items; -import cpw.mods.fml.relauncher.*; - import java.util.List; import mantle.items.abstracts.CraftingItem; @@ -14,6 +12,8 @@ import net.minecraft.util.StatCollector; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder.MaterialSet; import tconstruct.library.util.IPattern; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class Pattern extends CraftingItem implements IPattern { diff --git a/src/main/java/tconstruct/items/StrangeFood.java b/src/main/java/tconstruct/items/StrangeFood.java index 55078a4e..46c8d358 100644 --- a/src/main/java/tconstruct/items/StrangeFood.java +++ b/src/main/java/tconstruct/items/StrangeFood.java @@ -2,12 +2,12 @@ package tconstruct.items; import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/TitleIcon.java b/src/main/java/tconstruct/items/TitleIcon.java index 355be06a..fa53703d 100644 --- a/src/main/java/tconstruct/items/TitleIcon.java +++ b/src/main/java/tconstruct/items/TitleIcon.java @@ -10,7 +10,6 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Facing; diff --git a/src/main/java/tconstruct/items/ToolPart.java b/src/main/java/tconstruct/items/ToolPart.java index 6eae9864..af193b07 100644 --- a/src/main/java/tconstruct/items/ToolPart.java +++ b/src/main/java/tconstruct/items/ToolPart.java @@ -7,7 +7,6 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.IToolPart; diff --git a/src/main/java/tconstruct/items/ToolShard.java b/src/main/java/tconstruct/items/ToolShard.java index e52fcd51..5bfc382e 100644 --- a/src/main/java/tconstruct/items/ToolShard.java +++ b/src/main/java/tconstruct/items/ToolShard.java @@ -2,13 +2,12 @@ package tconstruct.items; import java.util.List; -import tconstruct.common.TContent; -import tconstruct.common.TRepo; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import tconstruct.common.TRepo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/armor/ArmorBasic.java b/src/main/java/tconstruct/items/armor/ArmorBasic.java index 4276eb53..9c579eb1 100644 --- a/src/main/java/tconstruct/items/armor/ArmorBasic.java +++ b/src/main/java/tconstruct/items/armor/ArmorBasic.java @@ -2,7 +2,8 @@ package tconstruct.items.armor; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; -import net.minecraft.item.*; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; public class ArmorBasic extends ItemArmor { diff --git a/src/main/java/tconstruct/items/armor/ArmorStandard.java b/src/main/java/tconstruct/items/armor/ArmorStandard.java index f29f0f2b..76e5f9bd 100644 --- a/src/main/java/tconstruct/items/armor/ArmorStandard.java +++ b/src/main/java/tconstruct/items/armor/ArmorStandard.java @@ -1,10 +1,10 @@ package tconstruct.items.armor; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; - -import net.minecraft.client.renderer.texture.IIconRegister; -import tconstruct.library.armor.*; +import tconstruct.library.armor.ArmorCore; +import tconstruct.library.armor.EnumArmorPart; public class ArmorStandard extends ArmorCore { diff --git a/src/main/java/tconstruct/items/armor/ExoArmor.java b/src/main/java/tconstruct/items/armor/ExoArmor.java index 18e0d8d0..60b01127 100644 --- a/src/main/java/tconstruct/items/armor/ExoArmor.java +++ b/src/main/java/tconstruct/items/armor/ExoArmor.java @@ -1,10 +1,7 @@ package tconstruct.items.armor; import java.util.List; -import java.util.UUID; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -12,11 +9,14 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.util.DamageSource; import tconstruct.library.TConstructRegistry; import tconstruct.library.armor.ArmorCore; import tconstruct.library.armor.EnumArmorPart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ExoArmor extends ArmorCore { diff --git a/src/main/java/tconstruct/items/armor/Glove.java b/src/main/java/tconstruct/items/armor/Glove.java index 57c7554e..564c0337 100644 --- a/src/main/java/tconstruct/items/armor/Glove.java +++ b/src/main/java/tconstruct/items/armor/Glove.java @@ -1,8 +1,8 @@ package tconstruct.items.armor; -import tconstruct.library.TConstructRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; +import tconstruct.library.TConstructRegistry; public class Glove extends Item { diff --git a/src/main/java/tconstruct/items/armor/HeartCanister.java b/src/main/java/tconstruct/items/armor/HeartCanister.java index 4a4dc73a..277d7459 100644 --- a/src/main/java/tconstruct/items/armor/HeartCanister.java +++ b/src/main/java/tconstruct/items/armor/HeartCanister.java @@ -2,15 +2,15 @@ package tconstruct.items.armor; import java.util.List; +import mantle.items.abstracts.CraftingItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.util.player.ArmorExtended; import tconstruct.util.player.TPlayerStats; -import mantle.items.abstracts.CraftingItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/armor/Knapsack.java b/src/main/java/tconstruct/items/armor/Knapsack.java index 9d7eb710..3a0a1df6 100644 --- a/src/main/java/tconstruct/items/armor/Knapsack.java +++ b/src/main/java/tconstruct/items/armor/Knapsack.java @@ -1,17 +1,12 @@ package tconstruct.items.armor; -import tconstruct.TConstruct; -import tconstruct.library.TConstructRegistry; -import tconstruct.util.player.*; -import mantle.items.abstracts.CraftingItem; -import net.minecraft.entity.Entity; -import net.minecraft.world.World; - import java.util.List; -import net.minecraft.util.StatCollector; +import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import tconstruct.library.TConstructRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/items/blocks/BarricadeItem.java index 60946685..2782724b 100644 --- a/src/main/java/tconstruct/items/blocks/BarricadeItem.java +++ b/src/main/java/tconstruct/items/blocks/BarricadeItem.java @@ -2,16 +2,16 @@ package tconstruct.items.blocks; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -import net.minecraft.world.World; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BarricadeItem extends ItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/CastingChannelItem.java b/src/main/java/tconstruct/items/blocks/CastingChannelItem.java index 91d265de..ed45b67f 100644 --- a/src/main/java/tconstruct/items/blocks/CastingChannelItem.java +++ b/src/main/java/tconstruct/items/blocks/CastingChannelItem.java @@ -1,7 +1,7 @@ package tconstruct.items.blocks; -import net.minecraft.block.Block; import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; public class CastingChannelItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java index c86af78a..f1eebc9c 100644 --- a/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java @@ -2,14 +2,14 @@ package tconstruct.items.blocks; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class CraftedSoilItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/GlassPaneItem.java b/src/main/java/tconstruct/items/blocks/GlassPaneItem.java index a05a0ec6..e5f1ab4c 100644 --- a/src/main/java/tconstruct/items/blocks/GlassPaneItem.java +++ b/src/main/java/tconstruct/items/blocks/GlassPaneItem.java @@ -1,7 +1,7 @@ package tconstruct.items.blocks; -import net.minecraft.block.Block; import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; public class GlassPaneItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/GravelOreItem.java b/src/main/java/tconstruct/items/blocks/GravelOreItem.java index dc479d7e..a1e419a0 100644 --- a/src/main/java/tconstruct/items/blocks/GravelOreItem.java +++ b/src/main/java/tconstruct/items/blocks/GravelOreItem.java @@ -2,9 +2,6 @@ package tconstruct.items.blocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; public class GravelOreItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java b/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java index 2999c214..2f6f6aee 100644 --- a/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/HamboneItemBlock.java @@ -3,16 +3,13 @@ package tconstruct.items.blocks; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java index 30ba78d8..361ec652 100644 --- a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java @@ -7,8 +7,8 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import tconstruct.blocks.logic.TileEntityLandmine; import tconstruct.common.TRepo; diff --git a/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java b/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java index 2ca53434..fb3000a9 100644 --- a/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java @@ -5,10 +5,8 @@ import java.util.List; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; public class LavaTankItemBlock extends MultiItemBlock diff --git a/src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java b/src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java index b4d3ebf1..f17fc973 100644 --- a/src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java @@ -5,10 +5,8 @@ import java.util.List; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.MathHelper; public class MetalOreItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/MultiBrickItem.java b/src/main/java/tconstruct/items/blocks/MultiBrickItem.java index 1c01b3a5..213a9bb4 100644 --- a/src/main/java/tconstruct/items/blocks/MultiBrickItem.java +++ b/src/main/java/tconstruct/items/blocks/MultiBrickItem.java @@ -5,9 +5,7 @@ import java.util.List; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java index 6ba275b3..6b724287 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java @@ -2,16 +2,16 @@ package tconstruct.items.blocks; import java.util.List; -import tconstruct.common.TRepo; import mantle.blocks.abstracts.MultiItemBlock; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.common.IPlantable; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.util.ForgeDirection; +import tconstruct.common.TRepo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java index 206a8a05..be33c1a6 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java @@ -2,18 +2,16 @@ package tconstruct.items.blocks; import java.util.List; -import tconstruct.common.TRepo; import mantle.blocks.abstracts.MultiItemBlock; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.common.IPlantable; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.util.ForgeDirection; +import tconstruct.common.TRepo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/blocks/SearedSlabItem.java b/src/main/java/tconstruct/items/blocks/SearedSlabItem.java index 602460d5..3c1da0f2 100644 --- a/src/main/java/tconstruct/items/blocks/SearedSlabItem.java +++ b/src/main/java/tconstruct/items/blocks/SearedSlabItem.java @@ -2,9 +2,6 @@ package tconstruct.items.blocks; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; public class SearedSlabItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java b/src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java index bc70f6ae..dd041da3 100644 --- a/src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java @@ -1,7 +1,7 @@ package tconstruct.items.blocks; -import net.minecraft.block.Block; import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; public class SearedTableItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java b/src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java index 2d3dc79c..df0b0f32 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java @@ -1,7 +1,7 @@ package tconstruct.items.blocks; -import net.minecraft.block.Block; import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; public class SlimeGelItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/SlimeGrassItemBlock.java b/src/main/java/tconstruct/items/blocks/SlimeGrassItemBlock.java index 2afdf417..83d82f73 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeGrassItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/SlimeGrassItemBlock.java @@ -1,7 +1,7 @@ package tconstruct.items.blocks; -import net.minecraft.block.Block; import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; public class SlimeGrassItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/SlimeLeavesItemBlock.java b/src/main/java/tconstruct/items/blocks/SlimeLeavesItemBlock.java index f3b0c44d..7ec21653 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeLeavesItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/SlimeLeavesItemBlock.java @@ -1,15 +1,7 @@ package tconstruct.items.blocks; -import java.util.List; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; public class SlimeLeavesItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/SlimeSaplingItemBlock.java b/src/main/java/tconstruct/items/blocks/SlimeSaplingItemBlock.java index 6923772b..38785b2e 100644 --- a/src/main/java/tconstruct/items/blocks/SlimeSaplingItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/SlimeSaplingItemBlock.java @@ -1,7 +1,7 @@ package tconstruct.items.blocks; -import net.minecraft.block.Block; import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; public class SlimeSaplingItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/SmelteryItemBlock.java b/src/main/java/tconstruct/items/blocks/SmelteryItemBlock.java index 11eb3994..dfa2a289 100644 --- a/src/main/java/tconstruct/items/blocks/SmelteryItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/SmelteryItemBlock.java @@ -2,13 +2,13 @@ package tconstruct.items.blocks; import java.util.List; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class SmelteryItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java b/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java index f95073e9..4f88440a 100644 --- a/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java +++ b/src/main/java/tconstruct/items/blocks/SpeedBlockItem.java @@ -5,9 +5,7 @@ import java.util.List; import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; public class SpeedBlockItem extends MultiItemBlock diff --git a/src/main/java/tconstruct/items/blocks/StainedGlassClearItem.java b/src/main/java/tconstruct/items/blocks/StainedGlassClearItem.java index 81fc8f8e..658d3c62 100644 --- a/src/main/java/tconstruct/items/blocks/StainedGlassClearItem.java +++ b/src/main/java/tconstruct/items/blocks/StainedGlassClearItem.java @@ -1,7 +1,7 @@ package tconstruct.items.blocks; -import net.minecraft.block.Block; import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; public class StainedGlassClearItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/StainedGlassClearPaneItem.java b/src/main/java/tconstruct/items/blocks/StainedGlassClearPaneItem.java index c5457bec..8d2f72da 100644 --- a/src/main/java/tconstruct/items/blocks/StainedGlassClearPaneItem.java +++ b/src/main/java/tconstruct/items/blocks/StainedGlassClearPaneItem.java @@ -1,7 +1,7 @@ package tconstruct.items.blocks; -import net.minecraft.block.Block; import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; public class StainedGlassClearPaneItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/ToolStationItemBlock.java b/src/main/java/tconstruct/items/blocks/ToolStationItemBlock.java index b4ae2815..23b98777 100644 --- a/src/main/java/tconstruct/items/blocks/ToolStationItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/ToolStationItemBlock.java @@ -1,7 +1,7 @@ package tconstruct.items.blocks; -import net.minecraft.block.Block; import mantle.blocks.abstracts.MultiItemBlock; +import net.minecraft.block.Block; public class ToolStationItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java index de7513e6..75f487a3 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab2Item.java @@ -4,8 +4,8 @@ import mantle.blocks.abstracts.MultiItemBlock; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.*; -import net.minecraft.util.MathHelper; +import net.minecraft.item.ItemDye; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; public class WoolSlab2Item extends MultiItemBlock diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 09beba22..593b0d0b 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -2,17 +2,16 @@ package tconstruct.items.tools; import java.util.List; -import tconstruct.TConstruct; -import tconstruct.common.TRepo; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.ToolCore; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import tconstruct.TConstruct; +import tconstruct.common.TRepo; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.tools.ToolCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java index 2af54a69..82f12c4c 100644 --- a/src/main/java/tconstruct/items/tools/BattleSign.java +++ b/src/main/java/tconstruct/items/tools/BattleSign.java @@ -1,8 +1,8 @@ package tconstruct.items.tools; +import net.minecraft.item.Item; import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; -import net.minecraft.item.Item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index c6a7aeb9..a462bbc9 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -1,10 +1,5 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -20,7 +15,11 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; +import tconstruct.common.TRepo; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.HarvestTool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index 786d66e6..3d968805 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -5,12 +5,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import tconstruct.TConstruct; -import tconstruct.common.TRepo; -import tconstruct.entity.projectile.ArrowEntity; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.ToolCore; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -27,6 +21,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.event.entity.player.ArrowNockEvent; +import tconstruct.TConstruct; +import tconstruct.common.TRepo; +import tconstruct.entity.projectile.ArrowEntity; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Broadsword.java b/src/main/java/tconstruct/items/tools/Broadsword.java index da200e5d..9a067a06 100644 --- a/src/main/java/tconstruct/items/tools/Broadsword.java +++ b/src/main/java/tconstruct/items/tools/Broadsword.java @@ -1,8 +1,8 @@ package tconstruct.items.tools; +import net.minecraft.item.Item; import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; -import net.minecraft.item.Item; public class Broadsword extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index 71aa396a..49adf460 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -1,10 +1,5 @@ package tconstruct.items.tools; -import tconstruct.TConstruct; -import tconstruct.common.TRepo; -import tconstruct.library.crafting.Detailing.DetailInput; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.ToolCore; import mantle.blocks.BlockUtils; import net.minecraft.block.Block; import net.minecraft.client.entity.EntityPlayerSP; @@ -17,6 +12,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; +import tconstruct.TConstruct; +import tconstruct.common.TRepo; +import tconstruct.library.crafting.Detailing.DetailInput; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index 6bb83faa..7771187d 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -1,9 +1,5 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.Weapon; -import tconstruct.util.config.PHConstruct; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,6 +7,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import tconstruct.common.TRepo; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.Weapon; +import tconstruct.util.config.PHConstruct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Cutlass.java b/src/main/java/tconstruct/items/tools/Cutlass.java index 0d49653b..3e6a49e8 100644 --- a/src/main/java/tconstruct/items/tools/Cutlass.java +++ b/src/main/java/tconstruct/items/tools/Cutlass.java @@ -1,10 +1,9 @@ package tconstruct.items.tools; +import net.minecraft.item.Item; import tconstruct.common.TRepo; import tconstruct.library.tools.Weapon; -import net.minecraft.item.Item; - public class Cutlass extends Weapon { public Cutlass() diff --git a/src/main/java/tconstruct/items/tools/Dagger.java b/src/main/java/tconstruct/items/tools/Dagger.java index 658bfa06..0e834312 100644 --- a/src/main/java/tconstruct/items/tools/Dagger.java +++ b/src/main/java/tconstruct/items/tools/Dagger.java @@ -1,13 +1,13 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.entity.projectile.DaggerEntity; -import tconstruct.library.tools.Weapon; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.common.TRepo; +import tconstruct.entity.projectile.DaggerEntity; +import tconstruct.library.tools.Weapon; public class Dagger extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index e076a5fc..03b71b40 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -1,10 +1,5 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -14,7 +9,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; +import tconstruct.common.TRepo; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.HarvestTool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java index c6bd6aed..b7d3970b 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -2,15 +2,8 @@ package tconstruct.items.tools; import java.util.List; -import tconstruct.blocks.logic.EquipLogic; -import tconstruct.common.TRepo; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.Weapon; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -19,6 +12,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import tconstruct.blocks.logic.EquipLogic; +import tconstruct.common.TRepo; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.Weapon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index 9571386a..02564637 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -1,14 +1,7 @@ package tconstruct.items.tools; -import java.util.ArrayList; import java.util.List; -import tconstruct.common.TRepo; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -21,7 +14,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; +import tconstruct.common.TRepo; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.HarvestTool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index a1e21f8f..2fe0edc0 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -1,15 +1,15 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; -import tconstruct.util.config.PHConstruct; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.common.TRepo; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.HarvestTool; +import tconstruct.util.config.PHConstruct; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java index 4694754f..6f36245a 100644 --- a/src/main/java/tconstruct/items/tools/Longsword.java +++ b/src/main/java/tconstruct/items/tools/Longsword.java @@ -1,7 +1,5 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.library.tools.Weapon; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -10,6 +8,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import tconstruct.common.TRepo; +import tconstruct.library.tools.Weapon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index a5257813..b7dd18a5 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -1,10 +1,5 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.HarvestTool; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -14,7 +9,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; +import tconstruct.common.TRepo; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.HarvestTool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Pickaxe.java b/src/main/java/tconstruct/items/tools/Pickaxe.java index 6064f0a2..bfc3aade 100644 --- a/src/main/java/tconstruct/items/tools/Pickaxe.java +++ b/src/main/java/tconstruct/items/tools/Pickaxe.java @@ -1,9 +1,9 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.library.tools.HarvestTool; import net.minecraft.block.material.Material; import net.minecraft.item.Item; +import tconstruct.common.TRepo; +import tconstruct.library.tools.HarvestTool; public class Pickaxe extends HarvestTool { diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index 78c7d4b1..f30f16ca 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -2,8 +2,6 @@ package tconstruct.items.tools; import java.util.List; -import tconstruct.entity.projectile.LaunchedPotion; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -17,6 +15,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import tconstruct.entity.projectile.LaunchedPotion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java index e406c96d..7e68d2b0 100644 --- a/src/main/java/tconstruct/items/tools/Rapier.java +++ b/src/main/java/tconstruct/items/tools/Rapier.java @@ -1,7 +1,5 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.library.tools.Weapon; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -10,6 +8,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import tconstruct.common.TRepo; +import tconstruct.library.tools.Weapon; public class Rapier extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 2c2e123c..216e4b34 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -2,11 +2,6 @@ package tconstruct.items.tools; import java.util.List; -import tconstruct.common.TRepo; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.Weapon; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -17,6 +12,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import tconstruct.common.TRepo; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.Weapon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java index a5dfb255..79a1cac5 100644 --- a/src/main/java/tconstruct/items/tools/Shovel.java +++ b/src/main/java/tconstruct/items/tools/Shovel.java @@ -1,9 +1,9 @@ package tconstruct.items.tools; -import tconstruct.common.TRepo; -import tconstruct.library.tools.HarvestTool; import net.minecraft.block.material.Material; import net.minecraft.item.Item; +import tconstruct.common.TRepo; +import tconstruct.library.tools.HarvestTool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/library/ActiveToolMod.java b/src/main/java/tconstruct/library/ActiveToolMod.java index a56bd530..8648c759 100644 --- a/src/main/java/tconstruct/library/ActiveToolMod.java +++ b/src/main/java/tconstruct/library/ActiveToolMod.java @@ -1,11 +1,11 @@ package tconstruct.library; -import tconstruct.library.tools.ToolCore; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import tconstruct.library.tools.ToolCore; public class ActiveToolMod { diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index 7125f75c..620c21c2 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -7,8 +7,9 @@ import java.util.HashMap; import java.util.List; import java.util.logging.Logger; -import com.google.common.collect.HashBiMap; - +import mantle.lib.TabTools; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tconstruct.library.crafting.Detailing; import tconstruct.library.crafting.LiquidCasting; import tconstruct.library.crafting.ToolBuilder; @@ -17,12 +18,8 @@ import tconstruct.library.tools.BowMaterial; import tconstruct.library.tools.BowstringMaterial; import tconstruct.library.tools.CustomMaterial; import tconstruct.library.tools.FletchingMaterial; -import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.TToolMaterial; -import mantle.lib.TabTools; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import tconstruct.library.tools.ToolCore; /** A registry to store any relevant API work * diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index be8b4212..4363bfe4 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -2,9 +2,12 @@ package tconstruct.library.armor; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.IBehaviorDispenseItem; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java index 09f61939..fbc47409 100644 --- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java +++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java @@ -4,12 +4,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class TConstructClientRegistry { diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index c54728aa..a9823aa9 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -1,17 +1,22 @@ package tconstruct.library.component; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.nbt.*; -import net.minecraft.tileentity.TileEntity; -import tconstruct.TConstruct; -import mantle.world.*; -import mantle.blocks.BlockUtils; import mantle.blocks.iface.IFacingLogic; import mantle.blocks.iface.IMasterLogic; import mantle.blocks.iface.IServantLogic; +import mantle.world.CoordTuple; +import mantle.world.CoordTupleSort; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import tconstruct.TConstruct; public class TankLayerScan extends LogicComponent { diff --git a/src/main/java/tconstruct/library/crafting/Detailing.java b/src/main/java/tconstruct/library/crafting/Detailing.java index 5080cd73..04647586 100644 --- a/src/main/java/tconstruct/library/crafting/Detailing.java +++ b/src/main/java/tconstruct/library/crafting/Detailing.java @@ -3,12 +3,11 @@ package tconstruct.library.crafting; import java.util.ArrayList; import java.util.List; -import tconstruct.library.tools.ToolCore; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolCore; import cpw.mods.fml.common.registry.GameRegistry; public class Detailing diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index c4a75bd0..f3f90672 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -2,7 +2,8 @@ package tconstruct.library.crafting; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import tconstruct.common.TRepo; public enum FluidType diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java index 6d0327a7..3c99a790 100644 --- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java +++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java @@ -5,15 +5,15 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import cpw.mods.fml.common.eventhandler.Event.Result; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.event.PartBuilderEvent; -import tconstruct.library.tools.CustomMaterial; -import tconstruct.library.util.IPattern; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.event.PartBuilderEvent; +import tconstruct.library.tools.CustomMaterial; +import tconstruct.library.util.IPattern; +import cpw.mods.fml.common.eventhandler.Event.Result; public class PatternBuilder { diff --git a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java index 9a140f33..30e8b160 100644 --- a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java @@ -4,13 +4,12 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import tconstruct.library.tools.ToolCore; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import tconstruct.library.tools.ToolCore; public class ShapelessToolRecipe extends ShapelessRecipes { diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index 9a10bad9..e572ed1f 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -1,6 +1,9 @@ package tconstruct.library.crafting; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index 32b05ab6..e4ad5421 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -11,16 +11,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.eventhandler.Event.Result; import tconstruct.library.TConstructRegistry; import tconstruct.library.armor.ArmorCore; import tconstruct.library.armor.ArmorMod; import tconstruct.library.event.ToolCraftEvent; -import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.TToolMaterial; +import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.ToolMod; import tconstruct.library.util.IToolPart; +import cpw.mods.fml.common.eventhandler.Event.Result; public class ToolBuilder { diff --git a/src/main/java/tconstruct/library/event/PartBuilderEvent.java b/src/main/java/tconstruct/library/event/PartBuilderEvent.java index 593f74cb..8b273a9e 100644 --- a/src/main/java/tconstruct/library/event/PartBuilderEvent.java +++ b/src/main/java/tconstruct/library/event/PartBuilderEvent.java @@ -1,7 +1,7 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.eventhandler.Event; /* This event fires after all of the other construction. The resulting nbttag is added to the tool * Note: The tag is the base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. diff --git a/src/main/java/tconstruct/library/event/SmelteryEvent.java b/src/main/java/tconstruct/library/event/SmelteryEvent.java index 44ac8201..a19fd784 100644 --- a/src/main/java/tconstruct/library/event/SmelteryEvent.java +++ b/src/main/java/tconstruct/library/event/SmelteryEvent.java @@ -1,9 +1,9 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; import mantle.blocks.abstracts.InventoryLogic; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.eventhandler.Event; public class SmelteryEvent extends Event { diff --git a/src/main/java/tconstruct/library/event/ToolCraftEvent.java b/src/main/java/tconstruct/library/event/ToolCraftEvent.java index eb10e194..1d5c27c9 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftEvent.java @@ -1,10 +1,10 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; -import tconstruct.library.tools.ToolCore; -import tconstruct.library.tools.TToolMaterial; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.TToolMaterial; +import tconstruct.library.tools.ToolCore; +import cpw.mods.fml.common.eventhandler.Event; /* This event fires after all of the other construction. The resulting nbttag is added to the tool * Note: The tag is the base tag. toolTag.getCompoundTag("InfiTool") will have all of the tool's data. diff --git a/src/main/java/tconstruct/library/event/ToolCraftedEvent.java b/src/main/java/tconstruct/library/event/ToolCraftedEvent.java index 07053c36..e5383629 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftedEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftedEvent.java @@ -1,9 +1,9 @@ package tconstruct.library.event; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.eventhandler.Event; public class ToolCraftedEvent extends Event { diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index 506a222b..a63d6b50 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -4,10 +4,8 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import cpw.mods.fml.common.eventhandler.Event.Result; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.enchantment.EnchantmentThorns; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -18,7 +16,6 @@ import net.minecraft.entity.passive.EntityWolf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; @@ -30,12 +27,13 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.UseHoeEvent; import tconstruct.library.ActiveToolMod; import tconstruct.library.TConstructRegistry; import tconstruct.library.util.PiercingEntityDamage; +import cpw.mods.fml.common.eventhandler.Event.Result; public class AbilityHelper { diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java index 70904ef0..402f96b2 100644 --- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java +++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java @@ -1,7 +1,5 @@ package tconstruct.library.tools; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -10,7 +8,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; /* Base class for harvest tools with each head having a different purpose */ diff --git a/src/main/java/tconstruct/library/tools/FletchingMaterial.java b/src/main/java/tconstruct/library/tools/FletchingMaterial.java index a40dcc69..5383b39b 100644 --- a/src/main/java/tconstruct/library/tools/FletchingMaterial.java +++ b/src/main/java/tconstruct/library/tools/FletchingMaterial.java @@ -1,6 +1,5 @@ package tconstruct.library.tools; -import net.minecraft.block.Block; import net.minecraft.item.ItemStack; public class FletchingMaterial extends CustomMaterial diff --git a/src/main/java/tconstruct/library/tools/HarvestTool.java b/src/main/java/tconstruct/library/tools/HarvestTool.java index 62ae7c08..db7cdb7e 100644 --- a/src/main/java/tconstruct/library/tools/HarvestTool.java +++ b/src/main/java/tconstruct/library/tools/HarvestTool.java @@ -1,7 +1,5 @@ package tconstruct.library.tools; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.TConstructRegistry; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -10,7 +8,8 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; /* Base class for tools that should be harvesting blocks */ diff --git a/src/main/java/tconstruct/library/util/IPattern.java b/src/main/java/tconstruct/library/util/IPattern.java index bf6c64a5..9cee2321 100644 --- a/src/main/java/tconstruct/library/util/IPattern.java +++ b/src/main/java/tconstruct/library/util/IPattern.java @@ -1,7 +1,7 @@ package tconstruct.library.util; -import tconstruct.library.crafting.PatternBuilder.MaterialSet; import net.minecraft.item.ItemStack; +import tconstruct.library.crafting.PatternBuilder.MaterialSet; public interface IPattern { diff --git a/src/main/java/tconstruct/modifiers/armor/AModProtection.java b/src/main/java/tconstruct/modifiers/armor/AModProtection.java index 1ea7a89b..7d7715ab 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModProtection.java +++ b/src/main/java/tconstruct/modifiers/armor/AModProtection.java @@ -1,12 +1,9 @@ package tconstruct.modifiers.armor; import java.util.EnumSet; -import java.util.UUID; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import tconstruct.library.armor.ArmorCore; import tconstruct.library.armor.EnumArmorPart; public class AModProtection extends ArmorModTypeFilter diff --git a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java index 97719286..a4038e33 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java @@ -1,6 +1,5 @@ package tconstruct.modifiers.tools; -import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModBoolean.java b/src/main/java/tconstruct/modifiers/tools/ModBoolean.java index 19998f9b..28ebddfc 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBoolean.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBoolean.java @@ -1,8 +1,8 @@ package tconstruct.modifiers.tools; -import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolMod; /* Adds a boolean NBTTag */ diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java index 7727bc5a..6408fc92 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java +++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java @@ -5,13 +5,12 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import tconstruct.library.tools.ToolCore; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import tconstruct.library.tools.ToolCore; public class ModButtertouch extends ModBoolean { diff --git a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java index f560ad0e..68024a1e 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java +++ b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java @@ -1,8 +1,8 @@ package tconstruct.modifiers.tools; -import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolMod; public class ModExtraModifier extends ToolMod { diff --git a/src/main/java/tconstruct/modifiers/tools/ModFlux.java b/src/main/java/tconstruct/modifiers/tools/ModFlux.java index 02164289..c51e0056 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModFlux.java +++ b/src/main/java/tconstruct/modifiers/tools/ModFlux.java @@ -1,13 +1,11 @@ package tconstruct.modifiers.tools; -import cofh.api.energy.IEnergyContainerItem; - import java.util.ArrayList; -import tconstruct.library.tools.ToolCore; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolCore; +import cofh.api.energy.IEnergyContainerItem; /* TE3 support */ diff --git a/src/main/java/tconstruct/modifiers/tools/ModInteger.java b/src/main/java/tconstruct/modifiers/tools/ModInteger.java index 3ad27ccd..667a3b16 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModInteger.java +++ b/src/main/java/tconstruct/modifiers/tools/ModInteger.java @@ -1,8 +1,8 @@ package tconstruct.modifiers.tools; -import tconstruct.library.tools.ToolMod; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolMod; /* Adds an integer NBTTag */ diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java index 70b48e74..50a4208d 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -5,15 +5,13 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import tconstruct.library.tools.ToolCore; -import tconstruct.library.tools.ToolMod; -import tconstruct.library.tools.Weapon; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.Weapon; public class ModLapis extends ToolModTypeFilter { diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java index 1f766873..590f0c61 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPiston.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPiston.java @@ -3,11 +3,9 @@ package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.List; -import tconstruct.library.tools.ToolCore; -import tconstruct.library.tools.ToolMod; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolCore; public class ModPiston extends ToolModTypeFilter { diff --git a/src/main/java/tconstruct/modifiers/tools/ModPotion.java b/src/main/java/tconstruct/modifiers/tools/ModPotion.java index e5be6869..8a2a88aa 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPotion.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPotion.java @@ -1,10 +1,9 @@ package tconstruct.modifiers.tools; -import tconstruct.library.tools.ToolMod; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolMod; public class ModPotion extends ToolMod { diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java index 8b0ae93d..1dd1b63f 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -3,11 +3,9 @@ package tconstruct.modifiers.tools; import java.util.Arrays; import java.util.List; -import tconstruct.library.tools.ToolCore; -import tconstruct.library.tools.ToolMod; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.library.tools.ToolCore; public class ModRedstone extends ToolModTypeFilter { diff --git a/src/main/java/tconstruct/modifiers/tools/ModRepair.java b/src/main/java/tconstruct/modifiers/tools/ModRepair.java index b92f54d4..9edc05b5 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRepair.java @@ -3,7 +3,9 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.crafting.PatternBuilder; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.ToolMod; /* Little mod for actually adding the lapis modifier */ diff --git a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java index 337e42bb..3835c58c 100644 --- a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java @@ -1,14 +1,7 @@ package tconstruct.modifiers.tools; -import java.util.Arrays; -import java.util.List; import java.util.Random; -import tconstruct.common.TRepo; -import tconstruct.library.ActiveToolMod; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.library.tools.ToolCore; -import tconstruct.util.config.PHConstruct; import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; @@ -25,6 +18,11 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import tconstruct.common.TRepo; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; +import tconstruct.util.config.PHConstruct; public class TActiveOmniMod extends ActiveToolMod { diff --git a/src/main/java/tconstruct/plugins/PluginController.java b/src/main/java/tconstruct/plugins/PluginController.java index b9c6c9ad..cc3bc5ae 100644 --- a/src/main/java/tconstruct/plugins/PluginController.java +++ b/src/main/java/tconstruct/plugins/PluginController.java @@ -1,6 +1,9 @@ package tconstruct.plugins; -import cpw.mods.fml.common.Loader; +import java.io.File; +import java.util.LinkedList; +import java.util.List; + import net.minecraftforge.common.config.Configuration; import tconstruct.TConstruct; import tconstruct.plugins.ic2.IC2; @@ -8,9 +11,7 @@ import tconstruct.plugins.imc.AppEng; import tconstruct.plugins.imc.BuildcraftTransport; import tconstruct.plugins.imc.Mystcraft; import tconstruct.plugins.imc.Thaumcraft; - -import java.io.File; -import java.util.*; +import cpw.mods.fml.common.Loader; public class PluginController { diff --git a/src/main/java/tconstruct/plugins/ic2/IC2.java b/src/main/java/tconstruct/plugins/ic2/IC2.java index 289a9bb2..1d3df442 100644 --- a/src/main/java/tconstruct/plugins/ic2/IC2.java +++ b/src/main/java/tconstruct/plugins/ic2/IC2.java @@ -1,21 +1,15 @@ package tconstruct.plugins.ic2; -import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import tconstruct.TConstruct; -import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.LiquidCasting; -import tconstruct.library.crafting.Smeltery; import tconstruct.plugins.ICompatPlugin; -import java.util.Map; - public class IC2 implements ICompatPlugin { diff --git a/src/main/java/tconstruct/plugins/imc/AppEng.java b/src/main/java/tconstruct/plugins/imc/AppEng.java index 3ba4c7b7..52452d42 100644 --- a/src/main/java/tconstruct/plugins/imc/AppEng.java +++ b/src/main/java/tconstruct/plugins/imc/AppEng.java @@ -1,12 +1,12 @@ package tconstruct.plugins.imc; -import cpw.mods.fml.common.event.FMLInterModComms; -import tconstruct.TConstruct; -import tconstruct.plugins.ICompatPlugin; - import java.util.Arrays; import java.util.List; +import tconstruct.TConstruct; +import tconstruct.plugins.ICompatPlugin; +import cpw.mods.fml.common.event.FMLInterModComms; + public class AppEng implements ICompatPlugin { diff --git a/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java b/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java index 7288135c..a0d98b18 100644 --- a/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java +++ b/src/main/java/tconstruct/plugins/imc/BuildcraftTransport.java @@ -1,10 +1,10 @@ package tconstruct.plugins.imc; import net.minecraft.block.Block; -import cpw.mods.fml.common.event.FMLInterModComms; import tconstruct.TConstruct; import tconstruct.common.TRepo; import tconstruct.plugins.ICompatPlugin; +import cpw.mods.fml.common.event.FMLInterModComms; public class BuildcraftTransport implements ICompatPlugin { diff --git a/src/main/java/tconstruct/plugins/imc/Mystcraft.java b/src/main/java/tconstruct/plugins/imc/Mystcraft.java index 44e75455..44f0b640 100644 --- a/src/main/java/tconstruct/plugins/imc/Mystcraft.java +++ b/src/main/java/tconstruct/plugins/imc/Mystcraft.java @@ -1,9 +1,9 @@ package tconstruct.plugins.imc; -import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.nbt.NBTTagCompound; import tconstruct.TConstruct; import tconstruct.plugins.ICompatPlugin; +import cpw.mods.fml.common.event.FMLInterModComms; public class Mystcraft implements ICompatPlugin { diff --git a/src/main/java/tconstruct/plugins/imc/Thaumcraft.java b/src/main/java/tconstruct/plugins/imc/Thaumcraft.java index 7ca39d6f..59dc98cc 100644 --- a/src/main/java/tconstruct/plugins/imc/Thaumcraft.java +++ b/src/main/java/tconstruct/plugins/imc/Thaumcraft.java @@ -1,10 +1,10 @@ package tconstruct.plugins.imc; -import cpw.mods.fml.common.event.FMLInterModComms; import net.minecraft.item.ItemStack; import tconstruct.TConstruct; import tconstruct.common.TRepo; import tconstruct.plugins.ICompatPlugin; +import cpw.mods.fml.common.event.FMLInterModComms; public class Thaumcraft implements ICompatPlugin { diff --git a/src/main/java/tconstruct/preloader/ASMInterfaceRepair.java b/src/main/java/tconstruct/preloader/ASMInterfaceRepair.java index d2f92552..b2a1f0a1 100644 --- a/src/main/java/tconstruct/preloader/ASMInterfaceRepair.java +++ b/src/main/java/tconstruct/preloader/ASMInterfaceRepair.java @@ -5,18 +5,20 @@ package tconstruct.preloader; * The code was adapted for this loader by Sunstrike. Any queries should be directed to him, not AlgorithmX2. */ +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + import net.minecraft.launchwrapper.IClassTransformer; + import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.signature.SignatureReader; import org.objectweb.asm.signature.SignatureVisitor; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; -import tconstruct.preloader.helpers.PropertyManager; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import tconstruct.preloader.helpers.PropertyManager; public class ASMInterfaceRepair implements IClassTransformer { diff --git a/src/main/java/tconstruct/preloader/AccessTransformers.java b/src/main/java/tconstruct/preloader/AccessTransformers.java index 21af7b93..dd61723e 100644 --- a/src/main/java/tconstruct/preloader/AccessTransformers.java +++ b/src/main/java/tconstruct/preloader/AccessTransformers.java @@ -1,10 +1,10 @@ package tconstruct.preloader; -import cpw.mods.fml.common.asm.transformers.AccessTransformer; - import java.io.IOException; import java.lang.reflect.Method; +import cpw.mods.fml.common.asm.transformers.AccessTransformer; + public class AccessTransformers extends AccessTransformer { diff --git a/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java b/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java index b5de6164..a527438a 100644 --- a/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java +++ b/src/main/java/tconstruct/preloader/TConstructLoaderContainer.java @@ -5,26 +5,22 @@ package tconstruct.preloader; * The code was adapted for this loader by Sunstrike. Any queries should be directed to him, not AlgorithmX2. */ -import com.google.common.eventbus.EventBus; - -import cpw.mods.fml.common.DummyModContainer; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.LoadController; -import cpw.mods.fml.common.ModMetadata; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin; -import tconstruct.preloader.helpers.PropertyManager; -import tconstruct.preloader.helpers.PropertyManager.PropAccessException; - import java.util.Arrays; import java.util.Map; -import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import tconstruct.preloader.helpers.PropertyManager; +import tconstruct.preloader.helpers.PropertyManager.PropAccessException; + +import com.google.common.eventbus.EventBus; + +import cpw.mods.fml.common.DummyModContainer; +import cpw.mods.fml.common.LoadController; +import cpw.mods.fml.common.ModMetadata; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; + public class TConstructLoaderContainer extends DummyModContainer implements IFMLLoadingPlugin { diff --git a/src/main/java/tconstruct/preloader/helpers/PropertyManager.java b/src/main/java/tconstruct/preloader/helpers/PropertyManager.java index 05aa2dee..708f6692 100644 --- a/src/main/java/tconstruct/preloader/helpers/PropertyManager.java +++ b/src/main/java/tconstruct/preloader/helpers/PropertyManager.java @@ -1,16 +1,13 @@ package tconstruct.preloader.helpers; -import tconstruct.preloader.TConstructLoaderContainer; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; import java.util.Properties; +import tconstruct.preloader.TConstructLoaderContainer; + /** * TCon Preloader properties file helper. * diff --git a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java index e64b3fb0..1d32d87a 100644 --- a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java +++ b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java @@ -1,8 +1,8 @@ package tconstruct.util; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.DamageSource; import net.minecraft.util.IChatComponent; -import net.minecraft.entity.EntityLivingBase; public class DamageSourceFireworkExplode extends DamageSource { diff --git a/src/main/java/tconstruct/util/DamageSourceLandmine.java b/src/main/java/tconstruct/util/DamageSourceLandmine.java index 7938ba9c..4a7b6477 100644 --- a/src/main/java/tconstruct/util/DamageSourceLandmine.java +++ b/src/main/java/tconstruct/util/DamageSourceLandmine.java @@ -1,10 +1,8 @@ package tconstruct.util; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.DamageSource; import net.minecraft.util.IChatComponent; -import net.minecraft.util.StatCollector; public class DamageSourceLandmine extends DamageSource { diff --git a/src/main/java/tconstruct/util/RecipeRemover.java b/src/main/java/tconstruct/util/RecipeRemover.java index 32c95e35..23817bd9 100644 --- a/src/main/java/tconstruct/util/RecipeRemover.java +++ b/src/main/java/tconstruct/util/RecipeRemover.java @@ -2,7 +2,6 @@ package tconstruct.util; import java.util.List; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/tconstruct/util/SmelteryDamageSource.java b/src/main/java/tconstruct/util/SmelteryDamageSource.java index 600e28b8..6e3539cd 100644 --- a/src/main/java/tconstruct/util/SmelteryDamageSource.java +++ b/src/main/java/tconstruct/util/SmelteryDamageSource.java @@ -1,9 +1,10 @@ package tconstruct.util; -import net.minecraft.util.*; - import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.*; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.StatCollector; import tconstruct.library.tools.AbilityHelper; public class SmelteryDamageSource extends DamageSource diff --git a/src/main/java/tconstruct/util/TCraftingHandler.java b/src/main/java/tconstruct/util/TCraftingHandler.java index 5d88efdd..937ff653 100644 --- a/src/main/java/tconstruct/util/TCraftingHandler.java +++ b/src/main/java/tconstruct/util/TCraftingHandler.java @@ -1,14 +1,14 @@ package tconstruct.util; -import tconstruct.achievements.TAchievements; -import tconstruct.TConstruct; -import tconstruct.common.TRepo; -import tconstruct.library.tools.AbilityHelper; -import tconstruct.util.player.TPlayerStats; import mantle.common.ComparisonHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import tconstruct.TConstruct; +import tconstruct.achievements.TAchievements; +import tconstruct.common.TRepo; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.util.player.TPlayerStats; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; diff --git a/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java b/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java index de2eed61..a1dabb86 100644 --- a/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/util/TDispenserBehaviorSpawnEgg.java @@ -1,12 +1,12 @@ package tconstruct.util; -import tconstruct.items.TitleIcon; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.EntityLiving; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import tconstruct.items.TitleIcon; public class TDispenserBehaviorSpawnEgg extends BehaviorDefaultDispenseItem { diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index 3227e86a..9cf82b85 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -1,15 +1,9 @@ package tconstruct.util; -import tconstruct.util.player.ArmorExtended; -import mantle.blocks.BlockUtils; -import mantle.world.WorldHelper; -import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; - import java.util.Random; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import mantle.blocks.BlockUtils; +import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -28,7 +22,6 @@ import net.minecraft.entity.passive.EntityChicken; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; @@ -40,6 +33,7 @@ import net.minecraft.world.GameRules; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.event.entity.player.BonemealEvent; @@ -54,7 +48,6 @@ import tconstruct.blocks.TankAirBlock; import tconstruct.common.TRepo; import tconstruct.items.tools.FryingPan; import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.event.PartBuilderEvent; import tconstruct.library.event.ToolCraftEvent; import tconstruct.library.tools.ArrowMaterial; @@ -63,9 +56,12 @@ import tconstruct.library.tools.BowstringMaterial; import tconstruct.library.tools.FletchingMaterial; import tconstruct.library.tools.ToolCore; import tconstruct.library.tools.Weapon; -import tconstruct.modifiers.tools.ModAttack; import tconstruct.util.config.PHConstruct; +import tconstruct.util.player.ArmorExtended; import tconstruct.util.player.TPlayerStats; +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TEventHandler { diff --git a/src/main/java/tconstruct/util/TEventHandlerAchievement.java b/src/main/java/tconstruct/util/TEventHandlerAchievement.java index e53739bb..1720f168 100644 --- a/src/main/java/tconstruct/util/TEventHandlerAchievement.java +++ b/src/main/java/tconstruct/util/TEventHandlerAchievement.java @@ -1,12 +1,13 @@ package tconstruct.util; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import tconstruct.library.event.SmelteryEvent; import net.minecraftforge.common.util.FakePlayer; import tconstruct.achievements.TAchievements; import tconstruct.blocks.logic.ToolForgeLogic; +import tconstruct.library.event.SmelteryEvent; import tconstruct.library.event.ToolCraftedEvent; -import tconstruct.library.tools.*; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.Weapon; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TEventHandlerAchievement { diff --git a/src/main/java/tconstruct/util/config/DimensionBlacklist.java b/src/main/java/tconstruct/util/config/DimensionBlacklist.java index f37cd274..09b0da61 100644 --- a/src/main/java/tconstruct/util/config/DimensionBlacklist.java +++ b/src/main/java/tconstruct/util/config/DimensionBlacklist.java @@ -1,12 +1,12 @@ package tconstruct.util.config; -import cpw.mods.fml.common.Loader; -import net.minecraftforge.common.config.Configuration; -import tconstruct.TConstruct; - import java.io.File; import java.util.ArrayList; +import net.minecraftforge.common.config.Configuration; +import tconstruct.TConstruct; +import cpw.mods.fml.common.Loader; + public class DimensionBlacklist { public static ArrayList blacklistedDims = new ArrayList(); diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index d025d4ca..2d8c44e2 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -1,14 +1,12 @@ package tconstruct.util.config; import java.io.File; -import java.io.IOException; -import cpw.mods.fml.common.Loader; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import tconstruct.TConstruct; import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; +import cpw.mods.fml.common.Loader; public class PHConstruct { diff --git a/src/main/java/tconstruct/util/landmine/behavior/Behavior.java b/src/main/java/tconstruct/util/landmine/behavior/Behavior.java index a62c17f8..8cfd971d 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/Behavior.java +++ b/src/main/java/tconstruct/util/landmine/behavior/Behavior.java @@ -5,18 +5,17 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; -import tconstruct.util.landmine.Helper; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import tconstruct.util.landmine.Helper; /** * diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java index ae6af56e..1b7b4161 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorBlockThrow.java @@ -1,7 +1,5 @@ package tconstruct.util.landmine.behavior; -import java.util.List; - import mantle.blocks.BlockUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityFallingBlock; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorDefault.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorDefault.java index 55603a94..af32af30 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorDefault.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorDefault.java @@ -1,10 +1,9 @@ package tconstruct.util.landmine.behavior; -import tconstruct.util.DamageSourceLandmine; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import tconstruct.util.DamageSourceLandmine; public class BehaviorDefault extends Behavior { diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorDummy.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorDummy.java index e003cf0f..fcfd7096 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorDummy.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorDummy.java @@ -1,7 +1,5 @@ package tconstruct.util.landmine.behavior; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java index 195304fc..7163bb9b 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorExplosive.java @@ -3,13 +3,11 @@ package tconstruct.util.landmine.behavior; import java.util.List; import mantle.common.ComparisonHelper; -import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java index 986dc698..5ac1cad9 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirecharge.java @@ -1,10 +1,7 @@ package tconstruct.util.landmine.behavior; -import java.util.List; import java.util.Random; -import tconstruct.items.blocks.ItemBlockLandmine; -import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraft.init.Blocks; @@ -12,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import tconstruct.items.blocks.ItemBlockLandmine; /** * diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirework.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirework.java index 2ef82441..bfeb3058 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirework.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorFirework.java @@ -1,10 +1,9 @@ package tconstruct.util.landmine.behavior; -import net.minecraft.util.EnumFacing; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import tconstruct.entity.item.EntityLandmineFirework; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorPotion.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorPotion.java index 629df81a..4b8e78ac 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorPotion.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorPotion.java @@ -3,17 +3,16 @@ package tconstruct.util.landmine.behavior; import java.util.Iterator; import java.util.List; -import tconstruct.items.blocks.ItemBlockLandmine; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemPotion; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import tconstruct.items.blocks.ItemBlockLandmine; /** * diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorProjectile.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorProjectile.java index 27492d99..e96fac83 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorProjectile.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorProjectile.java @@ -7,7 +7,6 @@ import net.minecraft.entity.item.EntityEnderPearl; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.entity.projectile.EntitySnowball; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java index ef402864..8a86d2ba 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorShears.java @@ -5,8 +5,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import tconstruct.items.blocks.ItemBlockLandmine; - import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -16,6 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; +import tconstruct.items.blocks.ItemBlockLandmine; //TODO Add a block that is similar to landmine, but only triggers by redstone, does not hurt the player, and does not disappear when used(also does not do anything that can deal damage) diff --git a/src/main/java/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java b/src/main/java/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java index f858e66b..74fe7267 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/util/landmine/behavior/BehaviorSpawnEgg.java @@ -1,6 +1,5 @@ package tconstruct.util.landmine.behavior; -import net.minecraft.block.BlockDispenser; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java b/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java index 7679324a..a7c8ed08 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java +++ b/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandler.java @@ -1,17 +1,15 @@ package tconstruct.util.landmine.behavior.stackCombo; import java.util.ArrayList; -import java.util.List; - -import tconstruct.blocks.logic.TileEntityLandmine; -import tconstruct.util.landmine.Helper; -import tconstruct.util.landmine.behavior.Behavior; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import tconstruct.blocks.logic.TileEntityLandmine; +import tconstruct.util.landmine.Helper; +import tconstruct.util.landmine.behavior.Behavior; /** * diff --git a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java b/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java index 7e1ff294..f716a16a 100644 --- a/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java +++ b/src/main/java/tconstruct/util/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java @@ -9,7 +9,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFireball; import net.minecraft.entity.projectile.EntityLargeFireball; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/util/network/packet/PacketPipeline.java b/src/main/java/tconstruct/util/network/packet/PacketPipeline.java index 6e2189a7..711f9c83 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/packet/PacketPipeline.java @@ -1,16 +1,29 @@ package tconstruct.util.network.packet; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.*; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.*; -import io.netty.buffer.*; -import io.netty.channel.*; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageCodec; -import java.util.*; + +import java.util.Collections; +import java.util.Comparator; +import java.util.EnumMap; +import java.util.LinkedList; +import java.util.List; + import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.*; -import net.minecraft.network.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.INetHandler; +import net.minecraft.network.NetHandlerPlayServer; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.FMLEmbeddedChannel; +import cpw.mods.fml.common.network.FMLOutboundHandler; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Packet pipeline class. Directs all registered packet data to be handled by the packets themselves. diff --git a/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java b/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java index 63f1e85e..aeb6266f 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java +++ b/src/main/java/tconstruct/util/network/packet/PacketSmeltery.java @@ -1,11 +1,5 @@ package tconstruct.util.network.packet; -import cpw.mods.fml.common.FMLCommonHandler; - -import net.minecraft.network.NetworkManager; - -import tconstruct.TConstruct; - import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +7,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; import tconstruct.blocks.logic.SmelteryLogic; +import cpw.mods.fml.common.FMLCommonHandler; public class PacketSmeltery extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java b/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java index 1e365267..4fd989d9 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java +++ b/src/main/java/tconstruct/util/network/packet/PacketStencilTable.java @@ -1,6 +1,5 @@ package tconstruct.util.network.packet; -import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import mantle.blocks.abstracts.InventoryLogic; @@ -8,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.common.network.ByteBufUtils; public class PacketStencilTable extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/network/packet/PacketToolStation.java b/src/main/java/tconstruct/util/network/packet/PacketToolStation.java index e371f3b6..c6f5cce7 100644 --- a/src/main/java/tconstruct/util/network/packet/PacketToolStation.java +++ b/src/main/java/tconstruct/util/network/packet/PacketToolStation.java @@ -1,12 +1,13 @@ package tconstruct.util.network.packet; -import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import tconstruct.blocks.logic.*; +import tconstruct.blocks.logic.ToolForgeLogic; +import tconstruct.blocks.logic.ToolStationLogic; +import cpw.mods.fml.common.network.ByteBufUtils; public class PacketToolStation extends AbstractPacket { diff --git a/src/main/java/tconstruct/util/player/ArmorExtended.java b/src/main/java/tconstruct/util/player/ArmorExtended.java index c37d2073..5171b585 100644 --- a/src/main/java/tconstruct/util/player/ArmorExtended.java +++ b/src/main/java/tconstruct/util/player/ArmorExtended.java @@ -1,7 +1,7 @@ package tconstruct.util.player; -import java.util.UUID; import java.lang.ref.WeakReference; +import java.util.UUID; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -11,7 +11,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.MathHelper; import tconstruct.TConstruct; import tconstruct.common.TRepo; import cpw.mods.fml.common.FMLCommonHandler; @@ -284,12 +283,14 @@ public class ArmorExtended implements IInventory } } } - - @Override - public void openInventory() { - } - @Override - public void closeInventory() { - } + @Override + public void openInventory () + { + } + + @Override + public void closeInventory () + { + } } diff --git a/src/main/java/tconstruct/util/player/KnapsackInventory.java b/src/main/java/tconstruct/util/player/KnapsackInventory.java index 8dcb00e5..06cbaf38 100644 --- a/src/main/java/tconstruct/util/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/util/player/KnapsackInventory.java @@ -189,16 +189,19 @@ public class KnapsackInventory implements IInventory dropper.worldObj.spawnEntityInWorld(entityitem); } - @Override - public void markDirty() { - } + @Override + public void markDirty () + { + } - @Override - public void openInventory() { - } + @Override + public void openInventory () + { + } - @Override - public void closeInventory() { - } + @Override + public void closeInventory () + { + } } \ No newline at end of file diff --git a/src/main/java/tconstruct/util/player/TPlayerHandler.java b/src/main/java/tconstruct/util/player/TPlayerHandler.java index 115d5ecd..e3b128a9 100644 --- a/src/main/java/tconstruct/util/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/util/player/TPlayerHandler.java @@ -1,22 +1,20 @@ package tconstruct.util.player; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent.*; -import cpw.mods.fml.relauncher.Side; - import java.io.ByteArrayOutputStream; import java.lang.ref.WeakReference; import java.util.Random; import java.util.concurrent.ConcurrentHashMap; import mantle.player.PlayerUtils; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; import net.minecraft.entity.Entity.EnumEntitySize; -import net.minecraft.entity.player.*; +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.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagString; import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.player.PlayerDropsEvent; import tconstruct.TConstruct; @@ -24,6 +22,14 @@ import tconstruct.common.TRepo; import tconstruct.library.tools.AbilityHelper; import tconstruct.util.config.PHConstruct; import tconstruct.util.network.packet.PacketDoubleJump; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; +import cpw.mods.fml.relauncher.Side; public class TPlayerHandler { diff --git a/src/main/java/tconstruct/worldgen/OverworldProvider.java b/src/main/java/tconstruct/worldgen/OverworldProvider.java index b2524e5a..1c21d698 100644 --- a/src/main/java/tconstruct/worldgen/OverworldProvider.java +++ b/src/main/java/tconstruct/worldgen/OverworldProvider.java @@ -1,6 +1,5 @@ package tconstruct.worldgen; -import tconstruct.util.config.PHConstruct; import net.minecraft.world.WorldProvider; public class OverworldProvider extends WorldProvider diff --git a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java index f21208b7..48fddb0d 100644 --- a/src/main/java/tconstruct/worldgen/SurfaceOreGen.java +++ b/src/main/java/tconstruct/worldgen/SurfaceOreGen.java @@ -2,12 +2,12 @@ package tconstruct.worldgen; import java.util.Random; -import tconstruct.util.config.PHConstruct; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; +import tconstruct.util.config.PHConstruct; public class SurfaceOreGen extends WorldGenerator { diff --git a/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java b/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java index 337e8e8f..2c01f80f 100644 --- a/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/worldgen/TerrainGenEventHandler.java @@ -6,11 +6,11 @@ import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.Ev import java.util.Random; -import tconstruct.common.TRepo; -import tconstruct.util.config.PHConstruct; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; +import tconstruct.common.TRepo; +import tconstruct.util.config.PHConstruct; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java index 10045db1..9d6088c0 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java +++ b/src/main/java/tconstruct/worldgen/village/ComponentSmeltery.java @@ -3,19 +3,16 @@ package tconstruct.worldgen.village; import java.util.List; import java.util.Random; -import tconstruct.TConstruct; -import tconstruct.common.TRepo; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import net.minecraft.world.gen.structure.MapGenStructureIO; -import net.minecraft.world.gen.structure.MapGenVillage; import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; - import net.minecraft.world.gen.structure.StructureVillagePieces.Start; +import tconstruct.TConstruct; +import tconstruct.common.TRepo; public class ComponentSmeltery extends StructureVillagePieces.House1 { diff --git a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java index d3b425e0..bdfbb577 100644 --- a/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java +++ b/src/main/java/tconstruct/worldgen/village/ComponentToolWorkshop.java @@ -3,19 +3,16 @@ package tconstruct.worldgen.village; import java.util.List; import java.util.Random; -import tconstruct.blocks.logic.CraftingStationLogic; -import tconstruct.blocks.logic.PatternChestLogic; -import tconstruct.common.TRepo; -import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; -import net.minecraft.world.gen.structure.MapGenVillage; import net.minecraft.world.gen.structure.StructureBoundingBox; import net.minecraft.world.gen.structure.StructureComponent; import net.minecraft.world.gen.structure.StructureVillagePieces; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; -import net.minecraft.world.gen.structure.MapGenStructureIO; +import tconstruct.blocks.logic.CraftingStationLogic; +import tconstruct.blocks.logic.PatternChestLogic; +import tconstruct.common.TRepo; public class ComponentToolWorkshop extends StructureVillagePieces.House1 { diff --git a/src/main/java/tconstruct/worldgen/village/TVillageTrades.java b/src/main/java/tconstruct/worldgen/village/TVillageTrades.java index 203f9e0a..85c6b62a 100644 --- a/src/main/java/tconstruct/worldgen/village/TVillageTrades.java +++ b/src/main/java/tconstruct/worldgen/village/TVillageTrades.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java b/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java index 174ae81f..d22f74ca 100644 --- a/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java +++ b/src/main/java/tconstruct/worldgen/village/VillageSmelteryHandler.java @@ -3,7 +3,6 @@ package tconstruct.worldgen.village; import java.util.List; import java.util.Random; -import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler; diff --git a/src/main/java/tconstruct/worldgen/village/VillageToolStationHandler.java b/src/main/java/tconstruct/worldgen/village/VillageToolStationHandler.java index 32749f8a..4347fbd5 100644 --- a/src/main/java/tconstruct/worldgen/village/VillageToolStationHandler.java +++ b/src/main/java/tconstruct/worldgen/village/VillageToolStationHandler.java @@ -3,9 +3,6 @@ package tconstruct.worldgen.village; import java.util.List; import java.util.Random; -import net.minecraft.world.gen.structure.StructureVillagePieces.House1; -import net.minecraft.world.gen.structure.StructureStart; -import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageCreationHandler;