From ba8feb526da0a1ce15a179e1e5ee44582f769768 Mon Sep 17 00:00:00 2001
From: Lance5057 <Lance5057@gmail.com>
Date: Fri, 18 Mar 2016 06:14:33 -0500
Subject: Added modifiers, beautified code

---
 .../finishingAnvil/utilities/Injector.java         | 127 +++++++++++----------
 .../utilities/InjectorLocations.java               |  36 +++---
 2 files changed, 84 insertions(+), 79 deletions(-)

(limited to 'src/main/java/lance5057/tDefense/finishingAnvil/utilities')

diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
index 61a4393..da9b672 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/Injector.java
@@ -16,27 +16,27 @@ 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) 
+	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()));
-		
+
+		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++)
+			for(int i = 0; i < temp.size(); i++)
 			{
 				if(temp.get(i).contains("head"))
 				{
@@ -59,142 +59,147 @@ public class Injector extends ToolCore
 	}
 
 	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++)
+		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);
+				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++)
+
+			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++)
+
+		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);
+				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++)
+
+			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++)
+
+		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);
+				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++)
+
+			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)
-    {
+	public void registerIcons(IIconRegister iconRegister)
+	{
 		loadHeads(iconRegister);
-    }
-	
+	}
+
 	@Override
-	 public String getDefaultTexturePath()
-	    {
-	        return "tinkersdefense:" + getDefaultFolder();
-	    }
+	public String getDefaultTexturePath()
+	{
+		return "tinkersdefense:" + getDefaultFolder();
+	}
 
 	@Override
-	public Item getAccessoryItem() {
+	public Item getAccessoryItem()
+	{
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public String getDefaultFolder() {
+	public String getDefaultFolder()
+	{
 		// TODO Auto-generated method stub
 		String s = tool.getDefaultFolder();
 		return s;
 	}
 
 	@Override
-	public String getEffectSuffix() {
+	public String getEffectSuffix()
+	{
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public Item getHeadItem() {
+	public Item getHeadItem()
+	{
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public String getIconSuffix(int arg0) {
+	public String getIconSuffix(int arg0)
+	{
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public String[] getTraits() {
+	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 7d557cf..f3693c1 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/InjectorLocations.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/InjectorLocations.java
@@ -3,14 +3,14 @@ package lance5057.tDefense.finishingAnvil.utilities;
 import java.util.ArrayList;
 import java.util.List;
 
-public class InjectorLocations 
+public class InjectorLocations
 {
-	List<String> list;
-	
+	List<String>	list;
+
 	public InjectorLocations()
 	{
 		list = new ArrayList<String>();
-		
+
 		//BroadSword
 		list.add("broadsword_dull_head");
 		list.add("broadsword_elusive_head");
@@ -27,7 +27,7 @@ public class InjectorLocations
 		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");
@@ -44,49 +44,49 @@ public class InjectorLocations
 		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");
@@ -94,11 +94,11 @@ public class InjectorLocations
 		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++)
@@ -109,7 +109,7 @@ public class InjectorLocations
 				}
 			}
 		}
-		
+
 		return request;
 	}
 }
-- 
cgit v1.2.3