- Bug report 289: Mod conflict with neu (change /socialoptions -> /pv)

- Bug report 289-1: Right_Click_Air on onInteract
- Bug report 289-2: MapProcessor player icon process not waiting until full state initialization

4 files changed, 126 insertions, 4 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/CosmeticsManager.java b/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/CosmeticsManager.java
index f6a9c3da..fa597962 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/CosmeticsManager.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/CosmeticsManager.java
@@ -237,6 +237,7 @@ public class CosmeticsManager implements StompMessageHandler {
     private static List<IChatReplacer> iChatReplacers = new ArrayList<>();
     static {
         iChatReplacers.add(new ChatReplacerViewProfile());
+        iChatReplacers.add(new ChatReplacerPV());
         iChatReplacers.add(new ChatReplacerSocialOptions());
         iChatReplacers.add(new ChatReplacerCoop());
         iChatReplacers.add(new ChatReplacerMessage());
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/chatreplacers/ChatReplacerPV.java b/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/chatreplacers/ChatReplacerPV.java
new file mode 100644
index 00000000..e5e4053f
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/chatreplacers/ChatReplacerPV.java
@@ -0,0 +1,119 @@
+/*
+ * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod
+ * Copyright (C) 2021  cyoung06
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package kr.syeyoung.dungeonsguide.cosmetics.chatreplacers;
+
+import kr.syeyoung.dungeonsguide.cosmetics.ActiveCosmetic;
+import kr.syeyoung.dungeonsguide.cosmetics.CosmeticData;
+import kr.syeyoung.dungeonsguide.cosmetics.CosmeticsManager;
+import kr.syeyoung.dungeonsguide.cosmetics.IChatReplacer;
+import kr.syeyoung.dungeonsguide.utils.TextUtils;
+import net.minecraft.util.ChatComponentText;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+
+import java.util.List;
+
+
+// Bug 289 - mod conflict with NEU (Replaces /socialoptions with /pv)
+public class ChatReplacerPV implements IChatReplacer {
+    @Override
+    public boolean isAcceptable(ClientChatReceivedEvent event) {
+        if (event.message.getChatStyle() != null && event.message.getChatStyle().getChatClickEvent() != null && event.message.getChatStyle().getChatClickEvent().getValue().startsWith("/pv")) return true;
+        return false;
+    }
+
+    @Override
+    public void translate(ClientChatReceivedEvent event, CosmeticsManager cosmeticsManager) {
+            if (event.message.getChatStyle() != null && event.message.getChatStyle().getChatClickEvent() != null && event.message.getChatStyle().getChatClickEvent().getValue().startsWith("/pv")) {
+                String username = event.message.getChatStyle().getChatClickEvent().getValue().split(" ")[1];
+                List<ActiveCosmetic> cDatas = cosmeticsManager.getActiveCosmeticByPlayerNameLowerCase().get(username.toLowerCase());
+
+                if (cDatas != null) {
+                    CosmeticData color=null, prefix=null;
+                    for (ActiveCosmetic activeCosmetic : cDatas) {
+                        CosmeticData cosmeticData = cosmeticsManager.getCosmeticDataMap().get(activeCosmetic.getCosmeticData());
+                        if (cosmeticData !=null && cosmeticData.getCosmeticType().equals("color")) {
+                            color = cosmeticData;
+                        } else if (cosmeticData != null && cosmeticData.getCosmeticType().equals("prefix")) {
+                            prefix = cosmeticData;
+                        }
+                    }
+
+                    String[] splitInto = event.message.getUnformattedTextForChat().split(" ");
+                    int lastValidNickname = -1;
+                    int lastprefix = -1;
+                    for (int i = 0; i < splitInto.length; i++) {
+                        String s = splitInto[i];
+                        if (s.startsWith("§7")) s = s.substring(2);
+                        char c = s.charAt(0);
+                        if (('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9') || c == '_' || c == '-') {
+                            lastValidNickname = i;
+                            if (i >= 1) {
+                                String str = TextUtils.stripColor(splitInto[i-1]);
+                                if (str.startsWith("[") && str.endsWith("]"))break;
+                            }
+                        }
+                    }
+                    if (lastValidNickname == -1) return;
+
+                    if (lastValidNickname -1 >= 0 && TextUtils.stripColor(splitInto[lastValidNickname - 1]).charAt(0) == '[') lastprefix = lastValidNickname -1;
+                    else lastprefix = lastValidNickname;
+
+                    String building = "";
+                    for (int i = 0; i < lastprefix; i++) {
+                        building += splitInto[i] +" ";
+                    }
+                    if (prefix != null) building += prefix.getData().replace("&", "§") + " ";
+                    for (int i = lastprefix; i < lastValidNickname; i++) {
+                        building += splitInto[i] +" ";
+                    }
+                    if (color != null) {
+                        String nick = splitInto[lastValidNickname];
+                        building += color.getData().replace("&","§");
+                        boolean foundLegitChar = false;
+                        boolean foundColor = false;
+                        for (char c : nick.toCharArray()) {
+                            if (foundColor) {
+                                foundColor = false; continue;
+                            }
+                            if (c == '§' && !foundLegitChar) foundColor = true;
+                            else {
+                                foundLegitChar = true;
+                                building += c;
+                            }
+                        }
+                        building += " ";
+                    } else {
+                        building += splitInto[lastValidNickname] + " ";
+                    }
+                    for (int i = lastValidNickname+1; i<splitInto.length; i++) {
+                        building += splitInto[i] + " ";
+                    }
+                    if (event.message.getUnformattedTextForChat().charAt(event.message.getUnformattedTextForChat().length()-1) != ' ')
+                        building = building.substring(0, building.length() - 1);
+
+                    ChatComponentText newChatCompText = new ChatComponentText(building);
+                    newChatCompText.setChatStyle(event.message.getChatStyle());
+                    newChatCompText.getSiblings().addAll(event.message.getSiblings());
+
+                    event.message = newChatCompText;
+                }
+            }
+
+    }
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
index aed2f2a1..dece169d 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/MapProcessor.java
@@ -416,7 +416,7 @@ public class MapProcessor {
         }
 
 
-        if (lastMapData2 != null && mapIconToPlayerMap.size() < context.getPlayers().size()) {
+        if (lastMapData2 != null && mapIconToPlayerMap.size() < context.getPlayers().size() && initialized) {
             label: for (Map.Entry<String, Vec4b> stringVec4bEntry : lastMapData2.mapDecorations.entrySet()) {
                 if (mapIconToPlayerMap.containsValue(stringVec4bEntry.getKey())) continue;
                 int x = stringVec4bEntry.getValue().func_176112_b() /2 + 64;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java
index 8b2b5933..6f944038 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/GeneralRoomProcessor.java
@@ -372,9 +372,11 @@ public class GeneralRoomProcessor implements RoomProcessor {
             a.onPlayerInteract(event);
         });
 
-        IBlockState iBlockState = event.world.getBlockState(event.pos);
-        if (iBlockState.getBlock() == Blocks.chest || iBlockState.getBlock() == Blocks.trapped_chest)
-            lastChest = event.pos;
+        if (event.pos != null) {
+            IBlockState iBlockState = event.world.getBlockState(event.pos);
+            if (iBlockState.getBlock() == Blocks.chest || iBlockState.getBlock() == Blocks.trapped_chest)
+                lastChest = event.pos;
+        }
 
         if (event.entityPlayer.getHeldItem() != null &&
             event.entityPlayer.getHeldItem().getItem() == Items.stick &&