1.4.1.1a update

10 files changed, 0 insertions, 833 deletions

diff --git a/src/main/java/lance5057/tDefense/baubles/BaublesBase.java b/src/main/java/lance5057/tDefense/baubles/BaublesBase.java
deleted file mode 100644
index b2af546..0000000
--- a/src/main/java/lance5057/tDefense/baubles/BaublesBase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package lance5057.tDefense.baubles;
-
-import lance5057.tDefense.baubles.tools.TDBaubles;
-import lance5057.tDefense.util.ModuleBase;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-
-public class BaublesBase extends ModuleBase
-{
-	public static BaublesBase instance = new BaublesBase();
-	
-	
-	public static BaublesItems items;
-	public static TDBaubles tools;
-	
-	@Override
-	public void preInit(FMLPreInitializationEvent e)
-	{
-		items = new BaublesItems();
-		tools = new TDBaubles();
-		
-		items.preInit(e);
-		tools.preInit(e);
-	}
-
-	@Override
-	public void init(FMLInitializationEvent e) {
-		// TODO Auto-generated method stub
-		items.init(e);
-		tools.init(e);
-	}
-
-	@Override
-	public void postInit(FMLPostInitializationEvent e) {
-		// TODO Auto-generated method stub
-		items.postInit(e);
-		tools.postInit(e);
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/BaublesClientProxy.java b/src/main/java/lance5057/tDefense/baubles/BaublesClientProxy.java
deleted file mode 100644
index d5603ff..0000000
--- a/src/main/java/lance5057/tDefense/baubles/BaublesClientProxy.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package lance5057.tDefense.baubles;
-
-import java.util.Map;
-
-import lance5057.tDefense.Reference;
-import lance5057.tDefense.baubles.renderers.BaubleRenderer;
-import lance5057.tDefense.baubles.renderers.SheatheModel;
-import lance5057.tDefense.baubles.tools.TDBaubles;
-import lance5057.tDefense.core.tools.TDTools;
-import lance5057.tDefense.util.ModuleBase;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.model.ModelBiped;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.renderer.entity.RenderPlayer;
-import net.minecraft.item.Item;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import slimeknights.tconstruct.common.ModelRegisterUtil;
-import slimeknights.tconstruct.library.TinkerRegistryClient;
-import slimeknights.tconstruct.library.client.ToolBuildGuiInfo;
-
-public class BaublesClientProxy {
-	
-	public SheatheModel sheathe;
-	
-	ToolBuildGuiInfo sheatheGUI;
-
-	public void preInit() {
-		// TODO Auto-generated method stub
-		
-		reloadRenderers();
-	}
-
-	public void init() {
-		// TODO Auto-generated method stub
-		Map<String, RenderPlayer> skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap();
-		RenderPlayer render;
-		render = skinMap.get("default");
-		render.addLayer(new BaubleRenderer());
-		
-		render = skinMap.get("slim");
-		render.addLayer(new BaubleRenderer());
-		
-		createToolGuis();
-		setupToolGuis();
-		registerToolGuis();
-	}
-	
-	public void postInit() 
-	{
-	}
-	
-	public void registerToolRenderers()
-	{
-		ModelRegisterUtil.registerToolModel(TDBaubles.sheathe);
-	}
-	
-	public void createToolGuis()
-	{
-		sheatheGUI = new ToolBuildGuiInfo(TDBaubles.sheathe);
-	}
-	
-	public void setupToolGuis()
-	{
-		sheatheGUI.addSlotPosition(34, 15+8);
-		sheatheGUI.addSlotPosition(34, 33+8);
-		sheatheGUI.addSlotPosition(34, 51+8);
-	}
-	
-	public void registerToolGuis()
-	{
-		TinkerRegistryClient.addToolBuilding(sheatheGUI);
-	}
-	
-	public void reloadRenderers()
-	{
-		sheathe = new SheatheModel();
-		registerToolRenderers();
-	}
-	
-	public void setToolGuis()
-	{
-		sheatheGUI.positions.clear();
-		sheatheGUI.addSlotPosition(34, 15);
-		sheatheGUI.addSlotPosition(34, 33);
-		sheatheGUI.addSlotPosition(34, 51);
-	}
-	
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/BaublesItems.java b/src/main/java/lance5057/tDefense/baubles/BaublesItems.java
deleted file mode 100644
index 69323bb..0000000
--- a/src/main/java/lance5057/tDefense/baubles/BaublesItems.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package lance5057.tDefense.baubles;
-
-import lance5057.tDefense.util.ItemsBase;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-
-public class BaublesItems extends ItemsBase
-{
-
-	@Override
-	public void preInit(FMLPreInitializationEvent e) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void init(FMLInitializationEvent e) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void postInit(FMLPostInitializationEvent e) {
-		// TODO Auto-generated method stub
-		
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/renderers/BaubleRenderer.java b/src/main/java/lance5057/tDefense/baubles/renderers/BaubleRenderer.java
deleted file mode 100644
index 8c6aec3..0000000
--- a/src/main/java/lance5057/tDefense/baubles/renderers/BaubleRenderer.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package lance5057.tDefense.baubles.renderers;
-
-import lance5057.tDefense.core.tools.Shield;
-import lance5057.tDefense.core.tools.Zweihander;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.entity.layers.LayerRenderer;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.ItemShield;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemSword;
-import net.minecraft.util.EnumHand;
-import slimeknights.tconstruct.library.tools.ToolCore;
-import slimeknights.tconstruct.tools.melee.item.Cleaver;
-
-public class BaubleRenderer implements LayerRenderer<EntityPlayer> {
-
-	@Override
-	public void doRenderLayer(EntityPlayer entitylivingbaseIn, float limbSwing, float limbSwingAmount,
-			float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
-
-//		ItemStack stack = entitylivingbaseIn.inventory.getStackInSlot(0);
-//		ItemStack stackShield = entitylivingbaseIn.inventory.getStackInSlot(1);
-//		
-//		ItemStack stackTest = entitylivingbaseIn.getHeldItem(EnumHand.MAIN_HAND);
-//		
-//		if (stack != null 
-//				&& (stack.getItem() instanceof ToolCore || stack.getItem() instanceof ItemSword) 
-//				&& !(stack.getItem() instanceof Shield)
-//				&& stack != stackTest) {
-//			GlStateManager.pushMatrix();
-//			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
-////			Helper.rotateIfSneaking(player);
-////			boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.LEGS).isEmpty();
-//			//GlStateManager.rotate(90, 0, 1, 0);
-//			GlStateManager.rotate(20, 0, 0, 1);
-//			GlStateManager.translate(-0.125, 0.1, 0.25);
-//			//GlStateManager.scale(0.55, 0.55, 0.55);
-//
-////			if (renderedOne)
-////				GlStateManager.translate(0F, 0F, armor ? 0.55F : 0.5F);
-////			else
-////				GlStateManager.translate(0F, 0F, armor ? -0.55F : -0.5F);
-//
-//			if(stack.getItem() instanceof Zweihander || stack.getItem() instanceof Cleaver)
-//			{
-//				GlStateManager.scale(1.5F, 1.5F, 0.75F);
-//				GlStateManager.translate(0.1, 0.1, 0);
-//			}
-//			else
-//				GlStateManager.scale(0.75F, 0.75F, 0.75F);
-//
-//			GlStateManager.color(1F, 1F, 1F);
-//			int light = 15728880;
-//			int lightmapX = light % 65536;
-//			int lightmapY = light / 65536;
-//			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
-//			Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
-//			GlStateManager.popMatrix();
-//		}
-//		
-//		//Shield
-//		if (stackShield != null 
-//				&& (stackShield.getItem() instanceof Shield || stackShield.getItem() instanceof ItemShield) 
-//				&& stackShield != stackTest) {
-//			GlStateManager.pushMatrix();
-//			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
-////			Helper.rotateIfSneaking(player);
-////			boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.LEGS).isEmpty();
-//			//GlStateManager.rotate(90, 0, 1, 0);
-//			GlStateManager.rotate(160, 0, 0, 1);
-//			GlStateManager.translate(0.125, -0.3, 0.3);
-//			//GlStateManager.scale(0.55, 0.55, 0.55);
-//
-////			if (renderedOne)
-////				GlStateManager.translate(0F, 0F, armor ? 0.55F : 0.5F);
-////			else
-////				GlStateManager.translate(0F, 0F, armor ? -0.55F : -0.5F);
-//
-//			if(stackShield.getItem() instanceof ItemShield)
-//			{
-//				//GlStateManager.scale(1.5F, 1.5F, 0.75F);
-//				GlStateManager.translate(0.5, 0.5, 0.5);
-//			}
-////			else
-//			//GlStateManager.scale(0.75F, 0.75F, 0.75F);
-//
-//			GlStateManager.color(1F, 1F, 1F);
-//			int light = 15728880;
-//			int lightmapX = light % 65536;
-//			int lightmapY = light / 65536;
-//			OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY);
-//			Minecraft.getMinecraft().getRenderItem().renderItem(stackShield, ItemCameraTransforms.TransformType.NONE);
-//			GlStateManager.popMatrix();
-//		}
-	}
-
-	@Override
-	public boolean shouldCombineTextures() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/renderers/SheatheModel.java b/src/main/java/lance5057/tDefense/baubles/renderers/SheatheModel.java
deleted file mode 100644
index 88177ef..0000000
--- a/src/main/java/lance5057/tDefense/baubles/renderers/SheatheModel.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package lance5057.tDefense.baubles.renderers;
-
-import lance5057.tDefense.core.tools.Shield;
-import lance5057.tDefense.core.tools.Zweihander;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.model.ModelBiped;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.item.ItemShield;
-import net.minecraft.item.ItemStack;
-import slimeknights.tconstruct.tools.melee.item.Cleaver;
-
-/**
- * Sheathe - Lance5057 Created using Tabula 4.1.1
- */
-public class SheatheModel extends ModelBiped {
-	public ModelRenderer Sheathe;
-	public ModelRenderer FrontCap;
-	public ModelRenderer WaistBelt;
-	public ModelRenderer BackCap;
-	public ModelRenderer ShoulderBelt;
-
-	public SheatheModel() {
-
-		// rSword = new RenderItem(Minecraft.getMinecraft().getTextureManager(),
-		// null, null);
-
-		this.textureWidth = 64;
-		this.textureHeight = 64;
-
-		this.WaistBelt = new ModelRenderer(this, 0, 32);
-		this.WaistBelt.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.WaistBelt.addBox(-4.5F, 4.5F, -2.5F, 9, 2, 5, -0.3F);
-		// this.bipedBody.addChild(WaistBelt);
-
-		this.ShoulderBelt = new ModelRenderer(this, 0, 32);
-		this.ShoulderBelt.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.ShoulderBelt.addBox(-3.0F, 1.0F, -2.5F, 9, 2, 5, -0.3F);
-		this.setRotateAngle(ShoulderBelt, 0.0F, 0.0F, 0.7853981633974483F);
-		// this.bipedBody.addChild(ShoulderBelt);
-
-		this.BackCap = new ModelRenderer(this, 0, 39);
-		this.BackCap.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.BackCap.addBox(-2.2F, 3.6F, -2.8F, 3, 3, 2, -0.4F);
-		this.setRotateAngle(BackCap, 0.0F, 0.0F, -0.4363323129985824F);
-		// this.bipedBody.addChild(BackCap);
-
-		this.FrontCap = new ModelRenderer(this, 0, 39);
-		this.FrontCap.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.FrontCap.addBox(-2.2F, 3.6F, 0.7F, 3, 3, 2, -0.4F);
-		this.setRotateAngle(FrontCap, 0.0F, 0.0F, -0.4363323129985824F);
-		// this.bipedBody.addChild(FrontCap);
-
-		this.Sheathe = new ModelRenderer(this, 28, 32);
-		this.Sheathe.setRotationPoint(0.0F, 0.0F, 0.0F);
-		this.Sheathe.addBox(-1.1F, 1.0F, 3.5F, 11, 3, 1, 0.2F);
-		this.setRotateAngle(Sheathe, 0.0F, 0.0F, 1.1344640137963142F);
-		// this.bipedBody.addChild(Sheathe);
-	}
-
-	public void render(float f5, ItemStack weapon, ItemStack shield, ItemStack active, ItemStack offhand) {
-
-		WaistBelt.render(f5);
-		ShoulderBelt.render(f5);
-		BackCap.render(f5);
-		FrontCap.render(f5);
-		Sheathe.render(f5);
-
-		
-		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
-
-		if (weapon != null && active != weapon) {
-			GlStateManager.pushMatrix();
-			
-			GlStateManager.rotate(20, 0, 0, 1);
-			float s = 13f;
-			GlStateManager.scale(s, s, s);
-			GlStateManager.translate(-0.1F, 0.175f, 0.3f);
-			
-			if(weapon.getItem() instanceof Zweihander || weapon.getItem() instanceof Cleaver)
-			{
-				GlStateManager.scale(2f, 2f, 1f);
-			}
-
-			Minecraft.getMinecraft().getRenderItem().renderItem(weapon, ItemCameraTransforms.TransformType.NONE);
-			
-			GlStateManager.popMatrix();
-		}
-
-		if (shield != null && shield != active
-				&& (shield.getItem() instanceof ItemShield || shield.getItem() instanceof Shield)) {
-			GlStateManager.pushMatrix();
-			
-			GlStateManager.rotate(20, 0, 0, 1);
-			float s = 13f;
-			GlStateManager.scale(s, s, s);
-			GlStateManager.translate(-0.1F, 0.175f, 0.3f);
-			
-			if (shield.getItem() instanceof Shield) {
-				
-				GlStateManager.rotate(180 - 45, 0, 0, 1);
-				GlStateManager.translate(-0.0F, -0.3f, 0.1f);
-				GlStateManager.scale(1.35, 1.35, 1.35);
-			} else {
-				GlStateManager.rotate(180 - 45, 0, 0, 1);
-				GlStateManager.translate(0.7F, 0.2f, 0.7f);
-				GlStateManager.scale(1.35, 1.35, 1.35);
-			}
-
-			Minecraft.getMinecraft().getRenderItem().renderItem(shield, ItemCameraTransforms.TransformType.NONE);
-			
-			GlStateManager.popMatrix();
-		}
-
-		
-	}
-
-	/**
-	 * This is a helper function from Tabula to set the rotation of model parts
-	 */
-	public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) {
-		modelRenderer.rotateAngleX = x;
-		modelRenderer.rotateAngleY = y;
-		modelRenderer.rotateAngleZ = z;
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/tileentities/TileEntity_JewelersBench.java b/src/main/java/lance5057/tDefense/baubles/tileentities/TileEntity_JewelersBench.java
deleted file mode 100644
index 5d6e187..0000000
--- a/src/main/java/lance5057/tDefense/baubles/tileentities/TileEntity_JewelersBench.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package lance5057.tDefense.baubles.tileentities;
-
-import net.minecraft.tileentity.TileEntity;
-
-public class TileEntity_JewelersBench extends TileEntity
-{
-
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/tools/BaubleTool.java b/src/main/java/lance5057/tDefense/baubles/tools/BaubleTool.java
deleted file mode 100644
index b393100..0000000
--- a/src/main/java/lance5057/tDefense/baubles/tools/BaubleTool.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package lance5057.tDefense.baubles.tools;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import baubles.api.BaubleType;
-import baubles.api.IBauble;
-import baubles.api.render.IRenderBauble;
-import lance5057.tDefense.core.materials.ShieldMaterialStats;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.item.EnumAction;
-import net.minecraft.item.IItemPropertyGetter;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.common.Optional;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import slimeknights.tconstruct.library.client.model.ToolModelLoader;
-import slimeknights.tconstruct.library.tinkering.PartMaterialType;
-import slimeknights.tconstruct.library.tools.ToolCore;
-import slimeknights.tconstruct.library.tools.ToolNBT;
-import slimeknights.tconstruct.tools.TinkerTools;
-
-//@Optional.InterfaceList({@Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.ISheathed"), @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowCatcher"), @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IArrowDisplay"), @Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.shield.IShield")})
-public abstract class BaubleTool extends ToolCore implements IBauble, IRenderBauble
-{
-	//protected static PartMaterialType ShieldMat = new PartMaterialType(TinkerTools.largePlate, ShieldMaterialStats.TYPE);
-	
-	public BaubleTool(PartMaterialType... requiredComponents)
-	{
-		super(requiredComponents);
-		
-//		this.addPropertyOverride(new ResourceLocation("block"), new IItemPropertyGetter()
-//        {
-//            @SideOnly(Side.CLIENT)
-//            public float apply(ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn)
-//            {
-//            	float i = entityIn != null && entityIn.isHandActive() && entityIn.getActiveItemStack() == stack ? 1.0F : 0.0F;
-//                return i;
-//            }
-//        });
-	}
-
-	protected float baseSpeed()
-	{
-		return 1.5f;
-	}
-
-	protected float effectiveSpeed()
-	{
-		return 15f;
-	}
-
-	public float breakSpeedModifier()
-	{
-		return 1.0f;
-	}
-
-//	@Override
-//	public float getDigSpeed(ItemStack stack, Block block, int meta)
-//	{
-//		return 0.0f;
-//	}
-
-	/**
-	 * returns the action that specifies what animation to play when the items
-	 * is being used
-	 */
-//	@Override
-//	public EnumAction getItemUseAction(ItemStack par1ItemStack)
-//	{
-//		return EnumAction.BLOCK;
-//	}
-	
-//	public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand)
-//    {
-//        playerIn.setActiveHand(hand);
-//        return new ActionResult(EnumActionResult.SUCCESS, itemStackIn);
-//    }
-//	
-//	public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ)
-//    {
-//        return super.onItemUse(stack, playerIn, worldIn, pos, hand, facing, hitX, hitY, hitZ);
-//    }
-
-	/**
-	 * How long it takes to use or consume an item
-	 */
-	@Override
-	public int getMaxItemUseDuration(ItemStack par1ItemStack)
-	{
-		return 72000;
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
-	{
-//		super.onUpdate(stack, world, entity, par4, par5);
-//		if(entity instanceof EntityPlayerSP)
-//		{
-//			final EntityPlayerSP player = (EntityPlayerSP) entity;
-//			final ItemStack usingItem = player.getActiveItemStack();
-//			if(usingItem != null && usingItem.getItem() == this)
-//			{
-//				player.movementInput.moveForward *= 2.5F;
-//				player.movementInput.moveStrafe *= 2.5F;
-//			}
-//		}
-	}
-
-	protected String getHarvestType()
-	{
-		return null;
-	}
-
-	@Override
-	public float damagePotential() {
-		// TODO Auto-generated method stub
-		return 0.1f;
-	}
-
-	@Override
-	public double attackSpeed() {
-		// TODO Auto-generated method stub
-		return 4;
-	}
-
-	@Override
-	public NBTTagCompound buildTag(
-			List<slimeknights.tconstruct.library.materials.Material> materials) {
-		ToolNBT data = buildDefaultTag(materials);
-		return data.get();
-	}
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/tools/Sheathe.java b/src/main/java/lance5057/tDefense/baubles/tools/Sheathe.java
deleted file mode 100644
index f9c62cc..0000000
--- a/src/main/java/lance5057/tDefense/baubles/tools/Sheathe.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package lance5057.tDefense.baubles.tools;
-
-import baubles.api.BaubleType;
-import lance5057.tDefense.Reference;
-import lance5057.tDefense.TinkersDefense;
-import lance5057.tDefense.baubles.BaublesBase;
-import lance5057.tDefense.proxy.ClientProxy;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import slimeknights.tconstruct.library.tinkering.PartMaterialType;
-import slimeknights.tconstruct.tools.TinkerTools;
-
-public class Sheathe extends BaubleTool {
-	private static final ResourceLocation texture = new ResourceLocation(Reference.MOD_ID, "textures/model/sheathe.png");
-
-	public Sheathe(PartMaterialType... requiredComponents) {
-		super(PartMaterialType.head(TinkerTools.largePlate), PartMaterialType.handle(TinkerTools.toolRod),
-				PartMaterialType.extra(TinkerTools.bowString));
-
-	}
-
-	@Override
-	public BaubleType getBaubleType(ItemStack itemstack) { 
-		// TODO Auto-generated method stub
-		return BaubleType.BODY;
-	}
-
-	@Override
-	public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) {
-		// TODO Auto-generated method stub
-
-		if (type == RenderType.BODY) {
-			float s = 1F / 16F;
-			GlStateManager.scale(s, s, s);
-
-			GlStateManager.enableLighting();
-			GlStateManager.enableRescaleNormal();
-
-			Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-
-			ClientProxy.baubles.sheathe.render(1f, player.inventory.getStackInSlot(0), player.inventory.getStackInSlot(1), player.getHeldItemMainhand(), player.getHeldItemOffhand());
-		}
-	}
-
-}
diff --git a/src/main/java/lance5057/tDefense/baubles/tools/TDBaubles.java b/src/main/java/lance5057/tDefense/baubles/tools/TDBaubles.java
deleted file mode 100644
index f06a217..0000000
--- a/src/main/java/lance5057/tDefense/baubles/tools/TDBaubles.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package lance5057.tDefense.baubles.tools;
-
-import com.google.common.eventbus.Subscribe;
-
-import lance5057.tDefense.core.tools.HeaterShield;
-import lance5057.tDefense.core.tools.RoundShield;
-import lance5057.tDefense.core.tools.TDToolEvents;
-import lance5057.tDefense.core.tools.Zweihander;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.registry.GameRegistry;
-import slimeknights.tconstruct.library.TinkerRegistry;
-import slimeknights.tconstruct.library.tools.ToolCore;
-
-public class TDBaubles
-{
-
-	TDToolEvents events = new TDToolEvents();
-
-  // Tools
-	public static ToolCore sheathe = new Sheathe();
-	
-  // Tool Parts
-
-  // Modifiers
-
-  // Helper stuff
-//  static List<ToolCore> tools = Lists.newLinkedList();      // contains all tools registered in this pulse
-//  static List<ToolPart> toolparts = Lists.newLinkedList();  // ^ all toolparts
-//  static List<IModifier> modifiers = Lists.newLinkedList(); // ^ all modifiers
-
-  // PRE-INITIALIZATION
-  @Subscribe
-  public void preInit(FMLPreInitializationEvent event) {
-    // register items
-	  MinecraftForge.EVENT_BUS.register(events);
-
-    regToolParts();
-    regTools();
-    registerModifiers();
-
-    // register blocks
-
-    // register entities
-    
-    //proxy.preInit();
-  }
-
-  private void regToolParts() {
-    // The order the items are registered in represents the order in the stencil table GUI too
-	  
-  }
-
-  private void regTools() {
-	  
-	  regTool(sheathe, "sheathe");
-	  
-	  TinkerRegistry.registerToolStationCrafting(sheathe);
-  }
-  
-  private void regTool(ToolCore tool, String name)
-  {
-	  tool.setRegistryName(new ResourceLocation("tinkersdefense:" + name));
-	  TinkerRegistry.registerTool(tool);
-	  GameRegistry.register(tool);
-  }
-
-  private void registerModifiers() {
-
-  }
-
-  // INITIALIZATION
-  @Subscribe
-  public void init(FMLInitializationEvent event) {
-    regToolBuilding();
-    regRecipies();
-
-    //proxy.init();
-  }
-
-  private void regToolBuilding() {
-    TinkerRegistry.registerToolCrafting(sheathe);
-  }
-
-  private void regRecipies() {
-
-  }
-  
-  // POST-INITIALIZATION
-  @Subscribe
-  public void postInit(FMLPostInitializationEvent event) {
-    //proxy.postInit();
-  }
-  
-  
-}
\ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/baubles/tools/TinkersGauntlets.java b/src/main/java/lance5057/tDefense/baubles/tools/TinkersGauntlets.java
deleted file mode 100644
index 688aaa7..0000000
--- a/src/main/java/lance5057/tDefense/baubles/tools/TinkersGauntlets.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package lance5057.tDefense.baubles.tools;
-//package lance5057.tDefense.armor.items;
-//
-//import lance5057.tDefense.TinkersDefense;
-//import lance5057.tDefense.armor.ArmorCore;
-//import lance5057.tDefense.armor.renderers.ArmorRenderer;
-//import lance5057.tDefense.proxy.ClientProxy;
-//import net.minecraft.entity.Entity;
-//import net.minecraft.item.Item;
-//import net.minecraft.item.ItemStack;
-//import tconstruct.library.accessory.IAccessory;
-//import tconstruct.tools.TinkerTools;
-//
-//public class TinkersGauntlets extends ArmorCore implements IAccessory
-//{
-//	public TinkersGauntlets()
-//	{
-//		super(0, -1);
-//		setUnlocalizedName("tinkersgauntlets");
-//	}
-//
-//	@Override
-//	public boolean canEquipAccessory(ItemStack item, int slot)
-//	{
-//		return slot == 1;
-//	}
-//
-//	@Override
-//	public Item getHeadItem()
-//	{
-//		return TinkersDefense.partArmorplate;
-//	}
-//
-//	@Override
-//	public Item getHandleItem()
-//	{
-//		return TinkerTools.toughRod;
-//	}
-//
-//	@Override
-//	public Item getAccessoryItem()
-//	{
-//		return TinkersDefense.partRivet;
-//	}
-//
-//	@Override
-//	public int durabilityTypeAccessory()
-//	{
-//		return 2;
-//	}
-//
-//	@Override
-//	public float getRepairCost()
-//	{
-//		return 1.0f;
-//	}
-//
-//	@Override
-//	public float getDurabilityModifier()
-//	{
-//		return 2.5f;
-//	}
-//
-//	@Override
-//	public float getDamageModifier()
-//	{
-//		return 0f;
-//	}
-//
-//	@Override
-//	public int getPartAmount()
-//	{
-//		return 3;
-//	}
-//
-//	@Override
-//	public String getIconSuffix(int partType)
-//	{
-//		switch(partType)
-//		{
-//			case 0:
-//				return "_gauntlet_plate";
-//			case 1:
-//				return "_gauntlet_plate_broken";
-//			case 2:
-//				return "_gauntlet_trim";
-//			case 3:
-//				return "_gauntlet_rivet";
-//			default:
-//				return "";
-//		}
-//	}
-//
-//	@Override
-//	public String getEffectSuffix()
-//	{
-//		return "_gauntlet_effect";
-//	}
-//
-//	@Override
-//	public String getDefaultFolder()
-//	{
-//		return "armor/gauntlets";
-//	}
-//
-//	// @Override
-//	// public void onUpdate(ItemStack stack, World world, Entity entity, int
-//	// par4,
-//	// boolean par5) {
-//	// super.onUpdate(stack, world, entity, par4, par5);
-//	//
-//	// }
-//
-//	@Override
-//	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
-//	{
-//		return "tinkersdefense:textures/armor/Tinkersgauntlet.png";
-//	}
-//
-//	@Override
-//	public String[] getTraits()
-//	{
-//		return new String[] {"hands", "gauntlet"};
-//	}
-//
-//	@Override
-//	public ArmorRenderer getRenderer()
-//	{
-//		return ClientProxy.gauntlets;
-//	}
-//}