% Cape Changes.

2 files changed, 60 insertions, 51 deletions

diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
index 1500982990..c53642c0ec 100644
--- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -20,6 +20,7 @@ import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
 import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
 import gtPlusPlus.core.handler.render.FirepitRender;
+import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.general.TileEntityFirepit;
 import gtPlusPlus.core.util.Utils;
@@ -33,24 +34,28 @@ import net.minecraft.entity.Entity;
 public class ClientProxy extends CommonProxy implements Runnable{
 
 	private final HashSet mCapeList = new HashSet();
-    private final GTPP_CapeRenderer mCapeRenderer;
-	 
-    public ClientProxy(){
-    	mCapeRenderer = new GTPP_CapeRenderer(mCapeList);
-    }
+	private final GTPP_CapeRenderer mCapeRenderer;
+
+	public ClientProxy(){
+		mCapeRenderer = new GTPP_CapeRenderer(mCapeList);
+	}
+
+	@SubscribeEvent
+	public void receiveRenderSpecialsEvent(net.minecraftforge.client.event.RenderPlayerEvent.Specials.Pre aEvent) {
+		if (CORE.mEnableCape){
+		mCapeRenderer.receiveRenderSpecialsEvent(aEvent);
+		}
+	}
 
-    @SubscribeEvent
-    public void receiveRenderSpecialsEvent(net.minecraftforge.client.event.RenderPlayerEvent.Specials.Pre aEvent) {
-        mCapeRenderer.receiveRenderSpecialsEvent(aEvent);
-    }
-    
 	@SideOnly(Side.CLIENT)
 	public static String playerName = "";
 
 	@Override
 	public void preInit(final FMLPreInitializationEvent e) {
 		super.preInit(e);
-		onPreLoad();
+		if (CORE.mEnableCape){
+			onPreLoad();			
+		}
 		//Do this weird things for textures.
 		GTplusplus.loadTextures();
 		//We boot up the sneak manager.
@@ -80,14 +85,14 @@ public class ClientProxy extends CommonProxy implements Runnable{
 		//RenderingRegistry.registerEntityRenderingHandler(EntityBloodSteelHostileMob.class, new RenderBloodSteelMobHostile(new ModelBloodSteelMob(), 0));
 		//RenderingRegistry.registerEntityRenderingHandler(EntityGrenade.class, new RenderSnowball(ModItems.tutGrenade));		
 		Utils.LOG_INFO("Registering Custom Renderer for Mining Explosives.");
-	    RenderingRegistry.registerEntityRenderingHandler(EntityPrimedMiningExplosive.class, new RenderMiningExplosivesPrimed());
-	    RenderingRegistry.registerEntityRenderingHandler(EntitySickBlaze.class, new RenderSickBlaze());
-	    RenderingRegistry.registerEntityRenderingHandler(EntityStaballoyConstruct.class, new RenderIronGolem());
-	    RenderingRegistry.registerEntityRenderingHandler(EntityToxinballSmall.class, new RenderToxinball(1F));
+		RenderingRegistry.registerEntityRenderingHandler(EntityPrimedMiningExplosive.class, new RenderMiningExplosivesPrimed());
+		RenderingRegistry.registerEntityRenderingHandler(EntitySickBlaze.class, new RenderSickBlaze());
+		RenderingRegistry.registerEntityRenderingHandler(EntityStaballoyConstruct.class, new RenderIronGolem());
+		RenderingRegistry.registerEntityRenderingHandler(EntityToxinballSmall.class, new RenderToxinball(1F));
 
 		//ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBloodSteelChest.class, new BloodSteelChestRenderer());
 		//MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.tutChest), new ItemRenderBloodSteelChest());
-	    Utils.LOG_INFO("Registering Custom Renderer for the Fire Pit.");
+		Utils.LOG_INFO("Registering Custom Renderer for the Fire Pit.");
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFirepit.class, new FirepitRender());
 	}
 
@@ -147,32 +152,36 @@ public class ClientProxy extends CommonProxy implements Runnable{
 	}
 
 
-	
+
 	public void onPreLoad() {
-        String arr$[] = {
-                "draknyte1", "fobius"
-        };
-        int len$ = arr$.length;
-        for (int i$ = 0; i$ < len$; i$++) {
-            String tName = arr$[i$];
-            mCapeList.add(tName.toLowerCase());
-        }
-        (new Thread(this)).start();
-    }
-	
+		if (CORE.mEnableCape){
+			String arr$[] = {
+					"draknyte1", "fobius"
+			};
+			int len$ = arr$.length;
+			for (int i$ = 0; i$ < len$; i$++) {
+				String tName = arr$[i$];
+				mCapeList.add(tName.toLowerCase());
+			}
+			(new Thread(this)).start();
+		}
+	}
+
 	public void run() {
-        try {
-            Utils.LOG_INFO("Skip: GT++ Mod: Downloading Cape List.");
-            @SuppressWarnings("resource")
-            Scanner tScanner = new Scanner(new URL("https://github.com/draknyte1/GTplusplus/blob/master/SupporterList.txt").openStream());
-            while (tScanner.hasNextLine()) {
-                String tName = tScanner.nextLine();
-                if (!this.mCapeList.contains(tName.toLowerCase())) {
-                    this.mCapeList.add(tName.toLowerCase());
-                }
-            }
-        } catch (Throwable e) {
-        }
-    }
+		try {
+			if (CORE.mEnableCape){
+				Utils.LOG_INFO("Skip: GT++ Mod: Downloading Cape List.");
+				@SuppressWarnings("resource")
+				Scanner tScanner = new Scanner(new URL("https://github.com/draknyte1/GTplusplus/blob/master/SupporterList.txt").openStream());
+				while (tScanner.hasNextLine()) {
+					String tName = tScanner.nextLine();
+					if (!this.mCapeList.contains(tName.toLowerCase())) {
+						this.mCapeList.add(tName.toLowerCase());
+					}
+				}
+			}
+		} catch (Throwable e) {
+		}
+	}
 
 }
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 fc5ece21d3..7bbef48891 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/TesterCape.png"), new ResourceLocation("miscutils:textures/TesterCape.png")};
+    private final ResourceLocation[] mCapes = {new ResourceLocation("miscutils:textures/Orange.png"), new ResourceLocation("miscutils:textures/TesterCape.png"), new ResourceLocation("miscutils:textures/TesterCape.png"), new ResourceLocation("miscutils:textures/DevCape.png")};
     private final Collection<String> mCapeList;
 
     public GTPP_CapeRenderer(Collection<String> aCapeList) {
@@ -41,24 +41,24 @@ public class GTPP_CapeRenderer
         try {
             ResourceLocation tResource = null;
             if (aPlayer.getDisplayName().equalsIgnoreCase("draknyte1")) {
-                tResource = this.mCapes[1];
-            }
-            if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase())) {
-                tResource = this.mCapes[0];
+                tResource = this.mCapes[3];
             }
-            if (aPlayer.getDisplayName().equalsIgnoreCase("fobius")) {
+            else if (aPlayer.getDisplayName().equalsIgnoreCase("fobius")) {
                 tResource = this.mCapes[1];
             }
-            if (aPlayer.getDisplayName().equalsIgnoreCase("doomsquirter")) {
+            else if (aPlayer.getDisplayName().equalsIgnoreCase("doomsquirter")) {
                 tResource = this.mCapes[0];
             }
-            if (aPlayer.getDisplayName().equalsIgnoreCase("ukdunc")) {
+            else  if (aPlayer.getDisplayName().equalsIgnoreCase("ukdunc")) {
                 tResource = this.mCapes[0];
             }
-            if (aPlayer.getDisplayName().equalsIgnoreCase("cantankerousrex")) {
+            else if (aPlayer.getDisplayName().equalsIgnoreCase("cantankerousrex")) {
                 tResource = this.mCapes[1];
             }
-            if (aPlayer.getDisplayName().equalsIgnoreCase("123_456_789")) {
+            else if (aPlayer.getDisplayName().equalsIgnoreCase("123_456_789")) {
+                tResource = this.mCapes[0];
+            }
+            else if (this.mCapeList.contains(aPlayer.getDisplayName().toLowerCase())) {
                 tResource = this.mCapes[0];
             }
             if ((tResource != null) && (!aPlayer.getHideCape())) {