% Rewrote cape handling to be more robust.

% Gave more people capes.

1 files changed, 122 insertions, 104 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 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