Buncha updates, forgot to github

3 files changed, 318 insertions, 7 deletions

diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
index 30b841f..e36aab8 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java
@@ -63,16 +63,16 @@ public class Gui_FinishingAnvil extends GuiContainer
 	public void initGui()
 	{
 		super.initGui();
-		this.buttonList.add(new GuiButton(1 ,this.guiLeft+25, this.guiTop+10, 10, 10,"▲"));
-		this.buttonList.add(new GuiButton(2 ,this.guiLeft+25, this.guiTop+59, 10, 10,"▼"));
-		this.buttonList.add(new GuiButton(3 ,this.guiLeft+47, this.guiTop+49, 18, 18,"✓"));
+		this.buttonList.add(new GuiButton(1 ,this.guiLeft+25, this.guiTop+10, 10, 10,""));
+		this.buttonList.add(new GuiButton(2 ,this.guiLeft+25, this.guiTop+59, 10, 10,""));
+		this.buttonList.add(new GuiButton(3 ,this.guiLeft+47, this.guiTop+49, 18, 18,""));
 		
 		this.buttonList.add(new GuiButton(4 ,this.guiLeft+5, this.guiTop+10, 20, 20,""));
 		this.buttonList.add(new GuiButton(5 ,this.guiLeft+5, this.guiTop+30, 20, 20,""));
 		this.buttonList.add(new GuiButton(6 ,this.guiLeft+5, this.guiTop+50, 20, 20,""));
 		
-		this.buttonList.add(new GuiButton(7 ,this.guiLeft+120, this.guiTop+10, 10, 10,"▲"));
-		this.buttonList.add(new GuiButton(8 ,this.guiLeft+120, this.guiTop+59, 10, 10,"▼"));
+		this.buttonList.add(new GuiButton(7 ,this.guiLeft+120, this.guiTop+10, 10, 10,""));
+		this.buttonList.add(new GuiButton(8 ,this.guiLeft+120, this.guiTop+59, 10, 10,""));
 		
 		this.buttonList.add(new GuiButton(9 ,this.guiLeft+130, this.guiTop+10, 20, 20,""));
 		this.buttonList.add(new GuiButton(10 ,this.guiLeft+130, this.guiTop+30, 20, 20,""));
@@ -87,7 +87,7 @@ public class Gui_FinishingAnvil extends GuiContainer
 		switch(button.id)
 		{
 		case 1: if(this.leftButtonPosX > 0) this.leftButtonPosX--; break;
-		case 2: if(this.leftButtonPosX+2 < ((ToolCore)bigCopy.getItem()).getPartAmount() - 1) this.leftButtonPosX++; break;
+		case 2: if(this.leftButtonPosX+2 < ((ToolCore)bigCopy.getItem()).getPartAmount()) this.leftButtonPosX++; break;
 		
 		case 3: 
 			 TinkersDefense.INSTANCE.sendToServer(new Message_FinishingAnvil(inventory.xCoord, inventory.yCoord, inventory.zCoord, this.bigCopy));
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
new file mode 100644
index 0000000..61a4393
--- /dev/null
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
@@ -0,0 +1,201 @@
+package lance5057.tDefense.finishingAnvil.utilities;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import lance5057.tDefense.TinkersDefense;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.Item;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+import tconstruct.library.crafting.PatternBuilder;
+import tconstruct.library.crafting.PatternBuilder.MaterialSet;
+import tconstruct.library.tools.ToolCore;
+
+public class Injector extends ToolCore
+{
+
+	ToolCore tool;
+	
+	InjectorLocations injectLoc;
+	
+	List<String> heads= new ArrayList<String>();
+	List<String> accessorys= new ArrayList<String>();
+	List<String> handles = new ArrayList<String>();
+	List<String> extras = new ArrayList<String>();
+	
+	public Injector(int baseDamage, ToolCore tool, InjectorLocations injLoc) 
+	{
+		super(0);
+		this.tool = tool;
+		
+		injectLoc = injLoc;
+		
+		List<String> temp = injectLoc.getList(tool.getUnlocalizedName().substring(tool.getUnlocalizedName().lastIndexOf('.')+1, tool.getUnlocalizedName().length()));
+		
+		if(!temp.isEmpty())
+		{
+			for(int i = 0; i<temp.size(); i++)
+			{
+				if(temp.get(i).contains("head"))
+				{
+					heads.add(temp.get(i));
+				}
+				if(temp.get(i).contains("accessory"))
+				{
+					accessorys.add(temp.get(i));
+				}
+				if(temp.get(i).contains("handle"))
+				{
+					handles.add(temp.get(i));
+				}
+				if(temp.get(i).contains("extra"))
+				{
+					extras.add(temp.get(i));
+				}
+			}
+		}
+	}
+
+	protected void loadHeads(IIconRegister iconRegister)
+	{		
+		IIcon origHead = tool.headIcons.get(-1);
+		IIcon origAccessory = tool.accessoryIcons.get(-1);
+		IIcon origHandle = tool.handleIcons.get(-1);
+		IIcon origExtra = tool.handleIcons.get(-1);
+		
+		//File[] icons = new File("tinkersdefense:items/" + tool.getDefaultFolder()).listFiles();
+		
+		
+		ResourceLocation icons = new ResourceLocation("tinkersdefense", tool.getDefaultFolder());
+		String test = icons.toString();
+		for(int i = 0; i<heads.size(); i++)
+		{
+			PatternBuilder pb = PatternBuilder.instance;
+			for(Map.Entry<String, MaterialSet> entry : pb.materialSets.entrySet())
+			{
+				String icon = "tinkersdefense:";
+		        icon += tool.getDefaultFolder() + "/" + entry.getKey().toLowerCase() + "/" + heads.get(i);
+		        //toolIcons[i] = icon;
+		        headStrings.put(entry.getValue().materialID+(TinkersDefense.config.MaterialIndex*(i+1)), icon);
+			}
+			
+			addIcons(tool.headStrings, headIcons, iconRegister, heads.get(i), false);
+			
+			for(int j = (i+1)*TinkersDefense.config.MaterialIndex; j<TinkersDefense.config.MaterialIndex + ((i+1)*TinkersDefense.config.MaterialIndex); j++)
+			{
+				if(!headIcons.containsKey(j))
+				{
+					headIcons.put(j, headIcons.get(-1));
+				}
+			}
+			
+			tool.headStrings.putAll(headStrings);
+			tool.headIcons.putAll(headIcons);
+		}
+		
+		for(int i = 0; i<accessorys.size(); i++)
+		{
+			PatternBuilder pb = PatternBuilder.instance;
+			for(Map.Entry<String, MaterialSet> entry : pb.materialSets.entrySet())
+			{
+				String icon = "tinkersdefense:";
+		        icon += tool.getDefaultFolder() + "/" + entry.getKey().toLowerCase() + "/" + accessorys.get(i);
+		        //toolIcons[i] = icon;
+		        accessoryStrings.put(entry.getValue().materialID+(TinkersDefense.config.MaterialIndex*(i+1)), icon);
+			}
+			
+			addIcons(accessoryStrings, accessoryIcons, iconRegister, accessorys.get(i), false);
+			
+			for(int j = (i+1)*TinkersDefense.config.MaterialIndex; j<TinkersDefense.config.MaterialIndex + ((i+1)*TinkersDefense.config.MaterialIndex); j++)
+			{
+				if(!accessoryIcons.containsKey(j))
+				{
+					accessoryIcons.put(j, accessoryIcons.get(-1));
+				}
+			}
+			
+			tool.accessoryStrings.putAll(accessoryStrings);
+			tool.accessoryIcons.putAll(accessoryIcons);
+		}
+		
+		for(int i = 0; i<handles.size(); i++)
+		{
+			PatternBuilder pb = PatternBuilder.instance;
+			for(Map.Entry<String, MaterialSet> entry : pb.materialSets.entrySet())
+			{
+				String icon = "tinkersdefense:";
+		        icon += tool.getDefaultFolder() + "/" + entry.getKey().toLowerCase() + "/" + handles.get(i);
+		        //toolIcons[i] = icon;
+		        handleStrings.put(entry.getValue().materialID+(TinkersDefense.config.MaterialIndex*(i+1)), icon);
+			}
+			
+			addIcons(handleStrings, handleIcons, iconRegister, handles.get(i), false);
+			
+			for(int j = (i+1)*TinkersDefense.config.MaterialIndex; j<TinkersDefense.config.MaterialIndex + ((i+1)*TinkersDefense.config.MaterialIndex); j++)
+			{
+				if(!handleIcons.containsKey(j))
+				{
+					handleIcons.put(j, handleIcons.get(-1));
+				}
+			}
+			
+			tool.handleStrings.putAll(handleStrings);
+			tool.handleIcons.putAll(handleIcons);
+		}
+		
+		tool.headIcons.put(-1, origHead);
+		tool.accessoryIcons.put(-1, origAccessory);
+		tool.handleIcons.put(-1, origHandle);
+	}
+	
+	@Override
+    public void registerIcons (IIconRegister iconRegister)
+    {
+		loadHeads(iconRegister);
+    }
+	
+	@Override
+	 public String getDefaultTexturePath()
+	    {
+	        return "tinkersdefense:" + getDefaultFolder();
+	    }
+
+	@Override
+	public Item getAccessoryItem() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getDefaultFolder() {
+		// TODO Auto-generated method stub
+		String s = tool.getDefaultFolder();
+		return s;
+	}
+
+	@Override
+	public String getEffectSuffix() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Item getHeadItem() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String getIconSuffix(int arg0) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public String[] getTraits() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/InjectorLocations.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/InjectorLocations.java
index 38f2b2d..7d557cf 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/InjectorLocations.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/InjectorLocations.java
@@ -1,5 +1,115 @@
 package lance5057.tDefense.finishingAnvil.utilities;
 
-public class InjectorLocations {
+import java.util.ArrayList;
+import java.util.List;
 
+public class InjectorLocations 
+{
+	List<String> list;
+	
+	public InjectorLocations()
+	{
+		list = new ArrayList<String>();
+		
+		//BroadSword
+		list.add("broadsword_dull_head");
+		list.add("broadsword_elusive_head");
+		list.add("broadsword_glass_head");
+		list.add("broadsword_mace_head");
+		list.add("broadsword_plumed_head");
+		list.add("broadsword_repulsive_head");
+		list.add("broadsword_spiked_head");
+		list.add("broadsword_tapered_head");
+		list.add("broadsword_widebase_head");
+		list.add("broadsword_falchion_head");
+		list.add("broadsword_big_head");
+		list.add("broadsword_segmented_head");
+		list.add("broadsword_nofuller_head");
+		list.add("broadsword_hourglass_head");
+		list.add("broadsword_flat_head");
+		
+		list.add("broadsword_basket_accessory");
+		list.add("broadsword_curved_accessory");
+		list.add("broadsword_elusive_accessory");
+		list.add("broadsword_extended_accessory");
+		list.add("broadsword_legendary_accessory");
+		list.add("broadsword_no_accessory");
+		list.add("broadsword_basket_accessory");
+		list.add("broadsword_repulsive_accessory");
+		list.add("broadsword_square_accessory");
+		list.add("broadsword_straight_accessory");
+		list.add("broadsword_straight_accessory");
+		list.add("broadsword_bulbous_accessory");
+		list.add("broadsword_sun_accessory");
+		list.add("broadsword_lamenting_accessory");
+		list.add("broadsword_pixie_accessory");
+		list.add("broadsword_forked_accessory");
+		
+		list.add("broadsword_ornate_handle");
+		list.add("broadsword_thick_handle");
+		list.add("broadsword_short_handle");
+		
+		//Arrow
+		list.add("arrow_broad_head");
+		list.add("arrow_elven_head");
+		list.add("arrow_horned_head");
+		list.add("arrow_trident_head");
+		list.add("arrow_winged_head");
+		
+		list.add("arrow_bulbous_handle");
+		list.add("arrow_natural_handle");
+		
+		list.add("arrow_matted_accessory");
+		list.add("arrow_magic_accessory");
+		list.add("arrow_pixie_accessory");
+		list.add("arrow_small_accessory");
+		
+		//Axe
+		list.add("axe_bearded_head");
+		list.add("axe_broad_head");
+		list.add("axe_minecraft_head");
+		list.add("axe_thin_head");
+		
+		//Battleaxe
+		list.add("battleaxe_halbard_head");
+		list.add("battleaxe_magic_head");
+		list.add("battleaxe_scythe_head");
+		
+		list.add("battleaxe_magic_extra");
+		list.add("battleaxe_scythe_extra");
+		list.add("battleaxe_halbard_extra");
+		
+		list.add("battleaxe_magic_accessory");
+		list.add("battleaxe_halbard_accessory");
+		list.add("battleaxe_knob_accessory");
+		
+		//Battlesign
+		list.add("battlesign_small_handle");
+		list.add("battlesign_smalllong_handle");
+		
+		list.add("battlesign_arrow_head");
+		list.add("battlesign_caution_head");
+		list.add("battlesign_noentry_head");
+		list.add("battlesign_railroad_head");
+		list.add("battlesign_stop_head");
+		list.add("battlesign_X_head");
+	}
+	
+	public List getList(String part)
+	{
+		List<String> request = new ArrayList<String>();
+		
+		if(!list.isEmpty())
+		{
+			for(int i = 0; i < list.size(); i++)
+			{
+				if(list.get(i).contains(part.toLowerCase()))
+				{
+					request.add(list.get(i).substring(part.length(), list.get(i).length()));
+				}
+			}
+		}
+		
+		return request;
+	}
 }