diff --git a/README.md b/README.md index 85cbcb84..cd76b94b 100644 --- a/README.md +++ b/README.md @@ -36,10 +36,7 @@ Folgende Funktionen sind nur für Spieler ohne Premium-Rang verfügbar, da Spiel ### Fraktionen -- Für bewusstlose Spieler wird hinter dem Spielernamen ein Symbol angezeigt, um die dazugehörige Fraktion zu erkennen -- Sollte ein Spieler Wanted-Punkte haben, wird der Name der Leiche dementsprechend eingefärbt - Das Design der Reinforcements ist so überarbeitet, dass diese besser auffallen -- Für das FBI, die Polizei und den Rettungsdienst gibt es einen Timer, der die Dauer der Bombe anzeigt - 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 ` kann das Eingabe GUI des Servers übersprungen werden diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/ShutdownScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/ShutdownScreen.java index b797327d..633ad200 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/ShutdownScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/ShutdownScreen.java @@ -1,11 +1,11 @@ package de.rettichlp.ucutils.common.gui.screens; import de.rettichlp.ucutils.common.models.ShutdownReason; +import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.DirectionalLayoutWidget; import net.minecraft.client.gui.widget.TextWidget; import net.minecraft.text.Text; -import static de.rettichlp.ucutils.UCUtils.renderService; import static de.rettichlp.ucutils.UCUtils.storage; import static net.minecraft.client.gui.widget.DirectionalLayoutWidget.vertical; import static net.minecraft.text.Text.empty; @@ -44,7 +44,7 @@ public void initBody() { directionalLayoutWidget.add(new TextWidget(empty() .append(of("wird das automatische Herunterfahren gestoppt.").copy().formatted(GRAY)), this.textRenderer), positioner -> positioner.marginBottom(16)); - renderService.addButton(directionalLayoutWidget, BUTTON_SHUTDOWN_ABORT_NAME, button -> close(), 150); + directionalLayoutWidget.add(ButtonWidget.builder(BUTTON_SHUTDOWN_ABORT_NAME, button -> close()).width(150).build()); directionalLayoutWidget.forEachChild(this::addDrawableChild); } diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/MainOptionsScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/MainOptionsScreen.java index 7f130f36..7de6605b 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/MainOptionsScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/MainOptionsScreen.java @@ -3,6 +3,7 @@ import de.rettichlp.ucutils.common.configuration.options.Options; import de.rettichlp.ucutils.common.gui.screens.OptionsScreen; import net.minecraft.client.gui.screen.GameMenuScreen; +import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.DirectionalLayoutWidget; import net.minecraft.text.Text; @@ -38,16 +39,16 @@ public void initBody() { renderService.addCyclingButton(directionalLayoutWidget, REINFORCEMENT_STYLE_NAME, Options.ReinforcementType.values(), Options.ReinforcementType::getDisplayName, Options::reinforcementType, Options::reinforcementType, 308); DirectionalLayoutWidget directionalLayoutWidget1 = directionalLayoutWidget.add(horizontal().spacing(8)); - renderService.addButton(directionalLayoutWidget1, TEXT_NAMETAG, button -> this.client.setScreen(new NameTagOptionsScreen(this)), 150); - renderService.addButton(directionalLayoutWidget1, TEXT_CHAT, button -> this.client.setScreen(new ChatOptionsScreen(this)), 150); + directionalLayoutWidget1.add(ButtonWidget.builder(TEXT_NAMETAG, button -> this.client.setScreen(new NameTagOptionsScreen(this))).width(150).build()); + directionalLayoutWidget1.add(ButtonWidget.builder(TEXT_CHAT, button -> this.client.setScreen(new ChatOptionsScreen(this))).width(150).build()); DirectionalLayoutWidget directionalLayoutWidget2 = directionalLayoutWidget.add(horizontal().spacing(8)); - renderService.addButton(directionalLayoutWidget2, TEXT_CAR, button -> this.client.setScreen(new CarOptionsScreen(this)), 150); - renderService.addButton(directionalLayoutWidget2, TEXT_SOUNDS, button -> this.client.setScreen(new SoundOptionsScreen(this)), 150); + directionalLayoutWidget2.add(ButtonWidget.builder(TEXT_CAR, button -> this.client.setScreen(new CarOptionsScreen(this))).width(150).build()); + directionalLayoutWidget2.add(ButtonWidget.builder(TEXT_SOUNDS, button -> this.client.setScreen(new SoundOptionsScreen(this))).width(150).build()); DirectionalLayoutWidget directionalLayoutWidget3 = directionalLayoutWidget.add(horizontal().spacing(8)); - renderService.addButton(directionalLayoutWidget3, TEXT_WIDGETS, button -> this.client.setScreen(new WidgetOptionsScreen(this)), 150); - renderService.addButton(directionalLayoutWidget3, TEXT_NOTIFICATIONS, button -> this.client.setScreen(new NotificationOptionsScreen(this)), 150); + directionalLayoutWidget3.add(ButtonWidget.builder(TEXT_WIDGETS, button -> this.client.setScreen(new WidgetOptionsScreen(this))).width(150).build()); + directionalLayoutWidget3.add(ButtonWidget.builder(TEXT_NOTIFICATIONS, button -> this.client.setScreen(new NotificationOptionsScreen(this))).width(150).build()); DirectionalLayoutWidget directionalLayoutWidget4 = directionalLayoutWidget.add(horizontal().spacing(8)); renderService.addToggleButton(directionalLayoutWidget4, HYDRATION_NAME, HYDRATION_TOOLTIP, Options::showHydration, Options::showHydration, 150); diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/WidgetOptionsPositionScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/WidgetOptionsPositionScreen.java index 7ca7a5f3..694478ae 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/WidgetOptionsPositionScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/WidgetOptionsPositionScreen.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.Click; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.DirectionalLayoutWidget; import net.minecraft.client.util.Window; import net.minecraft.text.Text; @@ -39,16 +40,16 @@ public WidgetOptionsPositionScreen(Screen parent) { public void initBody() { DirectionalLayoutWidget directionalLayoutWidget = this.layout.addBody(horizontal().spacing(8), positioner -> positioner.marginTop(this.client.getWindow().getScaledHeight() / 4)); - renderService.addButton(directionalLayoutWidget, DONE, button -> { + directionalLayoutWidget.add(ButtonWidget.builder(DONE, button -> { renderService.getWidgets().forEach(AbstractUCUtilsWidget::saveConfiguration); back(); - }, 150); + }).width(150).build()); - renderService.addButton(directionalLayoutWidget, CANCEL, button -> { + directionalLayoutWidget.add(ButtonWidget.builder(CANCEL, button -> { // restore configurations from the configuration file renderService.getWidgets().forEach(AbstractUCUtilsWidget::loadConfiguration); back(); - }, 150); + }).width(150).build()); directionalLayoutWidget.forEachChild(this::addDrawableChild); } diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/WidgetOptionsScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/WidgetOptionsScreen.java index 4652132b..be8b47ee 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/WidgetOptionsScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/WidgetOptionsScreen.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tooltip.Tooltip; +import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.DirectionalLayoutWidget; import net.minecraft.client.gui.widget.GridWidget; import net.minecraft.client.gui.widget.Positioner; @@ -40,7 +41,7 @@ public void initBody() { // general directionalLayoutWidget.add(new TextWidget(TEXT_GENERAL, this.textRenderer), Positioner::alignHorizontalCenter); - renderService.addButton(directionalLayoutWidget, TEXT_POSITION, button -> this.client.setScreen(new WidgetOptionsPositionScreen(this)), 308); + directionalLayoutWidget.add(ButtonWidget.builder(TEXT_POSITION, button -> this.client.setScreen(new WidgetOptionsPositionScreen(this))).width(308).build()); // general - enable status GridWidget gridWidget = directionalLayoutWidget.add(new GridWidget()); diff --git a/src/main/java/de/rettichlp/ucutils/common/services/RenderService.java b/src/main/java/de/rettichlp/ucutils/common/services/RenderService.java index 06c25dd1..23a3068c 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/RenderService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/RenderService.java @@ -9,7 +9,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.tooltip.Tooltip; -import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.CyclingButtonWidget; import net.minecraft.client.gui.widget.DirectionalLayoutWidget; import net.minecraft.client.render.Camera; @@ -103,18 +102,6 @@ public void initializeWidgets() { .collect(toCollection(LinkedHashSet::new)); } - public void addButton(@NotNull DirectionalLayoutWidget widget, - Text name, - ButtonWidget.PressAction onPress, - int width) { - ButtonWidget buttonWidget = ButtonWidget.builder(name, onPress) - .build(); - - buttonWidget.setWidth(width); - - widget.add(buttonWidget); - } - public void addCyclingButton(@NotNull DirectionalLayoutWidget widget, Text name, E[] values,