Optimize the code by deduplicating some code

BlockyTheDev · BlockyTheDev · commit bed8e18cc4f8 · 2025-10-19T17:26:45.000+02:00
diff --git a/common/src/main/java/io/github/communityradargg/forgemod/util/CommonHandler.java b/common/src/main/java/io/github/communityradargg/forgemod/util/CommonHandler.java
@@ -259,6 +259,37 @@ public void handleKeyInputEvent() {
         }
     }
 
+    /**
+     * Formats a prefix by replacing {@literal &} with {@literal §} and adding a space to the end.
+     *
+     * @param rawText The raw input text.
+     * @return Returns the formatted prefix.
+     */
+    public String formatPrefix(final @NotNull String rawText) {
+        return rawText.replace("&", "§") + " ";
+    }
+
+    /**
+     * Formats the text, wraps it into the version specific text component and gets the unformatted text from it for the possibility of comparison of texts.
+     *
+     * @param rawText The raw input text.
+     * @return Returns the unformatted text
+     */
+    public String unformatPrefixForCompare(final @NotNull String rawText) {
+        return versionBridge.wrapAndUnformatText(formatPrefix(rawText));
+    }
+
+    /**
+     * Checks if the given prefix candidate is matching with any of the old prefixes.
+     *
+     * @param prefixCandidate The possible prefix candidate.
+     * @param oldPrefixes The old prefixes.
+     * @return Returns {@code true} if there is a match, else {@code false}.
+     */
+    public boolean isPrefixMatching(final @NotNull String prefixCandidate, final @NotNull Set<@NotNull String> oldPrefixes) {
+        return oldPrefixes.stream().anyMatch(old -> unformatPrefixForCompare(old).equals(prefixCandidate));
+    }
+
     /**
      * Gets the list manager.
      *
diff --git a/common/src/main/java/io/github/communityradargg/forgemod/util/VersionBridge.java b/common/src/main/java/io/github/communityradargg/forgemod/util/VersionBridge.java
@@ -19,4 +19,6 @@ public interface VersionBridge {
     void updatePrefixes(final @NotNull CommonHandler commonHandler, final @NotNull Set<String> oldPrefixes);
 
     boolean isPlayerListKeyPressed();
+
+    @NotNull String wrapAndUnformatText(final @NotNull String text);
 }
diff --git a/versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/CommunityRadarMod.java b/versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/CommunityRadarMod.java
@@ -49,6 +49,7 @@ public void init(FMLInitializationEvent event) {
 
         registerEvents();
         registerCommands();
+
         LOGGER.info("Successfully loaded the mod '{}'", CommonHandler.MOD_ID);
     }
 
diff --git a/versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/util/Utils.java b/versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/util/Utils.java
@@ -84,13 +84,12 @@ public static void updatePlayerByUuid(final @NotNull CommonHandler commonHandler
      * @param oldPrefixes The old prefixes that need to be removed before adding the new one.
      */
     public static void updatePlayerNameTag(final @NotNull CommonHandler commonHandler, final @NotNull EntityPlayer player, final @NotNull Set<String> oldPrefixes) {
-        player.getPrefixes().removeIf(prefix -> oldPrefixes.stream().anyMatch(oldPrefix -> new TextComponentString(oldPrefix.replace("&", "§") + " ").getUnformattedText().equals(prefix.getUnformattedText())));
+        player.getPrefixes().removeIf(prefix -> commonHandler.isPrefixMatching(prefix.getUnformattedText(), oldPrefixes));
         final String addonPrefix = commonHandler.getListManager()
-                .getPrefix(player.getGameProfile().getId())
-                .replace("&", "§");
+                .getPrefix(player.getGameProfile().getId());
 
         if (!addonPrefix.isEmpty()) {
-            player.addPrefix(new TextComponentString(addonPrefix + " "));
+            player.addPrefix(new TextComponentString(commonHandler.formatPrefix(addonPrefix)));
         }
     }
 
@@ -123,17 +122,16 @@ private static void updatePlayerPrefix(final @NotNull CommonHandler commonHandle
         final ITextComponent displayName = player.getDisplayName();
         ITextComponent newDisplayName = displayName;
         for (final String prefix : oldPrefixes) {
-            if (!displayName.getUnformattedText().startsWith(new TextComponentString(prefix.replace("&", "§") + " ").getUnformattedText())) {
+            if (!displayName.getUnformattedText().startsWith(commonHandler.unformatPrefixForCompare(prefix))) {
                 continue;
             }
             newDisplayName = displayName.getSiblings().get(displayName.getSiblings().size() - 1);
         }
 
         final String addonPrefix = commonHandler.getListManager()
-                .getPrefix(player.getGameProfile().getId())
-                .replace("&", "§");
+                .getPrefix(player.getGameProfile().getId());
         if (!addonPrefix.isEmpty()) {
-            newDisplayName = new TextComponentString(addonPrefix + " ").appendSibling(newDisplayName);
+            newDisplayName = new TextComponentString(commonHandler.formatPrefix(addonPrefix)).appendSibling(newDisplayName);
         }
         player.setDisplayName(newDisplayName);
     }
diff --git a/versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/util/VersionBridgeImpl.java b/versions/1.12.2/src/main/java/io/github/communityradargg/forgemod/util/VersionBridgeImpl.java
@@ -72,4 +72,9 @@ public void updatePrefixes(final @NotNull CommonHandler commonHandler, final @No
     public boolean isPlayerListKeyPressed() {
         return Minecraft.getMinecraft().gameSettings.keyBindPlayerList.isPressed();
     }
+
+    @Override
+    public @NotNull String wrapAndUnformatText(final @NotNull String text) {
+        return new TextComponentString(text).getUnformattedText();
+    }
 }
diff --git a/versions/1.8.9/src/main/java/io/github/communityradargg/forgemod/CommunityRadarMod.java b/versions/1.8.9/src/main/java/io/github/communityradargg/forgemod/CommunityRadarMod.java
@@ -49,6 +49,7 @@ public void init(final FMLInitializationEvent event) {
 
         registerEvents();
         registerCommands();
+
         LOGGER.info("Successfully loaded the mod '{}'", CommonHandler.MOD_ID);
     }
 
diff --git a/versions/1.8.9/src/main/java/io/github/communityradargg/forgemod/util/Utils.java b/versions/1.8.9/src/main/java/io/github/communityradargg/forgemod/util/Utils.java
@@ -79,13 +79,12 @@ public static void updatePlayerByUuid(final @NotNull CommonHandler commonHandler
      * @param oldPrefixes The old prefixes that need to be removed before adding the new one.
      */
     public static void updatePlayerNameTag(final @NotNull CommonHandler commonHandler, final @NotNull EntityPlayer player, final @NotNull Set<String> oldPrefixes) {
-        player.getPrefixes().removeIf(prefix -> oldPrefixes.stream().anyMatch(oldPrefix -> new ChatComponentText(oldPrefix.replace("&", "§") + " ").getUnformattedText().equals(prefix.getUnformattedText())));
+        player.getPrefixes().removeIf(prefix -> commonHandler.isPrefixMatching(prefix.getUnformattedText(), oldPrefixes));
         final String addonPrefix = commonHandler.getListManager()
-                .getPrefix(player.getGameProfile().getId())
-                .replace("&", "§");
+                .getPrefix(player.getGameProfile().getId());
 
         if (!addonPrefix.isEmpty()) {
-            player.addPrefix(new ChatComponentText(addonPrefix + " "));
+            player.addPrefix(new ChatComponentText(commonHandler.formatPrefix(addonPrefix)));
         }
     }
 
@@ -115,17 +114,16 @@ private static void updatePlayerPrefix(final @NotNull CommonHandler commonHandle
         final IChatComponent displayName = player.getDisplayName();
         IChatComponent newDisplayName = displayName;
         for (final String prefix : oldPrefixes) {
-            if (!displayName.getUnformattedText().startsWith(new ChatComponentText(prefix.replace("&", "§") + " ").getUnformattedText())) {
+            if (!displayName.getUnformattedText().startsWith(commonHandler.unformatPrefixForCompare(prefix))) {
                 continue;
             }
             newDisplayName = displayName.getSiblings().get(displayName.getSiblings().size() - 1);
         }
 
         final String addonPrefix = commonHandler.getListManager()
-                .getPrefix(player.getGameProfile().getId())
-                .replace("&", "§");
+                .getPrefix(player.getGameProfile().getId());
         if (!addonPrefix.isEmpty()) {
-            newDisplayName = new ChatComponentText(addonPrefix + " ").appendSibling(newDisplayName);
+            newDisplayName = new ChatComponentText(commonHandler.formatPrefix(addonPrefix)).appendSibling(newDisplayName);
         }
         player.setDisplayName(newDisplayName);
     }
diff --git a/versions/1.8.9/src/main/java/io/github/communityradargg/forgemod/util/VersionBridgeImpl.java b/versions/1.8.9/src/main/java/io/github/communityradargg/forgemod/util/VersionBridgeImpl.java
@@ -72,4 +72,9 @@ public void updatePrefixes(final @NotNull CommonHandler commonHandler, final @No
     public boolean isPlayerListKeyPressed() {
         return Minecraft.getMinecraft().gameSettings.keyBindPlayerList.isPressed();
     }
+
+    @Override
+    public @NotNull String wrapAndUnformatText(final @NotNull String text) {
+        return new ChatComponentText(text).getUnformattedText();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,6 @@ public interface VersionBridge {`
`19`	`19`	`void updatePrefixes(final @NotNull CommonHandler commonHandler, final @NotNull Set<String> oldPrefixes);`
`20`	`20`
`21`	`21`	`boolean isPlayerListKeyPressed();`
	`22`	`+`
	`23`	`+ @NotNull String wrapAndUnformatText(final @NotNull String text);`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public void init(FMLInitializationEvent event) {`
`49`	`49`
`50`	`50`	`registerEvents();`
`51`	`51`	`registerCommands();`
	`52`	`+`
`52`	`53`	`LOGGER.info("Successfully loaded the mod '{}'", CommonHandler.MOD_ID);`
`53`	`54`	`}`
`54`	`55`
Original file line number	Diff line number	Diff line change
`@@ -84,13 +84,12 @@ public static void updatePlayerByUuid(final @NotNull CommonHandler commonHandler`
`84`	`84`	`* @param oldPrefixes The old prefixes that need to be removed before adding the new one.`
`85`	`85`	`*/`
`86`	`86`	`public static void updatePlayerNameTag(final @NotNull CommonHandler commonHandler, final @NotNull EntityPlayer player, final @NotNull Set<String> oldPrefixes) {`
`87`		`- player.getPrefixes().removeIf(prefix -> oldPrefixes.stream().anyMatch(oldPrefix -> new TextComponentString(oldPrefix.replace("&", "§") + " ").getUnformattedText().equals(prefix.getUnformattedText())));`
	`87`	`+ player.getPrefixes().removeIf(prefix -> commonHandler.isPrefixMatching(prefix.getUnformattedText(), oldPrefixes));`
`88`	`88`	`final String addonPrefix = commonHandler.getListManager()`
`89`		`- .getPrefix(player.getGameProfile().getId())`
`90`		`- .replace("&", "§");`
	`89`	`+ .getPrefix(player.getGameProfile().getId());`
`91`	`90`
`92`	`91`	`if (!addonPrefix.isEmpty()) {`
`93`		`- player.addPrefix(new TextComponentString(addonPrefix + " "));`
	`92`	`+ player.addPrefix(new TextComponentString(commonHandler.formatPrefix(addonPrefix)));`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`
`@@ -123,17 +122,16 @@ private static void updatePlayerPrefix(final @NotNull CommonHandler commonHandle`
`123`	`122`	`final ITextComponent displayName = player.getDisplayName();`
`124`	`123`	`ITextComponent newDisplayName = displayName;`
`125`	`124`	`for (final String prefix : oldPrefixes) {`
`126`		`- if (!displayName.getUnformattedText().startsWith(new TextComponentString(prefix.replace("&", "§") + " ").getUnformattedText())) {`
	`125`	`+ if (!displayName.getUnformattedText().startsWith(commonHandler.unformatPrefixForCompare(prefix))) {`
`127`	`126`	`continue;`
`128`	`127`	`}`
`129`	`128`	`newDisplayName = displayName.getSiblings().get(displayName.getSiblings().size() - 1);`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`final String addonPrefix = commonHandler.getListManager()`
`133`		`- .getPrefix(player.getGameProfile().getId())`
`134`		`- .replace("&", "§");`
	`132`	`+ .getPrefix(player.getGameProfile().getId());`
`135`	`133`	`if (!addonPrefix.isEmpty()) {`
`136`		`- newDisplayName = new TextComponentString(addonPrefix + " ").appendSibling(newDisplayName);`
	`134`	`+ newDisplayName = new TextComponentString(commonHandler.formatPrefix(addonPrefix)).appendSibling(newDisplayName);`
`137`	`135`	`}`
`138`	`136`	`player.setDisplayName(newDisplayName);`
`139`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,4 +72,9 @@ public void updatePrefixes(final @NotNull CommonHandler commonHandler, final @No`
`72`	`72`	`public boolean isPlayerListKeyPressed() {`
`73`	`73`	`return Minecraft.getMinecraft().gameSettings.keyBindPlayerList.isPressed();`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ @Override`
	`77`	`+ public @NotNull String wrapAndUnformatText(final @NotNull String text) {`
	`78`	`+ return new TextComponentString(text).getUnformattedText();`
	`79`	`+ }`
`75`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public void init(final FMLInitializationEvent event) {`
`49`	`49`
`50`	`50`	`registerEvents();`
`51`	`51`	`registerCommands();`
	`52`	`+`
`52`	`53`	`LOGGER.info("Successfully loaded the mod '{}'", CommonHandler.MOD_ID);`
`53`	`54`	`}`
`54`	`55`
Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,12 @@ public static void updatePlayerByUuid(final @NotNull CommonHandler commonHandler`
`79`	`79`	`* @param oldPrefixes The old prefixes that need to be removed before adding the new one.`
`80`	`80`	`*/`
`81`	`81`	`public static void updatePlayerNameTag(final @NotNull CommonHandler commonHandler, final @NotNull EntityPlayer player, final @NotNull Set<String> oldPrefixes) {`
`82`		`- player.getPrefixes().removeIf(prefix -> oldPrefixes.stream().anyMatch(oldPrefix -> new ChatComponentText(oldPrefix.replace("&", "§") + " ").getUnformattedText().equals(prefix.getUnformattedText())));`
	`82`	`+ player.getPrefixes().removeIf(prefix -> commonHandler.isPrefixMatching(prefix.getUnformattedText(), oldPrefixes));`
`83`	`83`	`final String addonPrefix = commonHandler.getListManager()`
`84`		`- .getPrefix(player.getGameProfile().getId())`
`85`		`- .replace("&", "§");`
	`84`	`+ .getPrefix(player.getGameProfile().getId());`
`86`	`85`
`87`	`86`	`if (!addonPrefix.isEmpty()) {`
`88`		`- player.addPrefix(new ChatComponentText(addonPrefix + " "));`
	`87`	`+ player.addPrefix(new ChatComponentText(commonHandler.formatPrefix(addonPrefix)));`
`89`	`88`	`}`
`90`	`89`	`}`
`91`	`90`
`@@ -115,17 +114,16 @@ private static void updatePlayerPrefix(final @NotNull CommonHandler commonHandle`
`115`	`114`	`final IChatComponent displayName = player.getDisplayName();`
`116`	`115`	`IChatComponent newDisplayName = displayName;`
`117`	`116`	`for (final String prefix : oldPrefixes) {`
`118`		`- if (!displayName.getUnformattedText().startsWith(new ChatComponentText(prefix.replace("&", "§") + " ").getUnformattedText())) {`
	`117`	`+ if (!displayName.getUnformattedText().startsWith(commonHandler.unformatPrefixForCompare(prefix))) {`
`119`	`118`	`continue;`
`120`	`119`	`}`
`121`	`120`	`newDisplayName = displayName.getSiblings().get(displayName.getSiblings().size() - 1);`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`final String addonPrefix = commonHandler.getListManager()`
`125`		`- .getPrefix(player.getGameProfile().getId())`
`126`		`- .replace("&", "§");`
	`124`	`+ .getPrefix(player.getGameProfile().getId());`
`127`	`125`	`if (!addonPrefix.isEmpty()) {`
`128`		`- newDisplayName = new ChatComponentText(addonPrefix + " ").appendSibling(newDisplayName);`
	`126`	`+ newDisplayName = new ChatComponentText(commonHandler.formatPrefix(addonPrefix)).appendSibling(newDisplayName);`
`129`	`127`	`}`
`130`	`128`	`player.setDisplayName(newDisplayName);`
`131`	`129`	`}`