Improvements about saving user inventory title

Author: Rothes

src/main/java/me/rothes/protocolstringreplacer/packetlisteners/server/AbstractServerPacketListener.java

@@ -119,13 +119,7 @@ protected static String getReplacedJson(@Nonnull PacketEvent packetEvent, @Nonnu
     @Nullable
     protected static String getReplacedJson(@Nonnull PacketEvent packetEvent, @Nonnull PsrUser user, @Nonnull ListenType listenType,
                                             @Nonnull String json, List<ReplacerConfig> replacers) {
-        return getReplacedJson(packetEvent, user, listenType, json, replacers, false);
-    }
-
-    @Nullable
-    protected static String getReplacedJson(@Nonnull PacketEvent packetEvent, @Nonnull PsrUser user, @Nonnull ListenType listenType,
-                                            @Nonnull String json, List<ReplacerConfig> replacers, boolean saveTitle) {
-        String replacedDirect = getReplacedDirect(packetEvent, user, listenType, json, replacers, saveTitle);
+        String replacedDirect = getReplacedDirect(packetEvent, user, listenType, json, replacers);
         if (replacedDirect == null) {
             return null;
         }
@@ -148,11 +142,7 @@ protected static String getReplacedJson(@Nonnull PacketEvent packetEvent, @Nonnu
 
     @Nullable
     protected static String getReplacedDirect(@Nonnull PacketEvent packetEvent, @Nonnull PsrUser user, @Nonnull ListenType listenType,
-                                            @Nonnull String json, List<ReplacerConfig> replacers, boolean saveTitle) {
-        if (saveTitle) {
-            user.setCurrentWindowTitle(json);
-        }
-
+                                            @Nonnull String json, List<ReplacerConfig> replacers) {
         StringBuilder sb = new StringBuilder();
         for (BaseComponent baseComponent : ComponentSerializer.parse(json)) {
             sb.append(baseComponent.toLegacyText());
@@ -221,10 +211,10 @@ protected static String getReplacedDirect(@Nonnull PacketEvent packetEvent, @Non
 
     @Nullable
     protected static WrappedChatComponent getReplacedJsonWrappedComponent(@Nonnull PacketEvent packetEvent, @Nonnull PsrUser user, @Nonnull ListenType listenType,
-                                                                          @Nonnull String json, BiPredicate<ReplacerConfig, PsrUser> filter, boolean saveTitle) {
+                                                                          @Nonnull String json, BiPredicate<ReplacerConfig, PsrUser> filter) {
         ReplacerManager replacerManager = ProtocolStringReplacer.getInstance().getReplacerManager();
         List<ReplacerConfig> replacers = replacerManager.getAcceptedReplacers(user, filter);
-        String replacedJson = getReplacedJson(packetEvent, user, listenType, json, replacers, saveTitle);
+        String replacedJson = getReplacedJson(packetEvent, user, listenType, json, replacers);
 
         if (replacedJson != null) {
             return WrappedChatComponent.fromJson(replacedJson);
@@ -233,12 +223,6 @@ protected static WrappedChatComponent getReplacedJsonWrappedComponent(@Nonnull P
         }
     }
 
-    @Nullable
-    protected static WrappedChatComponent getReplacedJsonWrappedComponent(@Nonnull PacketEvent packetEvent, @Nonnull PsrUser user, @Nonnull ListenType listenType,
-                                                                          @Nonnull String json, BiPredicate<ReplacerConfig, PsrUser> filter) {
-        return getReplacedJsonWrappedComponent(packetEvent, user, listenType, json, filter, false);
-    }
-
     @Nullable
     protected static String getReplacedText(@Nonnull PacketEvent packetEvent, @Nonnull PsrUser user, @Nonnull ListenType listenType,
                                             @Nonnull String text, BiPredicate<ReplacerConfig, PsrUser> filter) {

src/main/java/me/rothes/protocolstringreplacer/packetlisteners/server/OpenWindow.java

@@ -8,6 +8,7 @@
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import me.rothes.protocolstringreplacer.api.user.PsrUser;
 import me.rothes.protocolstringreplacer.replacer.ListenType;
+import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
 
@@ -37,7 +38,7 @@ public OpenWindow() {
 
     }
 
-    protected void process(PacketEvent packetEvent) {
+    protected void process(@NotNull PacketEvent packetEvent) {
         PsrUser user = getEventUser(packetEvent);
         if (user == null) {
             return;
@@ -47,8 +48,9 @@ protected void process(PacketEvent packetEvent) {
         WrappedChatComponent wrappedChatComponent = wrappedChatComponentStructureModifier.read(0);
         String json = wrappedChatComponent.getJson();
 
-        WrappedChatComponent replaced = getReplacedJsonWrappedComponent(packetEvent, user, listenType, json, filter, true);
+        WrappedChatComponent replaced = getReplacedJsonWrappedComponent(packetEvent, user, listenType, json, filter);
         if (replaced != null) {
+            user.setCurrentWindowTitle(json);
             wrappedChatComponentStructureModifier.write(0, replaced);
 
             if (windowTypeField != null) {