diff --git a/assets/tinker/lang/en_US.xml b/assets/tinker/lang/en_US.xml
index d44f591c..4a3a8396 100644
--- a/assets/tinker/lang/en_US.xml
+++ b/assets/tinker/lang/en_US.xml
@@ -356,6 +356,7 @@
Gardeslime
Armor Gui
+ Reload Capes
%1$s transformed into Soylent Green
%1$s has fused with the Smeltery
diff --git a/tconstruct/client/TControls.java b/tconstruct/client/TControls.java
index a9e1bd66..e55222fe 100644
--- a/tconstruct/client/TControls.java
+++ b/tconstruct/client/TControls.java
@@ -8,6 +8,8 @@ import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.gui.inventory.GuiInventory;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.network.packet.Packet250CustomPayload;
+
+import tconstruct.client.event.EventCloakRender;
import tconstruct.client.tabs.TabRegistry;
import cpw.mods.fml.common.TickType;
import cpw.mods.fml.common.network.PacketDispatcher;
@@ -17,6 +19,7 @@ public class TControls extends TKeyHandler
//static KeyBinding grabKey = new KeyBinding("key.grab", 29);
//static KeyBinding stiltsKey = new KeyBinding("key.stilts", 46);
public static KeyBinding armorKey = new KeyBinding("key.tarmor", 24);
+ public static KeyBinding refreshCapes = new KeyBinding("key.tcapes.reload", 88);
static KeyBinding jumpKey;
static KeyBinding invKey;
static Minecraft mc;
@@ -33,7 +36,7 @@ public class TControls extends TKeyHandler
public TControls()
{
- super(new KeyBinding[] { armorKey }, new boolean[] { false}, getVanillaKeyBindings(),
+ super(new KeyBinding[] { armorKey, refreshCapes }, new boolean[] { false, false }, getVanillaKeyBindings(),
new boolean[] { false, false });
//System.out.println("Controls registered");
}
@@ -65,6 +68,9 @@ public class TControls extends TKeyHandler
{
TabRegistry.addTabsToInventory((GuiContainer) mc.currentScreen);
}
+ if (kb == refreshCapes && mc.currentScreen == null){
+ EventCloakRender.instance.refreshCapes();
+ }
/*if (kb == jumpKey) //Double jump
{
if (jumping && !doubleJump)
diff --git a/tconstruct/client/event/EventCloakRender.java b/tconstruct/client/event/EventCloakRender.java
index 4889960b..d5a5765f 100644
--- a/tconstruct/client/event/EventCloakRender.java
+++ b/tconstruct/client/event/EventCloakRender.java
@@ -4,7 +4,7 @@ import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.*;
import java.net.*;
-import java.util.HashMap;
+import java.util.*;
import javax.swing.ImageIcon;
@@ -19,9 +19,13 @@ public class EventCloakRender {
private static final Graphics TEST_GRAPHICS = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB).getGraphics();
private HashMap cloaks = new HashMap();
+ private ArrayList capePlayers = new ArrayList();
+
+ public static EventCloakRender instance;
public EventCloakRender(){
buildCloakURLDatabase();
+ instance = this;
}
@ForgeSubscribe
@@ -29,13 +33,15 @@ public class EventCloakRender {
if(event.entityPlayer instanceof AbstractClientPlayer){
AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer)event.entityPlayer;
- if (abstractClientPlayer.func_110310_o().field_110560_d == null) {
+ if (!capePlayers.contains(abstractClientPlayer)) {
String cloakURL = cloaks.get(event.entityPlayer.username);
if(cloakURL == null){
return;
}
+ capePlayers.add(abstractClientPlayer);
+
abstractClientPlayer.func_110310_o().field_110559_g = false;
new Thread(new CloakThread(abstractClientPlayer, cloakURL)).start();
event.renderCape = true;
@@ -114,4 +120,10 @@ public class EventCloakRender {
}
}
}
+
+ public void refreshCapes(){
+ cloaks.clear();
+ capePlayers.clear();
+ buildCloakURLDatabase();
+ }
}