Format code again + organize imports

SlimeKnights · Feb 5, 2014 · 2a2f84e · 2a2f84e
1 parent 467e8e4
commit 2a2f84e
Show file tree

Hide file tree

Showing 275 changed files with 1,157 additions and 903 deletions.
diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
@@ -1,33 +1,54 @@
 package tconstruct;
 
-import cpw.mods.fml.common.*;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.event.*;
-import cpw.mods.fml.common.network.NetworkRegistry;
-import cpw.mods.fml.common.registry.*;
-import cpw.mods.fml.relauncher.Side;
+import mantle.lib.TabTools;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 import net.minecraftforge.common.MinecraftForge;
 
-import org.apache.logging.log4j.*;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.LoggerConfig;
 
 import tconstruct.achievements.TAchievements;
 import tconstruct.client.TControls;
-import tconstruct.common.*;
+import tconstruct.common.TContent;
+import tconstruct.common.TProxyCommon;
+import tconstruct.common.TRecipes;
+import tconstruct.common.TRepo;
 import tconstruct.library.TConstructRegistry;
-import tconstruct.library.crafting.*;
-import mantle.lib.TabTools;
+import tconstruct.library.crafting.Detailing;
+import tconstruct.library.crafting.LiquidCasting;
 import tconstruct.plugins.PluginController;
-import tconstruct.util.*;
-import tconstruct.util.config.*;
+import tconstruct.util.EnvironmentChecks;
+import tconstruct.util.TEventHandler;
+import tconstruct.util.TEventHandlerAchievement;
+import tconstruct.util.config.DimensionBlacklist;
+import tconstruct.util.config.PHConstruct;
 import tconstruct.util.landmine.behavior.Behavior;
 import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler;
 import tconstruct.util.network.packet.PacketPipeline;
 import tconstruct.util.player.TPlayerHandler;
-import tconstruct.worldgen.*;
-import tconstruct.worldgen.village.*;
+import tconstruct.worldgen.SlimeIslandGen;
+import tconstruct.worldgen.TBaseWorldGenerator;
+import tconstruct.worldgen.TerrainGenEventHandler;
+import tconstruct.worldgen.village.ComponentSmeltery;
+import tconstruct.worldgen.village.ComponentToolWorkshop;
+import tconstruct.worldgen.village.TVillageTrades;
+import tconstruct.worldgen.village.VillageSmelteryHandler;
+import tconstruct.worldgen.village.VillageToolStationHandler;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.Mod.Instance;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.network.NetworkRegistry;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.VillagerRegistry;
+import cpw.mods.fml.relauncher.Side;
 
 /** TConstruct, the tool mod.
  * Craft your tools with style, then modify until the original is gone!

diff --git a/src/main/java/tconstruct/achievements/TAchievements.java b/src/main/java/tconstruct/achievements/TAchievements.java
@@ -1,6 +1,7 @@
 package tconstruct.achievements;
 
 import java.util.HashMap;
+
 import net.minecraft.stats.Achievement;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.AchievementPage;

diff --git a/src/main/java/tconstruct/blocks/BlockLandmine.java b/src/main/java/tconstruct/blocks/BlockLandmine.java
@@ -20,7 +20,6 @@
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.item.EntityTNTPrimed;
 import net.minecraft.entity.player.EntityPlayer;

diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java
@@ -1,7 +1,6 @@
 package tconstruct.blocks;
 
 import mantle.blocks.MantleBlock;
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;

diff --git a/src/main/java/tconstruct/blocks/CraftingSlab.java b/src/main/java/tconstruct/blocks/CraftingSlab.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import mantle.blocks.abstracts.InventorySlab;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
@@ -23,7 +24,6 @@
 import tconstruct.common.TProxyCommon;
 import tconstruct.common.TRepo;
 import tconstruct.library.TConstructRegistry;
-import mantle.blocks.abstracts.InventorySlab;
 import tconstruct.util.config.PHConstruct;
 
 public class CraftingSlab extends InventorySlab

diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import mantle.blocks.abstracts.InventoryBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
@@ -17,7 +18,6 @@
 import tconstruct.client.block.TableRender;
 import tconstruct.common.TProxyCommon;
 import tconstruct.library.TConstructRegistry;
-import mantle.blocks.abstracts.InventoryBlock;
 
 public class CraftingStationBlock extends InventoryBlock
 {

diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java
@@ -2,12 +2,7 @@
 
 import java.util.List;
 
-import tconstruct.TConstruct;
-import tconstruct.blocks.logic.DryingRackLogic;
-import tconstruct.client.block.DryingRackRender;
-import tconstruct.library.TConstructRegistry;
 import mantle.blocks.abstracts.InventoryBlock;
-import tconstruct.library.tools.AbilityHelper;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
@@ -20,6 +15,11 @@
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import tconstruct.TConstruct;
+import tconstruct.blocks.logic.DryingRackLogic;
+import tconstruct.client.block.DryingRackRender;
+import tconstruct.library.TConstructRegistry;
+import tconstruct.library.tools.AbilityHelper;
 
 public class DryingRack extends InventoryBlock
 {

diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java
@@ -1,28 +1,29 @@
 package tconstruct.blocks;
 
-import tconstruct.blocks.logic.EquipLogic;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
+import java.util.Random;
 
-import java.util.*;
-
-import cpw.mods.fml.relauncher.*;
-import tconstruct.TConstruct;
-import tconstruct.blocks.logic.FrypanLogic;
-import tconstruct.client.block.FrypanRender;
 import mantle.blocks.abstracts.InventoryBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.*;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.*;
-import net.minecraft.world.*;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import tconstruct.TConstruct;
+import tconstruct.blocks.logic.EquipLogic;
+import tconstruct.blocks.logic.FrypanLogic;
+import tconstruct.client.block.FrypanRender;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class EquipBlock extends InventoryBlock
 {

diff --git a/src/main/java/tconstruct/blocks/FurnaceSlab.java b/src/main/java/tconstruct/blocks/FurnaceSlab.java
@@ -1,5 +1,8 @@
 package tconstruct.blocks;
 
+import mantle.blocks.abstracts.InventorySlab;
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -11,9 +14,6 @@
 import tconstruct.blocks.logic.FurnaceLogic;
 import tconstruct.common.TProxyCommon;
 import tconstruct.library.TConstructRegistry;
-import mantle.blocks.abstracts.InventorySlab;
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
 
 public class FurnaceSlab extends InventorySlab
 {

diff --git a/src/main/java/tconstruct/blocks/GlassBlock.java b/src/main/java/tconstruct/blocks/GlassBlock.java
@@ -1,12 +1,14 @@
 package tconstruct.blocks;
 
-import cpw.mods.fml.relauncher.*;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.IIcon;
-import net.minecraft.world.*;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class GlassBlock extends TConstructBlock
 {

diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java
@@ -1,13 +1,13 @@
 package tconstruct.blocks;
 
-import java.util.ArrayList;
-
 import mantle.blocks.MantleBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.util.*;
-import net.minecraft.world.*;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 import tconstruct.library.TConstructRegistry;
 import tconstruct.util.config.PHConstruct;
 

diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java b/src/main/java/tconstruct/blocks/GlassBlockConnectedMeta.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 
-import tconstruct.util.config.PHConstruct;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -11,6 +10,7 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
+import tconstruct.util.config.PHConstruct;
 
 /** @author fuj1n
  *

diff --git a/src/main/java/tconstruct/blocks/GlassPane.java b/src/main/java/tconstruct/blocks/GlassPane.java
@@ -1,7 +1,7 @@
 package tconstruct.blocks;
 
-import tconstruct.library.TConstructRegistry;
 import net.minecraft.block.material.Material;
+import tconstruct.library.TConstructRegistry;
 
 public class GlassPane extends PaneBase
 {

diff --git a/src/main/java/tconstruct/blocks/GlassPaneConnected.java b/src/main/java/tconstruct/blocks/GlassPaneConnected.java
@@ -1,10 +1,7 @@
 package tconstruct.blocks;
 
-import tconstruct.util.config.PHConstruct;
-
 import java.util.List;
 
-import tconstruct.client.block.PaneConnectedRender;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -14,6 +11,8 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
+import tconstruct.client.block.PaneConnectedRender;
+import tconstruct.util.config.PHConstruct;
 
 public class GlassPaneConnected extends GlassBlockConnected
 {

diff --git a/src/main/java/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/blocks/GlassPaneStained.java
@@ -1,7 +1,7 @@
 package tconstruct.blocks;
 
-import tconstruct.library.TConstructRegistry;
 import net.minecraft.block.material.Material;
+import tconstruct.library.TConstructRegistry;
 
 public class GlassPaneStained extends PaneBase
 {

diff --git a/src/main/java/tconstruct/blocks/GlueBlock.java b/src/main/java/tconstruct/blocks/GlueBlock.java
@@ -1,6 +1,5 @@
 package tconstruct.blocks;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;

diff --git a/src/main/java/tconstruct/blocks/GlueFluid.java b/src/main/java/tconstruct/blocks/GlueFluid.java
@@ -1,7 +1,5 @@
 package tconstruct.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -12,6 +10,8 @@
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.BlockFluidFinite;
 import net.minecraftforge.fluids.Fluid;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class GlueFluid extends BlockFluidFinite
 {

diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java
@@ -3,16 +3,14 @@
 import java.util.List;
 import java.util.Random;
 
-import tconstruct.library.TConstructRegistry;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockSand;
-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
+import tconstruct.library.TConstructRegistry;
 
 public class GravelOre extends BlockFalling
 {

diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java
@@ -2,12 +2,13 @@
 
 import java.util.List;
 
+import mantle.blocks.iface.IServantLogic;
+import mantle.world.WorldHelper;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -25,8 +26,6 @@
 import tconstruct.blocks.logic.LavaTankLogic;
 import tconstruct.client.block.TankRender;
 import tconstruct.library.TConstructRegistry;
-import mantle.blocks.iface.IServantLogic;
-import mantle.world.WorldHelper;
 
 public class LavaTankBlock extends BlockContainer
 {

diff --git a/src/main/java/tconstruct/blocks/LiquidMetalFinite.java b/src/main/java/tconstruct/blocks/LiquidMetalFinite.java
@@ -1,7 +1,5 @@
 package tconstruct.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -11,9 +9,10 @@
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.BlockFluidFinite;
 import net.minecraftforge.fluids.Fluid;
-import tconstruct.common.TContent;
 import tconstruct.common.TRepo;
 import tconstruct.library.TConstructRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class LiquidMetalFinite extends BlockFluidFinite
 {

diff --git a/src/main/java/tconstruct/blocks/MeatBlock.java b/src/main/java/tconstruct/blocks/MeatBlock.java
@@ -5,7 +5,6 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockWood;
-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;