Format code again + organize imports

This commit is contained in:
Alexander committed 2014-02-05 10:28:54 -05:00
1 parent 467e8e4ed5
commit 2a2f84ee88
275 files changed
+1163 -909

No files matched your search

@@ -1,8 +1,8 @@
package tconstruct.util;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.DamageSource;
import net.minecraft.util.IChatComponent;
import net.minecraft.entity.EntityLivingBase;
public class DamageSourceFireworkExplode extends DamageSource
{
@@ -1,10 +1,8 @@
package tconstruct.util;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.DamageSource;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.StatCollector;
public class DamageSourceLandmine extends DamageSource
{
@@ -2,7 +2,6 @@ package tconstruct.util;
import java.util.List;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
@@ -1,9 +1,10 @@
package tconstruct.util;
import net.minecraft.util.*;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.*;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.DamageSource;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.StatCollector;
import tconstruct.library.tools.AbilityHelper;
public class SmelteryDamageSource extends DamageSource
@@ -1,14 +1,14 @@
package tconstruct.util;
import tconstruct.achievements.TAchievements;
import tconstruct.TConstruct;
import tconstruct.common.TRepo;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.util.player.TPlayerStats;
import mantle.common.ComparisonHelper;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import tconstruct.TConstruct;
import tconstruct.achievements.TAchievements;
import tconstruct.common.TRepo;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.util.player.TPlayerStats;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
@@ -1,12 +1,12 @@
package tconstruct.util;
import tconstruct.items.TitleIcon;
import net.minecraft.block.BlockDispenser;
import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
import net.minecraft.dispenser.IBlockSource;
import net.minecraft.entity.EntityLiving;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import tconstruct.items.TitleIcon;
public class TDispenserBehaviorSpawnEgg extends BehaviorDefaultDispenseItem
{
@@ -1,15 +1,9 @@
package tconstruct.util;
import tconstruct.util.player.ArmorExtended;
import mantle.blocks.BlockUtils;
import mantle.world.WorldHelper;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import java.util.Random;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import mantle.blocks.BlockUtils;
import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
@@ -28,7 +22,6 @@ import net.minecraft.entity.passive.EntityChicken;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
@@ -40,6 +33,7 @@ import net.minecraft.world.GameRules;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import net.minecraftforge.event.entity.player.BonemealEvent;
@@ -54,7 +48,6 @@ import tconstruct.blocks.TankAirBlock;
import tconstruct.common.TRepo;
import tconstruct.items.tools.FryingPan;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.event.PartBuilderEvent;
import tconstruct.library.event.ToolCraftEvent;
import tconstruct.library.tools.ArrowMaterial;
@@ -63,9 +56,12 @@ import tconstruct.library.tools.BowstringMaterial;
import tconstruct.library.tools.FletchingMaterial;
import tconstruct.library.tools.ToolCore;
import tconstruct.library.tools.Weapon;
import tconstruct.modifiers.tools.ModAttack;
import tconstruct.util.config.PHConstruct;
import tconstruct.util.player.ArmorExtended;
import tconstruct.util.player.TPlayerStats;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class TEventHandler
{
@@ -1,12 +1,13 @@
package tconstruct.util;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import tconstruct.library.event.SmelteryEvent;
import net.minecraftforge.common.util.FakePlayer;
import tconstruct.achievements.TAchievements;
import tconstruct.blocks.logic.ToolForgeLogic;
import tconstruct.library.event.SmelteryEvent;
import tconstruct.library.event.ToolCraftedEvent;
import tconstruct.library.tools.*;
import tconstruct.library.tools.ToolCore;
import tconstruct.library.tools.Weapon;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class TEventHandlerAchievement
{
@@ -1,12 +1,12 @@
package tconstruct.util.config;
import cpw.mods.fml.common.Loader;
import net.minecraftforge.common.config.Configuration;
import tconstruct.TConstruct;
import java.io.File;
import java.util.ArrayList;
import net.minecraftforge.common.config.Configuration;
import tconstruct.TConstruct;
import cpw.mods.fml.common.Loader;
public class DimensionBlacklist
{
public static ArrayList<Integer> blacklistedDims = new ArrayList<Integer>();
@@ -1,14 +1,12 @@
package tconstruct.util.config;
import java.io.File;
import java.io.IOException;
import cpw.mods.fml.common.Loader;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import tconstruct.TConstruct;
import tconstruct.common.TRepo;
import tconstruct.library.tools.AbilityHelper;
import cpw.mods.fml.common.Loader;
public class PHConstruct
{
@@ -5,18 +5,17 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import tconstruct.util.landmine.Helper;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import tconstruct.util.landmine.Helper;
/**
*
@@ -1,7 +1,5 @@
package tconstruct.util.landmine.behavior;
import java.util.List;
import mantle.blocks.BlockUtils;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityFallingBlock;
@@ -1,10 +1,9 @@
package tconstruct.util.landmine.behavior;
import tconstruct.util.DamageSourceLandmine;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import tconstruct.util.DamageSourceLandmine;
public class BehaviorDefault extends Behavior
{
@@ -1,7 +1,5 @@
package tconstruct.util.landmine.behavior;
import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -3,13 +3,11 @@ package tconstruct.util.landmine.behavior;
import java.util.List;
import mantle.common.ComparisonHelper;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@@ -1,10 +1,7 @@
package tconstruct.util.landmine.behavior;
import java.util.List;
import java.util.Random;
import tconstruct.items.blocks.ItemBlockLandmine;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.projectile.EntitySmallFireball;
import net.minecraft.init.Blocks;
@@ -12,6 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import tconstruct.items.blocks.ItemBlockLandmine;
/**
*
@@ -1,10 +1,9 @@
package tconstruct.util.landmine.behavior;
import net.minecraft.util.EnumFacing;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import tconstruct.entity.item.EntityLandmineFirework;
@@ -3,17 +3,16 @@ package tconstruct.util.landmine.behavior;
import java.util.Iterator;
import java.util.List;
import tconstruct.items.blocks.ItemBlockLandmine;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityPotion;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemPotion;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
import tconstruct.items.blocks.ItemBlockLandmine;
/**
*
@@ -7,7 +7,6 @@ import net.minecraft.entity.item.EntityEnderPearl;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.entity.projectile.EntitySnowball;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
@@ -5,8 +5,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Random;
import tconstruct.items.blocks.ItemBlockLandmine;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
@@ -16,6 +14,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import tconstruct.items.blocks.ItemBlockLandmine;
//TODO Add a block that is similar to landmine, but only triggers by redstone, does not hurt the player, and does not disappear when used(also does not do anything that can deal damage)
@@ -1,6 +1,5 @@
package tconstruct.util.landmine.behavior;
import net.minecraft.block.BlockDispenser;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
@@ -1,17 +1,15 @@
package tconstruct.util.landmine.behavior.stackCombo;
import java.util.ArrayList;
import java.util.List;
import tconstruct.blocks.logic.TileEntityLandmine;
import tconstruct.util.landmine.Helper;
import tconstruct.util.landmine.behavior.Behavior;
import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import tconstruct.blocks.logic.TileEntityLandmine;
import tconstruct.util.landmine.Helper;
import tconstruct.util.landmine.behavior.Behavior;
/**
*
@@ -9,7 +9,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityFireball;
import net.minecraft.entity.projectile.EntityLargeFireball;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
@@ -1,16 +1,29 @@
package tconstruct.util.network.packet;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.*;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
import cpw.mods.fml.relauncher.*;
import io.netty.buffer.*;
import io.netty.channel.*;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageCodec;
import java.util.*;
import java.util.Collections;
import java.util.Comparator;
import java.util.EnumMap;
import java.util.LinkedList;
import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.*;
import net.minecraft.network.*;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetHandler;
import net.minecraft.network.NetHandlerPlayServer;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.FMLEmbeddedChannel;
import cpw.mods.fml.common.network.FMLOutboundHandler;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.network.internal.FMLProxyPacket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Packet pipeline class. Directs all registered packet data to be handled by the packets themselves.
@@ -1,11 +1,5 @@
package tconstruct.util.network.packet;
import cpw.mods.fml.common.FMLCommonHandler;
import net.minecraft.network.NetworkManager;
import tconstruct.TConstruct;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
@@ -13,6 +7,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import tconstruct.blocks.logic.SmelteryLogic;
import cpw.mods.fml.common.FMLCommonHandler;
public class PacketSmeltery extends AbstractPacket
{
@@ -1,6 +1,5 @@
package tconstruct.util.network.packet;
import cpw.mods.fml.common.network.ByteBufUtils;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import mantle.blocks.abstracts.InventoryLogic;
@@ -8,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.ByteBufUtils;
public class PacketStencilTable extends AbstractPacket
{
@@ -1,12 +1,13 @@
package tconstruct.util.network.packet;
import cpw.mods.fml.common.network.ByteBufUtils;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import tconstruct.blocks.logic.*;
import tconstruct.blocks.logic.ToolForgeLogic;
import tconstruct.blocks.logic.ToolStationLogic;
import cpw.mods.fml.common.network.ByteBufUtils;
public class PacketToolStation extends AbstractPacket
{
@@ -1,7 +1,7 @@
package tconstruct.util.player;
import java.util.UUID;
import java.lang.ref.WeakReference;
import java.util.UUID;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
@@ -11,7 +11,6 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.MathHelper;
import tconstruct.TConstruct;
import tconstruct.common.TRepo;
import cpw.mods.fml.common.FMLCommonHandler;
@@ -284,12 +283,14 @@ public class ArmorExtended implements IInventory
}
}
}
@Override
public void openInventory() {
}
@Override
public void closeInventory() {
}
@Override
public void openInventory ()
{
}
@Override
public void closeInventory ()
{
}
}
@@ -189,16 +189,19 @@ public class KnapsackInventory implements IInventory
dropper.worldObj.spawnEntityInWorld(entityitem);
}
@Override
public void markDirty() {
}
@Override
public void markDirty ()
{
}
@Override
public void openInventory() {
}
@Override
public void openInventory ()
{
}
@Override
public void closeInventory() {
}
@Override
public void closeInventory ()
{
}
}
@@ -1,22 +1,20 @@
package tconstruct.util.player;
import cpw.mods.fml.common.*;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.*;
import cpw.mods.fml.relauncher.Side;
import java.io.ByteArrayOutputStream;
import java.lang.ref.WeakReference;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import mantle.player.PlayerUtils;
import net.minecraft.entity.*;
import net.minecraft.entity.Entity;
import net.minecraft.entity.Entity.EnumEntitySize;
import net.minecraft.entity.player.*;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.*;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import net.minecraftforge.event.entity.living.LivingFallEvent;
import net.minecraftforge.event.entity.player.PlayerDropsEvent;
import tconstruct.TConstruct;
@@ -24,6 +22,14 @@ import tconstruct.common.TRepo;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.util.config.PHConstruct;
import tconstruct.util.network.packet.PacketDoubleJump;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
import cpw.mods.fml.relauncher.Side;
public class TPlayerHandler
{