hotfix/2-6-1

README.md

@@ -10,7 +10,6 @@ reibungsloser und angenehmer gestalten.
 
 - Sollte ein Command mit einem Großbuchstaben eingegeben werden (z. B. `/Afk` statt `/afk`) wird dieser Command automatisch zu einem
   gültigen Command umgewandelt
-- Die Tabliste wird nach Teammitgliedern und Fraktionen (FBI, Polizei, Rettungsdienst, News) sortiert
 - Als Business-Besitzer wird in der Business-Info ein Button angezeigt, um die Einnahmen direkt abzubuchen
 - Wirft man eine Glasflasche in der Nähe eines Shops weg, wird diese als Pfand abgegeben
 - Es wird angezeigt wie lang der Cooldown für Bandagen, Schmerzpillen und Absorption ist
@@ -31,7 +30,7 @@ reibungsloser und angenehmer gestalten.
 
 ### Fraktionen
 
-- Hinter dem Spielernamen befindet sich ein Symbol, um die dazugehörige Fraktion zu erkennen (auch für bewusstlose Personen)
+- Für bewusstlose Spieler wird hinter dem Spielernamen ein Symbol angezeigt, um die dazugehörige Fraktion zu erkennen
 - Sollte ein Spieler Contract, auf der Blacklist stehen, Hausverbot oder Wanted-Punkte haben, wird der Name dementsprechend eingefärbt
   und in der Spielerliste angezeigt
 - Das Design der Reinforcements ist so überarbeitet, dass diese besser auffallen
@@ -92,10 +91,10 @@ reibungsloser und angenehmer gestalten.
 
 **Geld**
 
-| Befehl                 | Beschreibung                                                                                                                                                                         |
-|------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `/einzahlen (<force>)` | Zahlt das gesamte Bargeld in den ATM in der Nähe ein                                                                                                                                 |
-| `/adropmoney`          | Bucht für den Geldtransport-Job 16000\$ vom Konto ab, sodass das Geld vom Geldtransport-Job in den ATM eingezahlt werden kann und bucht die 16000$ anschließend zurück auf das Konto |
+| Befehl                 | Beschreibung                                                                                                                                                                            |
+|------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `/einzahlen (<force>)` | Zahlt das gesamte Bargeld in den ATM in der Nähe ein                                                                                                                                    |
+| `/adropmoney`          | Bucht für den Geldtransport-Job so viel Geld vom Konto ab, sodass das Geld vom Geldtransport-Job in den ATM eingezahlt werden kann und bucht das Geld anschließend zurück auf das Konto |
 
 **Handy**
 

gradle.properties

@@ -13,7 +13,7 @@ loader_version=0.19.2
 loom_version=1.16.1
 
 # Mod Properties
-mod_version=2.6.0
+mod_version=2.6.1
 maven_group=de.rettichlp
 
 # Dependencies

src/main/java/de/rettichlp/ucutils/command/faction/BlackMarketCommand.java

@@ -6,6 +6,7 @@
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import org.jetbrains.annotations.NotNull;
 
+import static de.rettichlp.ucutils.UCUtils.commandService;
 import static de.rettichlp.ucutils.UCUtils.messageService;
 import static de.rettichlp.ucutils.UCUtils.player;
 import static de.rettichlp.ucutils.UCUtils.storage;
@@ -18,7 +19,7 @@ public class BlackMarketCommand extends CommandBase {
     @Override
     public LiteralArgumentBuilder<FabricClientCommandSource> execute(@NotNull LiteralArgumentBuilder<FabricClientCommandSource> node) {
         return node
-                .requires(fabricClientCommandSource -> storage.getFaction(player.getStringifiedName()).isBadFaction())
+                .requires(fabricClientCommandSource -> storage.getFaction(player.getStringifiedName()).isBadFaction() || commandService.isSuperUser())
                 .executes(context -> {
                     player.sendMessage(empty(), false);
 

src/main/java/de/rettichlp/ucutils/command/faction/DealerCommand.java

@@ -6,6 +6,7 @@
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
 import org.jetbrains.annotations.NotNull;
 
+import static de.rettichlp.ucutils.UCUtils.commandService;
 import static de.rettichlp.ucutils.UCUtils.messageService;
 import static de.rettichlp.ucutils.UCUtils.player;
 import static de.rettichlp.ucutils.UCUtils.storage;
@@ -18,7 +19,7 @@ public class DealerCommand extends CommandBase {
     @Override
     public LiteralArgumentBuilder<FabricClientCommandSource> execute(@NotNull LiteralArgumentBuilder<FabricClientCommandSource> node) {
         return node
-                .requires(fabricClientCommandSource -> storage.getFaction(player.getStringifiedName()).isBadFaction())
+                .requires(fabricClientCommandSource -> storage.getFaction(player.getStringifiedName()).isBadFaction() || commandService.isSuperUser())
                 .executes(context -> {
                     player.sendMessage(empty(), false);
 

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

@@ -102,6 +102,10 @@ public class Storage {
     @Nullable
     private Job currentJob;
 
+    @Getter
+    @Setter
+    private boolean dead = false;
+
     @Getter
     @Setter
     private int lastReceivedSmsNumber = -1;
@@ -173,6 +177,8 @@ public void print() {
         LOGGER.info("carLocked: {}", this.carLocked);
         // currentJob
         LOGGER.info("currentJob: {}", this.currentJob);
+        // dead
+        LOGGER.info("dead: {}", this.dead);
         // hydration
         LOGGER.info("hydration: {}", this.hydration);
         // lastReceivedSmsNumber

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

@@ -1,25 +1,17 @@
 package de.rettichlp.ucutils.common.configuration.options;
 
-import de.rettichlp.ucutils.common.models.Color;
-import de.rettichlp.ucutils.common.models.Faction;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @Getter
 @Setter
 @Accessors(fluent = true)
 public class NameTagOptions {
 
-    private boolean factionInformation = true;
-    private Map<Faction, Color> highlightFactions = new HashMap<>();
-    private boolean additionalBlacklist = true;
-    private boolean additionalContract = true;
-    private boolean additionalHouseban = true;
-    private boolean additionalWanted = true;
-    private boolean additionalAfk = true;
-    private boolean additionalMedicalInformation = true;
+    private boolean aDuty = true;
+    private boolean afk = true;
+    private boolean houseBan = true;
+    private boolean outlaw = true;
+    private boolean medicalInformation = true;
 }

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

@@ -1,93 +1,68 @@
 package de.rettichlp.ucutils.common.gui.screens.options;
 
+import de.rettichlp.ucutils.common.configuration.options.NameTagOptions;
 import de.rettichlp.ucutils.common.gui.screens.OptionsScreen;
-import de.rettichlp.ucutils.common.models.Color;
-import de.rettichlp.ucutils.common.models.Faction;
+import de.rettichlp.ucutils.common.gui.screens.components.ToggleButtonWidget;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.CyclingButtonWidget;
-import net.minecraft.client.gui.widget.DirectionalLayoutWidget;
+import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.GridWidget;
-import net.minecraft.client.gui.widget.Positioner;
-import net.minecraft.client.gui.widget.TextWidget;
 import net.minecraft.text.Text;
-import org.jetbrains.annotations.NotNull;
 
 import static de.rettichlp.ucutils.UCUtils.configuration;
-import static de.rettichlp.ucutils.UCUtils.renderService;
-import static de.rettichlp.ucutils.common.models.Color.WHITE;
-import static de.rettichlp.ucutils.common.models.Faction.NULL;
-import static java.util.Arrays.stream;
-import static net.minecraft.client.gui.widget.DirectionalLayoutWidget.horizontal;
-import static net.minecraft.client.gui.widget.DirectionalLayoutWidget.vertical;
-import static net.minecraft.text.Text.of;
 import static net.minecraft.text.Text.translatable;
 
 public class NameTagOptionsScreen extends OptionsScreen {
 
     private static final Text TEXT_NAMETAG = translatable("ucutils.options.text.nametag");
-    private static final Text TEXT_FACTION = translatable("ucutils.options.text.faction");
-    private static final Text TEXT_COLOR = translatable("ucutils.options.text.color");
-    private static final Text TEXT_ADDITIONAL = translatable("ucutils.options.text.additional");
-    private static final Text NAMETAG_FACTION_INFORMATION_NAME = translatable("ucutils.options.nametag.faction.information.name");
-    private static final Text NAMETAG_FACTION_INFORMATION_TOOLTIP = translatable("ucutils.options.nametag.faction.information.tooltip");
-    private static final Text NAMETAG_ADDITIONAL_BLACKLIST_NAME = translatable("ucutils.options.nametag.additional.blacklist.name");
-    private static final Text NAMETAG_ADDITIONAL_BLACKLIST_TOOLTIP = translatable("ucutils.options.nametag.additional.blacklist.tooltip");
-    private static final Text NAMETAG_ADDITIONAL_CONTRACT_NAME = translatable("ucutils.options.nametag.additional.contract.name");
-    private static final Text NAMETAG_ADDITIONAL_CONTRACT_TOOLTIP = translatable("ucutils.options.nametag.additional.contract.tooltip");
-    private static final Text NAMETAG_ADDITIONAL_HOUSEBAN_NAME = translatable("ucutils.options.nametag.additional.houseban.name");
-    private static final Text NAMETAG_ADDITIONAL_HOUSEBAN_TOOLTIP = translatable("ucutils.options.nametag.additional.houseban.tooltip");
-    private static final Text NAMETAG_ADDITIONAL_WANTED_NAME = translatable("ucutils.options.nametag.additional.wanted.name");
-    private static final Text NAMETAG_ADDITIONAL_WANTED_TOOLTIP = translatable("ucutils.options.nametag.additional.wanted.tooltip");
-    private static final Text NAMETAG_ADDITIONAL_AFK_NAME = translatable("ucutils.options.nametag.additional.afk.name");
-    private static final Text NAMETAG_ADDITIONAL_AFK_TOOLTIP = translatable("ucutils.options.nametag.additional.afk.tooltip");
-    private static final Text NAMETAG_ADDITIONAL_MEDICAL_INFORMATION_NAME = translatable("ucutils.options.nametag.additional.medical_information.name");
-    private static final Text NAMETAG_ADDITIONAL_MEDICAL_INFORMATION_TOOLTIP = translatable("ucutils.options.nametag.additional.medical_information.tooltip");
+    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_HOUSE_BAN_NAME = translatable("ucutils.options.nametag.house_ban.name");
+    private static final Text NAMETAG_HOUSE_BAN_TOOLTIP = translatable("ucutils.options.nametag.house_ban.tooltip");
+    private static final Text NAMETAG_OUTLAW_NAME = translatable("ucutils.options.nametag.outlaw.name");
+    private static final Text NAMETAG_OUTLAW_TOOLTIP = translatable("ucutils.options.nametag.outlaw.tooltip");
+    private static final Text NAMETAG_MEDICAL_INFORMATION_NAME = translatable("ucutils.options.nametag.medical_information.name");
+    private static final Text NAMETAG_MEDICAL_INFORMATION_TOOLTIP = translatable("ucutils.options.nametag.medical_information.tooltip");
 
     public NameTagOptionsScreen(Screen parent) {
         super(parent, TEXT_NAMETAG);
     }
 
     @Override
     public void initBody() {
-        DirectionalLayoutWidget directionalLayoutWidget = this.layout.addBody(vertical().spacing(4));
-
-        directionalLayoutWidget.add(new TextWidget(TEXT_FACTION, this.textRenderer), Positioner::alignHorizontalCenter);
-
-        renderService.addToggleButton(directionalLayoutWidget, NAMETAG_FACTION_INFORMATION_NAME, NAMETAG_FACTION_INFORMATION_TOOLTIP, (options, value) -> options.nameTag().factionInformation(value), options -> options.nameTag().factionInformation(), 308);
-
-        directionalLayoutWidget.add(new TextWidget(TEXT_COLOR, this.textRenderer), positioner -> positioner.alignHorizontalCenter().marginTop(16));
-        directionalLayoutWidget.add(getFactionColorOptions());
-
-        directionalLayoutWidget.add(new TextWidget(TEXT_ADDITIONAL, this.textRenderer), positioner -> positioner.alignHorizontalCenter().marginTop(16));
-
-        DirectionalLayoutWidget directionalLayoutWidget3 = directionalLayoutWidget.add(horizontal().spacing(8));
-        renderService.addToggleButton(directionalLayoutWidget3, NAMETAG_ADDITIONAL_BLACKLIST_NAME, NAMETAG_ADDITIONAL_BLACKLIST_TOOLTIP, (options, value) -> options.nameTag().additionalBlacklist(value), options -> options.nameTag().additionalBlacklist(), 150);
-        renderService.addToggleButton(directionalLayoutWidget3, NAMETAG_ADDITIONAL_CONTRACT_NAME, NAMETAG_ADDITIONAL_CONTRACT_TOOLTIP, (options, value) -> options.nameTag().additionalContract(value), options -> options.nameTag().additionalContract(), 150);
-
-        DirectionalLayoutWidget directionalLayoutWidget4 = directionalLayoutWidget.add(horizontal().spacing(8));
-        renderService.addToggleButton(directionalLayoutWidget4, NAMETAG_ADDITIONAL_HOUSEBAN_NAME, NAMETAG_ADDITIONAL_HOUSEBAN_TOOLTIP, (options, value) -> options.nameTag().additionalHouseban(value), options -> options.nameTag().additionalHouseban(), 150);
-        renderService.addToggleButton(directionalLayoutWidget4, NAMETAG_ADDITIONAL_WANTED_NAME, NAMETAG_ADDITIONAL_WANTED_TOOLTIP, (options, value) -> options.nameTag().additionalWanted(value), options -> options.nameTag().additionalWanted(), 150);
-
-        DirectionalLayoutWidget directionalLayoutWidget5 = directionalLayoutWidget.add(horizontal().spacing(8));
-        renderService.addToggleButton(directionalLayoutWidget5, NAMETAG_ADDITIONAL_AFK_NAME, NAMETAG_ADDITIONAL_AFK_TOOLTIP, (options, value) -> options.nameTag().additionalAfk(value), options -> options.nameTag().additionalAfk(), 150);
-        renderService.addToggleButton(directionalLayoutWidget5, NAMETAG_ADDITIONAL_MEDICAL_INFORMATION_NAME, NAMETAG_ADDITIONAL_MEDICAL_INFORMATION_TOOLTIP, (options, value) -> options.nameTag().additionalMedicalInformation(value), options -> options.nameTag().additionalMedicalInformation(), 150);
-
-        directionalLayoutWidget.forEachChild(this::addDrawableChild);
-    }
-
-    private @NotNull GridWidget getFactionColorOptions() {
-        GridWidget gridWidget = new GridWidget();
-        gridWidget.getMainPositioner().marginX(4).marginBottom(4).alignHorizontalCenter();
-        GridWidget.Adder adder = gridWidget.createAdder(2);
-
-        stream(Faction.values())
-                .filter(faction -> faction != NULL)
-                .map(faction -> new CyclingButtonWidget.Builder<>(Color::getDisplayName)
-                        .values(Color.values())
-                        .initially(configuration.getOptions().nameTag().highlightFactions().getOrDefault(faction, WHITE))
-                        .build(of(faction.getDisplayName()), (button, value) -> configuration.getOptions().nameTag().highlightFactions().put(faction, value)))
-                .forEach(adder::add);
-
-        return gridWidget;
+        GridWidget gridWidget = this.layout.addBody(new GridWidget());
+        gridWidget.setColumnSpacing(8).setRowSpacing(4);
+        GridWidget.Adder gridWidgetAdder = gridWidget.createAdder(2);
+
+        NameTagOptions nameTagOptions = configuration.getOptions().nameTag();
+
+        ToggleButtonWidget toggleButton1 = new ToggleButtonWidget(NAMETAG_A_DUTY_NAME, nameTagOptions::aDuty, nameTagOptions.aDuty());
+        toggleButton1.setWidth(150);
+        toggleButton1.setTooltip(Tooltip.of(NAMETAG_A_DUTY_TOOLTIP));
+        gridWidgetAdder.add(toggleButton1);
+
+        ToggleButtonWidget toggleButton2 = new ToggleButtonWidget(NAMETAG_AFK_NAME, nameTagOptions::afk, nameTagOptions.afk());
+        toggleButton2.setWidth(150);
+        toggleButton2.setTooltip(Tooltip.of(NAMETAG_AFK_TOOLTIP));
+        gridWidgetAdder.add(toggleButton2);
+
+        ToggleButtonWidget toggleButton3 = new ToggleButtonWidget(NAMETAG_HOUSE_BAN_NAME, nameTagOptions::houseBan, nameTagOptions.houseBan());
+        toggleButton3.setWidth(150);
+        toggleButton3.setTooltip(Tooltip.of(NAMETAG_HOUSE_BAN_TOOLTIP));
+        gridWidgetAdder.add(toggleButton3);
+
+        ToggleButtonWidget toggleButton4 = new ToggleButtonWidget(NAMETAG_OUTLAW_NAME, nameTagOptions::outlaw, nameTagOptions.outlaw());
+        toggleButton4.setWidth(150);
+        toggleButton4.setTooltip(Tooltip.of(NAMETAG_OUTLAW_TOOLTIP));
+        gridWidgetAdder.add(toggleButton4);
+
+        ToggleButtonWidget toggleButton5 = new ToggleButtonWidget(NAMETAG_MEDICAL_INFORMATION_NAME, nameTagOptions::medicalInformation, nameTagOptions.medicalInformation());
+        toggleButton5.setWidth(150);
+        toggleButton5.setTooltip(Tooltip.of(NAMETAG_MEDICAL_INFORMATION_TOOLTIP));
+        gridWidgetAdder.add(toggleButton5);
+
+        gridWidget.refreshPositions();
+        gridWidget.forEachChild(this::addDrawableChild);
     }
 }