Merge pull request #156 from draknyte1/Multiblock-Fix

Multiblock fix for #141, other misc. fixes & a few new additions.

1 files changed, 27 insertions, 17 deletions

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 f6507aa1c4..a287615315 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java
@@ -17,7 +17,7 @@ import java.util.Collection;
 
 public class GTPP_CapeRenderer
         extends RenderPlayer {
-    private final ResourceLocation[] mCapes = {new ResourceLocation("miscutils:textures/Orange.png"), new ResourceLocation("miscutils:textures/TesterCape.png"), new ResourceLocation("miscutils:textures/FancyCape.png"), new ResourceLocation("miscutils:textures/DevCape.png")};
+    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")};
     private final Collection<String> mCapeList;
 
     public GTPP_CapeRenderer(Collection<String> aCapeList) {
@@ -25,6 +25,12 @@ public class GTPP_CapeRenderer
         setRenderManager(RenderManager.instance);
     }
 
+    private final String[] mOrangeCapes = {"ImmortalPharaoh7", "Walmart_Employee", "ArchonCerulean", "asturrial"}; //Orange.png
+     private final String[] mTestCapes = {"123_456_789", "doomsquirter", "ukdunc"}; //TesterCape.png
+     private final String[] mBlueCapes = {"fobius", "cantankerousrex", "stephen_2015", "Dyonovan", "Bear989Sr", "CrazyJ1984"}; //Fancycape.png
+     private final String[] mDevCapes = {"draknyte1", "redmage17"}; //Capes for Developers
+    
+    
     public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) {
         AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer;
         if (GT_Utility.getFullInvisibility(aPlayer)) {
@@ -40,27 +46,31 @@ public class GTPP_CapeRenderer
         }
         try {
             ResourceLocation tResource = null;
-            if (aPlayer.getDisplayName().equalsIgnoreCase("draknyte1")) {
-                tResource = this.mCapes[3];
-            }
-            else if (aPlayer.getDisplayName().equalsIgnoreCase("fobius")) {
-                tResource = this.mCapes[2];
-            }
-            else if (aPlayer.getDisplayName().equalsIgnoreCase("doomsquirter")) {
-                tResource = this.mCapes[1];
+            
+            for (String mName : mOrangeCapes){
+            	if (mName.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
+                    tResource = this.mCapes[0];
+                }
             }
-            else  if (aPlayer.getDisplayName().equalsIgnoreCase("ukdunc")) {
-                tResource = this.mCapes[1];
+            for (String mName : mTestCapes){
+            	if (mName.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
+                    tResource = this.mCapes[1];
+                }
             }
-            else if (aPlayer.getDisplayName().equalsIgnoreCase("cantankerousrex")) {
-                tResource = this.mCapes[2];
+            for (String mName : mBlueCapes){
+            	if (mName.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
+                    tResource = this.mCapes[2];
+                }
             }
-            else if (aPlayer.getDisplayName().equalsIgnoreCase("123_456_789")) {
-                tResource = this.mCapes[1];
+            for (String mName : mDevCapes){
+            	if (mName.toLowerCase().contains(aPlayer.getDisplayName().toLowerCase())) {
+                    tResource = this.mCapes[3];
+                }
             }
-            else 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();