2.7.1

2 files changed, 127 insertions, 16 deletions

diff --git a/src/main/java/rosegoldaddons/mixins/MixinRenderString.java b/src/main/java/rosegoldaddons/mixins/MixinRenderString.java
index f7b0e8d..e4888e0 100644
--- a/src/main/java/rosegoldaddons/mixins/MixinRenderString.java
+++ b/src/main/java/rosegoldaddons/mixins/MixinRenderString.java
@@ -1,32 +1,98 @@
 package rosegoldaddons.mixins;
 
 import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.util.StringUtils;
+import org.apache.commons.codec.digest.DigestUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import rosegoldaddons.Main;
 
-import java.util.Map;
-
 @Mixin(FontRenderer.class)
 public abstract class MixinRenderString {
 
-    @ModifyVariable(method = "renderString", at = @At(value = "FIELD"))
+    @ModifyVariable(method = "drawString(Ljava/lang/String;FFIZ)I", at = @At(value = "FIELD"))
     private String replaceName(String text) {
-        if(Main.configFile.wydsi && text.contains("727")) {
+        if (Main.mc.theWorld == null || Main.mc.thePlayer == null) return text;
+        if (Main.configFile.wydsi && text.contains("727")) {
             text = text.replace("727", "726");
         }
-        if (Main.init) {
-            for (Map.Entry<String, String> entry : Main.resp.entrySet()) {
-                String key = entry.getKey();
-                String value = entry.getValue();
-
-                if (text.contains(key) && !text.contains(value)) {
-                    text = text.replace(key, value)+"§r";
-                    break;
+        if (Main.init && Main.configFile.alchsleep != 88 || Main.configFile.skiblock != 263) {
+            String[] words = stripString(text).replace(":"," ").replace("'"," ").split(" ");
+            String[] formatteds = text.replace(":"," ").replace("'"," ").split(" ");
+            for (String word : words) {
+                if (Main.hashedCache.contains(word)) continue;
+                if(Main.rankCache.containsKey(word)) {
+                    String rank = getRank(text, word);
+                    if(rank != null) {
+                        text = text.replace(rank, Main.rankCache.get(word));
+                    }
+                } else {
+                    String hashed = DigestUtils.sha256Hex(word + word);
+                    if (Main.ranks.containsKey(hashed)) {
+                        String rank = getRank(text, word);
+                        if(rank != null) {
+                            Main.rankCache.put(word, Main.ranks.get(hashed));
+                            System.out.println(word+":"+Main.ranks.get(hashed));
+                        }
+                    }
+                }
+            }
+            for (String word : words) {
+                if (Main.hashedCache.contains(word)) continue;
+                if (Main.nameCache.containsKey(word)) {
+                    String[] replaces = Main.nameCache.get(word).split(" ");
+                    for (String replace : replaces) {
+                        for (String formatted : formatteds) {
+                            if (replace.equals(formatted)) return text;
+                        }
+                    }
+                    String color = getColorBeforeIndex(text, text.indexOf(word));
+                    text = text.replace(word, Main.nameCache.get(word) + color);
+                } else {
+                    String hashed = DigestUtils.sha256Hex(word + word);
+                    if (Main.names.containsKey(hashed)) {
+                        Main.nameCache.put(word, Main.names.get(hashed));
+                    } else {
+                        Main.hashedCache.add(word);
+                    }
                 }
             }
         }
         return text;
     }
+
+    private String getRank(String str, String sub) {
+        if(!str.contains("[") || !str.contains("]")) return null;
+        if(sub.contains("[") || sub.contains("]")) return null;
+        if(str.indexOf(sub)-sub.length() >= str.indexOf("]")) return null;
+        if(str.indexOf(sub) < str.indexOf("[")) return null;
+
+        return str.substring(str.indexOf("["), str.indexOf("]")+1);
+    }
+
+    private String getColorBeforeIndex(String str, int index) {
+        String lastColor = "";
+        for (int i = 0; i < str.length(); i++) {
+            if (i == index) break;
+            if (str.charAt(i) == '§' && i + 1 < str.length() && str.charAt(i + 1) != 'r' && str.charAt(i + 1) != 'l' && str.charAt(i + 1) != 'k'
+                    && str.charAt(i + 1) != 'm' && str.charAt(i + 1) != 'n' && str.charAt(i + 1) != 'o') {
+                lastColor = str.charAt(i) + "" + str.charAt(i + 1);
+            }
+        }
+        return lastColor;
+    }
+
+    private String stripString(String s) {
+        char[] nonValidatedString = StringUtils.stripControlCodes(s).toCharArray();
+        StringBuilder validated = new StringBuilder();
+
+        for (char a : nonValidatedString) {
+            if ((int) a < 127 && (int) a > 20) {
+                validated.append(a);
+            }
+        }
+
+        return validated.toString();
+    }
 }
diff --git a/src/main/java/rosegoldaddons/mixins/MixinRendererLivingEntity.java b/src/main/java/rosegoldaddons/mixins/MixinRendererLivingEntity.java
index ae85419..25f1a2e 100644
--- a/src/main/java/rosegoldaddons/mixins/MixinRendererLivingEntity.java
+++ b/src/main/java/rosegoldaddons/mixins/MixinRendererLivingEntity.java
@@ -1,11 +1,10 @@
 package rosegoldaddons.mixins;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.entity.RendererLivingEntity;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityArmorStand;
 import net.minecraft.util.IChatComponent;
+import net.minecraft.util.StringUtils;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -15,13 +14,12 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import rosegoldaddons.Main;
 import rosegoldaddons.events.RenderLivingEntityEvent;
-import rosegoldaddons.utils.ChatUtils;
 
 @Mixin(value = RendererLivingEntity.class, priority = 1001)
 @SideOnly(Side.CLIENT)
 public abstract class MixinRendererLivingEntity {
-
     @Shadow
     protected ModelBase mainModel;
 
@@ -30,4 +28,51 @@ public abstract class MixinRendererLivingEntity {
         if (MinecraftForge.EVENT_BUS.post(new RenderLivingEntityEvent(entity, p_77036_2_, p_77036_3_, p_77036_4_, p_77036_5_, p_77036_6_, scaleFactor, mainModel)))
             ci.cancel();
     }
+
+    @Redirect(method = "renderName(Lnet/minecraft/entity/EntityLivingBase;DDD)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/IChatComponent;getFormattedText()Ljava/lang/String;"))
+    public String redirectGetFormattedText(IChatComponent instance) {
+        if (Main.init && Main.configFile.alchsleep == 63 && Main.configFile.skiblock == 263) return instance.getFormattedText();
+        String unformatted = stripString(instance.getUnformattedText()).replace(":"," ").replace("'"," ");
+        String[] words = unformatted.split(" ");
+        String[] formatteds = instance.getUnformattedText().replace(":"," ").replace("'"," ").split(" ");
+        for(String word : words) {
+            if (Main.nameCache.containsKey(word)) {
+                String[] replaces = Main.nameCache.get(word).split(" ");
+                for(String replace : replaces) {
+                    for(String formatted : formatteds) {
+                        if(replace.equals(formatted)) return instance.getFormattedText();
+                    }
+                }
+                String color = getColorBeforeIndex(instance.getUnformattedText(), instance.getUnformattedText().indexOf(word));
+                return instance.getUnformattedText().replace(word, Main.nameCache.get(word) + color);
+            }
+        }
+        return instance.getFormattedText();
+    }
+
+
+    private String getColorBeforeIndex(String str, int index) {
+        String lastColor = "";
+        for (int i = 0; i < str.length(); i++) {
+            if (i == index) break;
+            if (str.charAt(i) == '§' && i + 1 < str.length() && str.charAt(i + 1) != 'r' && str.charAt(i + 1) != 'l' && str.charAt(i + 1) != 'k'
+                    && str.charAt(i + 1) != 'm' && str.charAt(i + 1) != 'n' && str.charAt(i + 1) != 'o') {
+                lastColor = str.charAt(i) + "" + str.charAt(i + 1);
+            }
+        }
+        return lastColor;
+    }
+
+    private String stripString(String s) {
+        char[] nonValidatedString = StringUtils.stripControlCodes(s).toCharArray();
+        StringBuilder validated = new StringBuilder();
+
+        for (char a : nonValidatedString) {
+            if ((int) a < 127 && (int) a > 20) {
+                validated.append(a);
+            }
+        }
+
+        return validated.toString();
+    }
 }