diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java index bec94a31..e98799a4 100644 --- a/src/main/java/tconstruct/TConstruct.java +++ b/src/main/java/tconstruct/TConstruct.java @@ -70,7 +70,11 @@ import tconstruct.util.network.PacketPipeline; import tconstruct.weaponry.TinkerWeaponry; import tconstruct.world.TinkerWorld; import tconstruct.world.gen.SlimeIslandGen; -import tconstruct.world.village.*; +import tconstruct.world.village.ComponentSmeltery; +import tconstruct.world.village.ComponentToolWorkshop; +import tconstruct.world.village.TVillageTrades; +import tconstruct.world.village.VillageSmelteryHandler; +import tconstruct.world.village.VillageToolStationHandler; /** * TConstruct, the tool mod. Craft your tools with style, then modify until the original is gone! diff --git a/src/main/java/tconstruct/achievements/AchievementEvents.java b/src/main/java/tconstruct/achievements/AchievementEvents.java index 4db6fc7e..85c8ef4b 100644 --- a/src/main/java/tconstruct/achievements/AchievementEvents.java +++ b/src/main/java/tconstruct/achievements/AchievementEvents.java @@ -1,11 +1,13 @@ package tconstruct.achievements; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import net.minecraftforge.event.entity.living.*; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import com.mojang.realmsclient.gui.ChatFormatting; @@ -13,7 +15,8 @@ import com.mojang.realmsclient.gui.ChatFormatting; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import tconstruct.items.tools.FryingPan; import tconstruct.library.event.ToolCraftedEvent; -import tconstruct.library.tools.*; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.Weapon; import tconstruct.tools.logic.ToolForgeLogic; public class AchievementEvents { diff --git a/src/main/java/tconstruct/armor/ArmorProxyCommon.java b/src/main/java/tconstruct/armor/ArmorProxyCommon.java index 9763e2f9..63944930 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyCommon.java +++ b/src/main/java/tconstruct/armor/ArmorProxyCommon.java @@ -6,7 +6,8 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; import tconstruct.TConstruct; -import tconstruct.armor.inventory.*; +import tconstruct.armor.inventory.ArmorExtendedContainer; +import tconstruct.armor.inventory.KnapsackContainer; import tconstruct.armor.player.TPlayerStats; import tconstruct.common.TProxyCommon; diff --git a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java index 70086056..be982c8a 100644 --- a/src/main/java/tconstruct/armor/PlayerAbilityHelper.java +++ b/src/main/java/tconstruct/armor/PlayerAbilityHelper.java @@ -1,12 +1,16 @@ package tconstruct.armor; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; -import net.minecraft.potion.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; -import tconstruct.armor.player.*; +import tconstruct.armor.player.ArmorExtended; +import tconstruct.armor.player.TPlayerStats; import tconstruct.util.config.PHConstruct; public class PlayerAbilityHelper { diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java index 38edcb2d..3b93a7c1 100644 --- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java +++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java @@ -2,7 +2,8 @@ package tconstruct.armor; import java.util.Locale; -import net.minecraft.entity.boss.*; +import net.minecraft.entity.boss.EntityDragon; +import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; @@ -10,8 +11,10 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.event.entity.EntityJoinWorldEvent; -import net.minecraftforge.event.entity.living.*; +import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import tconstruct.TConstruct; diff --git a/src/main/java/tconstruct/armor/blocks/DryingRack.java b/src/main/java/tconstruct/armor/blocks/DryingRack.java index c42fcf10..3c15d664 100644 --- a/src/main/java/tconstruct/armor/blocks/DryingRack.java +++ b/src/main/java/tconstruct/armor/blocks/DryingRack.java @@ -3,15 +3,16 @@ package tconstruct.armor.blocks; import java.util.List; import net.minecraft.block.material.Material; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.armor.modelblock.DryingRackRender; diff --git a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java index 9679976a..67d50a66 100644 --- a/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/armor/gui/ArmorExtendedGui.java @@ -1,16 +1,17 @@ package tconstruct.armor.gui; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.InventoryEffectRenderer; +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.util.ResourceLocation; -import org.lwjgl.opengl.*; - import tconstruct.armor.inventory.ArmorExtendedContainer; import tconstruct.armor.player.ArmorExtended; -import tconstruct.client.tabs.*; +import tconstruct.client.tabs.InventoryTabArmorExtended; +import tconstruct.client.tabs.TabRegistry; public class ArmorExtendedGui extends InventoryEffectRenderer { diff --git a/src/main/java/tconstruct/armor/gui/KnapsackGui.java b/src/main/java/tconstruct/armor/gui/KnapsackGui.java index 000b93dc..b40f8b5b 100644 --- a/src/main/java/tconstruct/armor/gui/KnapsackGui.java +++ b/src/main/java/tconstruct/armor/gui/KnapsackGui.java @@ -2,13 +2,15 @@ package tconstruct.armor.gui; import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.*; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; import tconstruct.armor.inventory.KnapsackContainer; import tconstruct.armor.player.KnapsackInventory; -import tconstruct.client.tabs.*; +import tconstruct.client.tabs.InventoryTabKnapsack; +import tconstruct.client.tabs.TabRegistry; public class KnapsackGui extends InventoryEffectRenderer { diff --git a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java index 8746cc36..4c34c844 100644 --- a/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java +++ b/src/main/java/tconstruct/armor/inventory/ArmorExtendedContainer.java @@ -1,6 +1,7 @@ package tconstruct.armor.inventory; -import net.minecraft.entity.player.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java index 71e66893..9999f303 100644 --- a/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java +++ b/src/main/java/tconstruct/armor/inventory/KnapsackContainer.java @@ -1,7 +1,9 @@ package tconstruct.armor.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.Slot; import net.minecraft.item.ItemStack; import tconstruct.armor.player.KnapsackInventory; diff --git a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java index 5476f521..581beea9 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotAccessory.java +++ b/src/main/java/tconstruct/armor/inventory/SlotAccessory.java @@ -1,7 +1,9 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.*; -import net.minecraft.item.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tconstruct.library.accessory.IAccessory; diff --git a/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java index 92508e82..a4f9790f 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java +++ b/src/main/java/tconstruct/armor/inventory/SlotArmorCopy.java @@ -1,11 +1,14 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.*; -import net.minecraft.item.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.*; - public class SlotArmorCopy extends Slot { /** diff --git a/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java index b9bf9bc8..9ce0c25e 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotBehavedOnly.java @@ -1,6 +1,7 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import tconstruct.mechworks.landmine.behavior.Behavior; diff --git a/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java b/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java index e426cb96..17257074 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java +++ b/src/main/java/tconstruct/armor/inventory/SlotBlocksOnly.java @@ -1,7 +1,9 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.*; -import net.minecraft.item.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; /** * diff --git a/src/main/java/tconstruct/armor/inventory/SlotCanister.java b/src/main/java/tconstruct/armor/inventory/SlotCanister.java index e2281f5d..da83d514 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotCanister.java +++ b/src/main/java/tconstruct/armor/inventory/SlotCanister.java @@ -1,7 +1,9 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.*; -import net.minecraft.item.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tconstruct.library.accessory.IHealthAccessory; diff --git a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java index 0af9278f..713aa932 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java +++ b/src/main/java/tconstruct/armor/inventory/SlotKnapsack.java @@ -1,7 +1,9 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.*; -import net.minecraft.item.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tconstruct.armor.items.Knapsack; diff --git a/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java index 1840a994..f1b4f31b 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java +++ b/src/main/java/tconstruct/armor/inventory/SlotOnlyTake.java @@ -1,6 +1,7 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; public class SlotOnlyTake extends Slot { diff --git a/src/main/java/tconstruct/armor/inventory/SlotUnused.java b/src/main/java/tconstruct/armor/inventory/SlotUnused.java index 7f532cea..6cfb2780 100644 --- a/src/main/java/tconstruct/armor/inventory/SlotUnused.java +++ b/src/main/java/tconstruct/armor/inventory/SlotUnused.java @@ -1,6 +1,7 @@ package tconstruct.armor.inventory; -import net.minecraft.inventory.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; public class SlotUnused extends Slot { diff --git a/src/main/java/tconstruct/armor/items/ArmorBasic.java b/src/main/java/tconstruct/armor/items/ArmorBasic.java index 415774e6..5138939c 100644 --- a/src/main/java/tconstruct/armor/items/ArmorBasic.java +++ b/src/main/java/tconstruct/armor/items/ArmorBasic.java @@ -2,7 +2,8 @@ package tconstruct.armor.items; 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/armor/items/ArmorPattern.java b/src/main/java/tconstruct/armor/items/ArmorPattern.java index b5704949..5656bb3b 100644 --- a/src/main/java/tconstruct/armor/items/ArmorPattern.java +++ b/src/main/java/tconstruct/armor/items/ArmorPattern.java @@ -4,12 +4,13 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.*; import mantle.items.abstracts.CraftingItem; -import tconstruct.library.*; +import tconstruct.library.ItemBlocklike; +import tconstruct.library.TConstructRegistry; public class ArmorPattern extends CraftingItem implements ItemBlocklike { diff --git a/src/main/java/tconstruct/armor/items/DiamondApple.java b/src/main/java/tconstruct/armor/items/DiamondApple.java index b1418636..bd6c4608 100644 --- a/src/main/java/tconstruct/armor/items/DiamondApple.java +++ b/src/main/java/tconstruct/armor/items/DiamondApple.java @@ -2,13 +2,13 @@ package tconstruct.armor.items; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.potion.*; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; - public class DiamondApple extends ItemFood { public IIcon[] icons; diff --git a/src/main/java/tconstruct/armor/items/HeartCanister.java b/src/main/java/tconstruct/armor/items/HeartCanister.java index 594e9155..fbe90ca6 100644 --- a/src/main/java/tconstruct/armor/items/HeartCanister.java +++ b/src/main/java/tconstruct/armor/items/HeartCanister.java @@ -3,13 +3,14 @@ package tconstruct.armor.items; import java.util.List; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.items.abstracts.CraftingItem; -import tconstruct.armor.player.*; +import tconstruct.armor.player.ArmorExtended; +import tconstruct.armor.player.TPlayerStats; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IHealthAccessory; diff --git a/src/main/java/tconstruct/armor/items/Jerky.java b/src/main/java/tconstruct/armor/items/Jerky.java index 795a3dbc..6c19e38d 100644 --- a/src/main/java/tconstruct/armor/items/Jerky.java +++ b/src/main/java/tconstruct/armor/items/Jerky.java @@ -5,11 +5,13 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.potion.*; -import net.minecraft.util.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.world.items.SpecialFood; public class Jerky extends SpecialFood { diff --git a/src/main/java/tconstruct/armor/items/Knapsack.java b/src/main/java/tconstruct/armor/items/Knapsack.java index dce40dc6..e5712767 100644 --- a/src/main/java/tconstruct/armor/items/Knapsack.java +++ b/src/main/java/tconstruct/armor/items/Knapsack.java @@ -6,7 +6,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.*; import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; import tconstruct.library.accessory.IAccessory; diff --git a/src/main/java/tconstruct/armor/items/TArmorBase.java b/src/main/java/tconstruct/armor/items/TArmorBase.java index 8bc3b193..2da4f3e0 100644 --- a/src/main/java/tconstruct/armor/items/TArmorBase.java +++ b/src/main/java/tconstruct/armor/items/TArmorBase.java @@ -3,14 +3,12 @@ package tconstruct.armor.items; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; - public class TArmorBase extends ItemArmor // implements ISpecialArmor { diff --git a/src/main/java/tconstruct/armor/items/TravelBelt.java b/src/main/java/tconstruct/armor/items/TravelBelt.java index b4ff6ff6..1d9966d3 100644 --- a/src/main/java/tconstruct/armor/items/TravelBelt.java +++ b/src/main/java/tconstruct/armor/items/TravelBelt.java @@ -5,16 +5,15 @@ import java.util.List; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.settings.GameSettings; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.*; import tconstruct.armor.ArmorProxyClient; import tconstruct.client.ArmorControls; -import tconstruct.library.accessory.*; +import tconstruct.library.accessory.AccessoryCore; +import tconstruct.library.accessory.IAccessoryModel; public class TravelBelt extends AccessoryCore implements IAccessoryModel { diff --git a/src/main/java/tconstruct/armor/items/TravelGear.java b/src/main/java/tconstruct/armor/items/TravelGear.java index 290853ae..bb450787 100644 --- a/src/main/java/tconstruct/armor/items/TravelGear.java +++ b/src/main/java/tconstruct/armor/items/TravelGear.java @@ -14,10 +14,10 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.*; import tconstruct.armor.ArmorProxyClient; import tconstruct.armor.TinkerArmor; -import tconstruct.library.armor.*; +import tconstruct.library.armor.ArmorCore; +import tconstruct.library.armor.ArmorPart; import thaumcraft.api.IGoggles; import thaumcraft.api.nodes.IRevealer; diff --git a/src/main/java/tconstruct/armor/items/TravelGlove.java b/src/main/java/tconstruct/armor/items/TravelGlove.java index 0eb54730..9beafa3f 100644 --- a/src/main/java/tconstruct/armor/items/TravelGlove.java +++ b/src/main/java/tconstruct/armor/items/TravelGlove.java @@ -2,13 +2,13 @@ package tconstruct.armor.items; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.*; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.*; import tconstruct.armor.ArmorProxyClient; -import tconstruct.library.accessory.*; +import tconstruct.library.accessory.AccessoryCore; +import tconstruct.library.accessory.IAccessoryModel; public class TravelGlove extends AccessoryCore implements IAccessoryModel { diff --git a/src/main/java/tconstruct/armor/model/BeltModel.java b/src/main/java/tconstruct/armor/model/BeltModel.java index 483528d7..2a3bc3c6 100644 --- a/src/main/java/tconstruct/armor/model/BeltModel.java +++ b/src/main/java/tconstruct/armor/model/BeltModel.java @@ -1,6 +1,7 @@ package tconstruct.armor.model; -import net.minecraft.client.model.*; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class BeltModel extends ModelBiped { diff --git a/src/main/java/tconstruct/armor/model/BootBump.java b/src/main/java/tconstruct/armor/model/BootBump.java index 79104166..0c48add7 100644 --- a/src/main/java/tconstruct/armor/model/BootBump.java +++ b/src/main/java/tconstruct/armor/model/BootBump.java @@ -1,6 +1,7 @@ package tconstruct.armor.model; -import net.minecraft.client.model.*; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelRenderer; public class BootBump extends ModelBiped { diff --git a/src/main/java/tconstruct/armor/model/RenderArmorCast.java b/src/main/java/tconstruct/armor/model/RenderArmorCast.java index 96efe8fc..11b651b0 100644 --- a/src/main/java/tconstruct/armor/model/RenderArmorCast.java +++ b/src/main/java/tconstruct/armor/model/RenderArmorCast.java @@ -1,9 +1,11 @@ package tconstruct.armor.model; -import java.util.*; +import java.util.ArrayList; +import java.util.List; 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; diff --git a/src/main/java/tconstruct/armor/model/WingModel.java b/src/main/java/tconstruct/armor/model/WingModel.java index 19a6b259..c0a11f6d 100644 --- a/src/main/java/tconstruct/armor/model/WingModel.java +++ b/src/main/java/tconstruct/armor/model/WingModel.java @@ -1,6 +1,7 @@ package tconstruct.armor.model; -import net.minecraft.client.model.*; +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java index 67ce0908..7fa4bb0f 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackRender.java @@ -1,12 +1,14 @@ package tconstruct.armor.modelblock; import net.minecraft.block.Block; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.util.ItemHelper; public class DryingRackRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java index 2e99ce0d..2df5b47d 100644 --- a/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java +++ b/src/main/java/tconstruct/armor/modelblock/DryingRackSpecialRender.java @@ -1,13 +1,14 @@ package tconstruct.armor.modelblock; -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 cpw.mods.fml.relauncher.*; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.tools.entity.FancyEntityItem; diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index f317e1f7..0101117a 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -1,22 +1,29 @@ package tconstruct.armor.player; -import java.io.*; -import java.net.*; -import java.util.*; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.net.URLConnection; +import java.util.HashSet; +import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.*; import net.minecraft.entity.Entity.EnumEntitySize; import net.minecraft.entity.player.EntityPlayer; 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.EntityEvent; -import net.minecraftforge.event.entity.living.*; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; import net.minecraftforge.event.entity.player.PlayerDropsEvent; -import cpw.mods.fml.common.*; +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.PlayerLoggedInEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java index 02e64efb..41821f80 100644 --- a/src/main/java/tconstruct/blocks/SlabBase.java +++ b/src/main/java/tconstruct/blocks/SlabBase.java @@ -7,11 +7,13 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.item.*; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java index dbfecd57..878c19f2 100644 --- a/src/main/java/tconstruct/blocks/TConstructBlock.java +++ b/src/main/java/tconstruct/blocks/TConstructBlock.java @@ -5,10 +5,10 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 9ff0177e..53fad116 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -4,12 +4,12 @@ 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 cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryLogic; import tconstruct.library.crafting.DryingRackRecipes; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java index 8d0a4aaf..16610fa7 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeFluid.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeFluid.java @@ -1,15 +1,17 @@ package tconstruct.blocks.slime; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.*; import tconstruct.world.TinkerWorld; import tconstruct.world.entity.BlueSlime; import tconstruct.world.entity.KingBlueSlime; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGel.java b/src/main/java/tconstruct/blocks/slime/SlimeGel.java index 53673ea2..b1a2cafb 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGel.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGel.java @@ -5,13 +5,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; import net.minecraft.item.ItemStack; -import net.minecraft.potion.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.blocks.TConstructBlock; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index e7c5bf35..fdef902c 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -1,19 +1,23 @@ package tconstruct.blocks.slime; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemSaddle; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.world.*; -import net.minecraftforge.common.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java index 7d64ef9d..89ffb7df 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java @@ -1,16 +1,18 @@ package tconstruct.blocks.slime; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.block.BlockLeaves; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index 9e77f576..6d52aa5a 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -1,18 +1,20 @@ package tconstruct.blocks.slime; -import java.util.*; +import java.util.List; +import java.util.Random; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockSapling; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java index eead0105..8af10648 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeTallGrass.java @@ -1,18 +1,22 @@ package tconstruct.blocks.slime; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockBush; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; -import net.minecraft.world.*; -import net.minecraftforge.common.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.IShearable; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; public class SlimeTallGrass extends BlockBush implements IShearable { diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index 1f318400..dc538a58 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -5,11 +5,14 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.*; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.world.Explosion; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.world.model.BarricadeRender; diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 1eb0d9a1..c140b875 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -5,14 +5,15 @@ import java.util.Random; 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.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.potion.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; -import net.minecraft.world.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java index 491d9012..1cae7bab 100644 --- a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java +++ b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java @@ -2,7 +2,9 @@ package tconstruct.client; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.EntityRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/tconstruct/client/BreakingFX.java b/src/main/java/tconstruct/client/BreakingFX.java index 36a8ba2e..d6e4b7b9 100644 --- a/src/main/java/tconstruct/client/BreakingFX.java +++ b/src/main/java/tconstruct/client/BreakingFX.java @@ -6,8 +6,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; - @SideOnly(Side.CLIENT) public class BreakingFX extends EntityFX { diff --git a/src/main/java/tconstruct/client/CustomBowRenderer.java b/src/main/java/tconstruct/client/CustomBowRenderer.java index 16271cf3..0c93364e 100644 --- a/src/main/java/tconstruct/client/CustomBowRenderer.java +++ b/src/main/java/tconstruct/client/CustomBowRenderer.java @@ -1,7 +1,9 @@ package tconstruct.client; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.EntityLivingBase; @@ -10,8 +12,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; -import org.lwjgl.opengl.*; - public class CustomBowRenderer implements IItemRenderer { Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/tconstruct/client/CustomFont.java b/src/main/java/tconstruct/client/CustomFont.java index 6502e42a..bc0e1993 100644 --- a/src/main/java/tconstruct/client/CustomFont.java +++ b/src/main/java/tconstruct/client/CustomFont.java @@ -3,7 +3,8 @@ package tconstruct.client; import java.awt.*; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; -import java.io.*; +import java.io.File; +import java.io.InputStream; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index 3d365fa0..15c57ed8 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -3,13 +3,16 @@ package tconstruct.client; import java.io.InputStream; import java.text.DecimalFormat; -import javax.xml.parsers.*; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.init.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; import org.w3c.dom.Document; diff --git a/src/main/java/tconstruct/client/ToolCoreRenderer.java b/src/main/java/tconstruct/client/ToolCoreRenderer.java index 326a92bc..10695057 100644 --- a/src/main/java/tconstruct/client/ToolCoreRenderer.java +++ b/src/main/java/tconstruct/client/ToolCoreRenderer.java @@ -7,8 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; -import org.lwjgl.opengl.*; - import tconstruct.TConstruct; import tconstruct.library.tools.ToolCore; diff --git a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java index a76b92d7..8cc2051a 100644 --- a/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java +++ b/src/main/java/tconstruct/client/entity/item/ExplosiveRender.java @@ -9,7 +9,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.*; import tconstruct.mechworks.entity.item.ExplosivePrimed; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java index 16c7bb99..17d10ed9 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRender.java @@ -4,16 +4,18 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.*; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.*; - -import cpw.mods.fml.relauncher.*; import mantle.blocks.BlockUtils; import tconstruct.tools.entity.ArrowEntity; diff --git a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java index 8c5fdb17..2af9863c 100644 --- a/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/ArrowRenderCustom.java @@ -3,16 +3,15 @@ package tconstruct.client.entity.projectile; import java.util.Random; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.entity.*; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; -import org.lwjgl.opengl.*; - -import cpw.mods.fml.relauncher.*; import tconstruct.tools.entity.ArrowEntity; @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java index 4ac2321b..67f0d1aa 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRender.java @@ -5,17 +5,20 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.*; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.item.*; -import net.minecraft.util.*; +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.*; - -import cpw.mods.fml.relauncher.*; import mantle.blocks.BlockUtils; import tconstruct.tools.entity.DaggerEntity; diff --git a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java index 40c81906..728a09e4 100644 --- a/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java +++ b/src/main/java/tconstruct/client/entity/projectile/DaggerRenderCustom.java @@ -3,16 +3,16 @@ package tconstruct.client.entity.projectile; import java.util.Random; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.entity.*; -import net.minecraft.client.renderer.texture.*; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; -import org.lwjgl.opengl.*; - -import cpw.mods.fml.relauncher.*; import tconstruct.client.ToolCoreRenderer; import tconstruct.tools.entity.DaggerEntity; diff --git a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java index 0dfa84cd..4c1a61c8 100644 --- a/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java +++ b/src/main/java/tconstruct/client/entity/projectile/LaunchedItemRender.java @@ -4,13 +4,12 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemPotion; import net.minecraft.potion.PotionHelper; -import net.minecraft.util.*; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.*; - -import cpw.mods.fml.relauncher.*; import tconstruct.tools.entity.LaunchedPotion; @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/client/pages/BlockCastPage.java b/src/main/java/tconstruct/client/pages/BlockCastPage.java index 76e7e258..2bafc851 100644 --- a/src/main/java/tconstruct/client/pages/BlockCastPage.java +++ b/src/main/java/tconstruct/client/pages/BlockCastPage.java @@ -2,10 +2,11 @@ package tconstruct.client.pages; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.*; -import org.w3c.dom.*; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; import mantle.client.pages.BookPage; import mantle.lib.client.MantleClientRegistry; diff --git a/src/main/java/tconstruct/client/pages/MaterialPage.java b/src/main/java/tconstruct/client/pages/MaterialPage.java index 631b8549..fa645c77 100644 --- a/src/main/java/tconstruct/client/pages/MaterialPage.java +++ b/src/main/java/tconstruct/client/pages/MaterialPage.java @@ -4,8 +4,8 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.*; -import org.w3c.dom.*; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; import mantle.client.pages.BookPage; import mantle.lib.client.MantleClientRegistry; diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index 4f1505ff..2897732c 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -1,13 +1,15 @@ package tconstruct.client.pages; -import java.util.*; +import java.util.LinkedList; +import java.util.List; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.*; -import org.w3c.dom.*; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; import mantle.client.pages.BookPage; import mantle.lib.client.MantleClientRegistry; diff --git a/src/main/java/tconstruct/client/pages/ToolPage.java b/src/main/java/tconstruct/client/pages/ToolPage.java index a701d80e..7a62018c 100644 --- a/src/main/java/tconstruct/client/pages/ToolPage.java +++ b/src/main/java/tconstruct/client/pages/ToolPage.java @@ -4,8 +4,8 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.*; -import org.w3c.dom.*; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; import mantle.client.pages.BookPage; import mantle.lib.client.MantleClientRegistry; diff --git a/src/main/java/tconstruct/client/tabs/AbstractTab.java b/src/main/java/tconstruct/client/tabs/AbstractTab.java index 82f9265f..7973df26 100644 --- a/src/main/java/tconstruct/client/tabs/AbstractTab.java +++ b/src/main/java/tconstruct/client/tabs/AbstractTab.java @@ -7,8 +7,6 @@ import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.*; - public abstract class AbstractTab extends GuiButton { ResourceLocation texture = new ResourceLocation("textures/gui/container/creative_inventory/tabs.png"); diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java index 4c1be6e0..bfcf8f54 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java @@ -2,7 +2,8 @@ package tconstruct.client.tabs; import net.minecraft.item.ItemStack; -import tconstruct.armor.*; +import tconstruct.armor.ArmorProxyClient; +import tconstruct.armor.TinkerArmor; import tconstruct.client.ArmorControls; public class InventoryTabKnapsack extends AbstractTab { diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index 9e1e6fab..b7de7dac 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -1,6 +1,7 @@ package tconstruct.client.tabs; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index a5e56a6f..1c3cb68a 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -4,12 +4,12 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.CustomMaterial; diff --git a/src/main/java/tconstruct/items/tools/BattleSign.java b/src/main/java/tconstruct/items/tools/BattleSign.java index 746e23a3..227fa227 100644 --- a/src/main/java/tconstruct/items/tools/BattleSign.java +++ b/src/main/java/tconstruct/items/tools/BattleSign.java @@ -1,14 +1,15 @@ package tconstruct.items.tools; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.*; import tconstruct.TConstruct; import tconstruct.library.tools.Weapon; -import tconstruct.tools.*; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.ToolProxyClient; import tconstruct.tools.logic.EquipLogic; public class BattleSign extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index 986b479a..560a94b4 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -1,21 +1,30 @@ package tconstruct.items.tools; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.enchantment.*; -import net.minecraft.entity.player.*; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.*; +import net.minecraftforge.event.entity.player.ArrowLooseEvent; +import net.minecraftforge.event.entity.player.ArrowNockEvent; import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; import tconstruct.tools.entity.ArrowEntity; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index 1c94ffbc..50d5d863 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -4,16 +4,18 @@ import net.minecraft.block.Block; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.TConstruct; import tconstruct.library.crafting.Detailing.DetailInput; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; public class Chisel extends ToolCore { diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index 123f5751..fef2f278 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -2,11 +2,14 @@ package tconstruct.items.tools; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.potion.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; public class Cleaver extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Dagger.java b/src/main/java/tconstruct/items/tools/Dagger.java index 77c0e29a..4960884e 100644 --- a/src/main/java/tconstruct/items/tools/Dagger.java +++ b/src/main/java/tconstruct/items/tools/Dagger.java @@ -1,7 +1,9 @@ package tconstruct.items.tools; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tconstruct.library.tools.Weapon; diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 965ad952..5aef52db 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -1,9 +1,9 @@ package tconstruct.items.tools; import net.minecraft.block.material.Material; -import net.minecraft.item.*; +import net.minecraft.item.Item; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AOEHarvestTool; import tconstruct.tools.TinkerTools; public class Excavator extends AOEHarvestTool { diff --git a/src/main/java/tconstruct/items/tools/FryingPan.java b/src/main/java/tconstruct/items/tools/FryingPan.java index 4fc7db0f..f2f0f2cb 100644 --- a/src/main/java/tconstruct/items/tools/FryingPan.java +++ b/src/main/java/tconstruct/items/tools/FryingPan.java @@ -3,16 +3,18 @@ package tconstruct.items.tools; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; import tconstruct.tools.logic.EquipLogic; diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index f66ba99c..ec3fcd2a 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -4,12 +4,14 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AOEHarvestTool; import tconstruct.tools.TinkerTools; public class Hammer extends AOEHarvestTool { diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index 626d4827..2f3916a1 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -3,10 +3,12 @@ package tconstruct.items.tools; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.HarvestTool; import tconstruct.tools.TinkerTools; public class Hatchet extends HarvestTool { diff --git a/src/main/java/tconstruct/items/tools/Longsword.java b/src/main/java/tconstruct/items/tools/Longsword.java index 2bfbd530..4e5174fb 100644 --- a/src/main/java/tconstruct/items/tools/Longsword.java +++ b/src/main/java/tconstruct/items/tools/Longsword.java @@ -3,11 +3,12 @@ package tconstruct.items.tools; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index 4b6cf966..d20141d0 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -8,7 +8,8 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; @@ -21,8 +22,10 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import gnu.trove.set.hash.THashSet; import mantle.player.PlayerUtils; -import tconstruct.library.*; -import tconstruct.library.tools.*; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.AOEHarvestTool; +import tconstruct.library.tools.AbilityHelper; import tconstruct.tools.TinkerTools; public class LumberAxe extends AOEHarvestTool { diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java index 13858d03..e97f6bb3 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -4,11 +4,13 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.DualHarvestTool; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/items/tools/PotionLauncher.java b/src/main/java/tconstruct/items/tools/PotionLauncher.java index 012dfbc3..0fb8a5ca 100644 --- a/src/main/java/tconstruct/items/tools/PotionLauncher.java +++ b/src/main/java/tconstruct/items/tools/PotionLauncher.java @@ -5,14 +5,17 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.tools.entity.LaunchedPotion; public class PotionLauncher extends Item { diff --git a/src/main/java/tconstruct/items/tools/Rapier.java b/src/main/java/tconstruct/items/tools/Rapier.java index 876f110f..968b42b5 100644 --- a/src/main/java/tconstruct/items/tools/Rapier.java +++ b/src/main/java/tconstruct/items/tools/Rapier.java @@ -3,7 +3,9 @@ package tconstruct.items.tools; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 8ba7b81c..c04edab8 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -1,16 +1,20 @@ package tconstruct.items.tools; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.network.NetHandlerPlayClient; -import net.minecraft.enchantment.*; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetHandler; import net.minecraft.network.play.client.C07PacketPlayerDigging; @@ -20,8 +24,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import cpw.mods.fml.client.FMLClientHandler; -import tconstruct.library.*; -import tconstruct.library.tools.*; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.Weapon; import tconstruct.tools.TinkerTools; public class Scythe extends Weapon { diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java index 3bbe2574..df78377f 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -5,12 +5,12 @@ import java.util.List; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.BowstringMaterial; import tconstruct.library.tools.CustomMaterial; diff --git a/src/main/java/tconstruct/library/ActiveToolMod.java b/src/main/java/tconstruct/library/ActiveToolMod.java index 982da8ad..4e0fb329 100644 --- a/src/main/java/tconstruct/library/ActiveToolMod.java +++ b/src/main/java/tconstruct/library/ActiveToolMod.java @@ -1,7 +1,6 @@ package tconstruct.library; import net.minecraft.block.Block; -import net.minecraft.entity.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/library/TConstructCreativeTab.java b/src/main/java/tconstruct/library/TConstructCreativeTab.java index 8b8bb8b6..33595643 100644 --- a/src/main/java/tconstruct/library/TConstructCreativeTab.java +++ b/src/main/java/tconstruct/library/TConstructCreativeTab.java @@ -1,7 +1,8 @@ package tconstruct.library; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class TConstructCreativeTab extends CreativeTabs { diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index adcd5650..e0140768 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -1,15 +1,26 @@ package tconstruct.library; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; -import org.apache.logging.log4j.*; - -import tconstruct.library.crafting.*; +import tconstruct.library.crafting.Detailing; +import tconstruct.library.crafting.LiquidCasting; +import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.modifier.ActiveArmorMod; -import tconstruct.library.tools.*; +import tconstruct.library.tools.ArrowMaterial; +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.ToolMaterial; import tconstruct.tools.TinkerTools; /** diff --git a/src/main/java/tconstruct/library/accessory/AccessoryCore.java b/src/main/java/tconstruct/library/accessory/AccessoryCore.java index 96bb6ff5..8c146fc8 100644 --- a/src/main/java/tconstruct/library/accessory/AccessoryCore.java +++ b/src/main/java/tconstruct/library/accessory/AccessoryCore.java @@ -5,11 +5,11 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; diff --git a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java index 962e1c5f..6faea478 100644 --- a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java +++ b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java @@ -4,8 +4,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.*; - public interface IAccessoryModel { /** diff --git a/src/main/java/tconstruct/library/armor/ArmorCore.java b/src/main/java/tconstruct/library/armor/ArmorCore.java index 136a5146..ff823dc1 100644 --- a/src/main/java/tconstruct/library/armor/ArmorCore.java +++ b/src/main/java/tconstruct/library/armor/ArmorCore.java @@ -7,17 +7,21 @@ import net.minecraft.block.BlockDispenser; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.dispenser.IBehaviorDispenseItem; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; -import tconstruct.library.modifier.*; +import tconstruct.library.modifier.ActiveArmorMod; +import tconstruct.library.modifier.IModifyable; import tconstruct.library.tools.ToolCore; import tconstruct.tools.entity.FancyEntityItem; diff --git a/src/main/java/tconstruct/library/armor/ArmorMod.java b/src/main/java/tconstruct/library/armor/ArmorMod.java index 65761228..08803c9b 100644 --- a/src/main/java/tconstruct/library/armor/ArmorMod.java +++ b/src/main/java/tconstruct/library/armor/ArmorMod.java @@ -2,10 +2,12 @@ package tconstruct.library.armor; import java.util.EnumSet; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.modifier.*; +import tconstruct.library.modifier.IModifyable; +import tconstruct.library.modifier.ItemModifier; public abstract class ArmorMod extends ItemModifier { diff --git a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java index 51b6f110..1533b622 100644 --- a/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java +++ b/src/main/java/tconstruct/library/armor/ArmorModTypeFilter.java @@ -1,6 +1,8 @@ package tconstruct.library.armor; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java index a41093d5..a7f53e8f 100644 --- a/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java +++ b/src/main/java/tconstruct/library/armor/BehaviorDispenseArmorCopy.java @@ -4,11 +4,12 @@ import java.util.List; import net.minecraft.block.BlockDispenser; import net.minecraft.command.IEntitySelector; -import net.minecraft.dispenser.*; -import net.minecraft.entity.*; +import net.minecraft.dispenser.BehaviorDefaultDispenseItem; +import net.minecraft.dispenser.IBlockSource; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.EnumFacing; final class BehaviorDispenseArmorCopy extends BehaviorDefaultDispenseItem { diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java index 0ac4dfab..90acbab4 100644 --- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java +++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java @@ -1,6 +1,8 @@ package tconstruct.library.client; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java index 81de2605..a2ecea45 100644 --- a/src/main/java/tconstruct/library/component/MultiFluidTank.java +++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java @@ -1,9 +1,13 @@ package tconstruct.library.component; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import net.minecraft.nbt.*; -import net.minecraftforge.fluids.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidTank; import tconstruct.library.crafting.Smeltery; diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 7db78666..4a6d8d1b 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -1,13 +1,15 @@ package tconstruct.library.component; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; import net.minecraft.block.Block; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; -import mantle.blocks.iface.*; -import mantle.world.*; import tconstruct.TConstruct; public class TankLayerScan extends LogicComponent { diff --git a/src/main/java/tconstruct/library/crafting/AlloyMix.java b/src/main/java/tconstruct/library/crafting/AlloyMix.java index a0cec9ee..96e868ef 100644 --- a/src/main/java/tconstruct/library/crafting/AlloyMix.java +++ b/src/main/java/tconstruct/library/crafting/AlloyMix.java @@ -1,6 +1,7 @@ package tconstruct.library.crafting; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/tconstruct/library/crafting/Detailing.java b/src/main/java/tconstruct/library/crafting/Detailing.java index 8fe0c436..f159477c 100644 --- a/src/main/java/tconstruct/library/crafting/Detailing.java +++ b/src/main/java/tconstruct/library/crafting/Detailing.java @@ -1,9 +1,11 @@ package tconstruct.library.crafting; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java index 6f2f3079..c89de8a7 100644 --- a/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java +++ b/src/main/java/tconstruct/library/crafting/DryingRackRecipes.java @@ -3,7 +3,8 @@ package tconstruct.library.crafting; import java.util.ArrayList; import net.minecraft.block.Block; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class DryingRackRecipes { diff --git a/src/main/java/tconstruct/library/crafting/FluidType.java b/src/main/java/tconstruct/library/crafting/FluidType.java index a899d931..a603ea14 100644 --- a/src/main/java/tconstruct/library/crafting/FluidType.java +++ b/src/main/java/tconstruct/library/crafting/FluidType.java @@ -1,6 +1,7 @@ package tconstruct.library.crafting; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import net.minecraft.block.Block; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java index a872c696..1b342c7d 100644 --- a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java @@ -1,12 +1,14 @@ package tconstruct.library.crafting; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import tconstruct.library.event.ModifyEvent; -import tconstruct.library.modifier.*; +import tconstruct.library.modifier.IModifyable; +import tconstruct.library.modifier.ItemModifier; public class ModifyBuilder { diff --git a/src/main/java/tconstruct/library/crafting/PatternBuilder.java b/src/main/java/tconstruct/library/crafting/PatternBuilder.java index 2e673457..73757e5a 100644 --- a/src/main/java/tconstruct/library/crafting/PatternBuilder.java +++ b/src/main/java/tconstruct/library/crafting/PatternBuilder.java @@ -1,10 +1,14 @@ package tconstruct.library.crafting; /** How to build tool parts? With patterns! */ -import java.util.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import net.minecraft.block.Block; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.Event.Result; diff --git a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java index 036c0294..a6d9c003 100644 --- a/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java +++ b/src/main/java/tconstruct/library/crafting/ShapelessToolRecipe.java @@ -1,6 +1,7 @@ package tconstruct.library.crafting; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/library/crafting/Smeltery.java b/src/main/java/tconstruct/library/crafting/Smeltery.java index 6a4da14f..2297641e 100644 --- a/src/main/java/tconstruct/library/crafting/Smeltery.java +++ b/src/main/java/tconstruct/library/crafting/Smeltery.java @@ -1,10 +1,16 @@ package tconstruct.library.crafting; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.item.*; -import net.minecraftforge.fluids.*; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import mantle.utils.ItemMetaWrapper; diff --git a/src/main/java/tconstruct/library/crafting/StencilBuilder.java b/src/main/java/tconstruct/library/crafting/StencilBuilder.java index 4837f276..72ecf684 100644 --- a/src/main/java/tconstruct/library/crafting/StencilBuilder.java +++ b/src/main/java/tconstruct/library/crafting/StencilBuilder.java @@ -1,8 +1,13 @@ package tconstruct.library.crafting; -import java.util.*; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; public class StencilBuilder { diff --git a/src/main/java/tconstruct/library/crafting/ToolBuilder.java b/src/main/java/tconstruct/library/crafting/ToolBuilder.java index ac4ee162..22ce2fbd 100644 --- a/src/main/java/tconstruct/library/crafting/ToolBuilder.java +++ b/src/main/java/tconstruct/library/crafting/ToolBuilder.java @@ -1,18 +1,24 @@ package tconstruct.library.crafting; /** Once upon a time, too many tools to count. Let's put them together automatically */ -import java.util.*; -import net.minecraft.item.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.Event.Result; import tconstruct.library.TConstructRegistry; -import tconstruct.library.event.*; +import tconstruct.library.event.ToolBuildEvent; +import tconstruct.library.event.ToolCraftEvent; import tconstruct.library.modifier.ItemModifier; -import tconstruct.library.tools.*; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.IToolPart; public class ToolBuilder { diff --git a/src/main/java/tconstruct/library/entity/ProjectileBase.java b/src/main/java/tconstruct/library/entity/ProjectileBase.java index 84216c72..39c1e949 100644 --- a/src/main/java/tconstruct/library/entity/ProjectileBase.java +++ b/src/main/java/tconstruct/library/entity/ProjectileBase.java @@ -14,7 +14,11 @@ import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import cpw.mods.fml.common.network.ByteBufUtils; diff --git a/src/main/java/tconstruct/library/event/ToolCraftEvent.java b/src/main/java/tconstruct/library/event/ToolCraftEvent.java index b3e0acc5..fcc9c068 100644 --- a/src/main/java/tconstruct/library/event/ToolCraftEvent.java +++ b/src/main/java/tconstruct/library/event/ToolCraftEvent.java @@ -4,7 +4,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.eventhandler.Event; -import tconstruct.library.tools.*; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.ToolMaterial; /* * This event fires after all of the other construction. The resulting nbttag is added to the tool Note: The tag is the diff --git a/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java b/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java index d55148f4..83ba3a63 100644 --- a/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java +++ b/src/main/java/tconstruct/library/modifier/ActiveArmorMod.java @@ -4,7 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import tconstruct.library.armor.*; +import tconstruct.library.armor.ArmorCore; +import tconstruct.library.armor.ArmorPart; public class ActiveArmorMod { diff --git a/src/main/java/tconstruct/library/modifier/ItemModifier.java b/src/main/java/tconstruct/library/modifier/ItemModifier.java index f0616a31..d3253e2c 100644 --- a/src/main/java/tconstruct/library/modifier/ItemModifier.java +++ b/src/main/java/tconstruct/library/modifier/ItemModifier.java @@ -1,6 +1,10 @@ package tconstruct.library.modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; +import java.util.UUID; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/library/tools/AbilityHelper.java b/src/main/java/tconstruct/library/tools/AbilityHelper.java index bc3522ff..537a6933 100644 --- a/src/main/java/tconstruct/library/tools/AbilityHelper.java +++ b/src/main/java/tconstruct/library/tools/AbilityHelper.java @@ -20,7 +20,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.stats.AchievementList; import net.minecraft.stats.StatList; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 593698be..3d82b327 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -1,24 +1,31 @@ package tconstruct.library.tools; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemPotion; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cofh.api.energy.IEnergyContainerItem; import cofh.core.item.IEqualityOverrideItem; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.*; -import tconstruct.library.*; +import tconstruct.library.ActiveToolMod; +import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.ToolBuilder; -import tconstruct.library.modifier.*; +import tconstruct.library.modifier.IModifyable; +import tconstruct.library.modifier.ItemModifier; import tconstruct.library.util.TextureHelper; import tconstruct.tools.TinkerTools; import tconstruct.tools.entity.FancyEntityItem; diff --git a/src/main/java/tconstruct/library/tools/Weapon.java b/src/main/java/tconstruct/library/tools/Weapon.java index 3bb521df..e6c4e8d0 100644 --- a/src/main/java/tconstruct/library/tools/Weapon.java +++ b/src/main/java/tconstruct/library/tools/Weapon.java @@ -5,12 +5,12 @@ import net.minecraft.block.material.Material; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.*; import mods.battlegear2.api.PlayerEventChild; import mods.battlegear2.api.weapons.IBattlegearWeapon; import tconstruct.tools.TinkerTools; diff --git a/src/main/java/tconstruct/library/util/HarvestLevels.java b/src/main/java/tconstruct/library/util/HarvestLevels.java index 1854c029..b2d69506 100644 --- a/src/main/java/tconstruct/library/util/HarvestLevels.java +++ b/src/main/java/tconstruct/library/util/HarvestLevels.java @@ -1,6 +1,7 @@ package tconstruct.library.util; -import java.util.*; +import java.util.HashMap; +import java.util.Map; import net.minecraft.util.StatCollector; diff --git a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java index 962b6d31..9cadfb7b 100644 --- a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java +++ b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java @@ -8,7 +8,8 @@ import net.minecraft.world.World; import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.client.entity.item.ExplosiveRender; import tconstruct.common.TProxyCommon; -import tconstruct.mechworks.entity.item.*; +import tconstruct.mechworks.entity.item.EntityLandmineFirework; +import tconstruct.mechworks.entity.item.ExplosivePrimed; import tconstruct.mechworks.gui.GuiLandmine; import tconstruct.mechworks.inventory.ContainerLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; diff --git a/src/main/java/tconstruct/mechworks/TinkerMechworks.java b/src/main/java/tconstruct/mechworks/TinkerMechworks.java index 67357fde..3bc18867 100644 --- a/src/main/java/tconstruct/mechworks/TinkerMechworks.java +++ b/src/main/java/tconstruct/mechworks/TinkerMechworks.java @@ -2,18 +2,22 @@ package tconstruct.mechworks; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.ShapedOreRecipe; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; +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.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.mechworks.blocks.BlockLandmine; -import tconstruct.mechworks.entity.item.*; +import tconstruct.mechworks.entity.item.EntityLandmineFirework; +import tconstruct.mechworks.entity.item.ExplosivePrimed; import tconstruct.mechworks.itemblocks.ItemBlockLandmine; import tconstruct.mechworks.logic.TileEntityLandmine; import tconstruct.tools.TinkerTools; diff --git a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java index e52c05d4..bbb1fb69 100644 --- a/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/blocks/BlockLandmine.java @@ -1,6 +1,11 @@ package tconstruct.mechworks.blocks; -import static net.minecraftforge.common.util.ForgeDirection.*; +import static net.minecraftforge.common.util.ForgeDirection.DOWN; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +import static net.minecraftforge.common.util.ForgeDirection.NORTH; +import static net.minecraftforge.common.util.ForgeDirection.SOUTH; +import static net.minecraftforge.common.util.ForgeDirection.UP; +import static net.minecraftforge.common.util.ForgeDirection.WEST; import java.util.List; import java.util.Random; diff --git a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java index 6018a3d3..76c35dec 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java +++ b/src/main/java/tconstruct/mechworks/entity/item/EntityLandmineFirework.java @@ -6,7 +6,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.util.DamageSourceFireworkExplode; public class EntityLandmineFirework extends Entity { diff --git a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java index d043cfe9..b2704c3a 100644 --- a/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java +++ b/src/main/java/tconstruct/mechworks/entity/item/ExplosivePrimed.java @@ -1,11 +1,10 @@ package tconstruct.mechworks.entity.item; import net.minecraft.block.Block; -import net.minecraft.entity.*; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.*; +import net.minecraft.world.Explosion; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.world.MiningExplosion; public class ExplosivePrimed extends Entity { diff --git a/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java b/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java index ba991d54..4748d670 100644 --- a/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java +++ b/src/main/java/tconstruct/mechworks/gui/GuiLandmine.java @@ -5,7 +5,9 @@ import java.util.List; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java index fbbcf6c3..647c7927 100644 --- a/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java +++ b/src/main/java/tconstruct/mechworks/inventory/ContainerLandmine.java @@ -1,13 +1,17 @@ package tconstruct.mechworks.inventory; -import java.util.*; +import java.util.HashSet; +import java.util.Set; import net.minecraft.block.Block; -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.Slot; import net.minecraft.item.ItemStack; -import tconstruct.armor.inventory.*; +import tconstruct.armor.inventory.SlotBehavedOnly; +import tconstruct.armor.inventory.SlotOpaqueBlocksOnly; import tconstruct.mechworks.TinkerMechworks; import tconstruct.mechworks.logic.TileEntityLandmine; diff --git a/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java index 5e028f9e..2d45c6e7 100644 --- a/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/mechworks/itemblocks/ItemBlockLandmine.java @@ -1,10 +1,12 @@ package tconstruct.mechworks.itemblocks; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/mechworks/landmine/Helper.java b/src/main/java/tconstruct/mechworks/landmine/Helper.java index af2e5438..3acf5a8b 100644 --- a/src/main/java/tconstruct/mechworks/landmine/Helper.java +++ b/src/main/java/tconstruct/mechworks/landmine/Helper.java @@ -1,7 +1,8 @@ package tconstruct.mechworks.landmine; import net.minecraft.block.Block; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraftforge.common.util.ForgeDirection; /** diff --git a/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java b/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java index aa9b875c..7f089f09 100644 --- a/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java +++ b/src/main/java/tconstruct/mechworks/landmine/LandmineStack.java @@ -1,7 +1,9 @@ package tconstruct.mechworks.landmine; import net.minecraft.block.Block; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; public class LandmineStack { diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java index a1e20d90..6d293e2d 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/Behavior.java @@ -1,16 +1,23 @@ package tconstruct.mechworks.landmine.behavior; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.Entity; -import net.minecraft.init.*; -import net.minecraft.item.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +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.mechworks.landmine.*; +import tconstruct.mechworks.landmine.Helper; +import tconstruct.mechworks.landmine.LandmineStack; /** * diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java index 4cdb6f38..c09cdc92 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorExplosive.java @@ -2,10 +2,11 @@ package tconstruct.mechworks.landmine.behavior; import java.util.List; -import net.minecraft.entity.*; import net.minecraft.entity.item.EntityTNTPrimed; -import net.minecraft.init.*; -import net.minecraft.item.*; +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/mechworks/landmine/behavior/BehaviorFirecharge.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java index e2fcdd35..5176afdf 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorFirecharge.java @@ -6,7 +6,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.EntitySmallFireball; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import tconstruct.mechworks.itemblocks.ItemBlockLandmine; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java index cbdeb24e..4ccde4db 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorPotion.java @@ -1,12 +1,12 @@ package tconstruct.mechworks.landmine.behavior; -import java.util.*; +import java.util.List; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityPotion; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.ItemPotion; +import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java index 5258dae2..b15e44e9 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorProjectile.java @@ -1,8 +1,8 @@ package tconstruct.mechworks.landmine.behavior; -import net.minecraft.entity.*; import net.minecraft.entity.item.EntityEnderPearl; -import net.minecraft.entity.projectile.*; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.entity.projectile.EntitySnowball; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java index 796e93e0..7bb3c514 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorShears.java @@ -1,9 +1,12 @@ package tconstruct.mechworks.landmine.behavior; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Random; -import net.minecraft.enchantment.*; -import net.minecraft.entity.*; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java index 9bfa04e5..847ed61e 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/BehaviorSpawnEgg.java @@ -1,7 +1,7 @@ package tconstruct.mechworks.landmine.behavior; -import net.minecraft.entity.*; -import net.minecraft.item.*; +import net.minecraft.item.ItemMonsterPlacer; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java index 0ce0c37a..05911914 100644 --- a/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java +++ b/src/main/java/tconstruct/mechworks/landmine/behavior/stackCombo/SpecialStackHandlerRocketFireball.java @@ -1,10 +1,11 @@ package tconstruct.mechworks.landmine.behavior.stackCombo; -import java.util.*; +import java.util.ArrayList; +import java.util.Random; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.*; +import net.minecraft.entity.projectile.EntityFireball; +import net.minecraft.entity.projectile.EntityLargeFireball; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java index d4381250..f5fe7134 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineExplodeLogic.java @@ -1,6 +1,6 @@ package tconstruct.mechworks.logic; -import java.util.*; +import java.util.ArrayList; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java index 8d8c0bbb..9752cf48 100644 --- a/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java +++ b/src/main/java/tconstruct/mechworks/logic/LandmineSpecialStackLogic.java @@ -1,6 +1,6 @@ package tconstruct.mechworks.logic; -import java.util.*; +import java.util.ArrayList; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java index 3fbf9f22..37caca15 100644 --- a/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/mechworks/logic/TileEntityLandmine.java @@ -3,8 +3,10 @@ package tconstruct.mechworks.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/mechworks/model/CartRender.java b/src/main/java/tconstruct/mechworks/model/CartRender.java index 075bb5c6..e00c4e27 100644 --- a/src/main/java/tconstruct/mechworks/model/CartRender.java +++ b/src/main/java/tconstruct/mechworks/model/CartRender.java @@ -5,11 +5,12 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.*; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.*; import tconstruct.world.entity.CartEntity; @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/mechworks/model/ModelPullcart.java b/src/main/java/tconstruct/mechworks/model/ModelPullcart.java index 67ba6b82..138f8765 100644 --- a/src/main/java/tconstruct/mechworks/model/ModelPullcart.java +++ b/src/main/java/tconstruct/mechworks/model/ModelPullcart.java @@ -1,6 +1,7 @@ package tconstruct.mechworks.model; -import net.minecraft.client.model.*; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelPullcart extends ModelBase { diff --git a/src/main/java/tconstruct/mechworks/model/ModelWagon.java b/src/main/java/tconstruct/mechworks/model/ModelWagon.java index d83313cd..8f5fdef1 100644 --- a/src/main/java/tconstruct/mechworks/model/ModelWagon.java +++ b/src/main/java/tconstruct/mechworks/model/ModelWagon.java @@ -1,6 +1,7 @@ package tconstruct.mechworks.model; -import net.minecraft.client.model.*; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; public class ModelWagon extends ModelBase { diff --git a/src/main/java/tconstruct/modifiers/armor/AModBoolean.java b/src/main/java/tconstruct/modifiers/armor/AModBoolean.java index 0edbe718..5a3dee06 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModBoolean.java +++ b/src/main/java/tconstruct/modifiers/armor/AModBoolean.java @@ -2,10 +2,13 @@ package tconstruct.modifiers.armor; import java.util.EnumSet; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.armor.*; +import tconstruct.library.armor.ArmorCore; +import tconstruct.library.armor.ArmorMod; +import tconstruct.library.armor.ArmorPart; /* Adds a boolean NBTTag */ diff --git a/src/main/java/tconstruct/modifiers/armor/AModInteger.java b/src/main/java/tconstruct/modifiers/armor/AModInteger.java index e5677e31..dc209800 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModInteger.java +++ b/src/main/java/tconstruct/modifiers/armor/AModInteger.java @@ -5,7 +5,8 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.armor.*; +import tconstruct.library.armor.ArmorMod; +import tconstruct.library.armor.ArmorPart; /* Adds an integer NBTTag */ diff --git a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java index 36ca309a..8438db4a 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java +++ b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java @@ -1,9 +1,11 @@ package tconstruct.modifiers.armor; -import java.util.*; +import java.util.EnumSet; +import java.util.UUID; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import tconstruct.library.armor.ArmorPart; diff --git a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java index 83333abc..ccfcd2cd 100644 --- a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java +++ b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java @@ -3,13 +3,16 @@ package tconstruct.modifiers.armor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import tconstruct.TConstruct; import tconstruct.armor.player.TPlayerStats; -import tconstruct.library.armor.*; -import tconstruct.library.modifier.*; +import tconstruct.library.armor.ArmorCore; +import tconstruct.library.armor.ArmorPart; +import tconstruct.library.modifier.ActiveArmorMod; +import tconstruct.library.modifier.IModifyable; public class ActiveTinkerArmor extends ActiveArmorMod { diff --git a/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java b/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java index 10d50c9a..9419af08 100644 --- a/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java +++ b/src/main/java/tconstruct/modifiers/armor/TravelModDoubleJump.java @@ -5,7 +5,8 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.armor.*; +import tconstruct.library.armor.ArmorMod; +import tconstruct.library.armor.ArmorPart; import tconstruct.library.modifier.IModifyable; public class TravelModDoubleJump extends ArmorMod { diff --git a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java index dad37eee..3ffd8fed 100644 --- a/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java +++ b/src/main/java/tconstruct/modifiers/tools/ItemModTypeFilter.java @@ -1,6 +1,7 @@ package tconstruct.modifiers.tools; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java index c0cbbcf6..ac4d588b 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java @@ -1,6 +1,7 @@ package tconstruct.modifiers.tools; -import java.util.*; +import java.util.Arrays; +import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java index 0c2ac4e4..8de66002 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java +++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java @@ -1,10 +1,15 @@ package tconstruct.modifiers.tools; -import java.util.*; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import net.minecraft.enchantment.*; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import tconstruct.library.tools.ToolCore; diff --git a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java index 9991f8c2..f6ba2d7c 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java +++ b/src/main/java/tconstruct/modifiers/tools/ModExtraModifier.java @@ -3,7 +3,8 @@ package tconstruct.modifiers.tools; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import tconstruct.library.modifier.*; +import tconstruct.library.modifier.IModifyable; +import tconstruct.library.modifier.ItemModifier; public class ModExtraModifier extends ItemModifier { diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java index 4b918366..7752ac33 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -1,10 +1,15 @@ package tconstruct.modifiers.tools; -import java.util.*; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import net.minecraft.enchantment.*; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import tconstruct.library.tools.ToolCore; diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java index a5c41f0e..5f4c005e 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPiston.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPiston.java @@ -1,6 +1,7 @@ package tconstruct.modifiers.tools; -import java.util.*; +import java.util.Arrays; +import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java index f1ee874d..54055dfc 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -1,8 +1,10 @@ package tconstruct.modifiers.tools; -import java.util.*; +import java.util.Arrays; +import java.util.List; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.modifier.IModifyable; diff --git a/src/main/java/tconstruct/modifiers/tools/ModRepair.java b/src/main/java/tconstruct/modifiers/tools/ModRepair.java index 5d039004..8530a6b3 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRepair.java @@ -5,7 +5,8 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.ItemModifier; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; /* Little mod for actually adding the lapis modifier */ diff --git a/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java b/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java index f37a2fa6..f6cee1ce 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java +++ b/src/main/java/tconstruct/modifiers/tools/ModToolRepair.java @@ -6,7 +6,8 @@ import net.minecraft.nbt.NBTTagCompound; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.library.modifier.ItemModifier; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; public class ModToolRepair extends ItemModifier { diff --git a/src/main/java/tconstruct/plugins/TinkerThaumcraft.java b/src/main/java/tconstruct/plugins/TinkerThaumcraft.java index c4cd95dd..98ba1a31 100644 --- a/src/main/java/tconstruct/plugins/TinkerThaumcraft.java +++ b/src/main/java/tconstruct/plugins/TinkerThaumcraft.java @@ -2,9 +2,9 @@ package tconstruct.plugins; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.library.crafting.ModifyBuilder; import tconstruct.modifiers.armor.AModThaumicVision; diff --git a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java index a08023a7..a5304a57 100644 --- a/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java +++ b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java @@ -2,11 +2,12 @@ package tconstruct.plugins.ic2; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.LiquidCasting; diff --git a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java index 5a89b43a..899a8ec1 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java @@ -1,10 +1,11 @@ package tconstruct.plugins.imc; -import java.util.*; +import java.util.Arrays; +import java.util.List; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.*; import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) diff --git a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java index 6c1e6e4b..6797edca 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java @@ -3,8 +3,8 @@ package tconstruct.plugins.imc; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.event.*; -import mantle.pulsar.pulse.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; diff --git a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java index 8311fffd..87bcfce7 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java @@ -1,11 +1,30 @@ package tconstruct.plugins.imc; -import static tconstruct.smeltery.TinkerSmeltery.*; +import static tconstruct.smeltery.TinkerSmeltery.moltenAlubrassFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenAlumiteFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenArditeFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenBronzeFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenCobaltFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenElectrumFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenEmeraldFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenEnderFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenEnderiumFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenGoldFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenInvarFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenLumiumFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenManyullynFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenMithrilFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenQuartzFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenShinyFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenSignalumFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenSilverFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenSteelFluid; +import static tconstruct.smeltery.TinkerSmeltery.pigIronFluid; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.common.event.*; -import mantle.pulsar.pulse.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; import tconstruct.TConstruct; @Pulse( diff --git a/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java b/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java index 1b2115ac..28163b61 100644 --- a/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java +++ b/src/main/java/tconstruct/plugins/imc/TinkerRfTools.java @@ -1,6 +1,33 @@ package tconstruct.plugins.imc; -import static tconstruct.smeltery.TinkerSmeltery.*; +import static tconstruct.smeltery.TinkerSmeltery.moltenAlubrassFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenAluminumFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenAlumiteFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenArditeFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenBronzeFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenCobaltFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenCopperFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenElectrumFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenEmeraldFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenEnderFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenEnderiumFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenGlassFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenGoldFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenInvarFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenIronFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenLeadFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenLumiumFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenManyullynFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenMithrilFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenNickelFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenObsidianFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenQuartzFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenShinyFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenSignalumFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenSilverFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenSteelFluid; +import static tconstruct.smeltery.TinkerSmeltery.moltenTinFluid; +import static tconstruct.smeltery.TinkerSmeltery.pigIronFluid; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/tconstruct/plugins/mfr/Drinkables.java b/src/main/java/tconstruct/plugins/mfr/Drinkables.java index a29f7169..9d39f71d 100644 --- a/src/main/java/tconstruct/plugins/mfr/Drinkables.java +++ b/src/main/java/tconstruct/plugins/mfr/Drinkables.java @@ -1,7 +1,8 @@ package tconstruct.plugins.mfr; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.potion.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import powercrystals.minefactoryreloaded.api.ILiquidDrinkHandler; diff --git a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java index b395372e..cf171e3b 100644 --- a/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java +++ b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java @@ -1,13 +1,14 @@ package tconstruct.plugins.mfr; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.api.*; import tconstruct.tools.TinkerTools; public class GrindableHorse implements IFactoryGrindable { diff --git a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java index 80806327..3566cf96 100644 --- a/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java +++ b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java @@ -1,13 +1,15 @@ package tconstruct.plugins.mfr; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import powercrystals.minefactoryreloaded.api.*; - public class HarvestableOreBerry implements IFactoryHarvestable { private final Block _sourceBlock; diff --git a/src/main/java/tconstruct/plugins/mfr/MFRRegister.java b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java index 0e48664d..98761fc0 100644 --- a/src/main/java/tconstruct/plugins/mfr/MFRRegister.java +++ b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java @@ -1,6 +1,5 @@ package tconstruct.plugins.mfr; -import powercrystals.minefactoryreloaded.api.*; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java index b8bd97e9..1846d0bf 100644 --- a/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java +++ b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java @@ -2,7 +2,6 @@ package tconstruct.plugins.mfr; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.*; import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java index c6c64ec2..93135a76 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerAlloying.java @@ -1,6 +1,6 @@ package tconstruct.plugins.nei; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java index 14940bdf..a715668a 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerBase.java @@ -1,7 +1,6 @@ package tconstruct.plugins.nei; -import java.awt.Point; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java index 38fb7b8b..94da8dee 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerCastingBase.java @@ -1,6 +1,6 @@ package tconstruct.plugins.nei; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java index cb3d1239..e6027158 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerDryingRack.java @@ -1,6 +1,6 @@ package tconstruct.plugins.nei; -import java.awt.Rectangle; +import java.awt.*; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java index cc629499..fbb591d3 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerMelting.java @@ -1,6 +1,6 @@ package tconstruct.plugins.nei; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; diff --git a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java index 0b41bca3..b14e3ee8 100644 --- a/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java +++ b/src/main/java/tconstruct/plugins/nei/RecipeHandlerToolMaterials.java @@ -1,6 +1,6 @@ package tconstruct.plugins.nei; -import java.awt.Rectangle; +import java.awt.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java index 5a6328ed..4dc8b0fd 100644 --- a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java +++ b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java @@ -6,12 +6,12 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.*; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; diff --git a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java index 7ac722bc..1d249490 100644 --- a/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java @@ -9,9 +9,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; 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 mcp.mobius.waila.api.*; import tconstruct.smeltery.logic.CastingChannelLogic; public class CastingChannelDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java index d215ef0f..1e4d4505 100644 --- a/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java @@ -10,7 +10,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import mcp.mobius.waila.api.*; import tconstruct.smeltery.logic.LavaTankLogic; public class SearedTankDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java index 4bb122f0..262241c8 100644 --- a/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java +++ b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java @@ -10,7 +10,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; -import mcp.mobius.waila.api.*; import tconstruct.smeltery.logic.SmelteryLogic; public class SmelteryDataProvider implements IWailaDataProvider { diff --git a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java index 7e0fd60d..3ce919e1 100644 --- a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java +++ b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java @@ -1,8 +1,8 @@ package tconstruct.plugins.waila; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.*; import tconstruct.TConstruct; @ObjectHolder(TConstruct.modID) diff --git a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java index 800e406a..231a580c 100644 --- a/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java +++ b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java @@ -4,8 +4,11 @@ import net.minecraftforge.fluids.FluidStack; import mcp.mobius.waila.api.IWailaRegistrar; import tconstruct.TConstruct; -import tconstruct.smeltery.blocks.*; -import tconstruct.smeltery.logic.*; +import tconstruct.smeltery.blocks.LavaTankBlock; +import tconstruct.smeltery.blocks.SmelteryBlock; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.smeltery.logic.CastingChannelLogic; +import tconstruct.smeltery.logic.CastingTableLogic; public class WailaRegistrar { diff --git a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java index 99631031..c2285959 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java +++ b/src/main/java/tconstruct/smeltery/SmelteryDamageSource.java @@ -1,7 +1,10 @@ package tconstruct.smeltery; 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; diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java index bcea156a..9dfef81c 100644 --- a/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java +++ b/src/main/java/tconstruct/smeltery/SmelteryProxyClient.java @@ -1,7 +1,8 @@ package tconstruct.smeltery; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.*; +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; @@ -10,17 +11,29 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.RenderBlockFluid; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; import mantle.client.MProxyClient; import mantle.lib.client.MantleClientRegistry; import tconstruct.armor.TinkerArmor; -import tconstruct.armor.modelblock.*; +import tconstruct.armor.modelblock.DryingRackRender; +import tconstruct.armor.modelblock.DryingRackSpecialRender; import tconstruct.blocks.logic.DryingRackLogic; import tconstruct.client.pages.BlockCastPage; import tconstruct.common.TProxyCommon; -import tconstruct.smeltery.gui.*; -import tconstruct.smeltery.logic.*; -import tconstruct.smeltery.model.*; +import tconstruct.smeltery.gui.SmelteryGui; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.smeltery.logic.SmelteryLogic; +import tconstruct.smeltery.model.BlockRenderCastingChannel; +import tconstruct.smeltery.model.CastingBasinSpecialRender; +import tconstruct.smeltery.model.CastingBlockRender; +import tconstruct.smeltery.model.CastingTableSpecialRenderer; +import tconstruct.smeltery.model.PaneConnectedRender; +import tconstruct.smeltery.model.PaneRender; +import tconstruct.smeltery.model.SmelteryRender; +import tconstruct.smeltery.model.TankItemRenderer; +import tconstruct.smeltery.model.TankRender; import tconstruct.tools.TinkerTools; public class SmelteryProxyClient extends SmelteryProxyCommon { diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java index 44089f5a..d4b15dca 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java @@ -1,6 +1,9 @@ package tconstruct.smeltery; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; @@ -40,12 +43,43 @@ import tconstruct.library.crafting.FluidType; import tconstruct.library.crafting.LiquidCasting; import tconstruct.library.crafting.Smeltery; import tconstruct.library.util.IPattern; -import tconstruct.smeltery.blocks.*; -import tconstruct.smeltery.itemblocks.*; +import tconstruct.smeltery.blocks.BloodBlock; +import tconstruct.smeltery.blocks.CastingChannelBlock; +import tconstruct.smeltery.blocks.GlassBlockConnected; +import tconstruct.smeltery.blocks.GlassBlockConnectedMeta; +import tconstruct.smeltery.blocks.GlassPaneConnected; +import tconstruct.smeltery.blocks.GlassPaneStained; +import tconstruct.smeltery.blocks.GlueBlock; +import tconstruct.smeltery.blocks.GlueFluid; +import tconstruct.smeltery.blocks.LavaTankBlock; +import tconstruct.smeltery.blocks.PigIronMoltenBlock; +import tconstruct.smeltery.blocks.SearedBlock; +import tconstruct.smeltery.blocks.SearedSlab; +import tconstruct.smeltery.blocks.SmelteryBlock; +import tconstruct.smeltery.blocks.SpeedBlock; +import tconstruct.smeltery.blocks.SpeedSlab; +import tconstruct.smeltery.blocks.TConstructFluid; +import tconstruct.smeltery.itemblocks.CastingChannelItem; +import tconstruct.smeltery.itemblocks.GlassBlockItem; +import tconstruct.smeltery.itemblocks.GlassPaneItem; +import tconstruct.smeltery.itemblocks.LavaTankItemBlock; +import tconstruct.smeltery.itemblocks.SearedSlabItem; +import tconstruct.smeltery.itemblocks.SearedTableItemBlock; +import tconstruct.smeltery.itemblocks.SmelteryItemBlock; +import tconstruct.smeltery.itemblocks.SpeedBlockItem; +import tconstruct.smeltery.itemblocks.SpeedSlabItem; +import tconstruct.smeltery.itemblocks.StainedGlassClearItem; +import tconstruct.smeltery.itemblocks.StainedGlassClearPaneItem; import tconstruct.smeltery.items.ClayPattern; import tconstruct.smeltery.items.FilledBucket; import tconstruct.smeltery.items.MetalPattern; -import tconstruct.smeltery.logic.*; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.smeltery.logic.CastingChannelLogic; +import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.smeltery.logic.FaucetLogic; +import tconstruct.smeltery.logic.LavaTankLogic; +import tconstruct.smeltery.logic.SmelteryDrainLogic; +import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.tools.TinkerTools; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java index 633c63ae..3add9b08 100644 --- a/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java +++ b/src/main/java/tconstruct/smeltery/TinkerSmelteryEvents.java @@ -2,12 +2,13 @@ package tconstruct.smeltery; import net.minecraft.block.Block; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition.MovingObjectType; -import net.minecraftforge.event.entity.player.*; +import net.minecraftforge.event.entity.player.FillBucketEvent; -import cpw.mods.fml.common.eventhandler.*; import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import mantle.world.WorldHelper; import tconstruct.armor.player.TPlayerStats; diff --git a/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java b/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java index 630fdea6..35294558 100644 --- a/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/BloodBlock.java @@ -1,8 +1,8 @@ package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; -import net.minecraft.entity.*; -import net.minecraft.potion.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java index 251262f9..6cdec530 100644 --- a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java @@ -7,10 +7,12 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; 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; diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java index a7d4521c..b51da08b 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlock.java @@ -5,9 +5,9 @@ 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.*; import tconstruct.blocks.TConstructBlock; public class GlassBlock extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java index c85e74a1..edbc3198 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnected.java @@ -3,10 +3,11 @@ package tconstruct.smeltery.blocks; 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 cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java index 319bb574..72ba65e1 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockConnectedMeta.java @@ -5,11 +5,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.util.config.PHConstruct; /** diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java index 401d7e13..19d8d411 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassBlockStained.java @@ -6,7 +6,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.relauncher.*; import tconstruct.blocks.TConstructBlock; public class GlassBlockStained extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java index 403390dc..15d892ab 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlassPaneConnected.java @@ -6,11 +6,12 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -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 net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.*; import tconstruct.smeltery.model.PaneConnectedRender; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java index 70304f1c..26d1fe7c 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueBlock.java @@ -1,9 +1,9 @@ package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; -import net.minecraft.entity.*; import net.minecraft.init.Blocks; -import net.minecraft.potion.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java index 3d1b3e9d..85e2fadc 100644 --- a/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/GlueFluid.java @@ -2,13 +2,12 @@ package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.*; -import net.minecraft.potion.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.fluids.*; - -import cpw.mods.fml.relauncher.*; +import net.minecraftforge.fluids.BlockFluidFinite; +import net.minecraftforge.fluids.Fluid; public class GlueFluid extends BlockFluidFinite { diff --git a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java index 3884411e..562d7db0 100644 --- a/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java +++ b/src/main/java/tconstruct/smeltery/blocks/LiquidMetalFinite.java @@ -1,13 +1,13 @@ package tconstruct.smeltery.blocks; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; -import net.minecraft.util.*; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.BlockFluidFinite; +import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; diff --git a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java index 4eeae1a4..e13fdf9f 100644 --- a/src/main/java/tconstruct/smeltery/blocks/MetalOre.java +++ b/src/main/java/tconstruct/smeltery/blocks/MetalOre.java @@ -4,7 +4,8 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; import tconstruct.blocks.TConstructBlock; diff --git a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java index add0b275..0b0ebac8 100644 --- a/src/main/java/tconstruct/smeltery/blocks/PaneBase.java +++ b/src/main/java/tconstruct/smeltery/blocks/PaneBase.java @@ -6,10 +6,10 @@ import net.minecraft.block.BlockStainedGlassPane; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.*; import tconstruct.smeltery.model.PaneRender; public class PaneBase extends BlockStainedGlassPane { diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java index a9731ad3..d1c769ab 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java @@ -6,16 +6,21 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -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 cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; -import tconstruct.smeltery.logic.*; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.smeltery.logic.CastingBlockLogic; +import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.smeltery.logic.FaucetLogic; import tconstruct.smeltery.model.CastingBlockRender; public class SearedBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java index ed774529..b3b874b4 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SearedSlab.java @@ -5,10 +5,10 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.*; import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; diff --git a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java index 940873e9..1fc82d11 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SmelteryBlock.java @@ -1,6 +1,7 @@ package tconstruct.smeltery.blocks; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -8,18 +9,18 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; -import mantle.blocks.abstracts.*; -import mantle.blocks.iface.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.SmelteryProxyCommon; -import tconstruct.smeltery.logic.*; +import tconstruct.smeltery.logic.SmelteryDrainLogic; +import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.smeltery.model.SmelteryRender; public class SmelteryBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java index 219d2488..1fac32f2 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedBlock.java @@ -5,10 +5,10 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.blocks.TConstructBlock; public class SpeedBlock extends TConstructBlock { diff --git a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java index dc0f77d1..fe389390 100644 --- a/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java +++ b/src/main/java/tconstruct/smeltery/blocks/SpeedSlab.java @@ -6,11 +6,11 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.smeltery.TinkerSmeltery; diff --git a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java index 307de431..c9fc4ea9 100644 --- a/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java +++ b/src/main/java/tconstruct/smeltery/blocks/TConstructFluid.java @@ -3,9 +3,9 @@ package tconstruct.smeltery.blocks; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.BlockFluidClassic; +import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; public class TConstructFluid extends BlockFluidClassic { diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java index 0cf648b0..4215d4ee 100644 --- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java +++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java @@ -1,22 +1,27 @@ package tconstruct.smeltery.gui; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -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.fluids.FluidStack; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.*; import cpw.mods.fml.common.Loader; import tconstruct.TConstruct; -import tconstruct.smeltery.inventory.*; +import tconstruct.smeltery.inventory.ActiveContainer; +import tconstruct.smeltery.inventory.SmelteryContainer; import tconstruct.smeltery.logic.SmelteryLogic; import tconstruct.util.network.SmelteryPacket; diff --git a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java index 1a036234..944fe34c 100644 --- a/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveContainer.java @@ -1,6 +1,7 @@ package tconstruct.smeltery.inventory; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java index d909f917..5756401b 100644 --- a/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java +++ b/src/main/java/tconstruct/smeltery/inventory/ActiveSlot.java @@ -1,6 +1,7 @@ package tconstruct.smeltery.inventory; -import net.minecraft.inventory.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; public class ActiveSlot extends Slot { diff --git a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java index dc162041..629a9e3e 100644 --- a/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java +++ b/src/main/java/tconstruct/smeltery/inventory/SmelteryContainer.java @@ -1,7 +1,8 @@ package tconstruct.smeltery.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java index 7c023acc..607aac21 100644 --- a/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java +++ b/src/main/java/tconstruct/smeltery/itemblocks/SmelteryItemBlock.java @@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; import tconstruct.achievements.TAchievements; diff --git a/src/main/java/tconstruct/smeltery/items/ClayPattern.java b/src/main/java/tconstruct/smeltery/items/ClayPattern.java index 5b988fec..8d09bb0a 100644 --- a/src/main/java/tconstruct/smeltery/items/ClayPattern.java +++ b/src/main/java/tconstruct/smeltery/items/ClayPattern.java @@ -3,7 +3,8 @@ package tconstruct.smeltery.items; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tconstruct.tools.items.Pattern; diff --git a/src/main/java/tconstruct/smeltery/items/FilledBucket.java b/src/main/java/tconstruct/smeltery/items/FilledBucket.java index 00621e2f..b9cf601d 100644 --- a/src/main/java/tconstruct/smeltery/items/FilledBucket.java +++ b/src/main/java/tconstruct/smeltery/items/FilledBucket.java @@ -7,12 +7,15 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.*; -import net.minecraft.util.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBucket; +import net.minecraft.item.ItemStack; +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 cpw.mods.fml.relauncher.*; import mantle.world.WorldHelper; import tconstruct.TConstruct; import tconstruct.smeltery.TinkerSmeltery; diff --git a/src/main/java/tconstruct/smeltery/items/MetalPattern.java b/src/main/java/tconstruct/smeltery/items/MetalPattern.java index d37951e1..12240690 100644 --- a/src/main/java/tconstruct/smeltery/items/MetalPattern.java +++ b/src/main/java/tconstruct/smeltery/items/MetalPattern.java @@ -3,7 +3,8 @@ package tconstruct.smeltery.items; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tconstruct.tools.items.Pattern; diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java index 7f38d27b..0f65c388 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBasinLogic.java @@ -5,7 +5,8 @@ import net.minecraftforge.fluids.FluidStack; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; -import tconstruct.library.event.*; +import tconstruct.library.event.SmelteryCastEvent; +import tconstruct.library.event.SmelteryCastedEvent; public class CastingBasinLogic extends CastingBlockLogic { diff --git a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java index 75190d14..521e843e 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingBlockLogic.java @@ -2,21 +2,31 @@ package tconstruct.smeltery.logic; import net.minecraft.entity.player.EntityPlayer; 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.MinecraftForge; 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 cpw.mods.fml.common.eventhandler.Event; import mantle.blocks.abstracts.InventoryLogic; import tconstruct.TConstruct; -import tconstruct.library.crafting.*; -import tconstruct.library.event.*; +import tconstruct.library.crafting.CastingRecipe; +import tconstruct.library.crafting.LiquidCasting; +import tconstruct.library.event.SmelteryCastEvent; +import tconstruct.library.event.SmelteryCastedEvent; +import tconstruct.library.event.SmelteryEvent; import tconstruct.library.tools.AbilityHelper; import tconstruct.library.util.IPattern; diff --git a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java index 27f703f7..0d4f79fa 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java @@ -1,16 +1,22 @@ package tconstruct.smeltery.logic; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Set; import net.minecraft.entity.player.EntityPlayer; 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.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; -import cpw.mods.fml.relauncher.*; import tconstruct.TConstruct; /** diff --git a/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java index 37ff03ba..49168492 100644 --- a/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/CastingTableLogic.java @@ -5,7 +5,8 @@ import net.minecraftforge.fluids.FluidStack; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.CastingRecipe; -import tconstruct.library.event.*; +import tconstruct.library.event.SmelteryCastEvent; +import tconstruct.library.event.SmelteryCastedEvent; public class CastingTableLogic extends CastingBlockLogic { diff --git a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java index 6f399b5b..0be24c26 100644 --- a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java @@ -2,13 +2,16 @@ package tconstruct.smeltery.logic; 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.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 mantle.blocks.iface.*; import tconstruct.TConstruct; public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, IFluidHandler { diff --git a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java index 38d6bed0..758b6369 100644 --- a/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LavaTankLogic.java @@ -1,10 +1,17 @@ package tconstruct.smeltery.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.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import mantle.blocks.abstracts.MultiServantLogic; diff --git a/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java index 8030a25b..622349fe 100644 --- a/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/LiquidTextureLogic.java @@ -1,7 +1,8 @@ package tconstruct.smeltery.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/smeltery/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java index de313d12..eb27611d 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryDrainLogic.java @@ -2,11 +2,15 @@ package tconstruct.smeltery.logic; 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; import mantle.blocks.abstracts.MultiServantLogic; import mantle.blocks.iface.IFacingLogic; diff --git a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java index 7f7665f2..98ac3529 100644 --- a/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/smeltery/logic/SmelteryLogic.java @@ -27,7 +27,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fluids.IFluidTank; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java index 4a92c465..d66a1a3e 100644 --- a/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java +++ b/src/main/java/tconstruct/smeltery/model/BlockRenderCastingChannel.java @@ -3,14 +3,18 @@ package tconstruct.smeltery.model; import java.util.Set; import net.minecraft.block.Block; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; 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 org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.smeltery.logic.CastingChannelLogic; diff --git a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java index 0b53bec1..f1ad05eb 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBasinSpecialRender.java @@ -1,13 +1,14 @@ package tconstruct.smeltery.model; -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 cpw.mods.fml.relauncher.*; import tconstruct.library.ItemBlocklike; import tconstruct.smeltery.logic.CastingBasinLogic; import tconstruct.tools.entity.FancyEntityItem; diff --git a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java index fd629c9c..b3d099cb 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java +++ b/src/main/java/tconstruct/smeltery/model/CastingBlockRender.java @@ -6,12 +6,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fluids.Fluid; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.TConstruct; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.library.crafting.CastingRecipe; import tconstruct.smeltery.TinkerSmeltery; -import tconstruct.smeltery.logic.*; +import tconstruct.smeltery.logic.CastingBasinLogic; +import tconstruct.smeltery.logic.CastingTableLogic; +import tconstruct.smeltery.logic.FaucetLogic; import tconstruct.util.ItemHelper; public class CastingBlockRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java index 4632d3af..036f101e 100644 --- a/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java +++ b/src/main/java/tconstruct/smeltery/model/CastingTableSpecialRenderer.java @@ -1,13 +1,14 @@ package tconstruct.smeltery.model; -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 cpw.mods.fml.relauncher.*; import tconstruct.library.ItemBlocklike; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.smeltery.logic.CastingTableLogic; diff --git a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java index bbbfd519..755a7b17 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneConnectedRender.java @@ -1,13 +1,17 @@ package tconstruct.smeltery.model; -import static net.minecraftforge.common.util.ForgeDirection.*; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +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.RenderBlocks; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.smeltery.blocks.GlassPaneConnected; public class PaneConnectedRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/PaneRender.java b/src/main/java/tconstruct/smeltery/model/PaneRender.java index 55d5af6a..8fc390ee 100644 --- a/src/main/java/tconstruct/smeltery/model/PaneRender.java +++ b/src/main/java/tconstruct/smeltery/model/PaneRender.java @@ -4,7 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.util.ItemHelper; public class PaneRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java index dc568742..66e79efa 100644 --- a/src/main/java/tconstruct/smeltery/model/SmelteryRender.java +++ b/src/main/java/tconstruct/smeltery/model/SmelteryRender.java @@ -5,9 +5,11 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import mantle.world.CoordTuple; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.library.crafting.Smeltery; diff --git a/src/main/java/tconstruct/smeltery/model/TankRender.java b/src/main/java/tconstruct/smeltery/model/TankRender.java index 9cb8c357..fab2050c 100644 --- a/src/main/java/tconstruct/smeltery/model/TankRender.java +++ b/src/main/java/tconstruct/smeltery/model/TankRender.java @@ -1,14 +1,17 @@ package tconstruct.smeltery.model; import net.minecraft.block.Block; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.smeltery.logic.LavaTankLogic; import tconstruct.util.ItemHelper; diff --git a/src/main/java/tconstruct/tools/TActiveOmniMod.java b/src/main/java/tconstruct/tools/TActiveOmniMod.java index ea6f2f19..763d4a75 100644 --- a/src/main/java/tconstruct/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/tools/TActiveOmniMod.java @@ -3,12 +3,15 @@ package tconstruct.tools; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.enchantment.*; -import net.minecraft.entity.*; -import net.minecraft.entity.item.*; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; @@ -16,7 +19,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import tconstruct.library.ActiveToolMod; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.HarvestTool; +import tconstruct.library.tools.ToolCore; import tconstruct.library.weaponry.IAmmo; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/tools/TinkerToolEvents.java b/src/main/java/tconstruct/tools/TinkerToolEvents.java index 76a1dfe6..bb74fce2 100644 --- a/src/main/java/tconstruct/tools/TinkerToolEvents.java +++ b/src/main/java/tconstruct/tools/TinkerToolEvents.java @@ -32,7 +32,11 @@ import tconstruct.library.entity.ProjectileBase; import tconstruct.library.event.PartBuilderEvent; import tconstruct.library.event.ToolBuildEvent; import tconstruct.library.event.ToolCraftEvent; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.BowstringMaterial; +import tconstruct.library.tools.FletchingMaterial; +import tconstruct.library.tools.FletchlingLeafMaterial; +import tconstruct.library.tools.ToolCore; import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; import tconstruct.util.network.MovementUpdatePacket; diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java index 5d248d42..0a6b5784 100644 --- a/src/main/java/tconstruct/tools/TinkerTools.java +++ b/src/main/java/tconstruct/tools/TinkerTools.java @@ -1,38 +1,116 @@ package tconstruct.tools; -import static net.minecraft.util.EnumChatFormatting.*; +import static net.minecraft.util.EnumChatFormatting.AQUA; +import static net.minecraft.util.EnumChatFormatting.DARK_AQUA; +import static net.minecraft.util.EnumChatFormatting.DARK_GRAY; +import static net.minecraft.util.EnumChatFormatting.DARK_GREEN; +import static net.minecraft.util.EnumChatFormatting.DARK_PURPLE; +import static net.minecraft.util.EnumChatFormatting.DARK_RED; +import static net.minecraft.util.EnumChatFormatting.GOLD; +import static net.minecraft.util.EnumChatFormatting.GRAY; +import static net.minecraft.util.EnumChatFormatting.GREEN; +import static net.minecraft.util.EnumChatFormatting.LIGHT_PURPLE; +import static net.minecraft.util.EnumChatFormatting.RED; +import static net.minecraft.util.EnumChatFormatting.WHITE; +import static net.minecraft.util.EnumChatFormatting.YELLOW; import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.block.material.Material; -import net.minecraft.init.*; -import net.minecraft.item.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.*; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +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.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.*; import mantle.utils.RecipeRemover; import tconstruct.TConstruct; import tconstruct.achievements.items.CraftAchievementItem; import tconstruct.common.itemblocks.MetadataItemBlock; -import tconstruct.items.tools.*; +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.Shovel; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.crafting.*; -import tconstruct.library.tools.*; +import tconstruct.library.crafting.Detailing; +import tconstruct.library.crafting.ModifyBuilder; +import tconstruct.library.crafting.PatternBuilder; +import tconstruct.library.crafting.StencilBuilder; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.tools.DynamicToolPart; +import tconstruct.library.tools.ToolCore; import tconstruct.library.util.IPattern; -import tconstruct.modifiers.tools.*; +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.ModCreativeToolModifier; +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.ModSmite; +import tconstruct.modifiers.tools.ModToolRepair; import tconstruct.smeltery.TinkerSmeltery; -import tconstruct.tools.blocks.*; -import tconstruct.tools.itemblocks.*; -import tconstruct.tools.items.*; -import tconstruct.tools.logic.*; +import tconstruct.tools.blocks.BattlesignBlock; +import tconstruct.tools.blocks.CraftingSlab; +import tconstruct.tools.blocks.CraftingStationBlock; +import tconstruct.tools.blocks.EquipBlock; +import tconstruct.tools.blocks.FurnaceSlab; +import tconstruct.tools.blocks.ToolForgeBlock; +import tconstruct.tools.blocks.ToolStationBlock; +import tconstruct.tools.itemblocks.CraftingSlabItemBlock; +import tconstruct.tools.itemblocks.ToolStationItemBlock; +import tconstruct.tools.items.CreativeModifier; +import tconstruct.tools.items.Manual; +import tconstruct.tools.items.MaterialItem; +import tconstruct.tools.items.Pattern; +import tconstruct.tools.items.TitleIcon; +import tconstruct.tools.items.ToolShard; +import tconstruct.tools.logic.BattlesignLogic; +import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.tools.logic.FrypanLogic; +import tconstruct.tools.logic.FurnaceLogic; +import tconstruct.tools.logic.PartBuilderLogic; +import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.StencilTableLogic; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.logic.ToolStationLogic; import tconstruct.util.ItemHelper; import tconstruct.util.config.PHConstruct; import tconstruct.weaponry.TinkerWeaponry; diff --git a/src/main/java/tconstruct/tools/ToolProxyClient.java b/src/main/java/tconstruct/tools/ToolProxyClient.java index 3060f889..f40b7f53 100644 --- a/src/main/java/tconstruct/tools/ToolProxyClient.java +++ b/src/main/java/tconstruct/tools/ToolProxyClient.java @@ -1,10 +1,27 @@ package tconstruct.tools; -import static tconstruct.tools.TinkerTools.*; +import static tconstruct.tools.TinkerTools.battleaxe; +import static tconstruct.tools.TinkerTools.battlesign; +import static tconstruct.tools.TinkerTools.broadsword; +import static tconstruct.tools.TinkerTools.chisel; +import static tconstruct.tools.TinkerTools.cleaver; +import static tconstruct.tools.TinkerTools.dagger; +import static tconstruct.tools.TinkerTools.excavator; +import static tconstruct.tools.TinkerTools.frypan; +import static tconstruct.tools.TinkerTools.hammer; +import static tconstruct.tools.TinkerTools.hatchet; +import static tconstruct.tools.TinkerTools.longsword; +import static tconstruct.tools.TinkerTools.lumberaxe; +import static tconstruct.tools.TinkerTools.mattock; +import static tconstruct.tools.TinkerTools.pickaxe; +import static tconstruct.tools.TinkerTools.rapier; +import static tconstruct.tools.TinkerTools.scythe; +import static tconstruct.tools.TinkerTools.shovel; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; @@ -17,19 +34,44 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import mantle.client.MProxyClient; import mantle.lib.client.MantleClientRegistry; import tconstruct.client.FlexibleToolRenderer; -import tconstruct.client.entity.projectile.*; -import tconstruct.client.pages.*; +import tconstruct.client.entity.projectile.LaunchedItemRender; +import tconstruct.client.pages.MaterialPage; +import tconstruct.client.pages.ModifierPage; +import tconstruct.client.pages.ToolPage; import tconstruct.common.TProxyCommon; import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.*; -import tconstruct.library.crafting.*; +import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.client.ToolGuiElement; +import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.tools.ToolCore; import tconstruct.smeltery.TinkerSmeltery; import tconstruct.tools.client.DaggerEntityRenderer; -import tconstruct.tools.entity.*; -import tconstruct.tools.gui.*; -import tconstruct.tools.logic.*; -import tconstruct.tools.model.*; +import tconstruct.tools.entity.DaggerEntity; +import tconstruct.tools.entity.FancyEntityItem; +import tconstruct.tools.entity.LaunchedPotion; +import tconstruct.tools.gui.BattlesignGui; +import tconstruct.tools.gui.CraftingStationGui; +import tconstruct.tools.gui.FrypanGui; +import tconstruct.tools.gui.FurnaceGui; +import tconstruct.tools.gui.PartCrafterGui; +import tconstruct.tools.gui.PatternChestGui; +import tconstruct.tools.gui.StencilTableGui; +import tconstruct.tools.gui.ToolForgeGui; +import tconstruct.tools.gui.ToolStationGui; +import tconstruct.tools.logic.BattlesignLogic; +import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.tools.logic.FrypanLogic; +import tconstruct.tools.logic.FurnaceLogic; +import tconstruct.tools.logic.PartBuilderLogic; +import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.StencilTableLogic; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.logic.ToolStationLogic; +import tconstruct.tools.model.BattlesignRender; +import tconstruct.tools.model.BattlesignTesr; +import tconstruct.tools.model.FancyItemRender; +import tconstruct.tools.model.FrypanRender; +import tconstruct.tools.model.TableRender; import tconstruct.weaponry.TinkerWeaponry; public class ToolProxyClient extends ToolProxyCommon { diff --git a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java index 39aeaed4..9dd9d16b 100644 --- a/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java +++ b/src/main/java/tconstruct/tools/blocks/BattlesignBlock.java @@ -3,14 +3,14 @@ package tconstruct.tools.blocks; import java.util.List; import net.minecraft.block.material.Material; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.tools.logic.BattlesignLogic; import tconstruct.tools.model.BattlesignRender; diff --git a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java index 736e5296..6b112108 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingSlab.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingSlab.java @@ -8,18 +8,25 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +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.util.AxisAlignedBB; +import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventorySlab; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; -import tconstruct.tools.*; -import tconstruct.tools.logic.*; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.ToolProxyCommon; +import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.tools.logic.PartBuilderLogic; +import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.StencilTableLogic; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.logic.ToolStationLogic; import tconstruct.util.config.PHConstruct; public class CraftingSlab extends InventorySlab { diff --git a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java index 466a119d..5d07b03d 100644 --- a/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/CraftingStationBlock.java @@ -6,12 +6,13 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/tools/blocks/EquipBlock.java b/src/main/java/tconstruct/tools/blocks/EquipBlock.java index 91c12cbb..46d018a2 100644 --- a/src/main/java/tconstruct/tools/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/tools/blocks/EquipBlock.java @@ -9,18 +9,21 @@ 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.*; +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 cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; -import tconstruct.tools.logic.*; +import tconstruct.tools.logic.EquipLogic; +import tconstruct.tools.logic.FrypanLogic; import tconstruct.tools.model.FrypanRender; public class EquipBlock extends InventoryBlock { diff --git a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java index bc9ce963..8f2584a4 100644 --- a/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java +++ b/src/main/java/tconstruct/tools/blocks/FurnaceSlab.java @@ -7,11 +7,10 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventorySlab; -import mantle.blocks.iface.*; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.ToolProxyCommon; diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrick.java b/src/main/java/tconstruct/tools/blocks/MultiBrick.java index 78a2af69..55558935 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrick.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrick.java @@ -4,10 +4,11 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -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 cpw.mods.fml.relauncher.*; import tconstruct.blocks.TConstructBlock; public class MultiBrick extends TConstructBlock { diff --git a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java index b1a94bd1..820ba9fc 100644 --- a/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java +++ b/src/main/java/tconstruct/tools/blocks/MultiBrickFancy.java @@ -4,10 +4,11 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -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 cpw.mods.fml.relauncher.*; import tconstruct.blocks.TConstructBlock; public class MultiBrickFancy extends TConstructBlock { diff --git a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java index 73da21f1..c80dbbaa 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolForgeBlock.java @@ -8,13 +8,14 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java index c0fbe4af..866a596b 100644 --- a/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java +++ b/src/main/java/tconstruct/tools/blocks/ToolStationBlock.java @@ -8,19 +8,24 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +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.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.InventoryBlock; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; -import tconstruct.tools.logic.*; +import tconstruct.tools.logic.PartBuilderLogic; +import tconstruct.tools.logic.PatternChestLogic; +import tconstruct.tools.logic.StencilTableLogic; +import tconstruct.tools.logic.ToolStationLogic; import tconstruct.tools.model.TableRender; import tconstruct.util.config.PHConstruct; diff --git a/src/main/java/tconstruct/tools/entity/ArrowEntity.java b/src/main/java/tconstruct/tools/entity/ArrowEntity.java index bf5f1bdd..2b478681 100644 --- a/src/main/java/tconstruct/tools/entity/ArrowEntity.java +++ b/src/main/java/tconstruct/tools/entity/ArrowEntity.java @@ -1,18 +1,25 @@ package tconstruct.tools.entity; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.crash.*; -import net.minecraft.entity.*; +import net.minecraft.crash.CrashReport; +import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.entity.player.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S2BPacketChangeGameState; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ReportedException; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import cpw.mods.fml.common.network.ByteBufUtils; diff --git a/src/main/java/tconstruct/tools/entity/DaggerEntity.java b/src/main/java/tconstruct/tools/entity/DaggerEntity.java index 04d9bec5..18804848 100644 --- a/src/main/java/tconstruct/tools/entity/DaggerEntity.java +++ b/src/main/java/tconstruct/tools/entity/DaggerEntity.java @@ -2,11 +2,13 @@ package tconstruct.tools.entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import tconstruct.library.entity.ProjectileBase; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ToolCore; import tconstruct.util.config.PHConstruct; public class DaggerEntity extends ProjectileBase { diff --git a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java index 5b9a30ed..f568fe7d 100644 --- a/src/main/java/tconstruct/tools/entity/LaunchedPotion.java +++ b/src/main/java/tconstruct/tools/entity/LaunchedPotion.java @@ -1,18 +1,18 @@ package tconstruct.tools.entity; -import java.util.*; +import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.*; -import net.minecraft.util.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; - public class LaunchedPotion extends EntityThrowable { /** diff --git a/src/main/java/tconstruct/tools/entity/RotatingBase.java b/src/main/java/tconstruct/tools/entity/RotatingBase.java index 487771a3..a847fb92 100644 --- a/src/main/java/tconstruct/tools/entity/RotatingBase.java +++ b/src/main/java/tconstruct/tools/entity/RotatingBase.java @@ -8,7 +8,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import cpw.mods.fml.common.network.ByteBufUtils; diff --git a/src/main/java/tconstruct/tools/gui/BattlesignGui.java b/src/main/java/tconstruct/tools/gui/BattlesignGui.java index 9190b0b1..246a0508 100644 --- a/src/main/java/tconstruct/tools/gui/BattlesignGui.java +++ b/src/main/java/tconstruct/tools/gui/BattlesignGui.java @@ -1,10 +1,13 @@ package tconstruct.tools.gui; -import net.minecraft.client.gui.*; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; +import net.minecraft.util.ChatAllowedCharacters; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java index be6ac3c5..54a0cf77 100644 --- a/src/main/java/tconstruct/tools/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/tools/gui/CraftingStationGui.java @@ -1,6 +1,6 @@ package tconstruct.tools.gui; -import java.awt.Rectangle; +import java.awt.*; import java.util.Collections; import java.util.List; diff --git a/src/main/java/tconstruct/tools/gui/FrypanGui.java b/src/main/java/tconstruct/tools/gui/FrypanGui.java index 0faa6cad..01bbf015 100644 --- a/src/main/java/tconstruct/tools/gui/FrypanGui.java +++ b/src/main/java/tconstruct/tools/gui/FrypanGui.java @@ -2,7 +2,8 @@ package tconstruct.tools.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.*; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/tconstruct/tools/gui/FurnaceGui.java b/src/main/java/tconstruct/tools/gui/FurnaceGui.java index d6f77747..2b711b7b 100644 --- a/src/main/java/tconstruct/tools/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/tools/gui/FurnaceGui.java @@ -7,7 +7,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.*; import tconstruct.tools.inventory.FurnaceContainer; import tconstruct.tools.logic.FurnaceLogic; diff --git a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java index 01d6b845..11cb87f8 100644 --- a/src/main/java/tconstruct/tools/gui/GuiButtonTool.java +++ b/src/main/java/tconstruct/tools/gui/GuiButtonTool.java @@ -6,7 +6,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.*; import tconstruct.library.client.ToolGuiElement; @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/tools/gui/PatternChestGui.java b/src/main/java/tconstruct/tools/gui/PatternChestGui.java index 5bb34186..88bf5d96 100644 --- a/src/main/java/tconstruct/tools/gui/PatternChestGui.java +++ b/src/main/java/tconstruct/tools/gui/PatternChestGui.java @@ -2,7 +2,8 @@ package tconstruct.tools.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.*; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/tconstruct/tools/gui/StencilTableGui.java b/src/main/java/tconstruct/tools/gui/StencilTableGui.java index c7311fb7..a00bf77d 100644 --- a/src/main/java/tconstruct/tools/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/tools/gui/StencilTableGui.java @@ -7,7 +7,8 @@ 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; @@ -17,7 +18,8 @@ import codechicken.nei.api.INEIGuiHandler; import codechicken.nei.api.TaggedInventoryArea; import cpw.mods.fml.common.Optional; import tconstruct.TConstruct; -import tconstruct.library.client.*; +import tconstruct.library.client.StencilGuiElement; +import tconstruct.library.client.TConstructClientRegistry; import tconstruct.library.crafting.StencilBuilder; import tconstruct.tools.inventory.PatternShaperContainer; import tconstruct.tools.logic.StencilTableLogic; diff --git a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java index f2ec7586..69a414a0 100644 --- a/src/main/java/tconstruct/tools/gui/ToolForgeGui.java +++ b/src/main/java/tconstruct/tools/gui/ToolForgeGui.java @@ -5,8 +5,8 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; -import tconstruct.library.client.*; +import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.client.ToolGuiElement; import tconstruct.tools.logic.ToolForgeLogic; @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java index 6e60b241..c68a7145 100644 --- a/src/main/java/tconstruct/tools/inventory/FrypanContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FrypanContainer.java @@ -1,8 +1,11 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -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.tools.TinkerTools; diff --git a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java index 757d23bb..0e63e65c 100644 --- a/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java +++ b/src/main/java/tconstruct/tools/inventory/FurnaceContainer.java @@ -1,12 +1,15 @@ package tconstruct.tools.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.inventory.SlotFurnace; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; -import cpw.mods.fml.relauncher.*; import tconstruct.tools.logic.FurnaceLogic; public class FurnaceContainer extends Container { diff --git a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java index 184776b9..57314d55 100644 --- a/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/InventoryCraftingStation.java @@ -1,7 +1,8 @@ package tconstruct.tools.inventory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import mantle.blocks.abstracts.InventoryLogic; diff --git a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java index 051fd720..ed27a825 100644 --- a/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PartCrafterContainer.java @@ -1,7 +1,8 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java index 7b1f05cb..46fff9db 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternChestContainer.java @@ -1,8 +1,10 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -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.Slot; import net.minecraft.item.ItemStack; import invtweaks.api.container.ChestContainer; diff --git a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java index 16afea7e..062b9fb2 100644 --- a/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java +++ b/src/main/java/tconstruct/tools/inventory/PatternShaperContainer.java @@ -1,8 +1,10 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -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.Slot; import net.minecraft.item.ItemStack; import tconstruct.armor.inventory.SlotOnlyTake; diff --git a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java index 2f644381..1a68d657 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java +++ b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java @@ -1,7 +1,8 @@ package tconstruct.tools.inventory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import tconstruct.library.modifier.IModifyable; diff --git a/src/main/java/tconstruct/tools/inventory/SlotFrypan.java b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java index 84b4ba26..e8271ae3 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotFrypan.java +++ b/src/main/java/tconstruct/tools/inventory/SlotFrypan.java @@ -1,8 +1,10 @@ package tconstruct.tools.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/tools/inventory/SlotPartBuilder.java b/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java index 367f901e..c01e003c 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java +++ b/src/main/java/tconstruct/tools/inventory/SlotPartBuilder.java @@ -1,6 +1,7 @@ package tconstruct.tools.inventory; -import net.minecraft.inventory.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; public class SlotPartBuilder extends Slot { diff --git a/src/main/java/tconstruct/tools/inventory/SlotPattern.java b/src/main/java/tconstruct/tools/inventory/SlotPattern.java index 509f22d6..c0d74aa3 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotPattern.java +++ b/src/main/java/tconstruct/tools/inventory/SlotPattern.java @@ -1,6 +1,7 @@ package tconstruct.tools.inventory; -import net.minecraft.inventory.*; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import tconstruct.library.util.IPattern; diff --git a/src/main/java/tconstruct/tools/inventory/SlotTool.java b/src/main/java/tconstruct/tools/inventory/SlotTool.java index a719f789..439aeabc 100644 --- a/src/main/java/tconstruct/tools/inventory/SlotTool.java +++ b/src/main/java/tconstruct/tools/inventory/SlotTool.java @@ -4,7 +4,8 @@ import java.util.Random; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -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/tools/inventory/ToolForgeContainer.java b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java index e6fc8829..8e5dfdee 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolForgeContainer.java @@ -1,7 +1,8 @@ package tconstruct.tools.inventory; import net.minecraft.block.Block; -import net.minecraft.entity.player.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -11,7 +12,8 @@ import net.minecraftforge.common.MinecraftForge; import tconstruct.library.event.ToolCraftedEvent; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.TinkerTools; -import tconstruct.tools.logic.*; +import tconstruct.tools.logic.ToolForgeLogic; +import tconstruct.tools.logic.ToolStationLogic; public class ToolForgeContainer extends ToolStationContainer { diff --git a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java index d423f038..723b5014 100644 --- a/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java +++ b/src/main/java/tconstruct/tools/inventory/ToolStationContainer.java @@ -3,7 +3,8 @@ package tconstruct.tools.inventory; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.player.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java index 9426f5f7..af09c8f1 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickFancyItem.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; public class MultiBrickFancyItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java index 3aec2b76..ff2d3b71 100644 --- a/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java +++ b/src/main/java/tconstruct/tools/itemblocks/MultiBrickItem.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; public class MultiBrickItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/tools/items/Bowstring.java b/src/main/java/tconstruct/tools/items/Bowstring.java index d5b2055a..3d9a28f6 100644 --- a/src/main/java/tconstruct/tools/items/Bowstring.java +++ b/src/main/java/tconstruct/tools/items/Bowstring.java @@ -3,7 +3,8 @@ package tconstruct.tools.items; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Loader; import mantle.items.abstracts.CraftingItem; diff --git a/src/main/java/tconstruct/tools/items/CreativeModifier.java b/src/main/java/tconstruct/tools/items/CreativeModifier.java index 944715a9..50e925d7 100644 --- a/src/main/java/tconstruct/tools/items/CreativeModifier.java +++ b/src/main/java/tconstruct/tools/items/CreativeModifier.java @@ -5,13 +5,14 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.*; +import tconstruct.library.crafting.ToolBuilder; +import tconstruct.library.crafting.ToolRecipe; import tconstruct.library.tools.ToolCore; public class CreativeModifier extends Item { diff --git a/src/main/java/tconstruct/tools/items/Manual.java b/src/main/java/tconstruct/tools/items/Manual.java index e1a2c81f..934a5580 100644 --- a/src/main/java/tconstruct/tools/items/Manual.java +++ b/src/main/java/tconstruct/tools/items/Manual.java @@ -8,7 +8,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.relauncher.*; import mantle.books.BookData; import mantle.client.gui.GuiManual; import mantle.items.abstracts.CraftingItem; diff --git a/src/main/java/tconstruct/tools/items/ManualInfo.java b/src/main/java/tconstruct/tools/items/ManualInfo.java index 287a260d..6845333f 100644 --- a/src/main/java/tconstruct/tools/items/ManualInfo.java +++ b/src/main/java/tconstruct/tools/items/ManualInfo.java @@ -1,12 +1,12 @@ package tconstruct.tools.items; -import net.minecraft.util.*; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import org.w3c.dom.Document; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; -import mantle.books.*; import tconstruct.client.TProxyClient; public class ManualInfo { diff --git a/src/main/java/tconstruct/tools/items/Pattern.java b/src/main/java/tconstruct/tools/items/Pattern.java index c92d1e47..48cd4f91 100644 --- a/src/main/java/tconstruct/tools/items/Pattern.java +++ b/src/main/java/tconstruct/tools/items/Pattern.java @@ -6,10 +6,10 @@ import java.util.Map; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.*; import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder.MaterialSet; diff --git a/src/main/java/tconstruct/tools/items/TitleIcon.java b/src/main/java/tconstruct/tools/items/TitleIcon.java index 8acba7dc..3fcb4645 100644 --- a/src/main/java/tconstruct/tools/items/TitleIcon.java +++ b/src/main/java/tconstruct/tools/items/TitleIcon.java @@ -5,15 +5,16 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.*; -import net.minecraft.util.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Facing; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.*; import tconstruct.client.TProxyClient; import tconstruct.library.tools.ToolCore; import tconstruct.world.entity.BlueSlime; diff --git a/src/main/java/tconstruct/tools/items/ToolPart.java b/src/main/java/tconstruct/tools/items/ToolPart.java index 6f8eacf7..f268f0ad 100644 --- a/src/main/java/tconstruct/tools/items/ToolPart.java +++ b/src/main/java/tconstruct/tools/items/ToolPart.java @@ -3,7 +3,8 @@ package tconstruct.tools.items; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import mantle.items.abstracts.CraftingItem; diff --git a/src/main/java/tconstruct/tools/logic/FrypanLogic.java b/src/main/java/tconstruct/tools/logic/FrypanLogic.java index 733e082e..5add64b9 100644 --- a/src/main/java/tconstruct/tools/logic/FrypanLogic.java +++ b/src/main/java/tconstruct/tools/logic/FrypanLogic.java @@ -3,9 +3,16 @@ package tconstruct.tools.logic; import net.minecraft.block.Block; import net.minecraft.block.material.Material; 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.ItemFood; +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.world.World; diff --git a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java index 421f0f36..018b305f 100644 --- a/src/main/java/tconstruct/tools/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/tools/logic/FurnaceLogic.java @@ -4,12 +4,20 @@ 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.inventory.*; -import net.minecraft.item.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ISidedInventory; +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; @@ -18,7 +26,6 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import mantle.blocks.BlockUtils; import mantle.blocks.abstracts.InventoryLogic; -import mantle.blocks.iface.*; import tconstruct.tools.inventory.FurnaceContainer; /* diff --git a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java index ebd983c5..061f73ff 100644 --- a/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java +++ b/src/main/java/tconstruct/tools/logic/PartBuilderLogic.java @@ -1,7 +1,8 @@ package tconstruct.tools.logic; 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.tileentity.TileEntity; @@ -10,7 +11,8 @@ import net.minecraft.world.World; import mantle.blocks.abstracts.InventoryLogic; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.util.IPattern; -import tconstruct.tools.inventory.*; +import tconstruct.tools.inventory.PartCrafterChestContainer; +import tconstruct.tools.inventory.PartCrafterContainer; public class PartBuilderLogic extends InventoryLogic implements ISidedInventory { diff --git a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java index 0f137f83..3bb8e940 100644 --- a/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java +++ b/src/main/java/tconstruct/tools/logic/ToolForgeLogic.java @@ -1,11 +1,13 @@ package tconstruct.tools.logic; 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.world.World; -import tconstruct.library.crafting.*; +import tconstruct.library.crafting.ModifyBuilder; +import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.modifier.IModifyable; import tconstruct.tools.inventory.ToolForgeContainer; diff --git a/src/main/java/tconstruct/tools/model/BattlesignRender.java b/src/main/java/tconstruct/tools/model/BattlesignRender.java index 89bc50fb..9baa1c59 100644 --- a/src/main/java/tconstruct/tools/model/BattlesignRender.java +++ b/src/main/java/tconstruct/tools/model/BattlesignRender.java @@ -4,7 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; public class BattlesignRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/tools/model/FancyItemRender.java b/src/main/java/tconstruct/tools/model/FancyItemRender.java index e16d3e21..cec3dffd 100644 --- a/src/main/java/tconstruct/tools/model/FancyItemRender.java +++ b/src/main/java/tconstruct/tools/model/FancyItemRender.java @@ -5,19 +5,21 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.texture.*; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.*; -import net.minecraft.util.*; +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.*; - -import cpw.mods.fml.relauncher.*; - @SideOnly(Side.CLIENT) public class FancyItemRender extends Render { diff --git a/src/main/java/tconstruct/tools/model/FrypanRender.java b/src/main/java/tconstruct/tools/model/FrypanRender.java index 6f00b3a6..4ff9fb39 100644 --- a/src/main/java/tconstruct/tools/model/FrypanRender.java +++ b/src/main/java/tconstruct/tools/model/FrypanRender.java @@ -4,7 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; public class FrypanRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/tools/model/TableRender.java b/src/main/java/tconstruct/tools/model/TableRender.java index f2be34e2..126d7cb5 100644 --- a/src/main/java/tconstruct/tools/model/TableRender.java +++ b/src/main/java/tconstruct/tools/model/TableRender.java @@ -1,12 +1,14 @@ package tconstruct.tools.model; import net.minecraft.block.Block; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.tools.TinkerTools; public class TableRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/util/CraftingRecipeHelper.java b/src/main/java/tconstruct/util/CraftingRecipeHelper.java index 59b6ba7a..edfd0cf8 100644 --- a/src/main/java/tconstruct/util/CraftingRecipeHelper.java +++ b/src/main/java/tconstruct/util/CraftingRecipeHelper.java @@ -1,10 +1,15 @@ package tconstruct.util; -import java.util.*; +import java.util.HashMap; +import java.util.List; import net.minecraft.block.Block; -import net.minecraft.item.*; -import net.minecraft.item.crafting.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.item.crafting.ShapelessRecipes; public class CraftingRecipeHelper { diff --git a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java index 122590fd..b57787c5 100644 --- a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java +++ b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java @@ -1,7 +1,9 @@ package tconstruct.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; public class DamageSourceFireworkExplode extends DamageSource { diff --git a/src/main/java/tconstruct/util/DamageSourceLandmine.java b/src/main/java/tconstruct/util/DamageSourceLandmine.java index dba82050..39b81658 100644 --- a/src/main/java/tconstruct/util/DamageSourceLandmine.java +++ b/src/main/java/tconstruct/util/DamageSourceLandmine.java @@ -1,7 +1,9 @@ package tconstruct.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; public class DamageSourceLandmine extends DamageSource { diff --git a/src/main/java/tconstruct/util/ItemHelper.java b/src/main/java/tconstruct/util/ItemHelper.java index 0add9df5..182c2aa8 100644 --- a/src/main/java/tconstruct/util/ItemHelper.java +++ b/src/main/java/tconstruct/util/ItemHelper.java @@ -4,10 +4,12 @@ import java.lang.reflect.Field; 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.TextureMap; import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.event.entity.living.LivingDropsEvent; diff --git a/src/main/java/tconstruct/util/network/PacketPipeline.java b/src/main/java/tconstruct/util/network/PacketPipeline.java index 7b38e252..99caf496 100644 --- a/src/main/java/tconstruct/util/network/PacketPipeline.java +++ b/src/main/java/tconstruct/util/network/PacketPipeline.java @@ -1,19 +1,21 @@ package tconstruct.util.network; -import java.util.*; +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.*; +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.*; -import io.netty.buffer.*; -import io.netty.channel.*; import io.netty.handler.codec.MessageToMessageCodec; -import mantle.common.network.*; /** * Packet pipeline class. Directs all registered packet data to be handled by the packets themselves. diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java index 0a6e8a35..fb325e59 100644 --- a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java +++ b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java @@ -27,7 +27,14 @@ import mantle.pulsar.pulse.Handler; import mantle.pulsar.pulse.Pulse; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.*; +import tconstruct.library.crafting.CastingRecipe; +import tconstruct.library.crafting.FluidType; +import tconstruct.library.crafting.LiquidCasting; +import tconstruct.library.crafting.ModifyBuilder; +import tconstruct.library.crafting.PatternBuilder; +import tconstruct.library.crafting.Smeltery; +import tconstruct.library.crafting.StencilBuilder; +import tconstruct.library.crafting.ToolBuilder; import tconstruct.library.entity.ProjectileBase; import tconstruct.library.tools.DualMaterialToolPart; import tconstruct.library.tools.DynamicToolPart; @@ -50,12 +57,21 @@ import tconstruct.tools.items.Pattern; import tconstruct.util.config.PHConstruct; import tconstruct.weaponry.ammo.ArrowAmmo; import tconstruct.weaponry.ammo.BoltAmmo; -import tconstruct.weaponry.entity.*; +import tconstruct.weaponry.entity.ArrowEntity; +import tconstruct.weaponry.entity.BoltEntity; +import tconstruct.weaponry.entity.JavelinEntity; +import tconstruct.weaponry.entity.ShurikenEntity; +import tconstruct.weaponry.entity.ThrowingKnifeEntity; import tconstruct.weaponry.items.Boneana; import tconstruct.weaponry.items.GlassArrows; import tconstruct.weaponry.items.WeaponryPattern; import tconstruct.weaponry.items.WeaponryPatternClay; -import tconstruct.weaponry.weapons.*; +import tconstruct.weaponry.weapons.Crossbow; +import tconstruct.weaponry.weapons.Javelin; +import tconstruct.weaponry.weapons.LongBow; +import tconstruct.weaponry.weapons.ShortBow; +import tconstruct.weaponry.weapons.Shuriken; +import tconstruct.weaponry.weapons.ThrowingKnife; import tconstruct.world.TinkerWorld; @GameRegistry.ObjectHolder(TConstruct.modID) diff --git a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java index 9fe02fd3..669cdd78 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryClientProxy.java @@ -1,6 +1,13 @@ package tconstruct.weaponry; -import static tconstruct.weaponry.TinkerWeaponry.*; +import static tconstruct.weaponry.TinkerWeaponry.arrowAmmo; +import static tconstruct.weaponry.TinkerWeaponry.boltAmmo; +import static tconstruct.weaponry.TinkerWeaponry.crossbow; +import static tconstruct.weaponry.TinkerWeaponry.javelin; +import static tconstruct.weaponry.TinkerWeaponry.longbow; +import static tconstruct.weaponry.TinkerWeaponry.shortbow; +import static tconstruct.weaponry.TinkerWeaponry.shuriken; +import static tconstruct.weaponry.TinkerWeaponry.throwingknife; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -22,8 +29,15 @@ import tconstruct.weaponry.client.entity.ArrowEntityRenderer; import tconstruct.weaponry.client.entity.JavelinEntityRenderer; import tconstruct.weaponry.client.entity.ProjectileBaseRenderer; import tconstruct.weaponry.client.entity.ShurikenEntityRenderer; -import tconstruct.weaponry.client.item.*; -import tconstruct.weaponry.entity.*; +import tconstruct.weaponry.client.item.BowRenderer; +import tconstruct.weaponry.client.item.CrossbowRenderer; +import tconstruct.weaponry.client.item.JavelinRenderer; +import tconstruct.weaponry.client.item.ThrowingKnifeRenderer; +import tconstruct.weaponry.entity.ArrowEntity; +import tconstruct.weaponry.entity.BoltEntity; +import tconstruct.weaponry.entity.JavelinEntity; +import tconstruct.weaponry.entity.ShurikenEntity; +import tconstruct.weaponry.entity.ThrowingKnifeEntity; public class WeaponryClientProxy extends WeaponryCommonProxy { diff --git a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java index eb436674..7969537f 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java @@ -2,7 +2,11 @@ package tconstruct.weaponry; import cpw.mods.fml.common.registry.EntityRegistry; import tconstruct.TConstruct; -import tconstruct.weaponry.entity.*; +import tconstruct.weaponry.entity.ArrowEntity; +import tconstruct.weaponry.entity.BoltEntity; +import tconstruct.weaponry.entity.JavelinEntity; +import tconstruct.weaponry.entity.ShurikenEntity; +import tconstruct.weaponry.entity.ThrowingKnifeEntity; public class WeaponryCommonProxy { diff --git a/src/main/java/tconstruct/weaponry/WeaponryHandler.java b/src/main/java/tconstruct/weaponry/WeaponryHandler.java index ccbc8120..765a95f8 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryHandler.java +++ b/src/main/java/tconstruct/weaponry/WeaponryHandler.java @@ -23,7 +23,16 @@ import tconstruct.library.event.PartBuilderEvent; import tconstruct.library.event.SmelteryCastEvent; import tconstruct.library.event.ToolBuildEvent; import tconstruct.library.event.ToolCraftEvent; -import tconstruct.library.tools.*; +import tconstruct.library.tools.AbilityHelper; +import tconstruct.library.tools.ArrowMaterial; +import tconstruct.library.tools.BowMaterial; +import tconstruct.library.tools.BowstringMaterial; +import tconstruct.library.tools.CustomMaterial; +import tconstruct.library.tools.DualMaterialToolPart; +import tconstruct.library.tools.FletchingMaterial; +import tconstruct.library.tools.FletchlingLeafMaterial; +import tconstruct.library.tools.ToolCore; +import tconstruct.library.tools.ToolMaterial; import tconstruct.library.util.IToolPart; import tconstruct.library.weaponry.ArrowShaftMaterial; import tconstruct.library.weaponry.BowBaseAmmo; diff --git a/src/main/java/tconstruct/world/MiningExplosion.java b/src/main/java/tconstruct/world/MiningExplosion.java index 5e15a9f3..8e7c1f21 100644 --- a/src/main/java/tconstruct/world/MiningExplosion.java +++ b/src/main/java/tconstruct/world/MiningExplosion.java @@ -1,6 +1,11 @@ package tconstruct.world; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentProtection; @@ -8,8 +13,13 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.Vec3; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.Explosion; +import net.minecraft.world.World; public class MiningExplosion extends Explosion { diff --git a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java index 0506492c..82b8bc29 100644 --- a/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java +++ b/src/main/java/tconstruct/world/TDispenserBehaviorSpawnEgg.java @@ -1,7 +1,8 @@ package tconstruct.world; import net.minecraft.block.BlockDispenser; -import net.minecraft.dispenser.*; +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; diff --git a/src/main/java/tconstruct/world/TinkerWorld.java b/src/main/java/tconstruct/world/TinkerWorld.java index 040b2432..125e6ec7 100644 --- a/src/main/java/tconstruct/world/TinkerWorld.java +++ b/src/main/java/tconstruct/world/TinkerWorld.java @@ -1,47 +1,96 @@ package tconstruct.world; -import net.minecraft.block.*; +import net.minecraft.block.Block; import net.minecraft.block.Block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EnumCreatureType; -import net.minecraft.init.*; -import net.minecraft.item.*; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.potion.Potion; import net.minecraft.util.WeightedRandomChestContent; -import net.minecraftforge.common.*; -import net.minecraftforge.fluids.*; -import net.minecraftforge.oredict.*; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.ChestGenHooks; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; -import cpw.mods.fml.common.*; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.registry.*; +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.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; -import mantle.pulsar.pulse.*; import mantle.utils.RecipeRemover; import tconstruct.TConstruct; import tconstruct.armor.TinkerArmor; import tconstruct.blocks.SlabBase; -import tconstruct.blocks.slime.*; -import tconstruct.blocks.traps.*; +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.common.itemblocks.MetadataItemBlock; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.FluidType; import tconstruct.smeltery.blocks.MetalOre; import tconstruct.smeltery.itemblocks.MetalItemBlock; -import tconstruct.tools.*; -import tconstruct.tools.blocks.*; -import tconstruct.tools.entity.*; -import tconstruct.tools.itemblocks.*; +import tconstruct.tools.TinkerTools; +import tconstruct.tools.blocks.MultiBrick; +import tconstruct.tools.blocks.MultiBrickFancy; +import tconstruct.tools.blocks.MultiBrickMetal; +import tconstruct.tools.entity.ArrowEntity; +import tconstruct.tools.entity.DaggerEntity; +import tconstruct.tools.entity.FancyEntityItem; +import tconstruct.tools.entity.LaunchedPotion; +import tconstruct.tools.itemblocks.MultiBrickFancyItem; +import tconstruct.tools.itemblocks.MultiBrickItem; +import tconstruct.tools.itemblocks.MultiBrickMetalItem; import tconstruct.util.config.PHConstruct; -import tconstruct.world.blocks.*; -import tconstruct.world.entity.*; -import tconstruct.world.gen.*; -import tconstruct.world.itemblocks.*; -import tconstruct.world.items.*; +import tconstruct.world.blocks.ConveyorBase; +import tconstruct.world.blocks.GravelOre; +import tconstruct.world.blocks.MeatBlock; +import tconstruct.world.blocks.OreberryBush; +import tconstruct.world.blocks.OreberryBushEssence; +import tconstruct.world.blocks.SlimeExplosive; +import tconstruct.world.blocks.SlimePad; +import tconstruct.world.blocks.StoneLadder; +import tconstruct.world.blocks.StoneTorch; +import tconstruct.world.blocks.TMetalBlock; +import tconstruct.world.blocks.WoodRail; +import tconstruct.world.entity.BlueSlime; +import tconstruct.world.entity.Crystal; +import tconstruct.world.entity.KingBlueSlime; +import tconstruct.world.gen.TBaseWorldGenerator; +import tconstruct.world.gen.TerrainGenEventHandler; +import tconstruct.world.itemblocks.BarricadeItem; +import tconstruct.world.itemblocks.GravelOreItem; +import tconstruct.world.itemblocks.HamboneItemBlock; +import tconstruct.world.itemblocks.MetalOreItemBlock; +import tconstruct.world.itemblocks.OreberryBushItem; +import tconstruct.world.itemblocks.OreberryBushSecondItem; +import tconstruct.world.itemblocks.SlimeGelItemBlock; +import tconstruct.world.itemblocks.SlimeGrassItemBlock; +import tconstruct.world.itemblocks.SlimeLeavesItemBlock; +import tconstruct.world.itemblocks.SlimeSaplingItemBlock; +import tconstruct.world.itemblocks.SlimeTallGrassItem; +import tconstruct.world.itemblocks.WoolSlab1Item; +import tconstruct.world.itemblocks.WoolSlab2Item; +import tconstruct.world.items.GoldenHead; +import tconstruct.world.items.OreBerries; +import tconstruct.world.items.StrangeFood; @ObjectHolder(TConstruct.modID) @Pulse(id = "Tinkers' World", description = "Ores, slime islands, essence berries, and the like.", forced = true) diff --git a/src/main/java/tconstruct/world/TinkerWorldEvents.java b/src/main/java/tconstruct/world/TinkerWorldEvents.java index 17da60d8..60673064 100644 --- a/src/main/java/tconstruct/world/TinkerWorldEvents.java +++ b/src/main/java/tconstruct/world/TinkerWorldEvents.java @@ -1,17 +1,24 @@ package tconstruct.world; -import net.minecraft.entity.*; -import net.minecraft.entity.item.*; -import net.minecraft.entity.monster.*; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityXPOrb; +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.monster.EntityGhast; +import net.minecraft.entity.monster.EntitySpider; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.*; -import net.minecraft.potion.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import net.minecraftforge.event.entity.living.*; +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.event.entity.player.BonemealEvent; -import cpw.mods.fml.common.eventhandler.*; +import cpw.mods.fml.common.eventhandler.Event; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import tconstruct.TConstruct; import tconstruct.tools.TinkerTools; import tconstruct.util.ItemHelper; diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java index 5d5ad630..6d8ec0a1 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java @@ -3,8 +3,32 @@ package tconstruct.world; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelSlime; -import net.minecraft.client.particle.*; -import net.minecraft.init.*; +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.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -13,8 +37,16 @@ import cpw.mods.fml.common.registry.VillagerRegistry; import mantle.lib.client.MantleClientRegistry; import tconstruct.mechworks.model.CartRender; import tconstruct.tools.TinkerTools; -import tconstruct.world.entity.*; -import tconstruct.world.model.*; +import tconstruct.world.entity.BlueSlime; +import tconstruct.world.entity.CartEntity; +import tconstruct.world.entity.KingBlueSlime; +import tconstruct.world.model.BarricadeRender; +import tconstruct.world.model.OreberryRender; +import tconstruct.world.model.PunjiRender; +import tconstruct.world.model.RenderLandmine; +import tconstruct.world.model.SlimeChannelRender; +import tconstruct.world.model.SlimePadRender; +import tconstruct.world.model.SlimeRender; public class TinkerWorldProxyClient extends TinkerWorldProxyCommon { diff --git a/src/main/java/tconstruct/world/blocks/ConveyorBase.java b/src/main/java/tconstruct/world/blocks/ConveyorBase.java index 7bb507e2..66fb762f 100644 --- a/src/main/java/tconstruct/world/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/world/blocks/ConveyorBase.java @@ -2,13 +2,14 @@ package tconstruct.world.blocks; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.world.model.SlimeChannelRender; diff --git a/src/main/java/tconstruct/world/blocks/GravelOre.java b/src/main/java/tconstruct/world/blocks/GravelOre.java index 4518651d..c9501a7f 100644 --- a/src/main/java/tconstruct/world/blocks/GravelOre.java +++ b/src/main/java/tconstruct/world/blocks/GravelOre.java @@ -1,16 +1,17 @@ package tconstruct.world.blocks; -import java.util.*; +import java.util.List; +import java.util.Random; 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.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/world/blocks/MeatBlock.java b/src/main/java/tconstruct/world/blocks/MeatBlock.java index 98a70d80..09a0d320 100644 --- a/src/main/java/tconstruct/world/blocks/MeatBlock.java +++ b/src/main/java/tconstruct/world/blocks/MeatBlock.java @@ -1,15 +1,18 @@ package tconstruct.world.blocks; -import java.util.*; +import java.util.List; +import java.util.Random; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockWood; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; public class MeatBlock extends BlockWood { diff --git a/src/main/java/tconstruct/world/blocks/OreberryBush.java b/src/main/java/tconstruct/world/blocks/OreberryBush.java index 07cf1fb3..cf92d75a 100644 --- a/src/main/java/tconstruct/world/blocks/OreberryBush.java +++ b/src/main/java/tconstruct/world/blocks/OreberryBush.java @@ -1,8 +1,10 @@ package tconstruct.world.blocks; -import java.util.*; +import java.util.List; +import java.util.Random; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeavesBase; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,13 +12,17 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.util.*; -import net.minecraft.world.*; -import net.minecraftforge.common.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.*; import tconstruct.library.TConstructRegistry; import tconstruct.library.tools.AbilityHelper; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java index 037c1216..a1e66da4 100644 --- a/src/main/java/tconstruct/world/blocks/SlimeExplosive.java +++ b/src/main/java/tconstruct/world/blocks/SlimeExplosive.java @@ -5,15 +5,15 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.Explosion; +import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.world.WorldHelper; import tconstruct.blocks.TConstructBlock; import tconstruct.mechworks.entity.item.ExplosivePrimed; diff --git a/src/main/java/tconstruct/world/blocks/SlimePad.java b/src/main/java/tconstruct/world/blocks/SlimePad.java index 86d678d4..394a2c72 100644 --- a/src/main/java/tconstruct/world/blocks/SlimePad.java +++ b/src/main/java/tconstruct/world/blocks/SlimePad.java @@ -2,13 +2,13 @@ package tconstruct.world.blocks; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.*; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; import tconstruct.library.TConstructRegistry; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/world/blocks/SoilBlock.java b/src/main/java/tconstruct/world/blocks/SoilBlock.java index 0c362a6a..db5ef7e6 100644 --- a/src/main/java/tconstruct/world/blocks/SoilBlock.java +++ b/src/main/java/tconstruct/world/blocks/SoilBlock.java @@ -1,10 +1,11 @@ package tconstruct.world.blocks; import net.minecraft.block.material.Material; -import net.minecraft.entity.*; import net.minecraft.init.Blocks; -import net.minecraft.potion.*; -import net.minecraft.util.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; import net.minecraft.world.World; import tconstruct.blocks.TConstructBlock; diff --git a/src/main/java/tconstruct/world/blocks/SoilSlab.java b/src/main/java/tconstruct/world/blocks/SoilSlab.java index 3b24bd2b..f577e703 100644 --- a/src/main/java/tconstruct/world/blocks/SoilSlab.java +++ b/src/main/java/tconstruct/world/blocks/SoilSlab.java @@ -6,11 +6,12 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import net.minecraft.world.*; +import net.minecraft.world.ColorizerGrass; +import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.relauncher.*; import tconstruct.blocks.SlabBase; import tconstruct.library.TConstructRegistry; import tconstruct.tools.TinkerTools; diff --git a/src/main/java/tconstruct/world/blocks/StoneLadder.java b/src/main/java/tconstruct/world/blocks/StoneLadder.java index 57641d26..c577561b 100644 --- a/src/main/java/tconstruct/world/blocks/StoneLadder.java +++ b/src/main/java/tconstruct/world/blocks/StoneLadder.java @@ -6,8 +6,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.IIcon; -import cpw.mods.fml.relauncher.*; - public class StoneLadder extends BlockLadder { // Override ladder material diff --git a/src/main/java/tconstruct/world/blocks/StoneTorch.java b/src/main/java/tconstruct/world/blocks/StoneTorch.java index 5a468013..2bd828f6 100644 --- a/src/main/java/tconstruct/world/blocks/StoneTorch.java +++ b/src/main/java/tconstruct/world/blocks/StoneTorch.java @@ -1,6 +1,9 @@ package tconstruct.world.blocks; -import static net.minecraftforge.common.util.ForgeDirection.*; +import static net.minecraftforge.common.util.ForgeDirection.EAST; +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 java.util.Random; @@ -8,10 +11,11 @@ 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.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.blocks.MantleBlock; public class StoneTorch extends MantleBlock { diff --git a/src/main/java/tconstruct/world/blocks/WoodRail.java b/src/main/java/tconstruct/world/blocks/WoodRail.java index 0fd6443a..e12fbbd8 100644 --- a/src/main/java/tconstruct/world/blocks/WoodRail.java +++ b/src/main/java/tconstruct/world/blocks/WoodRail.java @@ -1,14 +1,13 @@ package tconstruct.world.blocks; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockRailBase; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.init.Blocks; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; - public class WoodRail extends BlockRailBase { @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/world/entity/BlueSlime.java b/src/main/java/tconstruct/world/entity/BlueSlime.java index 8edc9d3d..8a89f96b 100644 --- a/src/main/java/tconstruct/world/entity/BlueSlime.java +++ b/src/main/java/tconstruct/world/entity/BlueSlime.java @@ -1,7 +1,7 @@ package tconstruct.world.entity; import net.minecraft.item.Item; -import net.minecraft.world.*; +import net.minecraft.world.World; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/world/entity/CartEntity.java b/src/main/java/tconstruct/world/entity/CartEntity.java index 9129a81b..4c4971ee 100644 --- a/src/main/java/tconstruct/world/entity/CartEntity.java +++ b/src/main/java/tconstruct/world/entity/CartEntity.java @@ -1,22 +1,27 @@ package tconstruct.world.entity; -import java.util.*; +import java.util.ArrayList; +import java.util.List; -import net.minecraft.block.*; -import net.minecraft.entity.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockRail; import net.minecraft.entity.item.EntityItem; 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.ItemStack; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.*; -import net.minecraft.world.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MathHelper; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import cpw.mods.fml.relauncher.*; import io.netty.buffer.ByteBuf; public class CartEntity extends Entity implements IInventory, IEntityAdditionalSpawnData { diff --git a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java index 4e5d2db5..de48eae1 100644 --- a/src/main/java/tconstruct/world/gen/SlimeIslandGen.java +++ b/src/main/java/tconstruct/world/gen/SlimeIslandGen.java @@ -6,14 +6,17 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.world.*; +import net.minecraft.world.EnumSkyBlock; +import net.minecraft.world.World; +import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; import net.minecraft.world.gen.feature.WorldGenerator; import cpw.mods.fml.common.IWorldGenerator; import tconstruct.tools.TinkerTools; -import tconstruct.util.config.*; +import tconstruct.util.config.DimensionBlacklist; +import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator { diff --git a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java index db818263..ea0dc937 100644 --- a/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java +++ b/src/main/java/tconstruct/world/gen/TBaseWorldGenerator.java @@ -5,7 +5,8 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; -import net.minecraft.world.*; +import net.minecraft.world.World; +import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; diff --git a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java index daffa5b9..ea564810 100644 --- a/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java +++ b/src/main/java/tconstruct/world/gen/TerrainGenEventHandler.java @@ -1,6 +1,7 @@ package tconstruct.world.gen; -import static net.minecraft.world.biome.BiomeGenBase.*; +import static net.minecraft.world.biome.BiomeGenBase.extremeHills; +import static net.minecraft.world.biome.BiomeGenBase.extremeHillsEdge; import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; import java.util.Random; @@ -9,8 +10,6 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; -import com.google.common.collect.*; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import tconstruct.util.config.PHConstruct; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java index 68524085..44764f64 100644 --- a/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java +++ b/src/main/java/tconstruct/world/itemblocks/BarricadeItem.java @@ -5,12 +5,12 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.*; -import net.minecraft.util.*; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; - public class BarricadeItem extends ItemBlock { private final Block b; diff --git a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java index a32c4a05..67afafc6 100644 --- a/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/CraftedSoilItemBlock.java @@ -5,9 +5,9 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.*; +import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; public class CraftedSoilItemBlock extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java index a559d84a..3b067f5d 100644 --- a/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java +++ b/src/main/java/tconstruct/world/itemblocks/HamboneItemBlock.java @@ -4,13 +4,14 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; +import net.minecraft.item.EnumAction; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import cpw.mods.fml.common.Loader; -import cpw.mods.fml.relauncher.*; public class HamboneItemBlock extends ItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java index ed8dbb9b..befe856f 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushItem.java @@ -9,7 +9,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; import mantle.world.WorldHelper; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java index e7f2a179..d4b9a703 100644 --- a/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/world/itemblocks/OreberryBushSecondItem.java @@ -9,7 +9,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; import mantle.world.WorldHelper; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java index e7d2e8c6..3c698138 100644 --- a/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SlimeTallGrassItem.java @@ -1,9 +1,9 @@ package tconstruct.world.itemblocks; import net.minecraft.block.Block; -import net.minecraft.util.*; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java index 631172c9..1a1fb13f 100644 --- a/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java +++ b/src/main/java/tconstruct/world/itemblocks/SoilSlabItem.java @@ -7,7 +7,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import cpw.mods.fml.relauncher.*; import mantle.blocks.abstracts.MultiItemBlock; public class SoilSlabItem extends MultiItemBlock { diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java index 4ab5e047..4b72b863 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab1Item.java @@ -3,7 +3,8 @@ package tconstruct.world.itemblocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.ItemDye; +import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java index b0ee0fa0..950aed70 100644 --- a/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java +++ b/src/main/java/tconstruct/world/itemblocks/WoolSlab2Item.java @@ -3,7 +3,8 @@ package tconstruct.world.itemblocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.*; +import net.minecraft.item.ItemDye; +import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; diff --git a/src/main/java/tconstruct/world/items/GoldenHead.java b/src/main/java/tconstruct/world/items/GoldenHead.java index b60186e7..1975f3a9 100644 --- a/src/main/java/tconstruct/world/items/GoldenHead.java +++ b/src/main/java/tconstruct/world/items/GoldenHead.java @@ -5,13 +5,15 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.*; -import net.minecraft.potion.*; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemFood; +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 cpw.mods.fml.relauncher.*; - public class GoldenHead extends ItemFood { public GoldenHead(int par2, float par3, boolean par4) { diff --git a/src/main/java/tconstruct/world/items/OreBerries.java b/src/main/java/tconstruct/world/items/OreBerries.java index 75134872..72361e06 100644 --- a/src/main/java/tconstruct/world/items/OreBerries.java +++ b/src/main/java/tconstruct/world/items/OreBerries.java @@ -9,7 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; import mantle.items.abstracts.CraftingItem; import tconstruct.library.TConstructRegistry; diff --git a/src/main/java/tconstruct/world/items/SpecialFood.java b/src/main/java/tconstruct/world/items/SpecialFood.java index aed28afa..7fd72390 100644 --- a/src/main/java/tconstruct/world/items/SpecialFood.java +++ b/src/main/java/tconstruct/world/items/SpecialFood.java @@ -4,10 +4,11 @@ import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.*; -import net.minecraft.util.*; - -import cpw.mods.fml.relauncher.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; public class SpecialFood extends ItemFood { diff --git a/src/main/java/tconstruct/world/items/StrangeFood.java b/src/main/java/tconstruct/world/items/StrangeFood.java index a1439311..0aa87c65 100644 --- a/src/main/java/tconstruct/world/items/StrangeFood.java +++ b/src/main/java/tconstruct/world/items/StrangeFood.java @@ -4,12 +4,11 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.potion.*; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import cpw.mods.fml.relauncher.*; - public class StrangeFood extends SpecialFood { public StrangeFood() { diff --git a/src/main/java/tconstruct/world/model/BarricadeRender.java b/src/main/java/tconstruct/world/model/BarricadeRender.java index b4008784..cdeeb177 100644 --- a/src/main/java/tconstruct/world/model/BarricadeRender.java +++ b/src/main/java/tconstruct/world/model/BarricadeRender.java @@ -4,7 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.util.ItemHelper; public class BarricadeRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/CrystalRender.java b/src/main/java/tconstruct/world/model/CrystalRender.java index 039e1a08..73de666c 100644 --- a/src/main/java/tconstruct/world/model/CrystalRender.java +++ b/src/main/java/tconstruct/world/model/CrystalRender.java @@ -2,10 +2,8 @@ package tconstruct.world.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.entity.*; import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.*; import tconstruct.world.entity.Crystal; @SideOnly(Side.CLIENT) diff --git a/src/main/java/tconstruct/world/model/OreberryRender.java b/src/main/java/tconstruct/world/model/OreberryRender.java index a18f53af..f1ff671b 100644 --- a/src/main/java/tconstruct/world/model/OreberryRender.java +++ b/src/main/java/tconstruct/world/model/OreberryRender.java @@ -4,7 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.util.ItemHelper; public class OreberryRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/PunjiRender.java b/src/main/java/tconstruct/world/model/PunjiRender.java index 54e6690d..d13d0ec3 100644 --- a/src/main/java/tconstruct/world/model/PunjiRender.java +++ b/src/main/java/tconstruct/world/model/PunjiRender.java @@ -1,12 +1,14 @@ package tconstruct.world.model; import net.minecraft.block.Block; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; public class PunjiRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/RenderLandmine.java b/src/main/java/tconstruct/world/model/RenderLandmine.java index bb899e43..916d02ce 100644 --- a/src/main/java/tconstruct/world/model/RenderLandmine.java +++ b/src/main/java/tconstruct/world/model/RenderLandmine.java @@ -7,7 +7,8 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.mechworks.landmine.Helper; /** diff --git a/src/main/java/tconstruct/world/model/SlimeChannelRender.java b/src/main/java/tconstruct/world/model/SlimeChannelRender.java index 6c26dac3..c084a7c3 100644 --- a/src/main/java/tconstruct/world/model/SlimeChannelRender.java +++ b/src/main/java/tconstruct/world/model/SlimeChannelRender.java @@ -1,11 +1,14 @@ package tconstruct.world.model; import net.minecraft.block.Block; -import net.minecraft.client.renderer.*; -import net.minecraft.util.*; +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 cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.util.ItemHelper; public class SlimeChannelRender implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/tconstruct/world/model/SlimeModel.java b/src/main/java/tconstruct/world/model/SlimeModel.java index c49f948f..c7cd5f89 100644 --- a/src/main/java/tconstruct/world/model/SlimeModel.java +++ b/src/main/java/tconstruct/world/model/SlimeModel.java @@ -1,10 +1,9 @@ package tconstruct.world.model; -import net.minecraft.client.model.*; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import cpw.mods.fml.relauncher.*; - @SideOnly(Side.CLIENT) public class SlimeModel extends ModelBase { diff --git a/src/main/java/tconstruct/world/model/SlimePadRender.java b/src/main/java/tconstruct/world/model/SlimePadRender.java index dd7ff351..a0267933 100644 --- a/src/main/java/tconstruct/world/model/SlimePadRender.java +++ b/src/main/java/tconstruct/world/model/SlimePadRender.java @@ -4,7 +4,8 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.*; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import tconstruct.client.BlockSkinRenderHelper; import tconstruct.util.ItemHelper; import tconstruct.world.TinkerWorld; diff --git a/src/main/java/tconstruct/world/model/SlimeRender.java b/src/main/java/tconstruct/world/model/SlimeRender.java index 8cbf94e7..ae2e86c9 100644 --- a/src/main/java/tconstruct/world/model/SlimeRender.java +++ b/src/main/java/tconstruct/world/model/SlimeRender.java @@ -2,13 +2,11 @@ package tconstruct.world.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.entity.*; import net.minecraft.entity.boss.BossStatus; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.relauncher.*; import tconstruct.world.entity.KingBlueSlime; import tconstruct.world.entity.SlimeBase; diff --git a/src/main/java/tconstruct/world/village/ComponentSmeltery.java b/src/main/java/tconstruct/world/village/ComponentSmeltery.java index c2730c94..ec5860e4 100644 --- a/src/main/java/tconstruct/world/village/ComponentSmeltery.java +++ b/src/main/java/tconstruct/world/village/ComponentSmeltery.java @@ -1,11 +1,14 @@ package tconstruct.world.village; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.gen.structure.*; +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.smeltery.TinkerSmeltery; diff --git a/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java index 6d6c0c34..b05aecb0 100644 --- a/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java +++ b/src/main/java/tconstruct/world/village/ComponentToolWorkshop.java @@ -1,15 +1,19 @@ package tconstruct.world.village; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.init.Blocks; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; -import net.minecraft.world.gen.structure.*; +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.tools.TinkerTools; -import tconstruct.tools.logic.*; +import tconstruct.tools.logic.CraftingStationLogic; +import tconstruct.tools.logic.PatternChestLogic; import tconstruct.world.TinkerWorld; public class ComponentToolWorkshop extends StructureVillagePieces.House1 { diff --git a/src/main/java/tconstruct/world/village/TVillageTrades.java b/src/main/java/tconstruct/world/village/TVillageTrades.java index 168c7dc6..30bf59d8 100644 --- a/src/main/java/tconstruct/world/village/TVillageTrades.java +++ b/src/main/java/tconstruct/world/village/TVillageTrades.java @@ -1,11 +1,14 @@ package tconstruct.world.village; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.village.*; +import net.minecraft.village.MerchantRecipe; +import net.minecraft.village.MerchantRecipeList; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import tconstruct.mechworks.TinkerMechworks; diff --git a/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java index 4b33fc47..37ee560e 100644 --- a/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java +++ b/src/main/java/tconstruct/world/village/VillageSmelteryHandler.java @@ -1,6 +1,7 @@ package tconstruct.world.village; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start; diff --git a/src/main/java/tconstruct/world/village/VillageToolStationHandler.java b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java index 563703e4..c3c7886f 100644 --- a/src/main/java/tconstruct/world/village/VillageToolStationHandler.java +++ b/src/main/java/tconstruct/world/village/VillageToolStationHandler.java @@ -1,6 +1,7 @@ package tconstruct.world.village; -import java.util.*; +import java.util.List; +import java.util.Random; import net.minecraft.world.gen.structure.StructureVillagePieces.PieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieces.Start;