From fa70b855e417052c114b66ef94116da93c9bd5ef Mon Sep 17 00:00:00 2001
From: RettichLP <rettichlp01@gmail.com>
Date: Thu, 28 May 2026 10:50:47 +0200
Subject: [PATCH 1/3] Pathfinding: centralize house drink detection logic in
 `HouseListener`

---
 .../de/rettichlp/ucutils/listener/impl/HouseListener.java | 8 ++++++++
 .../rettichlp/ucutils/listener/impl/PlayerListener.java   | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/HouseListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/HouseListener.java
index 9f965caf..0a2c7cb3 100644
--- a/src/main/java/de/rettichlp/ucutils/listener/impl/HouseListener.java
+++ b/src/main/java/de/rettichlp/ucutils/listener/impl/HouseListener.java
@@ -11,6 +11,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static de.rettichlp.ucutils.UCUtils.commandService;
 import static de.rettichlp.ucutils.UCUtils.player;
 import static de.rettichlp.ucutils.common.services.MessageService.DATE_TIME_FORMAT;
 import static java.lang.Integer.parseInt;
@@ -35,6 +36,7 @@ public class HouseListener implements IMessageReceiveListener {
     private static final Pattern HOUSE_RENTER_HEADER_PATTERN = compile("^=== Mieter in Haus (?<number>\\d+) ===$");
     private static final Pattern HOUSE_RENTER_ENTRY_ONLINE_PATTERN = compile("^» (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) \\(Online\\)$");
     private static final Pattern HOUSE_RENTER_ENTRY_OFFLINE_PATTERN = compile("^» (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) \\(Offline seit (?<dateTime>\\d{2}\\.\\d{2}\\.\\d{4} \\d{2}:\\d{2}:\\d{2})\\)$");
+    private static final Pattern HOUSE_DRINK_PATTERN = compile("^\\[Küche] Du hast etwas getrunken\\.$");
 
     private int lastHouseNumber = 0;
 
@@ -91,6 +93,12 @@ public boolean onMessageReceive(Text text, String message) {
             return false;
         }
 
+        Matcher houseDrinkMatcher = HOUSE_DRINK_PATTERN.matcher(message);
+        if (houseDrinkMatcher.find()) {
+            commandService.sendCommandWithHiddenOutput("health");
+            return commandService.showCommandOutputMessage("health");
+        }
+
         return true;
     }
 }
diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/PlayerListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/PlayerListener.java
index 80b7f074..1d43c6e0 100644
--- a/src/main/java/de/rettichlp/ucutils/listener/impl/PlayerListener.java
+++ b/src/main/java/de/rettichlp/ucutils/listener/impl/PlayerListener.java
@@ -47,7 +47,6 @@ public class PlayerListener implements IMessageReceiveListener, ITickListener {
     private static final Pattern HEALTH_HEADER_PATTERN = compile("^=== Zustand von (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) ===$");
     private static final Pattern HEALTH_ENTRY_PATTERN = compile("^§.» (?<type>Gesundheit|Blut §.\\[§..+§.]|Hunger|Durst|Fett|Muskeln)§.: §.((§.)?#)+$");
     private static final Pattern HEALTH_ENTRY_HOVER_PATTERN = compile("^§.(?<value>\\d+(\\.\\d+)?)§./§.20\\.0$");
-    private static final Pattern HOUSE_DRINK_PATTERN = compile("^\\[Küche] Du hast etwas getrunken\\.$");
 
     // jail
     private static final Pattern JAIL_PATTERN = compile("^\\[Gefängnis] Du bist nun für (?<minutes>\\d+) Minuten im Gefängnis\\.$");
@@ -100,12 +99,6 @@ public boolean onMessageReceive(Text text, String message) {
             return commandService.showCommandOutputMessage("health");
         }
 
-        Matcher houseDrinkMatcher = HOUSE_DRINK_PATTERN.matcher(message);
-        if (houseDrinkMatcher.find()) {
-            commandService.sendCommandWithHiddenOutput("health");
-            return commandService.showCommandOutputMessage("health");
-        }
-
         Matcher jailMatcher = JAIL_PATTERN.matcher(message);
         if (jailMatcher.find()) {
             int minutes = parseInt(jailMatcher.group("minutes"));

From 4c7adfc3a3c2df137050cc517faa12a153e4c9bd Mon Sep 17 00:00:00 2001
From: RettichLP <rettichlp01@gmail.com>
Date: Thu, 28 May 2026 10:53:26 +0200
Subject: [PATCH 2/3] Remove `WantedEntry` model and refactor related logic
 from `WantedListener` to `CarListener`

---
 .../de/rettichlp/ucutils/common/Storage.java  |   6 -
 .../ucutils/common/models/WantedEntry.java    |  13 -
 .../ucutils/listener/impl/CarListener.java    |  10 +
 .../listener/impl/faction/WantedListener.java | 422 ------------------
 4 files changed, 10 insertions(+), 441 deletions(-)
 delete mode 100644 src/main/java/de/rettichlp/ucutils/common/models/WantedEntry.java
 delete mode 100644 src/main/java/de/rettichlp/ucutils/listener/impl/faction/WantedListener.java

diff --git a/src/main/java/de/rettichlp/ucutils/common/Storage.java b/src/main/java/de/rettichlp/ucutils/common/Storage.java
index 492152b5..7fd56098 100644
--- a/src/main/java/de/rettichlp/ucutils/common/Storage.java
+++ b/src/main/java/de/rettichlp/ucutils/common/Storage.java
@@ -7,7 +7,6 @@
 import de.rettichlp.ucutils.common.models.Job;
 import de.rettichlp.ucutils.common.models.ShutdownReason;
 import de.rettichlp.ucutils.common.models.TeamResponse;
-import de.rettichlp.ucutils.common.models.WantedEntry;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Setter;
@@ -52,9 +51,6 @@ public class Storage {
     @Getter
     private final Map<String, Faction> playerFactionCache = new HashMap<>();
 
-    @Getter
-    private final List<WantedEntry> wantedEntries = new ArrayList<>();
-
     @Getter
     @Setter
     private int activeServices = 0;
@@ -131,8 +127,6 @@ public void print() {
         LOGGER.info("medicPillCooldowns[{}]: {}", this.medicPillCooldowns.size(), this.medicPillCooldowns);
         // playerFactionCache
         LOGGER.info("playerFactionCache[{}]: {}", this.playerFactionCache.size(), this.playerFactionCache);
-        // wantedEntries
-        LOGGER.info("wantedEntries[{}]: {}", this.wantedEntries.size(), this.wantedEntries);
         // activeServices
         LOGGER.info("activeServices: {}", this.activeServices);
         // carLocked
diff --git a/src/main/java/de/rettichlp/ucutils/common/models/WantedEntry.java b/src/main/java/de/rettichlp/ucutils/common/models/WantedEntry.java
deleted file mode 100644
index bbd498eb..00000000
--- a/src/main/java/de/rettichlp/ucutils/common/models/WantedEntry.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package de.rettichlp.ucutils.common.models;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@Data
-@AllArgsConstructor
-public class WantedEntry {
-
-    private String playerName;
-    private int wantedPointAmount;
-    private String reason;
-}
diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/CarListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/CarListener.java
index 9a85f595..c710e319 100644
--- a/src/main/java/de/rettichlp/ucutils/listener/impl/CarListener.java
+++ b/src/main/java/de/rettichlp/ucutils/listener/impl/CarListener.java
@@ -17,6 +17,8 @@
 import static de.rettichlp.ucutils.UCUtils.configuration;
 import static de.rettichlp.ucutils.UCUtils.renderService;
 import static de.rettichlp.ucutils.UCUtils.storage;
+import static de.rettichlp.ucutils.UCUtils.utilService;
+import static de.rettichlp.ucutils.common.services.CommandService.COMMAND_COOLDOWN_MILLIS;
 import static java.lang.Integer.parseInt;
 import static java.util.Optional.ofNullable;
 import static java.util.regex.Pattern.compile;
@@ -25,6 +27,7 @@
 @UCUtilsListener
 public class CarListener implements IEntityRenderListener, IMessageReceiveListener {
 
+    private static final Pattern CAR_CHECK_PATTERN = compile("^Das Fahrzeug mit dem Kennzeichen [A-Z0-9-]+ gehört (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+)\\.$");
     private static final Pattern CAR_UNLOCK_PATTERN = compile("^\\[Car] Du hast deinen .+ aufgeschlossen\\.$");
     private static final Pattern CAR_LOCK_PATTERN = compile("^\\[Car] Du hast deinen .+ abgeschlossen\\.$");
     private static final Pattern CAR_LOCKED_OWN_PATTERN = compile("^\\[Car] Dein Fahrzeug ist abgeschlossen\\.$");
@@ -45,6 +48,13 @@ public void onEntityRender(WorldRenderContext context) {
 
     @Override
     public boolean onMessageReceive(Text text, String message) {
+        Matcher carCheckMatcher = CAR_CHECK_PATTERN.matcher(message);
+        if (carCheckMatcher.find()) {
+            String playerName = carCheckMatcher.group("playerName");
+            utilService.delayedAction(() -> commandService.sendCommand("memberinfo " + playerName), COMMAND_COOLDOWN_MILLIS);
+            return true;
+        }
+
         Matcher carUnlockMatcher = CAR_UNLOCK_PATTERN.matcher(message);
         if (carUnlockMatcher.find()) {
             storage.setCarLocked(false);
diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/WantedListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/WantedListener.java
deleted file mode 100644
index c2391bc5..00000000
--- a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/WantedListener.java
+++ /dev/null
@@ -1,422 +0,0 @@
-package de.rettichlp.ucutils.listener.impl.faction;
-
-import de.rettichlp.ucutils.common.models.WantedEntry;
-import de.rettichlp.ucutils.common.registry.UCUtilsListener;
-import de.rettichlp.ucutils.listener.IMessageReceiveListener;
-import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
-
-import java.util.function.Predicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static de.rettichlp.ucutils.UCUtils.commandService;
-import static de.rettichlp.ucutils.UCUtils.nameTagService;
-import static de.rettichlp.ucutils.UCUtils.player;
-import static de.rettichlp.ucutils.UCUtils.storage;
-import static de.rettichlp.ucutils.UCUtils.utilService;
-import static de.rettichlp.ucutils.common.services.CommandService.COMMAND_COOLDOWN_MILLIS;
-import static java.lang.Integer.parseInt;
-import static java.lang.String.valueOf;
-import static java.util.regex.Pattern.compile;
-import static net.minecraft.text.Text.empty;
-import static net.minecraft.text.Text.of;
-import static net.minecraft.util.Formatting.BLUE;
-import static net.minecraft.util.Formatting.DARK_AQUA;
-import static net.minecraft.util.Formatting.DARK_GRAY;
-import static net.minecraft.util.Formatting.GOLD;
-import static net.minecraft.util.Formatting.GRAY;
-import static net.minecraft.util.Formatting.RED;
-
-@UCUtilsListener
-public class WantedListener implements IMessageReceiveListener {
-
-    private static final Pattern WANTED_GIVEN_POINTS_PATTERN = compile("^HQ: (?:\\[UC])?([a-zA-Z0-9_]+)'s momentanes WantedLevel: (\\d+)$");
-    private static final Pattern WANTED_GIVEN_REASON_PATTERN = compile("^HQ: Gesuchter: (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+)\\. Grund: (?<reason>.+)$");
-    private static final Pattern WANTED_REASON_PATTERN = compile("^HQ: Fahndungsgrund: (?<reason>.+) \\| Fahndungszeit: (?<time>.+)$");
-    private static final Pattern WANTED_DELETE_PATTERN = compile("^HQ: (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+)(?:'s)* Akten gelöscht, over\\.$");
-    private static final Pattern WANTED_KILL_PATTERN = compile("^HQ: (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+) wurde von (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) getötet\\.$");
-    private static final Pattern WANTED_ARREST_PATTERN = compile("^HQ: (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+) wurde von (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) eingesperrt\\.$");
-    private static final Pattern WANTED_UNARREST_PATTERN = compile("^HQ: (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+) aus dem Gefängnis entlassen\\.$");
-    private static final Pattern WANTED_LIST_HEADER_PATTERN = compile("Online Spieler mit WantedPunkten:");
-    private static final Pattern WANTED_LIST_ENTRY_PATTERN = compile("- (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) \\| (?<wantedPointAmount>\\d+) WPS \\((?<reason>.+)\\)(?<afk> \\| AFK|)");
-    private static final Pattern LICENSE_DRIVING_GIVE_PATTERN = compile("^(Agent|Agentin|Beamter|Beamtin) (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+)(?:'s)* Führerschein zurückgegeben\\.$");
-    private static final Pattern LICENSE_DRIVING_TAKE_PATTERN = compile("^(Agent|Agentin|Beamter|Beamtin) (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+)(?:'s)* Führerschein abgenommen\\.$");
-    private static final Pattern LICENSE_GUN_GIVE_PATTERN = compile("^(Agent|Agentin|Beamter|Beamtin) (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+)(?:'s)* Waffenschein zurückgegeben\\.$");
-    private static final Pattern LICENSE_GUN_TAKE_PATTERN = compile("^(Agent|Agentin|Beamter|Beamtin) (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+)(?:'s)* Waffenschein abgenommen\\.$");
-    private static final Pattern TAKE_GUNS_PATTERN = compile("^(Beamter|Beamtin) (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+) (seine|ihre) Waffen abgenommen\\.$");
-    private static final Pattern TAKE_DRUGS_PATTERN = compile("^(Beamter|Beamtin) (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+) (seine|ihre) Drogen abgenommen.$");
-    private static final Pattern CAR_CHECK_PATTERN = compile("^Das Fahrzeug mit dem Kennzeichen [A-Z0-9-]+ gehört (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+)\\.$");
-    private static final Pattern CAR_PARKTICKET_PATTERN = compile("^HQ: (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat ein Strafzettel an das Fahrzeug \\[(?<plate>[A-Z0-9-]+)] vergeben\\.$");
-    private static final Pattern CAR_PARKTICKET_REMOVE_PATTERN = compile("^HQ: (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat ein Strafzettel von dem Fahrzeug \\[(?<plate>[A-Z0-9-]+)] entfernt\\.$");
-    private static final Pattern SEARCH_TRUNK_PATTERN = compile("^HQ: (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat den Kofferraum vom Fahrzeug (?<plate>.+) durchsucht, over\\.$");
-    private static final Pattern TRACKER_AGENT_PATTERN = compile("^HQ: (Agent|Agentin) (?:\\[UC])?(?<playerName>[a-zA-Z0-9_]+) hat ein Peilsender an (?:\\[UC])?(?<targetName>[a-zA-Z0-9_]+) befestigt, over\\.$");
-
-    @Override
-    public boolean onMessageReceive(Text text, String message) {
-        Matcher wantedGivenPointsMatcher = WANTED_GIVEN_POINTS_PATTERN.matcher(message);
-        if (wantedGivenPointsMatcher.find()) {
-            String playerName = wantedGivenPointsMatcher.group(1);
-            int wantedPoints = parseInt(wantedGivenPointsMatcher.group(2));
-
-            storage.getWantedEntries().stream()
-                    .filter(wantedEntry -> wantedEntry.getPlayerName().equals(playerName))
-                    .findFirst()
-                    .ifPresentOrElse(wantedEntry -> wantedEntry.setWantedPointAmount(wantedPoints), () -> {
-                        WantedEntry wantedEntry = new WantedEntry(playerName, wantedPoints, "");
-                        storage.getWantedEntries().add(wantedEntry);
-                    });
-
-            Text modifiedMessage = empty()
-                    .append(of("➥").copy().formatted(GRAY)).append(" ")
-                    .append(of(wantedGivenPointsMatcher.group(2)).copy().formatted(BLUE)).append(" ")
-                    .append(of("Wanteds").copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher wantedGivenReasonMatcher = WANTED_GIVEN_REASON_PATTERN.matcher(message);
-        if (wantedGivenReasonMatcher.find()) {
-            String playerName = wantedGivenReasonMatcher.group("playerName");
-            String reason = wantedGivenReasonMatcher.group("reason");
-
-            storage.getWantedEntries().stream()
-                    .filter(wantedEntry -> wantedEntry.getPlayerName().equals(playerName))
-                    .findFirst()
-                    .ifPresent(wantedEntry -> wantedEntry.setReason(reason));
-
-            Text modifiedMessage = empty()
-                    .append(of("Gesucht").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(wantedGivenReasonMatcher.group(1)).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(wantedGivenReasonMatcher.group(2)).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher wantedReasonMatcher = WANTED_REASON_PATTERN.matcher(message);
-        if (wantedReasonMatcher.find()) {
-            String reason = wantedReasonMatcher.group("reason");
-            String time = wantedReasonMatcher.group("time");
-
-            Text modifiedMessage = empty()
-                    .append(of("➥").copy().formatted(GRAY)).append(" ")
-                    .append(of(reason).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(time).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher wantedDeleteMatcher = WANTED_DELETE_PATTERN.matcher(message);
-        if (wantedDeleteMatcher.find()) {
-            String playerName = wantedDeleteMatcher.group("playerName");
-            String targetName = wantedDeleteMatcher.group("targetName");
-
-            int wpAmount = getWpAmountAndDelete(targetName);
-
-            Text modifiedMessage = empty()
-                    .append(of("Gelöscht").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("(").copy().formatted(GRAY))
-                    .append(of(valueOf(wpAmount)).copy().formatted(RED))
-                    .append(of(")").copy().formatted(GRAY)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher wantedKillMatcher = WANTED_KILL_PATTERN.matcher(message);
-        if (wantedKillMatcher.find()) {
-            String targetName = wantedKillMatcher.group("targetName");
-            String playerName = wantedKillMatcher.group("playerName");
-            int wpAmount = getWpAmountAndDelete(targetName);
-
-            Text modifiedMessage = empty()
-                    .append(of("Getötet").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("(").copy().formatted(GRAY))
-                    .append(of(valueOf(wpAmount)).copy().formatted(RED))
-                    .append(of(")").copy().formatted(GRAY)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-            return false;
-        }
-
-        Matcher wantedJailMatcher = WANTED_ARREST_PATTERN.matcher(message);
-        if (wantedJailMatcher.find()) {
-            String targetName = wantedJailMatcher.group("targetName");
-            String playerName = wantedJailMatcher.group("playerName");
-            int wpAmount = getWpAmountAndDelete(targetName);
-
-            Text modifiedMessage = empty()
-                    .append(of("Eingesperrt").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("(").copy().formatted(GRAY))
-                    .append(of(valueOf(wpAmount)).copy().formatted(RED))
-                    .append(of(")").copy().formatted(GRAY)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-            return false;
-        }
-
-        Matcher carCheckMatcher = CAR_CHECK_PATTERN.matcher(message);
-        if (carCheckMatcher.find()) {
-            String playerName = carCheckMatcher.group("playerName");
-            utilService.delayedAction(() -> commandService.sendCommand("memberinfo " + playerName), COMMAND_COOLDOWN_MILLIS);
-        }
-
-        Matcher carParkticketMatcher = CAR_PARKTICKET_PATTERN.matcher(message);
-        if (carParkticketMatcher.find()) {
-            String officerName = carParkticketMatcher.group("playerName");
-            String plate = carParkticketMatcher.group("plate");
-
-            Text modifiedMessage = empty()
-                    .append(of("Strafzettel").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(plate).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(officerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-            return false;
-        }
-
-        Matcher carParkticketRemoveMatcher = CAR_PARKTICKET_REMOVE_PATTERN.matcher(message);
-        if (carParkticketRemoveMatcher.find()) {
-            String officerName = carParkticketRemoveMatcher.group("playerName");
-            String plate = carParkticketRemoveMatcher.group("plate");
-
-            Text modifiedMessage = empty()
-                    .append(of("Strafzettel entfernt").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(plate).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(officerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher searchTrunkMatcher = SEARCH_TRUNK_PATTERN.matcher(message);
-        if (searchTrunkMatcher.find()) {
-            String officerName = searchTrunkMatcher.group("playerName");
-            String plate = searchTrunkMatcher.group("plate");
-
-            Text modifiedMessage = empty()
-                    .append(of("Fahrzeugkontrolle").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(plate).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(officerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher wantedUnarrestMatcher = WANTED_UNARREST_PATTERN.matcher(message);
-        if (wantedUnarrestMatcher.find()) {
-            String playerName = wantedUnarrestMatcher.group("playerName");
-            String targetName = wantedUnarrestMatcher.group("targetName");
-
-            Text modifiedMessage = empty()
-                    .append(of("Entlassen").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher wantedListHeaderMatcher = WANTED_LIST_HEADER_PATTERN.matcher(message);
-        if (wantedListHeaderMatcher.find()) {
-            storage.getWantedEntries().clear();
-            return commandService.showCommandOutputMessage("wanteds");
-        }
-
-        Matcher wantedListEntryMatcher = WANTED_LIST_ENTRY_PATTERN.matcher(message);
-        if (wantedListEntryMatcher.find()) {
-            String playerName = wantedListEntryMatcher.group("playerName");
-            int wantedPointAmount = parseInt(wantedListEntryMatcher.group("wantedPointAmount"));
-            String reason = wantedListEntryMatcher.group("reason");
-            boolean isAfk = wantedListEntryMatcher.group("afk").contains("AFK");
-
-            WantedEntry wantedEntry = new WantedEntry(playerName, wantedPointAmount, reason);
-            storage.getWantedEntries().add(wantedEntry);
-
-            Formatting color = nameTagService.getWantedPointColor(wantedPointAmount);
-
-            if (commandService.showCommandOutputMessage("wanteds")) {
-                Text modifiedMessage = empty()
-                        .append(of("➥").copy().formatted(GRAY)).append(" ")
-                        .append(of(playerName).copy().formatted(color)).append(" ")
-                        .append(of("-").copy().formatted(GRAY)).append(" ")
-                        .append(of(reason).copy().formatted(color)).append(" ")
-                        .append(of("(").copy().formatted(GRAY))
-                        .append(of(valueOf(wantedPointAmount)).copy().formatted(BLUE))
-                        .append(of(")").copy().formatted(GRAY)).append(" ")
-                        .append(of(isAfk ? "|" : "").copy().formatted(DARK_GRAY)).append(" ")
-                        .append(of(isAfk ? "AFK" : "").copy().formatted(GRAY));
-
-                player.sendMessage(modifiedMessage, false);
-            }
-
-            return false;
-        }
-
-        Matcher licenseDrivingGiveMatcher = LICENSE_DRIVING_GIVE_PATTERN.matcher(message);
-        if (licenseDrivingGiveMatcher.find()) {
-            String playerName = licenseDrivingGiveMatcher.group("playerName");
-            String targetName = licenseDrivingGiveMatcher.group("targetName");
-
-            Text modifiedMessage = empty()
-                    .append(of("Führerscheinrückgabe").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher licenseDrivingTakeMatcher = LICENSE_DRIVING_TAKE_PATTERN.matcher(message);
-        if (licenseDrivingTakeMatcher.find()) {
-            String playerName = licenseDrivingTakeMatcher.group("playerName");
-            String targetName = licenseDrivingTakeMatcher.group("targetName");
-
-            Text modifiedMessage = empty()
-                    .append(of("Führerscheinabnahme").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher licenseGunGiveMatcher = LICENSE_GUN_GIVE_PATTERN.matcher(message);
-        if (licenseGunGiveMatcher.find()) {
-            String playerName = licenseGunGiveMatcher.group("playerName");
-            String targetName = licenseGunGiveMatcher.group("targetName");
-
-            Text modifiedMessage = empty()
-                    .append(of("Waffenscheinrückgabe").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher licenseGunTakeMatcher = LICENSE_GUN_TAKE_PATTERN.matcher(message);
-        if (licenseGunTakeMatcher.find()) {
-            String playerName = licenseGunTakeMatcher.group("playerName");
-            String targetName = licenseGunTakeMatcher.group("targetName");
-
-            Text modifiedMessage = empty()
-                    .append(of("Waffenscheinabnahme").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher takeGunsMatcher = TAKE_GUNS_PATTERN.matcher(message);
-        if (takeGunsMatcher.find()) {
-            String playerName = takeGunsMatcher.group("playerName");
-            String targetName = takeGunsMatcher.group("targetName");
-
-            Text modifiedMessage = empty()
-                    .append(of("Waffenabnahme").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher takeDrugsMatcher = TAKE_DRUGS_PATTERN.matcher(message);
-        if (takeDrugsMatcher.find()) {
-            String playerName = takeDrugsMatcher.group("playerName");
-            String targetName = takeDrugsMatcher.group("targetName");
-
-            Text modifiedMessage = empty()
-                    .append(of("Drogenabnahme").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(BLUE)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(BLUE));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        Matcher trackerMatcher = TRACKER_AGENT_PATTERN.matcher(message);
-        if (trackerMatcher.find()) {
-            String playerName = trackerMatcher.group("playerName");
-            String targetName = trackerMatcher.group("targetName");
-
-            Text modifiedMessage = empty()
-                    .append(of("Peilsender").copy().formatted(RED)).append(" ")
-                    .append(of("-").copy().formatted(GRAY)).append(" ")
-                    .append(of(playerName).copy().formatted(DARK_AQUA)).append(" ")
-                    .append(of("»").copy().formatted(GRAY)).append(" ")
-                    .append(of(targetName).copy().formatted(GOLD));
-
-            player.sendMessage(modifiedMessage, false);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    private int getWpAmountAndDelete(String targetName) {
-        Predicate<WantedEntry> predicate = wantedEntry -> wantedEntry.getPlayerName().equals(targetName);
-        int wantedPointAmount = storage.getWantedEntries().stream()
-                .filter(predicate)
-                .findAny()
-                .map(WantedEntry::getWantedPointAmount)
-                .orElse(0);
-
-        storage.getWantedEntries().removeIf(predicate);
-        return wantedPointAmount;
-    }
-}

From e59975481a4817ce628439134ea24371e676954a Mon Sep 17 00:00:00 2001
From: RettichLP <rettichlp01@gmail.com>
Date: Thu, 28 May 2026 10:57:08 +0200
Subject: [PATCH 3/3] Remove redundant `WantedEntry` handling and simplify
 `getEnrichedDisplayName` logic in `EntityMixin`

---
 .../rettichlp/ucutils/mixin/EntityMixin.java  | 32 +-------------
 .../ucutils/mixin/PlayerListHudMixin.java     | 43 -------------------
 src/main/resources/ucutils.mixins.json        |  3 +-
 3 files changed, 3 insertions(+), 75 deletions(-)
 delete mode 100644 src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java

diff --git a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java
index 3944e797..fa365f68 100644
--- a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java
+++ b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java
@@ -1,7 +1,5 @@
 package de.rettichlp.ucutils.mixin;
 
-import de.rettichlp.ucutils.common.models.Faction;
-import de.rettichlp.ucutils.common.models.WantedEntry;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ItemEntity;
@@ -9,7 +7,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
 import net.minecraft.world.entity.UniquelyIdentifiable;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
@@ -19,15 +16,11 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.Optional;
-
 import static de.rettichlp.ucutils.UCUtils.commandService;
 import static de.rettichlp.ucutils.UCUtils.configuration;
-import static de.rettichlp.ucutils.UCUtils.nameTagService;
 import static de.rettichlp.ucutils.UCUtils.player;
 import static de.rettichlp.ucutils.UCUtils.storage;
 import static de.rettichlp.ucutils.UCUtils.utilService;
-import static de.rettichlp.ucutils.common.models.Color.WHITE;
 import static net.minecraft.item.Items.SKELETON_SKULL;
 import static net.minecraft.item.Items.WITHER_SKELETON_SKULL;
 import static net.minecraft.text.Text.empty;
@@ -111,30 +104,9 @@ public abstract class EntityMixin {
 
     @Unique
     private MutableText getEnrichedDisplayName(String targetName) {
-        Faction targetFaction = storage.getCachedFaction(targetName);
-
-        Text newTargetDisplayNamePrefix = empty();
-        Text newTargetDisplayName = literal(targetName);
-        Text newTargetDisplayNameSuffix = targetFaction.getNameTagSuffix();
-        Formatting newTargetDisplayNameColor;
-
-        // highlight factions
-        newTargetDisplayNameColor = WHITE.getFormatting();
-
-        // wanted
-        Optional<WantedEntry> optionalTargetWantedEntry = storage.getWantedEntries().stream()
-                .filter(wantedEntry -> wantedEntry.getPlayerName().equals(targetName))
-                .findAny();
-
-        if (optionalTargetWantedEntry.isPresent()) {
-            newTargetDisplayNameColor = nameTagService.getWantedPointColor(optionalTargetWantedEntry.get().getWantedPointAmount());
-        }
-
         return empty()
-                .append(newTargetDisplayNamePrefix)
-                .append(" ")
-                .append(newTargetDisplayName.copy().formatted(newTargetDisplayNameColor))
+                .append(literal(targetName))
                 .append(" ")
-                .append(newTargetDisplayNameSuffix);
+                .append(storage.getCachedFaction(targetName).getNameTagSuffix());
     }
 }
diff --git a/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java
deleted file mode 100644
index 1c972763..00000000
--- a/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package de.rettichlp.ucutils.mixin;
-
-import net.minecraft.client.gui.hud.PlayerListHud;
-import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
-import org.jetbrains.annotations.NotNull;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import static de.rettichlp.ucutils.UCUtils.storage;
-import static net.minecraft.text.Text.literal;
-import static net.minecraft.util.Formatting.BOLD;
-import static net.minecraft.util.Formatting.RED;
-
-@Mixin(PlayerListHud.class)
-public abstract class PlayerListHudMixin {
-
-    @Inject(method = "getPlayerName", at = @At("RETURN"), cancellable = true)
-    private void ucutils$getPlayerNameReturn(PlayerListEntry playerListEntry, @NotNull CallbackInfoReturnable<Text> cir) {
-        if (!storage.isUnicaCity()) {
-            return;
-        }
-
-        String playerName = playerListEntry.getProfile().name();
-        Text originText = cir.getReturnValue();
-
-        MutableText text = null;
-
-        boolean isWanted = storage.getWantedEntries().stream()
-                .anyMatch(wantedEntry -> wantedEntry.getPlayerName().equals(playerName));
-
-        if (isWanted) {
-            text = literal(" 🔍").formatted(RED, BOLD);
-        }
-
-        if (text != null) {
-            cir.setReturnValue(originText.copy().append(" ").append(text));
-        }
-    }
-}
diff --git a/src/main/resources/ucutils.mixins.json b/src/main/resources/ucutils.mixins.json
index 86151a0f..340c641e 100644
--- a/src/main/resources/ucutils.mixins.json
+++ b/src/main/resources/ucutils.mixins.json
@@ -21,7 +21,6 @@
     "GameMenuScreenMixin",
     "HandledScreenMixin",
     "InGameHudMixin",
-    "PlayerEntityRendererMixin",
-    "PlayerListHudMixin"
+    "PlayerEntityRendererMixin"
   ]
 }