feature/remove-fbank-deposit-with-reason

README.md

@@ -39,7 +39,6 @@ Folgende Funktionen sind nur für Spieler ohne Premium-Rang verfügbar, da Spiel
 - Das Design der Reinforcements ist so überarbeitet, dass diese besser auffallen
 - Für den Rettungsdienst wird der Cooldown von Bandagen und Schmerzpillen unter dem Spielernamen angezeigt
 - Der Fraktionschat kann individuell eingefärbt werden
-- Mit `/fbank einzahlen <Betrag> <Grund>` kann das Eingabe GUI des Servers übersprungen werden
 - Für den Rettungsdienst gibt es im Herstellungs-Inventar für Medikamente einen Button, um die benötigte Anzahl an Stoffen in den
   Fraktionschat zu senden
 - Für den Dealer und Schwarzmarkt wird (in der Übersicht) angezeigt, an welchem Ort der Händler gefunden wurde

src/main/java/de/rettichlp/ucutils/common/Storage.java

@@ -88,10 +88,6 @@ public class Storage {
     @Nullable
     private Vec3d dealerPosition;
 
-    @Getter
-    @Setter
-    private String fBankDepositReason = "";
-
     @Getter
     @Setter
     private double hydration = -1.0;
@@ -149,8 +145,6 @@ public void print() {
         LOGGER.info("currentJob: {}", this.currentJob);
         // dead
         LOGGER.info("dead: {}", this.dead);
-        // fBankDepositReason
-        LOGGER.info("fBankDepositReason: {}", this.fBankDepositReason);
         // hydration
         LOGGER.info("hydration: {}", this.hydration);
         // joinTimestamp

src/main/java/de/rettichlp/ucutils/common/configuration/options/NameTagOptions.java

@@ -9,7 +9,6 @@
 @Accessors(fluent = true)
 public class NameTagOptions {
 
-    private boolean aDuty = true;
     private boolean afk = true;
     private boolean medicalInformation = true;
 }

src/main/java/de/rettichlp/ucutils/common/gui/screens/options/NameTagOptionsScreen.java

@@ -14,8 +14,6 @@
 public class NameTagOptionsScreen extends OptionsScreen {
 
     private static final Text TEXT_NAMETAG = translatable("ucutils.options.text.nametag");
-    private static final Text NAMETAG_A_DUTY_NAME = translatable("ucutils.options.nametag.a_duty.name");
-    private static final Text NAMETAG_A_DUTY_TOOLTIP = translatable("ucutils.options.nametag.a_duty.tooltip");
     private static final Text NAMETAG_AFK_NAME = translatable("ucutils.options.nametag.afk.name");
     private static final Text NAMETAG_AFK_TOOLTIP = translatable("ucutils.options.nametag.afk.tooltip");
     private static final Text NAMETAG_MEDICAL_INFORMATION_NAME = translatable("ucutils.options.nametag.medical_information.name");
@@ -33,21 +31,16 @@ public void initBody() {
 
         NameTagOptions nameTagOptions = configuration.getOptions().nameTag();
 
-        ToggleButtonWidget toggleButton1 = new ToggleButtonWidget(NAMETAG_A_DUTY_NAME, nameTagOptions::aDuty, nameTagOptions.aDuty());
+        ToggleButtonWidget toggleButton1 = new ToggleButtonWidget(NAMETAG_AFK_NAME, nameTagOptions::afk, nameTagOptions.afk());
         toggleButton1.setWidth(150);
-        toggleButton1.setTooltip(Tooltip.of(NAMETAG_A_DUTY_TOOLTIP));
+        toggleButton1.setTooltip(Tooltip.of(NAMETAG_AFK_TOOLTIP));
         gridWidgetAdder.add(toggleButton1);
 
-        ToggleButtonWidget toggleButton2 = new ToggleButtonWidget(NAMETAG_AFK_NAME, nameTagOptions::afk, nameTagOptions.afk());
+        ToggleButtonWidget toggleButton2 = new ToggleButtonWidget(NAMETAG_MEDICAL_INFORMATION_NAME, nameTagOptions::medicalInformation, nameTagOptions.medicalInformation());
         toggleButton2.setWidth(150);
-        toggleButton2.setTooltip(Tooltip.of(NAMETAG_AFK_TOOLTIP));
+        toggleButton2.setTooltip(Tooltip.of(NAMETAG_MEDICAL_INFORMATION_TOOLTIP));
         gridWidgetAdder.add(toggleButton2);
 
-        ToggleButtonWidget toggleButton3 = new ToggleButtonWidget(NAMETAG_MEDICAL_INFORMATION_NAME, nameTagOptions::medicalInformation, nameTagOptions.medicalInformation());
-        toggleButton3.setWidth(150);
-        toggleButton3.setTooltip(Tooltip.of(NAMETAG_MEDICAL_INFORMATION_TOOLTIP));
-        gridWidgetAdder.add(toggleButton3);
-
         gridWidget.refreshPositions();
         gridWidget.forEachChild(this::addDrawableChild);
     }

src/main/java/de/rettichlp/ucutils/listener/impl/CommandListener.java

@@ -9,15 +9,13 @@
 import java.util.regex.Pattern;
 
 import static de.rettichlp.ucutils.UCUtils.commandService;
-import static de.rettichlp.ucutils.UCUtils.storage;
 import static java.lang.Character.isUpperCase;
 import static java.util.regex.Pattern.compile;
 
 @UCUtilsListener
 public class CommandListener implements ICommandSendListener {
 
     private static final Pattern COMMAND_NAVI_HOUSE_NUMBER_PATTERN = compile("^navi (?<number>\\d+)$");
-    private static final Pattern FACTION_BANK_DEPOSIT_WITH_REASON_PATTERN = compile("^fbank einzahlen (?<amount>\\d+) (?<reason>.+)$");
 
     @Override
     public boolean onCommandSend(@NotNull String command) {
@@ -45,15 +43,6 @@ public boolean onCommandSend(@NotNull String command) {
             return false;
         }
 
-        Matcher factionBankDepositWithReasonMatcher = FACTION_BANK_DEPOSIT_WITH_REASON_PATTERN.matcher(command);
-        if (factionBankDepositWithReasonMatcher.find()) {
-            String amount = factionBankDepositWithReasonMatcher.group("amount");
-            String reason = factionBankDepositWithReasonMatcher.group("reason");
-            storage.setFBankDepositReason(reason);
-            commandService.sendCommand("fbank einzahlen " + amount);
-            return false;
-        }
-
         return true;
     }
 

src/main/java/de/rettichlp/ucutils/listener/impl/faction/FactionListener.java

@@ -118,7 +118,7 @@ public boolean onMessageReceive(Text text, String message) {
 
             // check if color already matches formatting
             List<Text> siblings = text.getSiblings();
-            if (siblings.size() != 3 || messageMatchesColor(siblings, primaryFormatting, secondaryFormatting)) {
+            if (messageMatchesColor(siblings, primaryFormatting, secondaryFormatting)) {
                 return true;
             }
 
@@ -161,6 +161,10 @@ public boolean onMessageSend(String message) {
     }
 
     private boolean messageMatchesColor(@NonNull List<Text> siblings, Formatting primaryFormatting, Formatting secondaryFormatting) {
+        if (siblings.size() != 3) {
+            return false;
+        }
+
         TextColor primaryFormattingCurrent = siblings.get(0).getStyle().getColor();
         TextColor secondaryFormattingCurrent = siblings.get(2).getStyle().getColor();
         return primaryFormattingCurrent == null || secondaryFormattingCurrent == null || primaryFormattingCurrent.getRgb() == primaryFormatting.getColorValue() || secondaryFormattingCurrent.getRgb() == secondaryFormatting.getColorValue();

src/main/resources/assets/ucutils/lang/de_de.json

@@ -57,8 +57,6 @@
   "ucutils.options.car.automation.start.tooltip": "Startet das Auto automatisch, wenn du einsteigst",
   "ucutils.options.car.automation.check_kfz.name": "Automatisches /checkkfz",
   "ucutils.options.car.automation.check_kfz.tooltip": "Führt /checkkfz aus wenn du ein Auto rechtsklickst während du schleichst",
-  "ucutils.options.nametag.a_duty.name": "Admin-Dienst",
-  "ucutils.options.nametag.a_duty.tooltip": "Zeigt eine Information an über dem Namen von Spielern, die im Admin-Dienst sind",
   "ucutils.options.nametag.afk.name": "AFK",
   "ucutils.options.nametag.afk.tooltip": "Zeigt eine Information an über dem Namen von Spielern, die AFK sind",
   "ucutils.options.nametag.medical_information.name": "Information für Ärzte",

src/main/resources/assets/ucutils/lang/en_gb.json

@@ -57,8 +57,6 @@
   "ucutils.options.car.automation.start.tooltip": "Starts the car automatically when you enter it",
   "ucutils.options.car.automation.check_kfz.name": "Automated /checkkfz",
   "ucutils.options.car.automation.check_kfz.tooltip": "Automatically executes /checkkfz when you right click your car while sneaking",
-  "ucutils.options.nametag.a_duty.name": "Admin duty",
-  "ucutils.options.nametag.a_duty.tooltip": "Shows an information above the players name of players in admin duty",
   "ucutils.options.nametag.afk.name": "AFK",
   "ucutils.options.nametag.afk.tooltip": "Shows an information above the players name of afk players",
   "ucutils.options.nametag.medical_information.name": "Medical information",

src/main/resources/assets/ucutils/lang/en_us.json

@@ -57,8 +57,6 @@
   "ucutils.options.car.automation.start.tooltip": "Starts the car automatically when you enter it",
   "ucutils.options.car.automation.check_kfz.name": "Automated /checkkfz",
   "ucutils.options.car.automation.check_kfz.tooltip": "Automatically executes /checkkfz when you right click your car while sneaking",
-  "ucutils.options.nametag.a_duty.name": "Admin duty",
-  "ucutils.options.nametag.a_duty.tooltip": "Shows an information above the players name of players in admin duty",
   "ucutils.options.nametag.afk.name": "AFK",
   "ucutils.options.nametag.afk.tooltip": "Shows an information above the players name of afk players",
   "ucutils.options.nametag.medical_information.name": "Medical information",

src/main/resources/ucutils.mixins.json

@@ -17,7 +17,6 @@
     "ChatScreenMixin",
     "ClientPlayerEntityMixin",
     "ClientPlayNetworkHandlerMixin",
-    "DialogScreenMixin",
     "GameMenuScreenMixin",
     "HandledScreenMixin",
     "InGameHudMixin",