+Dungeons terminal display

set displays to be off by default
+ customisable sylveoon bridge chat

 - improved custom name a bit
 - removed the api key cuz it was dumb

Author: Ownwn

src/main/java/com/ownwn/ownwnaddons/OwnwnAddons.java

@@ -5,10 +5,7 @@
 import com.ownwn.ownwnaddons.commands.HyperionPrice;
 import com.ownwn.ownwnaddons.commands.IslandAfkTimer;
 import com.ownwn.ownwnaddons.commands.Owa;
-import com.ownwn.ownwnaddons.features.CreateGhostPick;
-import com.ownwn.ownwnaddons.features.SecretClickSounds;
-import com.ownwn.ownwnaddons.features.TrevorCooldown;
-import com.ownwn.ownwnaddons.features.WitherShieldSound;
+import com.ownwn.ownwnaddons.features.*;
 import com.ownwn.ownwnaddons.features.chat.*;
 import com.ownwn.ownwnaddons.utils.FetchOnServerJoin;
 import com.ownwn.ownwnaddons.utils.NewConfig;
@@ -44,7 +41,7 @@ public void onFMLInitialization(net.minecraftforge.fml.common.event.FMLInitializ
         config = new NewConfig();
 
         MinecraftForge.EVENT_BUS.register(this);
-        MinecraftForge.EVENT_BUS.register(new CustomChat());
+        MinecraftForge.EVENT_BUS.register(new CustomName());
         MinecraftForge.EVENT_BUS.register(new TrevorChatCleanup());
         MinecraftForge.EVENT_BUS.register(new BazaarChatCleanup());
         MinecraftForge.EVENT_BUS.register(new TrevorCooldown());
@@ -55,7 +52,7 @@ public void onFMLInitialization(net.minecraftforge.fml.common.event.FMLInitializ
         MinecraftForge.EVENT_BUS.register(new SecretClickSounds());
         MinecraftForge.EVENT_BUS.register(new WitherShieldSound());
         MinecraftForge.EVENT_BUS.register(new FetchOnServerJoin());
-        MinecraftForge.EVENT_BUS.register(new CreateGhostPick());
+        MinecraftForge.EVENT_BUS.register(new DungeonsTerminalDisplay());
 
 
         CommandManager.INSTANCE.registerCommand(new Owa());

src/main/java/com/ownwn/ownwnaddons/commands/Owa.java

@@ -1,18 +1,13 @@
 package com.ownwn.ownwnaddons.commands;
 
 import cc.polyfrost.oneconfig.libs.universal.UChat;
-import cc.polyfrost.oneconfig.utils.NetworkUtils;
 import cc.polyfrost.oneconfig.utils.commands.annotations.*;
-import com.google.gson.JsonObject;
 import com.ownwn.ownwnaddons.OwnwnAddons;
 import com.ownwn.ownwnaddons.utils.HttpRequest;
-import com.ownwn.ownwnaddons.utils.NewConfig;
 import com.ownwn.ownwnaddons.utils.Utils;
-import net.minecraft.client.Minecraft;
 
 @Command(value = "owa", description = "Access the " + OwnwnAddons.NAME + " GUI.", customHelpMessage = OwnwnAddons.HELP)
 public class Owa {
-    public String rank = "";
     public static boolean devMode = false;
     @Main
     private static void main() {
@@ -65,64 +60,4 @@ private void devtest() {
         devMode = true;
         UChat.chat(OwnwnAddons.PREFIX + "&bEnabled &adev mode");
     }
-
-    @SubCommand(description = "Gets the player's Hypixel rank")
-    @SuppressWarnings("SameParameterValue")
-    private void getrank() {
-        UChat.chat(OwnwnAddons.PREFIX + "&bFetching rank...");
-            if (NewConfig.HYPIXEL_API_KEY.equals("")) {
-                UChat.chat(OwnwnAddons.PREFIX + "&cYour Hypixel API key isn't set! For now you need to manually set it in &b/owa");
-                return;
-            }
-            Thread T = new Thread(() -> {
-                JsonObject playerData;
-                try {
-
-
-                    playerData = NetworkUtils.getJsonElement("https://api.hypixel.net/player?uuid=" + Minecraft.getMinecraft().thePlayer.getUniqueID() + "&key=" + NewConfig.HYPIXEL_API_KEY).getAsJsonObject().get("player").getAsJsonObject();
-
-                    playerData.get("playername").getAsString();
-
-                } catch (NullPointerException noData) {
-                    UChat.chat(OwnwnAddons.PREFIX + "&cError getting player data! Perhaps the Hypixel API is down?");
-                    noData.printStackTrace();
-                    return;
-                }
-
-                try { // check if has a rank
-                    playerData.get("newPackageRank").getAsString();
-                } catch (NullPointerException defaultRank) {
-                    setRank(1);
-                    return;
-                }
-
-                if (playerData.get("monthlyPackageRank").getAsString().equals("SUPERSTAR")) { // check if has mvp++
-                    setRank(6);
-                } else {
-                     // just get the rank
-                    rank = playerData.get("newPackageRank").getAsString();
-                    switch (rank) {
-                        case "VIP":
-                            setRank(2);
-                            break;
-                        case "VIP_PLUS":
-                            setRank(3);
-                            break;
-                        case "MVP":
-                            setRank(4);
-                            break;
-                        case "MVP_PLUS":
-                            setRank(5);
-                            break;
-                    }
-                }
-
-            });
-            T.start();
-    }
-
-    public void setRank(int rank) {
-        NewConfig.PLAYER_HYPIXEL_RANK = rank;
-        UChat.chat(OwnwnAddons.PREFIX + "&bSuccessfully set rank!");
-    }
 }

src/main/java/com/ownwn/ownwnaddons/features/DungeonsTerminalDisplay.java

@@ -0,0 +1,93 @@
+package com.ownwn.ownwnaddons.features;
+
+import cc.polyfrost.oneconfig.hud.SingleTextHud;
+import com.ownwn.ownwnaddons.utils.NewConfig;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.event.world.WorldEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class DungeonsTerminalDisplay extends SingleTextHud {
+
+    public static String returnText = "";
+    public static String completedTerms = "(§r§c???§a)";
+    public static boolean deviceDone = false;
+
+
+
+    public DungeonsTerminalDisplay() {
+        super("Terminals", false);
+    }
+
+    @Override
+    public String getText(boolean example) {
+        if (example) return "§b" + "(5/7)§aDevice: §aYES";
+        return returnText;
+    }
+
+
+    @SubscribeEvent
+    public void onChat(ClientChatReceivedEvent event) {
+
+
+        String msg = event.message.getFormattedText();
+
+        switch (msg) {
+            case "§r§4[BOSS] Goldor§r§c: §r§cThe little ants have a brain it seems.§r":
+            case "§r§4[BOSS] Goldor§r§c: §r§cI will replace that gate with a stronger one!§r":
+            case "§r§4[BOSS] Goldor§r§c: §r§cYOUR END IS NEAR!!§r":
+            case "§r§4[BOSS] Goldor§r§c: §r§cWho dares trespass into my domain?§r":
+                reset();
+                break;
+            case "§r§aThe Core entrance is opening!§r": // p3 over
+                deviceDone = false;
+                NewConfig.dungeonsTerminalDisplay.enabled = false;
+                break;
+
+        }
+
+        if (!msg.contains("activated a") && !msg.contains("completed a")) {
+            if (returnText.equals("")) {
+                returnText = "§a" + completedTerms +
+                        " §rDevice: §4NO";
+                return;
+            }
+        }
+
+        Matcher activatedMatcher = Pattern.compile("§r§.+§r§a activated a .+! (\\(§r§c\\d§r§a/\\d\\))§r").matcher(msg);
+        Matcher completedMatcher = Pattern.compile("§r§.+§r§a completed a device! (\\(§r§c\\d§r§a/\\d\\))§r").matcher(msg);
+        if (activatedMatcher.find()) {
+            completedTerms = activatedMatcher.group(1);
+        } else if (completedMatcher.find()) {
+            completedTerms = completedMatcher.group(1);
+            deviceDone = true;
+        }
+
+        
+        if (deviceDone) {
+            returnText = "§a" + completedTerms +
+                    " §rDevice: §aYES";
+
+        } else {
+            returnText = "§a" + completedTerms +
+                    " §rDevice: §4NO";
+        }
+
+    }
+
+    @SubscribeEvent
+    public void onWorldLoad(WorldEvent.Load event) {
+        if (NewConfig.dungeonsTerminalDisplay.isEnabled()) {
+            NewConfig.dungeonsTerminalDisplay.enabled = false;
+        }
+
+    }
+    public void reset() {
+        NewConfig.dungeonsTerminalDisplay.enabled = true;
+        completedTerms = "(§r§c???§a)";
+        deviceDone = false;
+    }
+
+}

src/main/java/com/ownwn/ownwnaddons/features/OwaDevMode.java

@@ -0,0 +1,19 @@
+package com.ownwn.ownwnaddons.features;
+
+public class OwaDevMode {
+//    @Subscribe
+//    public void onPacket(SendPacketEvent event) {
+//        if (!Owa.devMode) {
+//            return;
+//        }
+//        String packet = event.packet.toString();
+//        if (packet.contains("PacketEntityHead") || packet.contains("PacketEntityRelMove") || packet.contains("PacketKeepAlive") || packet.contains("PacketTimeUpdate") || packet.contains("PacketEntityTeleport") || packet.contains("BlockChange") || packet.contains("PacketChat") || packet.contains("PacketChunkData")) {
+//            return;
+//        }
+//        if (packet.contains("minecraft.network.play.client.C03PacketPlayer@") || packet.contains("PacketPlayerPosition") || packet.contains("PacketPlayerLook")) {
+//            return;
+//        }
+//
+//        UChat.chat(event.packet);
+//    }
+}

src/main/java/com/ownwn/ownwnaddons/features/TrevorCooldown.java

@@ -7,7 +7,7 @@
 public class TrevorCooldown extends SingleTextHud {
 
     public TrevorCooldown() {
-        super("Trevor Cooldown", true);
+        super("Trevor Cooldown", false);
     }
 
     @Override

…ons/features/chat/TrevorLootTracker.java …wnaddons/features/TrevorLootTracker.javasrc/main/java/com/ownwn/ownwnaddons/features/chat/TrevorLootTracker.java renamed to src/main/java/com/ownwn/ownwnaddons/features/TrevorLootTracker.java src/main/java/com/ownwn/ownwnaddons/features/chat/TrevorLootTracker.java renamed to src/main/java/com/ownwn/ownwnaddons/features/TrevorLootTracker.java

@@ -1,13 +1,14 @@
-package com.ownwn.ownwnaddons.features.chat;
+package com.ownwn.ownwnaddons.features;
 
 import cc.polyfrost.oneconfig.hud.TextHud;
+import com.ownwn.ownwnaddons.features.chat.TrevorChatCleanup;
 
 import java.util.List;
 
 public class TrevorLootTracker extends TextHud {
 
     public TrevorLootTracker() {
-        super(true);
+        super(false);
     }
 
     @Override

…wnwnaddons/features/chat/CustomChat.java …wnwnaddons/features/chat/CustomName.javasrc/main/java/com/ownwn/ownwnaddons/features/chat/CustomChat.java renamed to src/main/java/com/ownwn/ownwnaddons/features/chat/CustomName.java src/main/java/com/ownwn/ownwnaddons/features/chat/CustomChat.java renamed to src/main/java/com/ownwn/ownwnaddons/features/chat/CustomName.java

@@ -4,12 +4,13 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.ChatComponentText;
 import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class CustomChat {
+public class CustomName {
 
     @SubscribeEvent
     public void onChat(ClientChatReceivedEvent event) {
@@ -23,23 +24,20 @@ public void onChat(ClientChatReceivedEvent event) {
 
         String player = Minecraft.getMinecraft().thePlayer.getName();
         String msg = event.message.getFormattedText();
-        String newMsg = "";
+
 
         if (!msg.contains(player)) {
             return;
         }
 
+        String newMsg = "";
         String newCustomName = NewConfig.CUSTOM_NAME_EDITOR.replace("&&", "§");
-
-        if (NewConfig.CUSTOM_NAME_MODE) {
-            newMsg = msg.replace(player, newCustomName);
-            event.message = new ChatComponentText(newMsg).setChatStyle(event.message.getChatStyle());
-            return;
-        }
+        String newCustomRank = NewConfig.CUSTOM_RANK_EDITOR.replace("&&", "§");
 
         Matcher noPlusMatcher = Pattern.compile("(§b\\[MVP]|§a\\[VIP]) (" + player + ")").matcher(msg); // for vip or mvp
         Matcher defaultMatcher = Pattern.compile("((§7)+" + player + ")").matcher(msg); // for players without a rank (grey name)
         Matcher rankMatcher = Pattern.compile("((§b|§6)\\[MVP(§r)*§.\\+{1,2}(§r)*(§b|§6)]|§a\\[VIP(§r)*§6\\+(§r)*§a]) (" + player + ")").matcher(msg); // for players with vip+/mvp+/mvp++
+        Matcher missingRankMatcher = Pattern.compile("(§." + player + ")").matcher(msg); // for replacing just the name and one colour code
 
         if (NewConfig.PLAYER_HYPIXEL_RANK == 1) { // default rank
             if (defaultMatcher.find()) {
@@ -50,7 +48,7 @@ public void onChat(ClientChatReceivedEvent event) {
         } else if (NewConfig.PLAYER_HYPIXEL_RANK == 2 || NewConfig.PLAYER_HYPIXEL_RANK == 4) { // MVP/VIP
             if (noPlusMatcher.find()) {
                 if (NewConfig.NAME_REPLACE_RANK) {
-                    newMsg = msg.replace(noPlusMatcher.group(0), newCustomName);
+                    newMsg = msg.replace(noPlusMatcher.group(0), newCustomRank+ " " + newCustomName);
                 } else {
                     newMsg = msg.replace(noPlusMatcher.group(2), newCustomName);
                 }
@@ -59,19 +57,45 @@ public void onChat(ClientChatReceivedEvent event) {
         } else { // VIP+/MVP+/MVP++
             if (rankMatcher.find()) {
                 if (NewConfig.NAME_REPLACE_RANK) {
-                    newMsg = msg.replace(rankMatcher.group(0), newCustomName);
+                    newMsg = msg.replace(rankMatcher.group(0), newCustomRank + " " + newCustomName);
                 } else {
                     newMsg = msg.replace(rankMatcher.group(8), newCustomName);
                 }
             }
         }
 
 
+        if (newMsg.equals("")) {
+            if (missingRankMatcher.find() && NewConfig.CUSTOM_NAME_AGGRO) {
+                newMsg = msg.replace(missingRankMatcher.group(1), newCustomName + "§r");
+            }
+        }
         if (newMsg.equals("")) {
             return;
         }
 
         event.message = new ChatComponentText(newMsg).setChatStyle(event.message.getChatStyle()); // replace msg
 
+    }
+
+    @SubscribeEvent
+    public void renderTooltip(ItemTooltipEvent event) {
+    if (!NewConfig.CUSTOM_NAME_TOOLTIPS) {
+        return;
+    }
+    if (event.toolTip.isEmpty()) {
+        return;
+    }
+    String name = Minecraft.getMinecraft().thePlayer.getName();
+    String newCustomName = NewConfig.CUSTOM_NAME_EDITOR.replace("&&", "§");
+
+    for (int i = 0; i < event.toolTip.size(); i++) {
+        if (event.toolTip.get(i).contains(name)) {
+            event.toolTip.replaceAll(s -> s.replace(name, newCustomName + "§r"));
+            return;
+        }
+    }
+
+
     }
 }

src/main/java/com/ownwn/ownwnaddons/features/chat/SylveoonDiscordChat.java

@@ -12,7 +12,7 @@
 public class SylveoonDiscordChat {
     @SubscribeEvent(priority = EventPriority.LOW)
     public void onChat(ClientChatReceivedEvent event) {
-        if (!NewConfig.GUILD_MSG_PRETTY) {
+        if (!NewConfig.GUILD_MSG_PRETTY.contains("NAME") || !NewConfig.GUILD_MSG_PRETTY.contains("MSG")) {
             return;
         }
 
@@ -22,15 +22,14 @@ public void onChat(ClientChatReceivedEvent event) {
         if (!msg.contains("Sylveoon")) {
             return;
         }
-        Matcher shortPrefix = Pattern.compile("§r§r§r§2G > §7Sylveoon §3\\[ADMIN]§f: §r(.+): (.+)§r").matcher(msg);
-        Matcher standardPrefix = Pattern.compile("§r§2Guild > §7Sylveoon §3\\[ADMIN]§f: §r(.+): (.+)§r").matcher(msg);
 
-        if (standardPrefix.find()) {
-            newMsg = "§1Discord > §3" + standardPrefix.group(1) + "§f: " + standardPrefix.group(2);
-        } else if (shortPrefix.find()) {
-            newMsg = "§1Discord > §3" + shortPrefix.group(1) + "§f: " + shortPrefix.group(2);
-        }
-        if (newMsg.equals("")) {
+        String msgReplace = NewConfig.GUILD_MSG_PRETTY.replace("&&", "§");
+        Matcher discordPrefix = Pattern.compile("§r§2Guild > §7Sylveoon §3\\[ADMIN]§f: §r(.+?): (.+)§r").matcher(msg);
+
+        if (discordPrefix.find()) {
+            //newMsg = "§1Discord > §3" + standardPrefix.group(1) + "§f: " + standardPrefix.group(2);
+            newMsg = msgReplace.replace("NAME", discordPrefix.group(1)).replace("MSG", discordPrefix.group(2));
+        } else {
             return;
         }
 

src/main/java/com/ownwn/ownwnaddons/utils/FetchOnServerJoin.java

@@ -45,7 +45,7 @@ public void getHypixelRank(TickEvent.ClientTickEvent event) {
         if (Minecraft.getMinecraft().thePlayer == null) {
             return;
         }
-        Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(OwnwnAddons.PREFIX + "§aYour Hypixel rank isn't set! set it by §eclicking here §aor with §b/owa getrank").setChatStyle(new ChatStyle().setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/owa getrank"))));
+        UChat.chat(OwnwnAddons.PREFIX + "&aYour Hypixel rank isn't set! The custom name thingo will not work without it.\n &aSet it in &b/owa");
         getRankTime = 0;
     }