% Rewrote cape handling to be more robust.

% Gave more people capes.

3 files changed, 203 insertions, 112 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 80c7959a4f..61e358fabe 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -5,6 +5,7 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Timer;
 
 import cpw.mods.fml.common.Mod;
@@ -23,6 +24,8 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
 
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.api.objects.minecraft.ChunkManager;
 import gtPlusPlus.core.commands.CommandMath;
 import gtPlusPlus.core.common.CommonProxy;
@@ -147,7 +150,7 @@ public class GTplusplus implements ActionListener {
 		BookHandler.runLater();
 		Core_Manager.postInit();
 		RecipeGen_Recycling.executeGenerators();	
-		
+
 		Logger.INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
 		Logger.INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: "
 				+ RegistrationHandler.recipesFailed + " |");
@@ -162,9 +165,9 @@ public class GTplusplus implements ActionListener {
 
 	@EventHandler
 	public void serverStarting(final FMLServerStartingEvent event) {
-		
+
 		if (CORE.DEVENV)
-		event.registerServerCommand(new CommandMath());
+			event.registerServerCommand(new CommandMath());
 
 		//Chunk Loading
 		Timer h = ChunkManager.createChunkQueue();
@@ -194,15 +197,15 @@ public class GTplusplus implements ActionListener {
 	public void actionPerformed(final ActionEvent arg0) {
 
 	}
-	
-	
+
+
 	/**
 	 * This {@link EventHandler} is called after the {@link FMLPostInitializationEvent} stages of all loaded mods executes successfully.
 	 * {@link #onLoadComplete(FMLLoadCompleteEvent)} exists to inject recipe generation after Gregtech and all other mods are entirely loaded and initialized.
 	 * @param event - The {@link EventHandler} object passed through from FML to {@link #GTplusplus()}'s {@link #instance}.
 	 */
 	@Mod.EventHandler
-    public void onLoadComplete(FMLLoadCompleteEvent event) {		
+	public void onLoadComplete(FMLLoadCompleteEvent event) {		
 		RecipeGen_BlastSmelterGT_GTNH.generateGTNHBlastSmelterRecipesFromEBFList();
 		FishPondFakeRecipe.generateFishPondRecipes();
 
@@ -219,14 +222,14 @@ public class GTplusplus implements ActionListener {
 				CORE.RA.addMultiblockElectrolyzerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mDuration, x.mEUt);
 			}
 		}
-		
+
 		//Advanced Vacuum Freezer generation
 		for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList) {
 			if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) {			
 				CORE.RA.addAdvancedFreezerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, (x.mDuration/2), x.mEUt);
 			}
 		}
-		
+
 	}
 
 	protected void dumpGtRecipeMap(final GT_Recipe_Map r) {
@@ -296,4 +299,61 @@ public class GTplusplus implements ActionListener {
 		//Force - Alloying
 		mGregMatLoader.enableMaterial(Materials.Force);		
 	}
+
+	/**
+	 * Capes
+	 */
+
+	public static final AutoMap<Pair<String, String>> mOrangeCapes = new AutoMap<Pair<String, String>>();
+	public static final AutoMap<Pair<String, String>> mMiscCapes = new AutoMap<Pair<String, String>>();
+	public static final AutoMap<Pair<String, String>> mBetaTestCapes = new AutoMap<Pair<String, String>>();
+	public static final AutoMap<Pair<String, String>> mDevCapes = new AutoMap<Pair<String, String>>();
+	public static final AutoMap<Pair<String, String>> mPatreonCapes = new AutoMap<Pair<String, String>>();
+
+	public static void BuildCapeList() {
+		//Basic Orange Cape (I give these away at times, just because)
+		mOrangeCapes.put(new Pair<String, String>("ImmortalPharaoh7", "c8c479b2-7464-4b20-adea-b43ff1c10c53"));
+		mOrangeCapes.put(new Pair<String, String>("Walmart_Employee", "7a56602b-9a67-44e3-95a5-270f887712c6"));
+		mOrangeCapes.put(new Pair<String, String>("ArchonCerulean", "f773e61f-261f-41e7-a221-5dcace291ced"));
+		mOrangeCapes.put(new Pair<String, String>("asturrial", "26c4881f-c708-4c5d-aa76-4419c3a1265b"));
+		mOrangeCapes.put(new Pair<String, String>("netmc", "c3ecbcc3-0d83-4da6-bb89-69f3f1a6e38b"));
+		mOrangeCapes.put(new Pair<String, String>("twinsrock8", "c1239b45b-b3a3-4282-8143-c73778897dda"));
+		mOrangeCapes.put(new Pair<String, String>("Ajes", "b1781fc7-35ca-4255-a21c-cdb1b7ea1853"));
+		mOrangeCapes.put(new Pair<String, String>("Piky", "7822ae35-9d5a-4fe7-bd5f-d03006932a65"));
+		mOrangeCapes.put(new Pair<String, String>("LAGIdiot", "44f38ff8-aad7-49c3-acb3-d92317af9078"));
+		mOrangeCapes.put(new Pair<String, String>("Snaggerr", "7e553c3b-b259-4c16-992a-c8c107401e74"));
+		mOrangeCapes.put(new Pair<String, String>("Semmelx4", "651b3963-038f-4769-9f75-0eaca0c4e748"));
+		//mOrangeCapes.put(new Pair<String, String>("aaaa", "1234"));
+		//mOrangeCapes.put(new Pair<String, String>("aaaa", "1234"));
+		//mOrangeCapes.put(new Pair<String, String>("aaaa", "1234"));
+
+		//Misc
+		mMiscCapes.put(new Pair<String, String>("doomsquirter", "3aee80ab-d982-4e6d-b8d0-7912bbd75f5d"));
+		mMiscCapes.put(new Pair<String, String>("ukdunc", "17d57521-3a1e-4eb9-91e6-901a65c15e07"));
+		mMiscCapes.put(new Pair<String, String>("JaidenC", "00b157e5-cd97-43a2-a080-460f550e93cd"));
+		mMiscCapes.put(new Pair<String, String>("TheGiggitygoo", "9f996c78-bddc-4dec-a522-0df7267f11f3"));
+
+		//Beta/Dev Tester Capes
+		mBetaTestCapes.put(new Pair<String, String>("fobius", "ca399a5b-d1bb-46e3-af5b-5939817b5cf8"));
+		mBetaTestCapes.put(new Pair<String, String>("cantankerousrex", ""));
+		mBetaTestCapes.put(new Pair<String, String>("stephen_2015", "004ae3d8-ecaf-48eb-9e4e-224d42d31c78"));
+		mBetaTestCapes.put(new Pair<String, String>("Dyonovan", "2f3a7dff-b1ec-4c05-8eed-63ad2a3ba73f"));
+		mBetaTestCapes.put(new Pair<String, String>("Bear989Sr", "1964e3d1-6500-40e7-9ff2-e6161d41a8c2"));
+		mBetaTestCapes.put(new Pair<String, String>("CrazyJ1984", "d84f9654-87ea-46a9-881f-c6aa45dd5af8"));
+		mBetaTestCapes.put(new Pair<String, String>("AndreyKV", "9550c173-a8c5-4e7f-bf8d-b5ded56921ef"));
+		
+		//Dev Capes
+		mDevCapes.put(new Pair<String, String>("draknyte1", "5652713c-668e-47f3-853a-3fa959a9dfd3"));
+		mDevCapes.put(new Pair<String, String>("crimsonhood17", "c4773470-2585-4bd7-82b3-8764ca6acd08"));
+
+		
+		/**
+		 * Patreons
+		 */
+		
+		mPatreonCapes.put(new Pair<String, String>("Baxterzz", "e8aa5500-7319-4453-822c-b96b29ab5981"));
+		mPatreonCapes.put(new Pair<String, String>("leagris", "09752aa3-8b9c-4f8f-b04f-5421e799547d"));
+		mPatreonCapes.put(new Pair<String, String>("Traumeister", "fd3f46ac-801a-4566-90b5-75cb362d261e"));
+	}
+
 }
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index d2732cac86..ca26ca21ff 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1243,6 +1243,19 @@ public class RECIPES_GREGTECH {
 					FluidUtils.getFluidStack("ammonium", 2000),
 					ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2), 20 * 20);
 		}
+		
+		GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), // Input
+				// Stack
+				// 1
+				ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), // Input
+				// Stack
+				// 2
+				null, // Fluid Input
+				null, // Fluid Output
+				ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 10), // Output
+				// Stack
+				600 * 20);
+		
 	}
 
 	private static void blastFurnaceRecipes() {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
index 7667ca1eee..ff7cf6c76f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -1,14 +1,20 @@
 package gtPlusPlus.xmod.gregtech.common.render;
 
+import static gtPlusPlus.GTplusplus.*;
+
 import java.util.Collection;
+import java.util.UUID;
 
 import org.lwjgl.opengl.GL11;
 
+import com.mojang.authlib.GameProfile;
+
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.potion.Potion;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 
@@ -16,115 +22,127 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_Utility;
 
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.lib.CORE;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 
 public class GTPP_CapeRenderer
-        extends RenderPlayer {
-    private final ResourceLocation[] mCapes = {new ResourceLocation("miscutils:textures/OrangeHD.png"), new ResourceLocation("miscutils:textures/TesterCapeHD.png"), new ResourceLocation("miscutils:textures/FancyCapeHD.png"), new ResourceLocation("miscutils:textures/DevCapeHD.png"), new ResourceLocation("miscutils:textures/PatreonCapeHD.png")};
-    private final Collection<String> mCapeList;
+extends RenderPlayer {
+	private final ResourceLocation[] mCapes = {new ResourceLocation("miscutils:textures/OrangeHD.png"), new ResourceLocation("miscutils:textures/TesterCapeHD.png"), new ResourceLocation("miscutils:textures/FancyCapeHD.png"), new ResourceLocation("miscutils:textures/DevCapeHD.png"), new ResourceLocation("miscutils:textures/PatreonCapeHD.png")};
+	private final Collection<String> mCapeList;
+
+	public GTPP_CapeRenderer(Collection<String> aCapeList) {
+		this.mCapeList = aCapeList;
+		setRenderManager(RenderManager.instance);
+		BuildCapeList();
+	}
 
-    public GTPP_CapeRenderer(Collection<String> aCapeList) {
-        this.mCapeList = aCapeList;
-        setRenderManager(RenderManager.instance);
-    }
+	public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) {
+		AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer;		
+		if (mDevCapes.size() <= 1) {
+			BuildCapeList();
+		}		
+		if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible() || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) {
+			aEvent.setCanceled(true);
+			return;
+		}
+		float aPartialTicks = aEvent.partialRenderTick;
+		try {
+			ResourceLocation tResource = null;			
+			String mTemp = "";
+			
+			for (Pair<String, String> mName : mOrangeCapes){				
+				mTemp = getPlayerName((String) mName.getKey(), (String) mName.getValue());
+				if (mTemp.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
+					tResource = this.mCapes[0];
+				}
+			}
+			for (Pair<String, String> mName : mMiscCapes){
+				mTemp = getPlayerName((String) mName.getKey(), (String) mName.getValue());
+				if (mTemp.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
+					tResource = this.mCapes[1];
+				}
+			}
+			for (Pair<String, String> mName : mBetaTestCapes){
+				mTemp = getPlayerName((String) mName.getKey(), (String) mName.getValue());
+				if (mTemp.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
+					tResource = this.mCapes[2];
+				}
+			}
+			for (Pair<String, String> mName : mDevCapes){
+				mTemp = getPlayerName((String) mName.getKey(), (String) mName.getValue());
+				if (mTemp.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
+					tResource = this.mCapes[3];
+				}
+			}
+			for (Pair<String, String> mName : mPatreonCapes){
+				mTemp = getPlayerName((String) mName.getKey(), (String) mName.getValue());
+				if (mTemp.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
+					tResource = this.mCapes[4];
+				}
+			}
+			
+			if (CORE.DEVENV) {
+				tResource = this.mCapes[3];
+			}
 
-    private final String[] mOrangeCapes = {"ImmortalPharaoh7", "Walmart_Employee", "ArchonCerulean", "asturrial", "netmc"}; //Orange.png
-     private final String[] mTestCapes = {"123_456_789", "doomsquirter", "ukdunc", "JaidenC", "TheGiggitygoo"}; //TesterCape.png
-     private final String[] mBlueCapes = {"fobius", "cantankerousrex", "stephen_2015", "Dyonovan", "Bear989Sr", "CrazyJ1984", "AndreyKV"}; //Fancycape.png
-     private final String[] mDevCapes = {"draknyte1", "redmage17"}; //Capes for Developers
-     
-     
-     /**
-      * Patreon capes
-      * 
-      */
-     
-     private final String[] mPatreonCapes = {"Traumeister"}; //Capes for Patrons
-    
-    
-    public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) {
-        AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer;
-        if (GT_Utility.getFullInvisibility(aPlayer)) {
-            aEvent.setCanceled(true);
-            return;
-        }
-        float aPartialTicks = aEvent.partialRenderTick;
-        if (aPlayer.isInvisible()) {
-            return;
-        }
-        if (GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) {
-            return;
-        }
-        try {
-            ResourceLocation tResource = null;
-            
-            for (String mName : mOrangeCapes){
-            	if (mName.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
-                    tResource = this.mCapes[0];
-                }
-            }
-            for (String mName : mTestCapes){
-            	if (mName.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
-                    tResource = this.mCapes[1];
-                }
-            }
-            for (String mName : mBlueCapes){
-            	if (mName.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
-                    tResource = this.mCapes[2];
-                }
-            }
-            for (String mName : mDevCapes){
-            	if (mName.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
-                    tResource = this.mCapes[3];
-                }
-            }
-            for (String mName : mPatreonCapes){
-            	if (mName.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
-                    tResource = this.mCapes[4];
-                }
-            }
-            
-            /*if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase())) {
+			/*if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase())) {
                 tResource = this.mCapes[0];
             }*/
-            if ((tResource != null) && (!aPlayer.getHideCape())) {
-                bindTexture(tResource);
-                GL11.glPushMatrix();
-                GL11.glTranslatef(0.0F, 0.0F, 0.125F);
-                double d0 = aPlayer.field_71091_bM + (aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks - (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks);
-                double d1 = aPlayer.field_71096_bN + (aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks - (aPlayer.prevPosY + (aPlayer.posY - aPlayer.prevPosY) * aPartialTicks);
-                double d2 = aPlayer.field_71097_bO + (aPlayer.field_71085_bR - aPlayer.field_71097_bO) * aPartialTicks - (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks);
-                float f6 = aPlayer.prevRenderYawOffset + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks;
-                double d3 = MathHelper.sin(f6 * 3.141593F / 180.0F);
-                double d4 = -MathHelper.cos(f6 * 3.141593F / 180.0F);
-                float f7 = (float) d1 * 10.0F;
-                float f8 = (float) (d0 * d3 + d2 * d4) * 100.0F;
-                float f9 = (float) (d0 * d4 - d2 * d3) * 100.0F;
-                if (f7 < -6.0F) {
-                    f7 = -6.0F;
-                }
-                if (f7 > 32.0F) {
-                    f7 = 32.0F;
-                }
-                if (f8 < 0.0F) {
-                    f8 = 0.0F;
-                }
-                float f10 = aPlayer.prevCameraYaw + (aPlayer.cameraYaw - aPlayer.prevCameraYaw) * aPartialTicks;
-                f7 += MathHelper.sin((aPlayer.prevDistanceWalkedModified + (aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified) * aPartialTicks) * 6.0F) * 32.0F * f10;
-                if (aPlayer.isSneaking()) {
-                    f7 += 25.0F;
-                }
-                GL11.glRotatef(6.0F + f8 / 2.0F + f7, 1.0F, 0.0F, 0.0F);
-                GL11.glRotatef(f9 / 2.0F, 0.0F, 0.0F, 1.0F);
-                GL11.glRotatef(-f9 / 2.0F, 0.0F, 1.0F, 0.0F);
-                GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
-                ((ModelBiped) this.mainModel).renderCloak(0.0625F);
-                GL11.glPopMatrix();
-            }
-        } catch (Throwable e) {
-            if (GT_Values.D1) {
-                e.printStackTrace(GT_Log.err);
-            }
-        }
-    }
+			if ((tResource != null) && (!aPlayer.getHideCape())) {
+				bindTexture(tResource);
+				GL11.glPushMatrix();
+				GL11.glTranslatef(0.0F, 0.0F, 0.125F);
+				double d0 = aPlayer.field_71091_bM + (aPlayer.field_71094_bP - aPlayer.field_71091_bM) * aPartialTicks - (aPlayer.prevPosX + (aPlayer.posX - aPlayer.prevPosX) * aPartialTicks);
+				double d1 = aPlayer.field_71096_bN + (aPlayer.field_71095_bQ - aPlayer.field_71096_bN) * aPartialTicks - (aPlayer.prevPosY + (aPlayer.posY - aPlayer.prevPosY) * aPartialTicks);
+				double d2 = aPlayer.field_71097_bO + (aPlayer.field_71085_bR - aPlayer.field_71097_bO) * aPartialTicks - (aPlayer.prevPosZ + (aPlayer.posZ - aPlayer.prevPosZ) * aPartialTicks);
+				float f6 = aPlayer.prevRenderYawOffset + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks;
+				double d3 = MathHelper.sin(f6 * 3.141593F / 180.0F);
+				double d4 = -MathHelper.cos(f6 * 3.141593F / 180.0F);
+				float f7 = (float) d1 * 10.0F;
+				float f8 = (float) (d0 * d3 + d2 * d4) * 100.0F;
+				float f9 = (float) (d0 * d4 - d2 * d3) * 100.0F;
+				if (f7 < -6.0F) {
+					f7 = -6.0F;
+				}
+				if (f7 > 32.0F) {
+					f7 = 32.0F;
+				}
+				if (f8 < 0.0F) {
+					f8 = 0.0F;
+				}
+				float f10 = aPlayer.prevCameraYaw + (aPlayer.cameraYaw - aPlayer.prevCameraYaw) * aPartialTicks;
+				f7 += MathHelper.sin((aPlayer.prevDistanceWalkedModified + (aPlayer.distanceWalkedModified - aPlayer.prevDistanceWalkedModified) * aPartialTicks) * 6.0F) * 32.0F * f10;
+				if (aPlayer.isSneaking()) {
+					f7 += 25.0F;
+				}
+				GL11.glRotatef(6.0F + f8 / 2.0F + f7, 1.0F, 0.0F, 0.0F);
+				GL11.glRotatef(f9 / 2.0F, 0.0F, 0.0F, 1.0F);
+				GL11.glRotatef(-f9 / 2.0F, 0.0F, 1.0F, 0.0F);
+				GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F);
+				((ModelBiped) this.mainModel).renderCloak(0.0625F);
+				GL11.glPopMatrix();
+			}
+		} catch (Throwable e) {
+			if (GT_Values.D1) {
+				e.printStackTrace(GT_Log.err);
+			}
+		}
+	}
+
+	private String getPlayerName(String name, String uuid) {
+		if (uuid != null) {    		
+			if (uuid.length() > 0) {
+				UUID g = UUID.fromString(uuid);
+				if (g != null) {
+					GameProfile profile = MinecraftServer.getServer().func_152358_ax().func_152652_a(g);
+					if (profile != null) {
+						return profile.getName();
+					}  
+				}
+			}    		
+		}    	
+		return name;
+	}
+
 }
\ No newline at end of file