Removed wavey capes, fixes to cosmetic gui and handler and fix to a chat formatting issue

Author: sinender

gradle.properties

@@ -9,7 +9,7 @@ mod_id = hysentials
 mod_version = 1.3.2-beta1
 dev_version = 1.3.0-dev
 
-dev = false
+dev = true
 
 loom.platform = forge
 

src/main/java/llc/redstone/hysentials/config/hysentialmods/CosmeticConfig.java

@@ -27,23 +27,6 @@ public class CosmeticConfig extends Config {
     )
     public static boolean disableCustomCapes = false;
 
-    @Switch(
-        name = "Wind Effect",
-        category = "Comsetics",
-        subcategory = "Capes",
-        description = "Will give the capes a windy effect making it look like they are blowing in the wind."
-    )
-    public static boolean windEffect = true;
-
-    @Dropdown(
-        name = "Cape Animation",
-        category = "Comsetics",
-        subcategory = "Capes",
-        description = "Which animation the capes should render with.",
-        options = {"Blocky Animation", "Silky Animation"}
-    )
-    public static int blockyCapes = 0;
-
     public CosmeticConfig() {
         super(new Mod("Cosmetics", ModType.UTIL_QOL, "/assets/hysentials/mods/cosmetics.png", 244, 80), "hysentials-cosmetic.json");
         initialize();

src/main/java/llc/redstone/hysentials/cosmetics/capes/CapeHandler.java

@@ -1,26 +1,46 @@
 package llc.redstone.hysentials.cosmetics.capes;
 
+import com.mojang.authlib.minecraft.MinecraftProfileTexture;
+import com.mojang.authlib.properties.Property;
+import llc.redstone.hysentials.config.hysentialmods.CosmeticConfig;
 import llc.redstone.hysentials.cosmetic.CosmeticManager;
 import llc.redstone.hysentials.schema.HysentialsSchema;
 import llc.redstone.hysentials.websocket.Socket;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.network.NetworkPlayerInfo;
 import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.resources.SkinManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
+import net.minecraftforge.fml.relauncher.ReflectionHelper;
 
 import java.awt.image.BufferedImage;
 import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
 
 public class CapeHandler {
     public static HashMap<UUID, Integer> tickMap = new HashMap<>();
-    public static HashMap<UUID, DynamicTexture> textureMap = new HashMap<>();
-    public static HashMap<UUID, String> resourceMap = new HashMap<>();
+    public static HashMap<String, ResourceLocation> resourceList = new HashMap<>();
+
+    private Field capeLocationField;
+    public CapeHandler() {
+        try {
+            capeLocationField = ReflectionHelper.findField(NetworkPlayerInfo.class, "locationCape", "field_178862_f");
+            capeLocationField.setAccessible(true);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
     @SubscribeEvent
     public void onTickEvent(TickEvent.ClientTickEvent event) {
         if (event.phase != TickEvent.Phase.END) return;
+        if (CosmeticConfig.disableCustomCapes) return;
         try {
             for (String id : Socket.cachedUsers.keySet()) {
                 UUID uuid = UUID.fromString(id);
@@ -31,7 +51,6 @@ public void onTickEvent(TickEvent.ClientTickEvent event) {
                         String name = cosmetic.getName();
                         if (CosmeticManager.hasCosmetic(uuid, name) || CosmeticManager.isPreviewing(uuid, name)) {
                             ResourceLocation location = new ResourceLocation(cosmetic.getResource());
-                            resourceMap.put(uuid, cosmetic.getResource());
                             try {
                                 InputStream stream = Minecraft.getMinecraft().mcDefaultResourcePack.getInputStream(location);
                                 if (stream == null) {
@@ -51,7 +70,19 @@ public void onTickEvent(TickEvent.ClientTickEvent event) {
                                 tickMap.put(uuid, tick);
                                 BufferedImage frameImage = image.getSubimage(0, frame * 32, 64, 32);
                                 DynamicTexture texture = new DynamicTexture(frameImage);
-                                textureMap.put(uuid, texture);
+                                String frameString = (frames > 1 ? "_" + frame : "");
+                                if (!resourceList.containsKey(name + frameString)) {
+                                    resourceList.put(name + frameString, Minecraft.getMinecraft().getTextureManager().getDynamicTextureLocation(name + frameString, texture));
+                                }
+                                ResourceLocation capeResource = resourceList.get(name + frameString);
+                                if (Minecraft.getMinecraft().getNetHandler() == null || capeResource == null) return;
+
+                                NetworkPlayerInfo info = Minecraft.getMinecraft().getNetHandler().getPlayerInfo(uuid);
+                                if (info != null) {
+                                    ResourceLocation loc = (ResourceLocation) capeLocationField.get(info);
+                                    capeLocationField.set(info, capeResource);
+                                }
+
                                 stream.close();
                             } catch (Exception e) {
                                 e.printStackTrace();
@@ -60,9 +91,22 @@ public void onTickEvent(TickEvent.ClientTickEvent event) {
                     }
                 }
                 if (!wearingCape) {
-                    tickMap.remove(uuid);
-                    textureMap.remove(uuid);
-                    resourceMap.remove(uuid);
+                    NetworkPlayerInfo info = Minecraft.getMinecraft().getNetHandler().getPlayerInfo(uuid);
+                    if (tickMap.containsKey(uuid)) {
+                        tickMap.remove(uuid);
+                        if (info == null) return;
+                        Minecraft.getMinecraft().getSkinManager().loadProfileTextures(info.getGameProfile(), new SkinManager.SkinAvailableCallback() {
+                            public void skinAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture) {
+                                if (typeIn == MinecraftProfileTexture.Type.CAPE) {
+                                    try {
+                                        capeLocationField.set(info, location);
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            }
+                        }, true);
+                    }
                 }
             }
         } catch (Exception e) {