From f168d3599ffb510b0c86aa7904a1b15bababca4d Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 27 Apr 2026 21:06:35 +0200 Subject: [PATCH 1/7] optimize imports --- .../ucutils/command/ADropMoneyCommand.java | 5 +---- .../rettichlp/ucutils/command/MiCommand.java | 5 +---- .../rettichlp/ucutils/command/MiaCommand.java | 5 +---- .../rettichlp/ucutils/command/ModCommand.java | 11 ++-------- .../command/NotVisitedHousesCommand.java | 4 +--- .../command/faction/BlackMarketCommand.java | 4 +--- .../command/faction/PersonalUseCommand.java | 6 +---- .../command/faction/ScreenshotCommand.java | 5 +---- .../ucutils/command/mobile/ACallCommand.java | 4 +--- .../ucutils/command/mobile/ASMSCommand.java | 8 ++----- .../ucutils/command/mobile/ReplyCommand.java | 4 +--- .../ucutils/command/money/DepositCommand.java | 4 +--- .../command/money/RichTaxesCommand.java | 6 +---- .../de/rettichlp/ucutils/common/api/Api.java | 6 +---- .../common/gui/screens/OptionsScreen.java | 4 +--- .../common/gui/screens/ShutdownScreen.java | 4 +--- .../components/TableHeaderTextWidget.java | 4 +--- .../components/ToggleButtonWidget.java | 4 +--- .../screens/options/NameTagOptionsScreen.java | 6 +---- .../options/PersonalUseOptionsScreen.java | 14 +++--------- .../options/WidgetOptionsPositionScreen.java | 5 +---- .../common/gui/widgets/CarLockedWidget.java | 9 ++------ .../common/gui/widgets/HearthWidget.java | 6 ++--- .../gui/widgets/NotificationWidget.java | 2 +- .../common/gui/widgets/PayDayWidget.java | 4 +--- .../gui/widgets/ServiceCountWidget.java | 2 +- .../base/AbstractUCUtilsTextWidget.java | 2 +- .../widgets/base/AbstractUCUtilsWidget.java | 9 ++------ .../ucutils/common/models/ActivityEntry.java | 4 +--- .../ucutils/common/models/BlackMarket.java | 8 +------ .../ucutils/common/models/Faction.java | 13 +---------- .../ucutils/common/models/Purity.java | 5 +---- .../ucutils/common/registry/Registry.java | 20 ++--------------- .../common/services/CommandService.java | 7 +----- .../common/services/FactionService.java | 22 ++++--------------- .../common/services/MessageService.java | 5 +---- .../common/services/NotificationService.java | 14 +++--------- .../common/services/RenderService.java | 2 +- .../listener/impl/faction/BombListener.java | 9 ++------ .../listener/impl/faction/MedicListener.java | 8 +------ .../listener/impl/faction/PlantListener.java | 18 +++------------ .../listener/impl/job/GarbageManListener.java | 5 +---- .../listener/impl/job/JobListener.java | 9 ++------ .../mixin/ClientPlayerEntityMixin.java | 5 +---- .../rettichlp/ucutils/mixin/EntityMixin.java | 4 +--- .../ucutils/mixin/PlayerListHudMixin.java | 8 +------ 46 files changed, 63 insertions(+), 255 deletions(-) diff --git a/src/main/java/de/rettichlp/ucutils/command/ADropMoneyCommand.java b/src/main/java/de/rettichlp/ucutils/command/ADropMoneyCommand.java index 30bf7ce5..ea2e7ffe 100644 --- a/src/main/java/de/rettichlp/ucutils/command/ADropMoneyCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/ADropMoneyCommand.java @@ -12,10 +12,7 @@ import java.util.List; import java.util.Optional; -import static de.rettichlp.ucutils.UCUtils.commandService; -import static de.rettichlp.ucutils.UCUtils.configuration; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.player; +import static de.rettichlp.ucutils.UCUtils.*; import static java.lang.Math.min; import static java.util.Optional.ofNullable; import static net.minecraft.scoreboard.ScoreHolder.fromName; diff --git a/src/main/java/de/rettichlp/ucutils/command/MiCommand.java b/src/main/java/de/rettichlp/ucutils/command/MiCommand.java index 9b93ce2c..f1af0071 100644 --- a/src/main/java/de/rettichlp/ucutils/command/MiCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/MiCommand.java @@ -9,10 +9,7 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; -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; +import static de.rettichlp.ucutils.UCUtils.*; import static de.rettichlp.ucutils.common.models.Faction.fromDisplayName; import static java.util.Arrays.stream; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; diff --git a/src/main/java/de/rettichlp/ucutils/command/MiaCommand.java b/src/main/java/de/rettichlp/ucutils/command/MiaCommand.java index dc8f4441..48d60475 100644 --- a/src/main/java/de/rettichlp/ucutils/command/MiaCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/MiaCommand.java @@ -9,10 +9,7 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; -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; +import static de.rettichlp.ucutils.UCUtils.*; import static de.rettichlp.ucutils.common.models.Faction.fromDisplayName; import static java.util.Arrays.stream; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; diff --git a/src/main/java/de/rettichlp/ucutils/command/ModCommand.java b/src/main/java/de/rettichlp/ucutils/command/ModCommand.java index e32b2b43..129aa242 100644 --- a/src/main/java/de/rettichlp/ucutils/command/ModCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/ModCommand.java @@ -12,19 +12,12 @@ import java.util.Collection; import java.util.StringJoiner; -import static de.rettichlp.ucutils.UCUtils.MOD_ID; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.player; -import static de.rettichlp.ucutils.UCUtils.storage; -import static de.rettichlp.ucutils.UCUtils.syncService; -import static de.rettichlp.ucutils.UCUtils.utilService; +import static de.rettichlp.ucutils.UCUtils.*; import static java.net.URI.create; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.DARK_GRAY; -import static net.minecraft.util.Formatting.GRAY; -import static net.minecraft.util.Formatting.WHITE; +import static net.minecraft.util.Formatting.*; @UCUtilsCommand(label = "ucutils") public class ModCommand extends CommandBase { diff --git a/src/main/java/de/rettichlp/ucutils/command/NotVisitedHousesCommand.java b/src/main/java/de/rettichlp/ucutils/command/NotVisitedHousesCommand.java index 20a33b3d..fdfaa9f0 100644 --- a/src/main/java/de/rettichlp/ucutils/command/NotVisitedHousesCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/NotVisitedHousesCommand.java @@ -11,9 +11,7 @@ import java.util.Collection; import java.util.List; -import static de.rettichlp.ucutils.UCUtils.configuration; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.player; +import static de.rettichlp.ucutils.UCUtils.*; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; diff --git a/src/main/java/de/rettichlp/ucutils/command/faction/BlackMarketCommand.java b/src/main/java/de/rettichlp/ucutils/command/faction/BlackMarketCommand.java index 312363e0..363b61be 100644 --- a/src/main/java/de/rettichlp/ucutils/command/faction/BlackMarketCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/faction/BlackMarketCommand.java @@ -6,9 +6,7 @@ import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import org.jetbrains.annotations.NotNull; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.player; -import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.*; import static java.util.Comparator.comparingDouble; import static net.minecraft.text.Text.empty; diff --git a/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java b/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java index b9bb0e5b..e307e42b 100644 --- a/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java @@ -16,11 +16,7 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.word; -import static de.rettichlp.ucutils.UCUtils.commandService; -import static de.rettichlp.ucutils.UCUtils.configuration; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.networkHandler; -import static de.rettichlp.ucutils.UCUtils.utilService; +import static de.rettichlp.ucutils.UCUtils.*; import static java.lang.String.valueOf; import static java.util.regex.Pattern.compile; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; diff --git a/src/main/java/de/rettichlp/ucutils/command/faction/ScreenshotCommand.java b/src/main/java/de/rettichlp/ucutils/command/faction/ScreenshotCommand.java index c21598a2..0ac2059c 100644 --- a/src/main/java/de/rettichlp/ucutils/command/faction/ScreenshotCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/faction/ScreenshotCommand.java @@ -24,10 +24,7 @@ import static net.minecraft.command.CommandSource.suggestMatching; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.AQUA; -import static net.minecraft.util.Formatting.DARK_AQUA; -import static net.minecraft.util.Formatting.DARK_GRAY; -import static net.minecraft.util.Formatting.GRAY; +import static net.minecraft.util.Formatting.*; @UCUtilsCommand(label = "screenshot") public class ScreenshotCommand extends CommandBase { diff --git a/src/main/java/de/rettichlp/ucutils/command/mobile/ACallCommand.java b/src/main/java/de/rettichlp/ucutils/command/mobile/ACallCommand.java index 71596968..d86d3ced 100644 --- a/src/main/java/de/rettichlp/ucutils/command/mobile/ACallCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/mobile/ACallCommand.java @@ -12,9 +12,7 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.word; -import static de.rettichlp.ucutils.UCUtils.commandService; -import static de.rettichlp.ucutils.UCUtils.networkHandler; -import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.*; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; import static net.minecraft.command.CommandSource.suggestMatching; diff --git a/src/main/java/de/rettichlp/ucutils/command/mobile/ASMSCommand.java b/src/main/java/de/rettichlp/ucutils/command/mobile/ASMSCommand.java index 316a629f..c0993466 100644 --- a/src/main/java/de/rettichlp/ucutils/command/mobile/ASMSCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/mobile/ASMSCommand.java @@ -10,12 +10,8 @@ import java.util.List; -import static com.mojang.brigadier.arguments.StringArgumentType.getString; -import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; -import static com.mojang.brigadier.arguments.StringArgumentType.word; -import static de.rettichlp.ucutils.UCUtils.commandService; -import static de.rettichlp.ucutils.UCUtils.networkHandler; -import static de.rettichlp.ucutils.UCUtils.storage; +import static com.mojang.brigadier.arguments.StringArgumentType.*; +import static de.rettichlp.ucutils.UCUtils.*; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; import static net.minecraft.command.CommandSource.suggestMatching; diff --git a/src/main/java/de/rettichlp/ucutils/command/mobile/ReplyCommand.java b/src/main/java/de/rettichlp/ucutils/command/mobile/ReplyCommand.java index 06383c74..87f08dd5 100644 --- a/src/main/java/de/rettichlp/ucutils/command/mobile/ReplyCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/mobile/ReplyCommand.java @@ -8,9 +8,7 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; -import static de.rettichlp.ucutils.UCUtils.commandService; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.*; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; @UCUtilsCommand(label = "reply", aliases = "r") diff --git a/src/main/java/de/rettichlp/ucutils/command/money/DepositCommand.java b/src/main/java/de/rettichlp/ucutils/command/money/DepositCommand.java index bf94373b..b60b06b9 100644 --- a/src/main/java/de/rettichlp/ucutils/command/money/DepositCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/money/DepositCommand.java @@ -12,9 +12,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static de.rettichlp.ucutils.UCUtils.commandService; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.utilService; +import static de.rettichlp.ucutils.UCUtils.*; import static de.rettichlp.ucutils.common.services.CommandService.COMMAND_COOLDOWN_MILLIS; import static java.lang.Integer.parseInt; import static java.util.regex.Pattern.compile; diff --git a/src/main/java/de/rettichlp/ucutils/command/money/RichTaxesCommand.java b/src/main/java/de/rettichlp/ucutils/command/money/RichTaxesCommand.java index f7b589f0..156e5c97 100644 --- a/src/main/java/de/rettichlp/ucutils/command/money/RichTaxesCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/money/RichTaxesCommand.java @@ -6,11 +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.configuration; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.storage; -import static de.rettichlp.ucutils.UCUtils.utilService; +import static de.rettichlp.ucutils.UCUtils.*; import static de.rettichlp.ucutils.common.services.CommandService.COMMAND_COOLDOWN_MILLIS; @UCUtilsCommand(label = "reichensteuer") diff --git a/src/main/java/de/rettichlp/ucutils/common/api/Api.java b/src/main/java/de/rettichlp/ucutils/common/api/Api.java index 3e56f984..dad5c4f1 100644 --- a/src/main/java/de/rettichlp/ucutils/common/api/Api.java +++ b/src/main/java/de/rettichlp/ucutils/common/api/Api.java @@ -1,10 +1,6 @@ package de.rettichlp.ucutils.common.api; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializer; +import com.google.gson.*; import com.google.gson.reflect.TypeToken; import com.mojang.authlib.GameProfile; import de.rettichlp.ucutils.common.api.response.ErrorResponse; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/OptionsScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/OptionsScreen.java index 8e76ba1f..19f94360 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/OptionsScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/OptionsScreen.java @@ -12,9 +12,7 @@ import static net.minecraft.client.gui.widget.DirectionalLayoutWidget.horizontal; import static net.minecraft.screen.ScreenTexts.BACK; import static net.minecraft.screen.ScreenTexts.DONE; -import static net.minecraft.text.Text.empty; -import static net.minecraft.text.Text.of; -import static net.minecraft.text.Text.translatable; +import static net.minecraft.text.Text.*; public abstract class OptionsScreen extends UCUtilsScreen { 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..1e8ba422 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 @@ -8,9 +8,7 @@ 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; -import static net.minecraft.text.Text.of; -import static net.minecraft.text.Text.translatable; +import static net.minecraft.text.Text.*; import static net.minecraft.util.Formatting.GOLD; import static net.minecraft.util.Formatting.GRAY; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/TableHeaderTextWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/TableHeaderTextWidget.java index 04d6ff54..0a09cb5e 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/TableHeaderTextWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/TableHeaderTextWidget.java @@ -12,9 +12,7 @@ import java.util.Comparator; import java.util.function.Consumer; -import static de.rettichlp.ucutils.common.gui.screens.components.TableHeaderTextWidget.SortingDirection.ASCENDING; -import static de.rettichlp.ucutils.common.gui.screens.components.TableHeaderTextWidget.SortingDirection.DESCENDING; -import static de.rettichlp.ucutils.common.gui.screens.components.TableHeaderTextWidget.SortingDirection.NONE; +import static de.rettichlp.ucutils.common.gui.screens.components.TableHeaderTextWidget.SortingDirection.*; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; import static net.minecraft.util.Formatting.AQUA; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/ToggleButtonWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/ToggleButtonWidget.java index a96b0a2a..43d9eae7 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/ToggleButtonWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/ToggleButtonWidget.java @@ -10,9 +10,7 @@ import static net.minecraft.screen.ScreenTexts.ON; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.GRAY; -import static net.minecraft.util.Formatting.GREEN; -import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.*; public class ToggleButtonWidget extends ButtonWidget { diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/NameTagOptionsScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/NameTagOptionsScreen.java index 6c0070c6..40fd9a66 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/NameTagOptionsScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/NameTagOptionsScreen.java @@ -4,11 +4,7 @@ import de.rettichlp.ucutils.common.models.Color; import de.rettichlp.ucutils.common.models.Faction; 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.widget.GridWidget; -import net.minecraft.client.gui.widget.Positioner; -import net.minecraft.client.gui.widget.TextWidget; +import net.minecraft.client.gui.widget.*; import net.minecraft.text.Text; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/PersonalUseOptionsScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/PersonalUseOptionsScreen.java index e3852ce0..1aeb4bbe 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/PersonalUseOptionsScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/PersonalUseOptionsScreen.java @@ -5,27 +5,19 @@ import de.rettichlp.ucutils.common.models.PersonalUseEntry; import de.rettichlp.ucutils.common.models.Purity; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.DirectionalLayoutWidget; -import net.minecraft.client.gui.widget.EmptyWidget; -import net.minecraft.client.gui.widget.Positioner; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.gui.widget.TextWidget; +import net.minecraft.client.gui.widget.*; import net.minecraft.text.Text; import org.jetbrains.annotations.NotNull; import java.util.List; -import static de.rettichlp.ucutils.UCUtils.LOGGER; -import static de.rettichlp.ucutils.UCUtils.configuration; -import static de.rettichlp.ucutils.UCUtils.renderService; +import static de.rettichlp.ucutils.UCUtils.*; import static java.lang.Integer.parseInt; import static java.lang.String.valueOf; 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.empty; -import static net.minecraft.text.Text.of; -import static net.minecraft.text.Text.translatable; +import static net.minecraft.text.Text.*; public class PersonalUseOptionsScreen extends OptionsScreen { 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..f0b7ba42 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 @@ -13,10 +13,7 @@ import static de.rettichlp.ucutils.UCUtils.configuration; import static de.rettichlp.ucutils.UCUtils.renderService; import static de.rettichlp.ucutils.common.services.RenderService.TEXT_BOX_PADDING; -import static java.awt.Color.BLACK; -import static java.awt.Color.BLUE; -import static java.awt.Color.GRAY; -import static java.awt.Color.GREEN; +import static java.awt.Color.*; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static net.minecraft.client.gui.widget.DirectionalLayoutWidget.horizontal; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/CarLockedWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/CarLockedWidget.java index 492fe0b0..5106aac9 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/CarLockedWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/CarLockedWidget.java @@ -17,13 +17,8 @@ import static de.rettichlp.ucutils.UCUtils.storage; import static de.rettichlp.ucutils.common.gui.widgets.CarLockedWidget.Style.MINIMALISTIC; -import static net.minecraft.text.Text.empty; -import static net.minecraft.text.Text.of; -import static net.minecraft.text.Text.translatable; -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.GREEN; +import static net.minecraft.text.Text.*; +import static net.minecraft.util.Formatting.*; @UCUtilsWidget(registryName = "car_locked", defaultX = 110.0, defaultY = 4.0) public class CarLockedWidget extends AbstractUCUtilsTextWidget { diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/HearthWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/HearthWidget.java index db7bbc78..c6dfb015 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/HearthWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/HearthWidget.java @@ -9,14 +9,12 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; -import java.awt.Color; +import java.awt.*; import static java.lang.String.format; import static net.minecraft.text.Text.of; import static net.minecraft.text.Text.translatable; -import static net.minecraft.util.Formatting.GRAY; -import static net.minecraft.util.Formatting.RED; -import static net.minecraft.util.Formatting.YELLOW; +import static net.minecraft.util.Formatting.*; @UCUtilsWidget(registryName = "hearth", defaultX = 4.0, defaultY = 4.0, defaultEnabled = false) public class HearthWidget extends AbstractUCUtilsTextWidget { diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/NotificationWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/NotificationWidget.java index e03d5065..ede9a5eb 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/NotificationWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/NotificationWidget.java @@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor; import net.minecraft.text.Text; -import java.awt.Color; +import java.awt.*; import java.time.LocalDateTime; import static java.time.LocalDateTime.now; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/PayDayWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/PayDayWidget.java index 3cec36f3..6ef3d0fe 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/PayDayWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/PayDayWidget.java @@ -15,9 +15,7 @@ import static de.rettichlp.ucutils.UCUtils.renderService; import static java.lang.String.valueOf; import static net.minecraft.client.gui.widget.DirectionalLayoutWidget.horizontal; -import static net.minecraft.text.Text.empty; -import static net.minecraft.text.Text.of; -import static net.minecraft.text.Text.translatable; +import static net.minecraft.text.Text.*; import static net.minecraft.util.Formatting.DARK_GRAY; @UCUtilsWidget(registryName = "payday", defaultX = 126.0, defaultY = 4.0) diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/ServiceCountWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/ServiceCountWidget.java index 5eb50719..f2a1e227 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/ServiceCountWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/ServiceCountWidget.java @@ -7,7 +7,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; -import java.awt.Color; +import java.awt.*; import static de.rettichlp.ucutils.UCUtils.storage; import static java.awt.Color.RED; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsTextWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsTextWidget.java index 4288c9f3..56af694e 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsTextWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsTextWidget.java @@ -5,7 +5,7 @@ import net.minecraft.text.Text; import org.jetbrains.annotations.NotNull; -import java.awt.Color; +import java.awt.*; import static de.rettichlp.ucutils.UCUtils.renderService; import static de.rettichlp.ucutils.common.services.RenderService.TEXT_BOX_PADDING; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsWidget.java index e866c3f4..0d12a40d 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsWidget.java @@ -12,13 +12,8 @@ import java.lang.reflect.Type; import java.util.Map; -import static de.rettichlp.ucutils.UCUtils.LOGGER; -import static de.rettichlp.ucutils.UCUtils.api; -import static de.rettichlp.ucutils.UCUtils.configuration; -import static de.rettichlp.ucutils.UCUtils.notificationService; -import static de.rettichlp.ucutils.common.gui.widgets.base.AbstractUCUtilsWidget.Alignment.CENTER; -import static de.rettichlp.ucutils.common.gui.widgets.base.AbstractUCUtilsWidget.Alignment.LEFT; -import static de.rettichlp.ucutils.common.gui.widgets.base.AbstractUCUtilsWidget.Alignment.RIGHT; +import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.common.gui.widgets.base.AbstractUCUtilsWidget.Alignment.*; import static java.util.Objects.isNull; import static java.util.Optional.ofNullable; diff --git a/src/main/java/de/rettichlp/ucutils/common/models/ActivityEntry.java b/src/main/java/de/rettichlp/ucutils/common/models/ActivityEntry.java index 62723a48..cf60d04a 100644 --- a/src/main/java/de/rettichlp/ucutils/common/models/ActivityEntry.java +++ b/src/main/java/de/rettichlp/ucutils/common/models/ActivityEntry.java @@ -7,9 +7,7 @@ import java.time.Instant; import java.util.List; -import static de.rettichlp.ucutils.common.models.Faction.FBI; -import static de.rettichlp.ucutils.common.models.Faction.POLIZEI; -import static de.rettichlp.ucutils.common.models.Faction.RETTUNGSDIENST; +import static de.rettichlp.ucutils.common.models.Faction.*; import static java.util.Arrays.asList; import static java.util.Objects.nonNull; diff --git a/src/main/java/de/rettichlp/ucutils/common/models/BlackMarket.java b/src/main/java/de/rettichlp/ucutils/common/models/BlackMarket.java index 6112a13c..edf04e5a 100644 --- a/src/main/java/de/rettichlp/ucutils/common/models/BlackMarket.java +++ b/src/main/java/de/rettichlp/ucutils/common/models/BlackMarket.java @@ -17,13 +17,7 @@ import static java.util.Objects.isNull; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.DARK_GRAY; -import static net.minecraft.util.Formatting.DARK_GREEN; -import static net.minecraft.util.Formatting.GOLD; -import static net.minecraft.util.Formatting.GRAY; -import static net.minecraft.util.Formatting.GREEN; -import static net.minecraft.util.Formatting.RED; -import static net.minecraft.util.Formatting.YELLOW; +import static net.minecraft.util.Formatting.*; @Getter @AllArgsConstructor diff --git a/src/main/java/de/rettichlp/ucutils/common/models/Faction.java b/src/main/java/de/rettichlp/ucutils/common/models/Faction.java index c8436181..f7620588 100644 --- a/src/main/java/de/rettichlp/ucutils/common/models/Faction.java +++ b/src/main/java/de/rettichlp/ucutils/common/models/Faction.java @@ -14,18 +14,7 @@ import static java.util.Arrays.stream; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.literal; -import static net.minecraft.util.Formatting.BLUE; -import static net.minecraft.util.Formatting.DARK_AQUA; -import static net.minecraft.util.Formatting.DARK_BLUE; -import static net.minecraft.util.Formatting.DARK_GRAY; -import static net.minecraft.util.Formatting.DARK_PURPLE; -import static net.minecraft.util.Formatting.DARK_RED; -import static net.minecraft.util.Formatting.GOLD; -import static net.minecraft.util.Formatting.GRAY; -import static net.minecraft.util.Formatting.GREEN; -import static net.minecraft.util.Formatting.LIGHT_PURPLE; -import static net.minecraft.util.Formatting.RED; -import static net.minecraft.util.Formatting.YELLOW; +import static net.minecraft.util.Formatting.*; @Getter @AllArgsConstructor diff --git a/src/main/java/de/rettichlp/ucutils/common/models/Purity.java b/src/main/java/de/rettichlp/ucutils/common/models/Purity.java index c9f611b1..ab5a9e25 100644 --- a/src/main/java/de/rettichlp/ucutils/common/models/Purity.java +++ b/src/main/java/de/rettichlp/ucutils/common/models/Purity.java @@ -7,10 +7,7 @@ import net.minecraft.text.Text; import static net.minecraft.text.Text.translatable; -import static net.minecraft.util.Formatting.DARK_GREEN; -import static net.minecraft.util.Formatting.GREEN; -import static net.minecraft.util.Formatting.RED; -import static net.minecraft.util.Formatting.YELLOW; +import static net.minecraft.util.Formatting.*; @Getter @AllArgsConstructor diff --git a/src/main/java/de/rettichlp/ucutils/common/registry/Registry.java b/src/main/java/de/rettichlp/ucutils/common/registry/Registry.java index ef379c50..75196475 100644 --- a/src/main/java/de/rettichlp/ucutils/common/registry/Registry.java +++ b/src/main/java/de/rettichlp/ucutils/common/registry/Registry.java @@ -3,21 +3,7 @@ import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import de.rettichlp.ucutils.common.models.Sound; -import de.rettichlp.ucutils.listener.IAbsorptionGetListener; -import de.rettichlp.ucutils.listener.IBlockRightClickListener; -import de.rettichlp.ucutils.listener.ICommandSendListener; -import de.rettichlp.ucutils.listener.IEnterVehicleListener; -import de.rettichlp.ucutils.listener.IEntityRenderListener; -import de.rettichlp.ucutils.listener.IEntityRightClickListener; -import de.rettichlp.ucutils.listener.IHudRenderListener; -import de.rettichlp.ucutils.listener.IKeyPressListener; -import de.rettichlp.ucutils.listener.IMessageReceiveListener; -import de.rettichlp.ucutils.listener.IMessageSendListener; -import de.rettichlp.ucutils.listener.IMoveListener; -import de.rettichlp.ucutils.listener.INaviSpotReachedListener; -import de.rettichlp.ucutils.listener.IScreenOpenListener; -import de.rettichlp.ucutils.listener.ITickListener; -import de.rettichlp.ucutils.listener.IUCUtilsListener; +import de.rettichlp.ucutils.listener.*; import de.rettichlp.ucutils.listener.callback.PlayerEnterVehicleCallback; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; @@ -36,9 +22,7 @@ import java.util.Objects; import java.util.Set; -import static de.rettichlp.ucutils.UCUtils.LOGGER; -import static de.rettichlp.ucutils.UCUtils.player; -import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.*; import static java.util.Collections.emptySet; import static java.util.Objects.isNull; import static java.util.Optional.ofNullable; diff --git a/src/main/java/de/rettichlp/ucutils/common/services/CommandService.java b/src/main/java/de/rettichlp/ucutils/common/services/CommandService.java index dc8f2ebe..3bd6f81d 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/CommandService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/CommandService.java @@ -6,12 +6,7 @@ import java.util.TimerTask; import java.util.function.Consumer; -import static de.rettichlp.ucutils.UCUtils.LOGGER; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.networkHandler; -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.UCUtils.*; import static java.lang.Boolean.getBoolean; import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; diff --git a/src/main/java/de/rettichlp/ucutils/common/services/FactionService.java b/src/main/java/de/rettichlp/ucutils/common/services/FactionService.java index c4823154..e32bad93 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/FactionService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/FactionService.java @@ -1,11 +1,7 @@ package de.rettichlp.ucutils.common.services; import de.rettichlp.ucutils.common.configuration.options.NameTagOptions; -import de.rettichlp.ucutils.common.models.BlacklistEntry; -import de.rettichlp.ucutils.common.models.ContractEntry; -import de.rettichlp.ucutils.common.models.Faction; -import de.rettichlp.ucutils.common.models.HousebanEntry; -import de.rettichlp.ucutils.common.models.WantedEntry; +import de.rettichlp.ucutils.common.models.*; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -13,21 +9,11 @@ import java.util.Optional; -import static de.rettichlp.ucutils.UCUtils.configuration; -import static de.rettichlp.ucutils.UCUtils.factionService; -import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.*; import static de.rettichlp.ucutils.common.models.Color.WHITE; import static java.time.LocalDateTime.now; -import static net.minecraft.text.Text.empty; -import static net.minecraft.text.Text.literal; -import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.DARK_GRAY; -import static net.minecraft.util.Formatting.DARK_GREEN; -import static net.minecraft.util.Formatting.DARK_RED; -import static net.minecraft.util.Formatting.GOLD; -import static net.minecraft.util.Formatting.GREEN; -import static net.minecraft.util.Formatting.RED; -import static net.minecraft.util.Formatting.YELLOW; +import static net.minecraft.text.Text.*; +import static net.minecraft.util.Formatting.*; public class FactionService { diff --git a/src/main/java/de/rettichlp/ucutils/common/services/MessageService.java b/src/main/java/de/rettichlp/ucutils/common/services/MessageService.java index bcff2e9f..b7a46207 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/MessageService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/MessageService.java @@ -13,10 +13,7 @@ import static java.lang.String.format; import static java.time.format.DateTimeFormatter.ofPattern; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.DARK_GRAY; -import static net.minecraft.util.Formatting.DARK_PURPLE; -import static net.minecraft.util.Formatting.LIGHT_PURPLE; -import static net.minecraft.util.Formatting.WHITE; +import static net.minecraft.util.Formatting.*; public class MessageService { diff --git a/src/main/java/de/rettichlp/ucutils/common/services/NotificationService.java b/src/main/java/de/rettichlp/ucutils/common/services/NotificationService.java index a4bb5b13..0fba485f 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/NotificationService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/NotificationService.java @@ -5,22 +5,14 @@ import net.minecraft.text.Text; import org.jetbrains.annotations.NotNull; -import java.awt.Color; +import java.awt.*; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; +import java.util.*; import java.util.List; -import java.util.Objects; -import java.util.UUID; import java.util.function.Supplier; import static de.rettichlp.ucutils.UCUtils.renderService; -import static java.awt.Color.CYAN; -import static java.awt.Color.GREEN; -import static java.awt.Color.ORANGE; -import static java.awt.Color.RED; -import static java.awt.Color.WHITE; +import static java.awt.Color.*; import static java.time.LocalDateTime.now; import static java.util.Objects.hash; import static java.util.Objects.nonNull; 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 969aae7a..6d6a406e 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/RenderService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/RenderService.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.joml.Matrix4f; -import java.awt.Color; +import java.awt.*; import java.util.LinkedHashSet; import java.util.Objects; import java.util.function.BiConsumer; diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/BombListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/BombListener.java index 11029cd0..d1e66e74 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/BombListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/BombListener.java @@ -16,9 +16,7 @@ import static de.rettichlp.ucutils.UCUtils.player; import static de.rettichlp.ucutils.UCUtils.storage; -import static de.rettichlp.ucutils.common.models.Faction.FBI; -import static de.rettichlp.ucutils.common.models.Faction.POLIZEI; -import static de.rettichlp.ucutils.common.models.Faction.RETTUNGSDIENST; +import static de.rettichlp.ucutils.common.models.Faction.*; import static de.rettichlp.ucutils.common.models.Sound.BOMB_SOUND; import static java.lang.String.format; import static java.time.Duration.between; @@ -28,10 +26,7 @@ import static java.util.regex.Pattern.compile; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.literal; -import static net.minecraft.util.Formatting.BOLD; -import static net.minecraft.util.Formatting.GOLD; -import static net.minecraft.util.Formatting.GRAY; -import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.*; @UCUtilsListener public class BombListener implements IMessageReceiveListener, IHudRenderListener { diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java index 5cbaef28..4a2d9151 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java @@ -14,13 +14,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static de.rettichlp.ucutils.UCUtils.commandService; -import static de.rettichlp.ucutils.UCUtils.configuration; -import static de.rettichlp.ucutils.UCUtils.messageService; -import static de.rettichlp.ucutils.UCUtils.player; -import static de.rettichlp.ucutils.UCUtils.storage; -import static de.rettichlp.ucutils.UCUtils.syncService; -import static de.rettichlp.ucutils.UCUtils.utilService; +import static de.rettichlp.ucutils.UCUtils.*; import static de.rettichlp.ucutils.common.services.CommandService.COMMAND_COOLDOWN_MILLIS; import static java.lang.Integer.parseInt; import static java.lang.System.currentTimeMillis; diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/PlantListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/PlantListener.java index 5c294748..d27b27a8 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/PlantListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/PlantListener.java @@ -29,11 +29,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -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.renderService; -import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.*; import static java.time.Duration.between; import static java.time.LocalDateTime.now; import static java.util.Objects.nonNull; @@ -41,19 +37,11 @@ import static net.minecraft.block.Blocks.FERN; import static net.minecraft.block.Blocks.PODZOL; import static net.minecraft.entity.EquipmentSlot.MAINHAND; -import static net.minecraft.item.Items.BONE_MEAL; -import static net.minecraft.item.Items.PUMPKIN_SEEDS; -import static net.minecraft.item.Items.WATER_BUCKET; -import static net.minecraft.item.Items.WHEAT_SEEDS; +import static net.minecraft.item.Items.*; import static net.minecraft.screen.slot.SlotActionType.PICKUP; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.AQUA; -import static net.minecraft.util.Formatting.BLUE; -import static net.minecraft.util.Formatting.GOLD; -import static net.minecraft.util.Formatting.GRAY; -import static net.minecraft.util.Formatting.GREEN; -import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.*; @UCUtilsListener public class PlantListener implements IBlockRightClickListener, IEntityRenderListener, IMessageReceiveListener, IScreenOpenListener { diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/job/GarbageManListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/job/GarbageManListener.java index aefd893b..fbf4d695 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/job/GarbageManListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/job/GarbageManListener.java @@ -17,10 +17,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -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.utilService; +import static de.rettichlp.ucutils.UCUtils.*; import static java.lang.Double.compare; import static java.lang.System.currentTimeMillis; import static java.util.Arrays.stream; diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/job/JobListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/job/JobListener.java index c4610d1f..9fa645a4 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/job/JobListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/job/JobListener.java @@ -14,13 +14,8 @@ 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.UCUtils.storage; -import static de.rettichlp.ucutils.UCUtils.utilService; -import static de.rettichlp.ucutils.common.models.Job.PIZZA_DELIVERY; -import static de.rettichlp.ucutils.common.models.Job.TOBACCO_PLANTATION; -import static de.rettichlp.ucutils.common.models.Job.URANIUM_TRANSPORT; +import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.common.models.Job.*; import static java.lang.Integer.parseInt; import static java.time.Duration.between; import static java.time.LocalDateTime.now; diff --git a/src/main/java/de/rettichlp/ucutils/mixin/ClientPlayerEntityMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/ClientPlayerEntityMixin.java index e7b96664..29c8d18f 100644 --- a/src/main/java/de/rettichlp/ucutils/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/de/rettichlp/ucutils/mixin/ClientPlayerEntityMixin.java @@ -10,10 +10,7 @@ import java.util.List; -import static de.rettichlp.ucutils.UCUtils.LOGGER; -import static de.rettichlp.ucutils.UCUtils.networkHandler; -import static de.rettichlp.ucutils.UCUtils.player; -import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.*; import static net.minecraft.item.Items.GLASS_BOTTLE; @Mixin(ClientPlayerEntity.class) diff --git a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java index 4cc74d35..f498b107 100644 --- a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java +++ b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java @@ -16,9 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static de.rettichlp.ucutils.UCUtils.factionService; -import static de.rettichlp.ucutils.UCUtils.player; -import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.*; import static net.minecraft.item.Items.SKELETON_SKULL; import static net.minecraft.item.Items.WITHER_SKELETON_SKULL; import static net.minecraft.text.Text.empty; diff --git a/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java index 4f7bdcab..56a0757e 100644 --- a/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java +++ b/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java @@ -20,13 +20,7 @@ import static java.util.Comparator.comparing; import static net.minecraft.text.Text.of; import static net.minecraft.text.TextColor.fromFormatting; -import static net.minecraft.util.Formatting.BLUE; -import static net.minecraft.util.Formatting.BOLD; -import static net.minecraft.util.Formatting.DARK_BLUE; -import static net.minecraft.util.Formatting.DARK_GRAY; -import static net.minecraft.util.Formatting.DARK_RED; -import static net.minecraft.util.Formatting.GOLD; -import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.*; @Mixin(PlayerListHud.class) public abstract class PlayerListHudMixin { From ae062327ec1e2ae948551e91a3b8b51eb950bc3c Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 27 Apr 2026 21:11:31 +0200 Subject: [PATCH 2/7] add function to display thirst --- .../java/de/rettichlp/ucutils/UCUtils.java | 2 + .../de/rettichlp/ucutils/common/Storage.java | 25 +--- .../common/configuration/options/Options.java | 10 +- .../screens/options/MainOptionsScreen.java | 6 + .../ucutils/common/services/SyncService.java | 115 ++++++++++++++++-- .../ucutils/mixin/InGameHudMixin.java | 66 ++++++++++ .../resources/assets/ucutils/lang/de_de.json | 4 +- .../resources/assets/ucutils/lang/en_gb.json | 4 +- .../resources/assets/ucutils/lang/en_us.json | 4 +- .../ucutils/textures/hud/thirst_empty.png | Bin 0 -> 411 bytes .../ucutils/textures/hud/thirst_full.png | Bin 0 -> 462 bytes .../ucutils/textures/hud/thirst_half.png | Bin 0 -> 442 bytes src/main/resources/ucutils.mixins.json | 1 + 13 files changed, 197 insertions(+), 40 deletions(-) create mode 100644 src/main/java/de/rettichlp/ucutils/mixin/InGameHudMixin.java create mode 100644 src/main/resources/assets/ucutils/textures/hud/thirst_empty.png create mode 100644 src/main/resources/assets/ucutils/textures/hud/thirst_full.png create mode 100644 src/main/resources/assets/ucutils/textures/hud/thirst_half.png diff --git a/src/main/java/de/rettichlp/ucutils/UCUtils.java b/src/main/java/de/rettichlp/ucutils/UCUtils.java index dfa06ca4..4ffda4f0 100644 --- a/src/main/java/de/rettichlp/ucutils/UCUtils.java +++ b/src/main/java/de/rettichlp/ucutils/UCUtils.java @@ -74,6 +74,8 @@ public void onInitialize() { } }); + syncService.checkThirst(); + ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> this.registry.registerCommands(dispatcher)); ClientLifecycleEvents.CLIENT_STOPPING.register(client -> configuration.saveToFile()); diff --git a/src/main/java/de/rettichlp/ucutils/common/Storage.java b/src/main/java/de/rettichlp/ucutils/common/Storage.java index d3a2e953..940c3a4d 100644 --- a/src/main/java/de/rettichlp/ucutils/common/Storage.java +++ b/src/main/java/de/rettichlp/ucutils/common/Storage.java @@ -1,30 +1,13 @@ package de.rettichlp.ucutils.common; -import de.rettichlp.ucutils.common.models.BlackMarket; -import de.rettichlp.ucutils.common.models.BlacklistEntry; -import de.rettichlp.ucutils.common.models.BlacklistReason; -import de.rettichlp.ucutils.common.models.ContractEntry; -import de.rettichlp.ucutils.common.models.Countdown; -import de.rettichlp.ucutils.common.models.Faction; -import de.rettichlp.ucutils.common.models.FactionEntry; -import de.rettichlp.ucutils.common.models.HousebanEntry; -import de.rettichlp.ucutils.common.models.Job; -import de.rettichlp.ucutils.common.models.PlantEntry; -import de.rettichlp.ucutils.common.models.Reinforcement; -import de.rettichlp.ucutils.common.models.ShutdownReason; -import de.rettichlp.ucutils.common.models.WantedEntry; +import de.rettichlp.ucutils.common.models.*; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import net.minecraft.entity.vehicle.MinecartEntity; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import static de.rettichlp.ucutils.UCUtils.LOGGER; import static de.rettichlp.ucutils.UCUtils.storage; @@ -111,6 +94,10 @@ public class Storage { @Setter private ToggledChat toggledChat = NONE; + @Getter + @Setter + private double thirst = -1.0; + { this.blackMarkets.addAll(stream(BlackMarket.Type.values()) .map(type -> new BlackMarket(type, null, false)) diff --git a/src/main/java/de/rettichlp/ucutils/common/configuration/options/Options.java b/src/main/java/de/rettichlp/ucutils/common/configuration/options/Options.java index 8aca3f8e..3f24cb9f 100644 --- a/src/main/java/de/rettichlp/ucutils/common/configuration/options/Options.java +++ b/src/main/java/de/rettichlp/ucutils/common/configuration/options/Options.java @@ -16,13 +16,8 @@ import static de.rettichlp.ucutils.common.configuration.options.Options.AtmInformationType.NONE; import static de.rettichlp.ucutils.common.configuration.options.Options.ReinforcementType.UNICACITYADDON; -import static net.minecraft.text.Text.empty; -import static net.minecraft.text.Text.of; -import static net.minecraft.text.Text.translatable; -import static net.minecraft.util.Formatting.AQUA; -import static net.minecraft.util.Formatting.BLUE; -import static net.minecraft.util.Formatting.DARK_AQUA; -import static net.minecraft.util.Formatting.RED; +import static net.minecraft.text.Text.*; +import static net.minecraft.util.Formatting.*; @Getter @Setter @@ -36,6 +31,7 @@ public class Options { private ReinforcementType reinforcementType = UNICACITYADDON; private boolean customSounds = true; private AtmInformationType atmInformationType = NONE; + private boolean showThirst = true; @Getter @AllArgsConstructor 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 54794b63..f5b6006c 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 @@ -22,6 +22,9 @@ public class MainOptionsScreen extends OptionsScreen { private static final Text NOTIFICATION_SOUNDS_TOOLTIP = translatable("ucutils.options.notification_sounds.tooltip"); private static final Text BANK_INFORMATION_NAME = translatable("ucutils.options.atm_information.name"); + private static final Text THIRST_NAME = translatable("ucutils.options.thirst.name"); + private static final Text THIRST_TOOLTIP = translatable("ucutils.options.thirst.tooltip"); + public MainOptionsScreen() { super(new GameMenuScreen(true)); } @@ -44,6 +47,9 @@ public void initBody() { renderService.addButton(directionalLayoutWidget3, TEXT_WIDGETS, button -> this.client.setScreen(new WidgetOptionsScreen(this)), 150); renderService.addCyclingButton(directionalLayoutWidget3, BANK_INFORMATION_NAME, Options.AtmInformationType.values(), Options.AtmInformationType::getDisplayName, Options::atmInformationType, Options::atmInformationType, 150); + DirectionalLayoutWidget directionalLayoutWidget4 = directionalLayoutWidget.add(horizontal().spacing(8)); + renderService.addToggleButton(directionalLayoutWidget4, THIRST_NAME, THIRST_TOOLTIP, Options::showThirst, Options::showThirst, 150); + directionalLayoutWidget.forEachChild(this::addDrawableChild); } } diff --git a/src/main/java/de/rettichlp/ucutils/common/services/SyncService.java b/src/main/java/de/rettichlp/ucutils/common/services/SyncService.java index 0b159465..6bb4fcd8 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/SyncService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/SyncService.java @@ -3,16 +3,21 @@ import de.rettichlp.ucutils.common.models.Faction; import de.rettichlp.ucutils.common.models.FactionEntry; import lombok.Getter; +import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.text.HoverEvent; +import net.minecraft.text.Text; import java.util.Map; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; -import static de.rettichlp.ucutils.UCUtils.LOGGER; -import static de.rettichlp.ucutils.UCUtils.api; -import static de.rettichlp.ucutils.UCUtils.commandService; -import static de.rettichlp.ucutils.UCUtils.notificationService; -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.UCUtils.*; import static de.rettichlp.ucutils.common.models.Faction.NULL; import static de.rettichlp.ucutils.common.services.CommandService.COMMAND_COOLDOWN_MILLIS; import static java.awt.Color.MAGENTA; @@ -20,16 +25,23 @@ import static java.util.concurrent.TimeUnit.MINUTES; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.DARK_GRAY; -import static net.minecraft.util.Formatting.GRAY; -import static net.minecraft.util.Formatting.GREEN; -import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.*; public class SyncService { @Getter private boolean gameSyncProcessActive = false; + private ScheduledExecutorService scheduler; + private ScheduledFuture scheduledTask; + + private boolean executedByTask = false; + private int healthMessageLineCount = 0; + + private static final Pattern HEALTH_STATUS_PATTERN = Pattern.compile( + "=== Zustand von .+ ===|Gesundheit|Blut|Hunger|Durst|Fett|Muskeln" + ); + public void syncFactionMembers() { for (Faction faction : Faction.values()) { if (faction == NULL) { @@ -92,4 +104,85 @@ public void checkForUpdates() { } }); } + + public void checkThirst() { + + ClientReceiveMessageEvents.ALLOW_GAME.register((message, overlay) -> { + + String plainText = message.getString(); + + if (this.executedByTask && HEALTH_STATUS_PATTERN.matcher(plainText).find()) { + this.healthMessageLineCount++; + if (this.healthMessageLineCount >= 7) { + this.executedByTask = false; + this.healthMessageLineCount = 0; + } + } else { + return true; + } + + if (plainText.contains("Durst")) { + for (Text child : message.getSiblings()) { + HoverEvent hoverEvent = child.getStyle().getHoverEvent(); + if (hoverEvent != null && hoverEvent.getAction() == HoverEvent.Action.SHOW_TEXT) { + if (hoverEvent instanceof HoverEvent.ShowText(Text value)) { + String hoverText = value.getString(); + double thirst = this.parseFirstValue(hoverText); + storage.setThirst(thirst); + LOGGER.debug("Set Thirst: {}", thirst); + } + } + } + } + + return false; + }); + + ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> { + if (!storage.isUnicaCity()) { + return; + } + + LOGGER.info("Starting thirst monitoring scheduler"); + + this.scheduler = Executors.newSingleThreadScheduledExecutor(); + this.scheduledTask = this.scheduler.scheduleAtFixedRate(() -> { + MinecraftClient instance = MinecraftClient.getInstance(); + ClientPlayNetworkHandler networkHandler = instance.getNetworkHandler(); + if (networkHandler == null) { + return; + } + instance.execute(() -> { + this.executedByTask = true; + this.healthMessageLineCount = 0; + networkHandler.sendChatCommand("health"); + }); + }, 0, 10, TimeUnit.SECONDS); + + LOGGER.debug("Thirst monitoring scheduler started"); + }); + + ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> { + + storage.setThirst(-1.0); + + this.executedByTask = false; + this.healthMessageLineCount = 0; + if (this.scheduledTask != null && !this.scheduledTask.isCancelled()) { + this.scheduledTask.cancel(false); + } + if (this.scheduler != null && !this.scheduler.isShutdown()) { + this.scheduler.shutdown(); + } + }); + } + + private double parseFirstValue(String text) { + String cleaned = text.replaceAll("ยง.", ""); + String[] parts = cleaned.split("/"); + if (parts.length > 0) { + return Double.parseDouble(parts[0].trim()); + } + return 0.0; + } } diff --git a/src/main/java/de/rettichlp/ucutils/mixin/InGameHudMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/InGameHudMixin.java new file mode 100644 index 00000000..3cc33aee --- /dev/null +++ b/src/main/java/de/rettichlp/ucutils/mixin/InGameHudMixin.java @@ -0,0 +1,66 @@ +package de.rettichlp.ucutils.mixin; + +import com.llamalad7.mixinextras.sugar.Local; +import de.rettichlp.ucutils.UCUtils; +import net.minecraft.client.gl.RenderPipelines; +import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.util.Identifier; +import net.minecraft.util.profiler.Profilers; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(InGameHud.class) +public abstract class InGameHudMixin { + + @Unique + private static final Identifier THIRST_EMPTY_TEXTURE = + Identifier.of("ucutils", "textures/hud/thirst_empty.png"); + @Unique + private static final Identifier THIRST_HALF_TEXTURE = + Identifier.of("ucutils", "textures/hud/thirst_half.png"); + @Unique + private static final Identifier THIRST_FULL_TEXTURE = + Identifier.of("ucutils", "textures/hud/thirst_full.png"); + + @Inject( + method = "renderStatusBars", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/gui/hud/InGameHud;renderHealthBar(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/entity/player/PlayerEntity;IIIIFIIIZ)V", + shift = At.Shift.AFTER + ) + ) + private void inject(DrawContext context, CallbackInfo ci, @Local(ordinal = 3) int m, @Local(ordinal = 8) int r) { + if (!UCUtils.configuration.getOptions().showThirst() || UCUtils.storage.getThirst() == -1) { + return; + } + Profilers.get().swap("thirst"); + this.ucutils$renderThirst(context, r, m); + } + + @Unique + private void ucutils$renderThirst(DrawContext context, int y, int rightX) { + double thirst = UCUtils.storage.getThirst(); + + for (int i = 0; i < 10; ++i) { + int x = rightX - (i * 8) - 10; + + double currentThirst = thirst - (i * 2.0); + + Identifier texture; + if (currentThirst >= 2.0) { + texture = THIRST_FULL_TEXTURE; + } else if (currentThirst >= 1.0) { + texture = THIRST_HALF_TEXTURE; + } else { + texture = THIRST_EMPTY_TEXTURE; + } + + context.drawTexture(RenderPipelines.GUI_TEXTURED, texture, x, y, 0, 0, 9, 9, 9, 9); + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ucutils/lang/de_de.json b/src/main/resources/assets/ucutils/lang/de_de.json index 38924c77..55b15451 100644 --- a/src/main/resources/assets/ucutils/lang/de_de.json +++ b/src/main/resources/assets/ucutils/lang/de_de.json @@ -102,5 +102,7 @@ "ucutils.screen.faction.blacklist.header.reason": "Grund", "ucutils.screen.faction.blacklist.header.price": "Preis", "ucutils.screen.faction.blacklist.header.kills": "Tode", - "ucutils.screen.shutdown_abort.button.name": "Herunterfahren abbrechen" + "ucutils.screen.shutdown_abort.button.name": "Herunterfahren abbrechen", + "ucutils.options.thirst.name": "Zeige Durst", + "ucutils.options.thirst.tooltip": "Zeige deinen Durst in deiner Hotbar an" } diff --git a/src/main/resources/assets/ucutils/lang/en_gb.json b/src/main/resources/assets/ucutils/lang/en_gb.json index ba39add9..d3e74920 100644 --- a/src/main/resources/assets/ucutils/lang/en_gb.json +++ b/src/main/resources/assets/ucutils/lang/en_gb.json @@ -102,5 +102,7 @@ "ucutils.screen.faction.blacklist.header.reason": "Reason", "ucutils.screen.faction.blacklist.header.price": "Price", "ucutils.screen.faction.blacklist.header.kills": "Kills", - "ucutils.screen.shutdown_abort.button.name": "Abort shutdown" + "ucutils.screen.shutdown_abort.button.name": "Abort shutdown", + "ucutils.options.thirst.name": "Show Thirst", + "ucutils.options.thirst.tooltip": "Display your thirst on your hotbar" } diff --git a/src/main/resources/assets/ucutils/lang/en_us.json b/src/main/resources/assets/ucutils/lang/en_us.json index ba39add9..d3e74920 100644 --- a/src/main/resources/assets/ucutils/lang/en_us.json +++ b/src/main/resources/assets/ucutils/lang/en_us.json @@ -102,5 +102,7 @@ "ucutils.screen.faction.blacklist.header.reason": "Reason", "ucutils.screen.faction.blacklist.header.price": "Price", "ucutils.screen.faction.blacklist.header.kills": "Kills", - "ucutils.screen.shutdown_abort.button.name": "Abort shutdown" + "ucutils.screen.shutdown_abort.button.name": "Abort shutdown", + "ucutils.options.thirst.name": "Show Thirst", + "ucutils.options.thirst.tooltip": "Display your thirst on your hotbar" } diff --git a/src/main/resources/assets/ucutils/textures/hud/thirst_empty.png b/src/main/resources/assets/ucutils/textures/hud/thirst_empty.png new file mode 100644 index 0000000000000000000000000000000000000000..226a5af8e0763552b808a2471448bdca6a20bdc9 GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCf`V@Ck7R(l$1>KysRQ^jjdsToU9L{Qp10^;5h+wG5mE9+AZi419+{nDKc2 ziWH!rM2TxeNpOBzNqJ&XDnmeGW?qS&pKFMMsh**pWlr8LJD{3vsS%!Oo}O9^96$~$ zgA^kx10#^-1;o-&Hps;qjLcwhCLr68k%>V7NJjy2W;+X5JPXJMfdn81>4(v1mNEeS zJb|5o1*pQn$k>2!0mM|04%P(_lcoUKAixAPhY74Q$kGDHg6c9fFaXK=oIl{9+JAik zkg4YB;usb1Py{bJqbcb5?Bl;Mk=s%bk1#E(%jj|=)%MxY|M~WvH!InNVlh} KpUXO@geCyY_)V<< literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ucutils/textures/hud/thirst_full.png b/src/main/resources/assets/ucutils/textures/hud/thirst_full.png new file mode 100644 index 0000000000000000000000000000000000000000..e53baa22ee163ac8b5cffed8d8ef95e37cdf4cf5 GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbUfwbGXGoiQ7_W!wJeeSgRt|QtDwx+$fAm6b4nJ@ErzW#^d=bQhM5`Y+_A4a2D$^Z3?#4ne^UZdjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCiji0(?STfwYZ{ZQ6?q=DUt)FW4$tI9tAB1yJxx^w%dqilZdRFZe$MFx+e2 z8wnKSEbxddW?J{^=O8ZN1`G qaswW&SLhM5%-SR>d27~ThbjhZUq+X`^?b%4gFIdRT-G@yGywoRb78Xp literal 0 HcmV?d00001 diff --git a/src/main/resources/ucutils.mixins.json b/src/main/resources/ucutils.mixins.json index ae154cc7..99b90661 100644 --- a/src/main/resources/ucutils.mixins.json +++ b/src/main/resources/ucutils.mixins.json @@ -16,6 +16,7 @@ "ChatScreenMixin", "ClientPlayerEntityMixin", "GameMenuScreenMixin", + "InGameHudMixin", "PlayerListHudMixin" ] } From c42b0b9814484cdc8f29fd6f4c39537fcd48c04a Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 27 Apr 2026 21:11:51 +0200 Subject: [PATCH 3/7] refactor isUnicaCity method to accept network handler as a parameter --- src/main/java/de/rettichlp/ucutils/UCUtils.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/rettichlp/ucutils/UCUtils.java b/src/main/java/de/rettichlp/ucutils/UCUtils.java index 4ffda4f0..ecb7e954 100644 --- a/src/main/java/de/rettichlp/ucutils/UCUtils.java +++ b/src/main/java/de/rettichlp/ucutils/UCUtils.java @@ -15,7 +15,6 @@ import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.client.network.ClientPlayerEntity; import org.slf4j.Logger; @@ -62,7 +61,7 @@ public void onInitialize() { player = client.player; networkHandler = handler; - boolean isUnicaCity = isUnicaCity(); + boolean isUnicaCity = isUnicaCity(handler); storage.setUnicaCity(isUnicaCity); if (isUnicaCity) { client.execute(() -> { @@ -81,14 +80,11 @@ public void onInitialize() { ClientLifecycleEvents.CLIENT_STOPPING.register(client -> configuration.saveToFile()); } - private boolean isUnicaCity() { + private boolean isUnicaCity(ClientPlayNetworkHandler networkHandler) { if (getBoolean("fabric.development")) { return true; } - MinecraftClient client = MinecraftClient.getInstance(); - - ClientPlayNetworkHandler networkHandler = client.getNetworkHandler(); if (isNull(networkHandler)) { LOGGER.warn("Not connected to UnicaCity: Network handler is null"); return false; From 2d75442ef123e4dfd8c61a54cc2dc13a57815087 Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 29 Apr 2026 12:38:13 +0200 Subject: [PATCH 4/7] Revert "optimize imports" This reverts commit f168d359 --- .../ucutils/command/ADropMoneyCommand.java | 5 ++++- .../rettichlp/ucutils/command/MiCommand.java | 5 ++++- .../rettichlp/ucutils/command/MiaCommand.java | 5 ++++- .../rettichlp/ucutils/command/ModCommand.java | 11 ++++++++-- .../command/NotVisitedHousesCommand.java | 4 +++- .../command/faction/BlackMarketCommand.java | 4 +++- .../command/faction/PersonalUseCommand.java | 6 ++++- .../command/faction/ScreenshotCommand.java | 5 ++++- .../ucutils/command/mobile/ACallCommand.java | 4 +++- .../ucutils/command/mobile/ASMSCommand.java | 8 +++++-- .../ucutils/command/mobile/ReplyCommand.java | 4 +++- .../ucutils/command/money/DepositCommand.java | 4 +++- .../command/money/RichTaxesCommand.java | 6 ++++- .../de/rettichlp/ucutils/common/api/Api.java | 6 ++++- .../common/gui/screens/OptionsScreen.java | 4 +++- .../common/gui/screens/ShutdownScreen.java | 4 +++- .../components/TableHeaderTextWidget.java | 4 +++- .../components/ToggleButtonWidget.java | 4 +++- .../screens/options/NameTagOptionsScreen.java | 6 ++++- .../options/PersonalUseOptionsScreen.java | 14 +++++++++--- .../options/WidgetOptionsPositionScreen.java | 5 ++++- .../common/gui/widgets/CarLockedWidget.java | 9 ++++++-- .../common/gui/widgets/HearthWidget.java | 6 +++-- .../gui/widgets/NotificationWidget.java | 2 +- .../common/gui/widgets/PayDayWidget.java | 4 +++- .../gui/widgets/ServiceCountWidget.java | 2 +- .../base/AbstractUCUtilsTextWidget.java | 2 +- .../widgets/base/AbstractUCUtilsWidget.java | 9 ++++++-- .../ucutils/common/models/ActivityEntry.java | 4 +++- .../ucutils/common/models/BlackMarket.java | 8 ++++++- .../ucutils/common/models/Faction.java | 13 ++++++++++- .../ucutils/common/models/Purity.java | 5 ++++- .../ucutils/common/registry/Registry.java | 20 +++++++++++++++-- .../common/services/CommandService.java | 7 +++++- .../common/services/FactionService.java | 22 +++++++++++++++---- .../common/services/MessageService.java | 5 ++++- .../common/services/NotificationService.java | 16 ++++++++++---- .../common/services/RenderService.java | 2 +- .../listener/impl/faction/BombListener.java | 9 ++++++-- .../listener/impl/faction/MedicListener.java | 8 ++++++- .../listener/impl/faction/PlantListener.java | 18 ++++++++++++--- .../listener/impl/job/GarbageManListener.java | 5 ++++- .../listener/impl/job/JobListener.java | 9 ++++++-- .../mixin/ClientPlayerEntityMixin.java | 5 ++++- .../rettichlp/ucutils/mixin/EntityMixin.java | 4 +++- .../ucutils/mixin/PlayerListHudMixin.java | 8 ++++++- 46 files changed, 256 insertions(+), 64 deletions(-) diff --git a/src/main/java/de/rettichlp/ucutils/command/ADropMoneyCommand.java b/src/main/java/de/rettichlp/ucutils/command/ADropMoneyCommand.java index ea2e7ffe..30bf7ce5 100644 --- a/src/main/java/de/rettichlp/ucutils/command/ADropMoneyCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/ADropMoneyCommand.java @@ -12,7 +12,10 @@ import java.util.List; import java.util.Optional; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.commandService; +import static de.rettichlp.ucutils.UCUtils.configuration; +import static de.rettichlp.ucutils.UCUtils.messageService; +import static de.rettichlp.ucutils.UCUtils.player; import static java.lang.Math.min; import static java.util.Optional.ofNullable; import static net.minecraft.scoreboard.ScoreHolder.fromName; diff --git a/src/main/java/de/rettichlp/ucutils/command/MiCommand.java b/src/main/java/de/rettichlp/ucutils/command/MiCommand.java index f1af0071..9b93ce2c 100644 --- a/src/main/java/de/rettichlp/ucutils/command/MiCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/MiCommand.java @@ -9,7 +9,10 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; -import static de.rettichlp.ucutils.UCUtils.*; +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; import static de.rettichlp.ucutils.common.models.Faction.fromDisplayName; import static java.util.Arrays.stream; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; diff --git a/src/main/java/de/rettichlp/ucutils/command/MiaCommand.java b/src/main/java/de/rettichlp/ucutils/command/MiaCommand.java index 48d60475..dc8f4441 100644 --- a/src/main/java/de/rettichlp/ucutils/command/MiaCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/MiaCommand.java @@ -9,7 +9,10 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; -import static de.rettichlp.ucutils.UCUtils.*; +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; import static de.rettichlp.ucutils.common.models.Faction.fromDisplayName; import static java.util.Arrays.stream; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; diff --git a/src/main/java/de/rettichlp/ucutils/command/ModCommand.java b/src/main/java/de/rettichlp/ucutils/command/ModCommand.java index 129aa242..e32b2b43 100644 --- a/src/main/java/de/rettichlp/ucutils/command/ModCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/ModCommand.java @@ -12,12 +12,19 @@ import java.util.Collection; import java.util.StringJoiner; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.MOD_ID; +import static de.rettichlp.ucutils.UCUtils.messageService; +import static de.rettichlp.ucutils.UCUtils.player; +import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.syncService; +import static de.rettichlp.ucutils.UCUtils.utilService; import static java.net.URI.create; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.DARK_GRAY; +import static net.minecraft.util.Formatting.GRAY; +import static net.minecraft.util.Formatting.WHITE; @UCUtilsCommand(label = "ucutils") public class ModCommand extends CommandBase { diff --git a/src/main/java/de/rettichlp/ucutils/command/NotVisitedHousesCommand.java b/src/main/java/de/rettichlp/ucutils/command/NotVisitedHousesCommand.java index fdfaa9f0..20a33b3d 100644 --- a/src/main/java/de/rettichlp/ucutils/command/NotVisitedHousesCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/NotVisitedHousesCommand.java @@ -11,7 +11,9 @@ import java.util.Collection; import java.util.List; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.configuration; +import static de.rettichlp.ucutils.UCUtils.messageService; +import static de.rettichlp.ucutils.UCUtils.player; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; diff --git a/src/main/java/de/rettichlp/ucutils/command/faction/BlackMarketCommand.java b/src/main/java/de/rettichlp/ucutils/command/faction/BlackMarketCommand.java index 363b61be..312363e0 100644 --- a/src/main/java/de/rettichlp/ucutils/command/faction/BlackMarketCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/faction/BlackMarketCommand.java @@ -6,7 +6,9 @@ import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import org.jetbrains.annotations.NotNull; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.messageService; +import static de.rettichlp.ucutils.UCUtils.player; +import static de.rettichlp.ucutils.UCUtils.storage; import static java.util.Comparator.comparingDouble; import static net.minecraft.text.Text.empty; diff --git a/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java b/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java index e307e42b..b9bb0e5b 100644 --- a/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/faction/PersonalUseCommand.java @@ -16,7 +16,11 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.word; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.commandService; +import static de.rettichlp.ucutils.UCUtils.configuration; +import static de.rettichlp.ucutils.UCUtils.messageService; +import static de.rettichlp.ucutils.UCUtils.networkHandler; +import static de.rettichlp.ucutils.UCUtils.utilService; import static java.lang.String.valueOf; import static java.util.regex.Pattern.compile; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; diff --git a/src/main/java/de/rettichlp/ucutils/command/faction/ScreenshotCommand.java b/src/main/java/de/rettichlp/ucutils/command/faction/ScreenshotCommand.java index 0ac2059c..c21598a2 100644 --- a/src/main/java/de/rettichlp/ucutils/command/faction/ScreenshotCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/faction/ScreenshotCommand.java @@ -24,7 +24,10 @@ import static net.minecraft.command.CommandSource.suggestMatching; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.AQUA; +import static net.minecraft.util.Formatting.DARK_AQUA; +import static net.minecraft.util.Formatting.DARK_GRAY; +import static net.minecraft.util.Formatting.GRAY; @UCUtilsCommand(label = "screenshot") public class ScreenshotCommand extends CommandBase { diff --git a/src/main/java/de/rettichlp/ucutils/command/mobile/ACallCommand.java b/src/main/java/de/rettichlp/ucutils/command/mobile/ACallCommand.java index d86d3ced..71596968 100644 --- a/src/main/java/de/rettichlp/ucutils/command/mobile/ACallCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/mobile/ACallCommand.java @@ -12,7 +12,9 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.word; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.commandService; +import static de.rettichlp.ucutils.UCUtils.networkHandler; +import static de.rettichlp.ucutils.UCUtils.storage; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; import static net.minecraft.command.CommandSource.suggestMatching; diff --git a/src/main/java/de/rettichlp/ucutils/command/mobile/ASMSCommand.java b/src/main/java/de/rettichlp/ucutils/command/mobile/ASMSCommand.java index c0993466..316a629f 100644 --- a/src/main/java/de/rettichlp/ucutils/command/mobile/ASMSCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/mobile/ASMSCommand.java @@ -10,8 +10,12 @@ import java.util.List; -import static com.mojang.brigadier.arguments.StringArgumentType.*; -import static de.rettichlp.ucutils.UCUtils.*; +import static com.mojang.brigadier.arguments.StringArgumentType.getString; +import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; +import static com.mojang.brigadier.arguments.StringArgumentType.word; +import static de.rettichlp.ucutils.UCUtils.commandService; +import static de.rettichlp.ucutils.UCUtils.networkHandler; +import static de.rettichlp.ucutils.UCUtils.storage; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; import static net.minecraft.command.CommandSource.suggestMatching; diff --git a/src/main/java/de/rettichlp/ucutils/command/mobile/ReplyCommand.java b/src/main/java/de/rettichlp/ucutils/command/mobile/ReplyCommand.java index 87f08dd5..06383c74 100644 --- a/src/main/java/de/rettichlp/ucutils/command/mobile/ReplyCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/mobile/ReplyCommand.java @@ -8,7 +8,9 @@ import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.commandService; +import static de.rettichlp.ucutils.UCUtils.messageService; +import static de.rettichlp.ucutils.UCUtils.storage; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; @UCUtilsCommand(label = "reply", aliases = "r") diff --git a/src/main/java/de/rettichlp/ucutils/command/money/DepositCommand.java b/src/main/java/de/rettichlp/ucutils/command/money/DepositCommand.java index b60b06b9..bf94373b 100644 --- a/src/main/java/de/rettichlp/ucutils/command/money/DepositCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/money/DepositCommand.java @@ -12,7 +12,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.commandService; +import static de.rettichlp.ucutils.UCUtils.messageService; +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.regex.Pattern.compile; diff --git a/src/main/java/de/rettichlp/ucutils/command/money/RichTaxesCommand.java b/src/main/java/de/rettichlp/ucutils/command/money/RichTaxesCommand.java index 156e5c97..f7b589f0 100644 --- a/src/main/java/de/rettichlp/ucutils/command/money/RichTaxesCommand.java +++ b/src/main/java/de/rettichlp/ucutils/command/money/RichTaxesCommand.java @@ -6,7 +6,11 @@ import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import org.jetbrains.annotations.NotNull; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.commandService; +import static de.rettichlp.ucutils.UCUtils.configuration; +import static de.rettichlp.ucutils.UCUtils.messageService; +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; @UCUtilsCommand(label = "reichensteuer") diff --git a/src/main/java/de/rettichlp/ucutils/common/api/Api.java b/src/main/java/de/rettichlp/ucutils/common/api/Api.java index dad5c4f1..3e56f984 100644 --- a/src/main/java/de/rettichlp/ucutils/common/api/Api.java +++ b/src/main/java/de/rettichlp/ucutils/common/api/Api.java @@ -1,6 +1,10 @@ package de.rettichlp.ucutils.common.api; -import com.google.gson.*; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializer; import com.google.gson.reflect.TypeToken; import com.mojang.authlib.GameProfile; import de.rettichlp.ucutils.common.api.response.ErrorResponse; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/OptionsScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/OptionsScreen.java index 19f94360..8e76ba1f 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/OptionsScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/OptionsScreen.java @@ -12,7 +12,9 @@ import static net.minecraft.client.gui.widget.DirectionalLayoutWidget.horizontal; import static net.minecraft.screen.ScreenTexts.BACK; import static net.minecraft.screen.ScreenTexts.DONE; -import static net.minecraft.text.Text.*; +import static net.minecraft.text.Text.empty; +import static net.minecraft.text.Text.of; +import static net.minecraft.text.Text.translatable; public abstract class OptionsScreen extends UCUtilsScreen { 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 1e8ba422..b797327d 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 @@ -8,7 +8,9 @@ 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.*; +import static net.minecraft.text.Text.empty; +import static net.minecraft.text.Text.of; +import static net.minecraft.text.Text.translatable; import static net.minecraft.util.Formatting.GOLD; import static net.minecraft.util.Formatting.GRAY; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/TableHeaderTextWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/TableHeaderTextWidget.java index 0a09cb5e..04d6ff54 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/TableHeaderTextWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/TableHeaderTextWidget.java @@ -12,7 +12,9 @@ import java.util.Comparator; import java.util.function.Consumer; -import static de.rettichlp.ucutils.common.gui.screens.components.TableHeaderTextWidget.SortingDirection.*; +import static de.rettichlp.ucutils.common.gui.screens.components.TableHeaderTextWidget.SortingDirection.ASCENDING; +import static de.rettichlp.ucutils.common.gui.screens.components.TableHeaderTextWidget.SortingDirection.DESCENDING; +import static de.rettichlp.ucutils.common.gui.screens.components.TableHeaderTextWidget.SortingDirection.NONE; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; import static net.minecraft.util.Formatting.AQUA; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/ToggleButtonWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/ToggleButtonWidget.java index 43d9eae7..a96b0a2a 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/ToggleButtonWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/components/ToggleButtonWidget.java @@ -10,7 +10,9 @@ import static net.minecraft.screen.ScreenTexts.ON; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.GRAY; +import static net.minecraft.util.Formatting.GREEN; +import static net.minecraft.util.Formatting.RED; public class ToggleButtonWidget extends ButtonWidget { diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/NameTagOptionsScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/NameTagOptionsScreen.java index 40fd9a66..6c0070c6 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/NameTagOptionsScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/NameTagOptionsScreen.java @@ -4,7 +4,11 @@ import de.rettichlp.ucutils.common.models.Color; import de.rettichlp.ucutils.common.models.Faction; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.*; +import net.minecraft.client.gui.widget.CyclingButtonWidget; +import net.minecraft.client.gui.widget.DirectionalLayoutWidget; +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; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/PersonalUseOptionsScreen.java b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/PersonalUseOptionsScreen.java index 1aeb4bbe..e3852ce0 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/PersonalUseOptionsScreen.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/screens/options/PersonalUseOptionsScreen.java @@ -5,19 +5,27 @@ import de.rettichlp.ucutils.common.models.PersonalUseEntry; import de.rettichlp.ucutils.common.models.Purity; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.*; +import net.minecraft.client.gui.widget.DirectionalLayoutWidget; +import net.minecraft.client.gui.widget.EmptyWidget; +import net.minecraft.client.gui.widget.Positioner; +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.client.gui.widget.TextWidget; import net.minecraft.text.Text; import org.jetbrains.annotations.NotNull; import java.util.List; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.LOGGER; +import static de.rettichlp.ucutils.UCUtils.configuration; +import static de.rettichlp.ucutils.UCUtils.renderService; import static java.lang.Integer.parseInt; import static java.lang.String.valueOf; 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.*; +import static net.minecraft.text.Text.empty; +import static net.minecraft.text.Text.of; +import static net.minecraft.text.Text.translatable; public class PersonalUseOptionsScreen extends OptionsScreen { 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 f0b7ba42..7ca7a5f3 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 @@ -13,7 +13,10 @@ import static de.rettichlp.ucutils.UCUtils.configuration; import static de.rettichlp.ucutils.UCUtils.renderService; import static de.rettichlp.ucutils.common.services.RenderService.TEXT_BOX_PADDING; -import static java.awt.Color.*; +import static java.awt.Color.BLACK; +import static java.awt.Color.BLUE; +import static java.awt.Color.GRAY; +import static java.awt.Color.GREEN; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import static net.minecraft.client.gui.widget.DirectionalLayoutWidget.horizontal; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/CarLockedWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/CarLockedWidget.java index 5106aac9..492fe0b0 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/CarLockedWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/CarLockedWidget.java @@ -17,8 +17,13 @@ import static de.rettichlp.ucutils.UCUtils.storage; import static de.rettichlp.ucutils.common.gui.widgets.CarLockedWidget.Style.MINIMALISTIC; -import static net.minecraft.text.Text.*; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.text.Text.empty; +import static net.minecraft.text.Text.of; +import static net.minecraft.text.Text.translatable; +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.GREEN; @UCUtilsWidget(registryName = "car_locked", defaultX = 110.0, defaultY = 4.0) public class CarLockedWidget extends AbstractUCUtilsTextWidget { diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/HearthWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/HearthWidget.java index c6dfb015..db7bbc78 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/HearthWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/HearthWidget.java @@ -9,12 +9,14 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; -import java.awt.*; +import java.awt.Color; import static java.lang.String.format; import static net.minecraft.text.Text.of; import static net.minecraft.text.Text.translatable; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.GRAY; +import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.YELLOW; @UCUtilsWidget(registryName = "hearth", defaultX = 4.0, defaultY = 4.0, defaultEnabled = false) public class HearthWidget extends AbstractUCUtilsTextWidget { diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/NotificationWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/NotificationWidget.java index ede9a5eb..e03d5065 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/NotificationWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/NotificationWidget.java @@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor; import net.minecraft.text.Text; -import java.awt.*; +import java.awt.Color; import java.time.LocalDateTime; import static java.time.LocalDateTime.now; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/PayDayWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/PayDayWidget.java index 6ef3d0fe..3cec36f3 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/PayDayWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/PayDayWidget.java @@ -15,7 +15,9 @@ import static de.rettichlp.ucutils.UCUtils.renderService; import static java.lang.String.valueOf; import static net.minecraft.client.gui.widget.DirectionalLayoutWidget.horizontal; -import static net.minecraft.text.Text.*; +import static net.minecraft.text.Text.empty; +import static net.minecraft.text.Text.of; +import static net.minecraft.text.Text.translatable; import static net.minecraft.util.Formatting.DARK_GRAY; @UCUtilsWidget(registryName = "payday", defaultX = 126.0, defaultY = 4.0) diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/ServiceCountWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/ServiceCountWidget.java index f2a1e227..5eb50719 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/ServiceCountWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/ServiceCountWidget.java @@ -7,7 +7,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.text.Text; -import java.awt.*; +import java.awt.Color; import static de.rettichlp.ucutils.UCUtils.storage; import static java.awt.Color.RED; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsTextWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsTextWidget.java index 56af694e..4288c9f3 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsTextWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsTextWidget.java @@ -5,7 +5,7 @@ import net.minecraft.text.Text; import org.jetbrains.annotations.NotNull; -import java.awt.*; +import java.awt.Color; import static de.rettichlp.ucutils.UCUtils.renderService; import static de.rettichlp.ucutils.common.services.RenderService.TEXT_BOX_PADDING; diff --git a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsWidget.java b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsWidget.java index 3c27bed1..b6261389 100644 --- a/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsWidget.java +++ b/src/main/java/de/rettichlp/ucutils/common/gui/widgets/base/AbstractUCUtilsWidget.java @@ -12,8 +12,13 @@ import java.lang.reflect.Type; import java.util.Map; -import static de.rettichlp.ucutils.UCUtils.*; -import static de.rettichlp.ucutils.common.gui.widgets.base.AbstractUCUtilsWidget.Alignment.*; +import static de.rettichlp.ucutils.UCUtils.LOGGER; +import static de.rettichlp.ucutils.UCUtils.api; +import static de.rettichlp.ucutils.UCUtils.configuration; +import static de.rettichlp.ucutils.UCUtils.notificationService; +import static de.rettichlp.ucutils.common.gui.widgets.base.AbstractUCUtilsWidget.Alignment.CENTER; +import static de.rettichlp.ucutils.common.gui.widgets.base.AbstractUCUtilsWidget.Alignment.LEFT; +import static de.rettichlp.ucutils.common.gui.widgets.base.AbstractUCUtilsWidget.Alignment.RIGHT; import static java.util.Objects.isNull; import static java.util.Optional.ofNullable; import static net.minecraft.text.Text.translatable; diff --git a/src/main/java/de/rettichlp/ucutils/common/models/ActivityEntry.java b/src/main/java/de/rettichlp/ucutils/common/models/ActivityEntry.java index cf60d04a..62723a48 100644 --- a/src/main/java/de/rettichlp/ucutils/common/models/ActivityEntry.java +++ b/src/main/java/de/rettichlp/ucutils/common/models/ActivityEntry.java @@ -7,7 +7,9 @@ import java.time.Instant; import java.util.List; -import static de.rettichlp.ucutils.common.models.Faction.*; +import static de.rettichlp.ucutils.common.models.Faction.FBI; +import static de.rettichlp.ucutils.common.models.Faction.POLIZEI; +import static de.rettichlp.ucutils.common.models.Faction.RETTUNGSDIENST; import static java.util.Arrays.asList; import static java.util.Objects.nonNull; diff --git a/src/main/java/de/rettichlp/ucutils/common/models/BlackMarket.java b/src/main/java/de/rettichlp/ucutils/common/models/BlackMarket.java index edf04e5a..6112a13c 100644 --- a/src/main/java/de/rettichlp/ucutils/common/models/BlackMarket.java +++ b/src/main/java/de/rettichlp/ucutils/common/models/BlackMarket.java @@ -17,7 +17,13 @@ import static java.util.Objects.isNull; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.DARK_GRAY; +import static net.minecraft.util.Formatting.DARK_GREEN; +import static net.minecraft.util.Formatting.GOLD; +import static net.minecraft.util.Formatting.GRAY; +import static net.minecraft.util.Formatting.GREEN; +import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.YELLOW; @Getter @AllArgsConstructor diff --git a/src/main/java/de/rettichlp/ucutils/common/models/Faction.java b/src/main/java/de/rettichlp/ucutils/common/models/Faction.java index f7620588..c8436181 100644 --- a/src/main/java/de/rettichlp/ucutils/common/models/Faction.java +++ b/src/main/java/de/rettichlp/ucutils/common/models/Faction.java @@ -14,7 +14,18 @@ import static java.util.Arrays.stream; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.literal; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.BLUE; +import static net.minecraft.util.Formatting.DARK_AQUA; +import static net.minecraft.util.Formatting.DARK_BLUE; +import static net.minecraft.util.Formatting.DARK_GRAY; +import static net.minecraft.util.Formatting.DARK_PURPLE; +import static net.minecraft.util.Formatting.DARK_RED; +import static net.minecraft.util.Formatting.GOLD; +import static net.minecraft.util.Formatting.GRAY; +import static net.minecraft.util.Formatting.GREEN; +import static net.minecraft.util.Formatting.LIGHT_PURPLE; +import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.YELLOW; @Getter @AllArgsConstructor diff --git a/src/main/java/de/rettichlp/ucutils/common/models/Purity.java b/src/main/java/de/rettichlp/ucutils/common/models/Purity.java index ab5a9e25..c9f611b1 100644 --- a/src/main/java/de/rettichlp/ucutils/common/models/Purity.java +++ b/src/main/java/de/rettichlp/ucutils/common/models/Purity.java @@ -7,7 +7,10 @@ import net.minecraft.text.Text; import static net.minecraft.text.Text.translatable; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.DARK_GREEN; +import static net.minecraft.util.Formatting.GREEN; +import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.YELLOW; @Getter @AllArgsConstructor diff --git a/src/main/java/de/rettichlp/ucutils/common/registry/Registry.java b/src/main/java/de/rettichlp/ucutils/common/registry/Registry.java index 75196475..ef379c50 100644 --- a/src/main/java/de/rettichlp/ucutils/common/registry/Registry.java +++ b/src/main/java/de/rettichlp/ucutils/common/registry/Registry.java @@ -3,7 +3,21 @@ import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.LiteralArgumentBuilder; import de.rettichlp.ucutils.common.models.Sound; -import de.rettichlp.ucutils.listener.*; +import de.rettichlp.ucutils.listener.IAbsorptionGetListener; +import de.rettichlp.ucutils.listener.IBlockRightClickListener; +import de.rettichlp.ucutils.listener.ICommandSendListener; +import de.rettichlp.ucutils.listener.IEnterVehicleListener; +import de.rettichlp.ucutils.listener.IEntityRenderListener; +import de.rettichlp.ucutils.listener.IEntityRightClickListener; +import de.rettichlp.ucutils.listener.IHudRenderListener; +import de.rettichlp.ucutils.listener.IKeyPressListener; +import de.rettichlp.ucutils.listener.IMessageReceiveListener; +import de.rettichlp.ucutils.listener.IMessageSendListener; +import de.rettichlp.ucutils.listener.IMoveListener; +import de.rettichlp.ucutils.listener.INaviSpotReachedListener; +import de.rettichlp.ucutils.listener.IScreenOpenListener; +import de.rettichlp.ucutils.listener.ITickListener; +import de.rettichlp.ucutils.listener.IUCUtilsListener; import de.rettichlp.ucutils.listener.callback.PlayerEnterVehicleCallback; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; @@ -22,7 +36,9 @@ import java.util.Objects; import java.util.Set; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.LOGGER; +import static de.rettichlp.ucutils.UCUtils.player; +import static de.rettichlp.ucutils.UCUtils.storage; import static java.util.Collections.emptySet; import static java.util.Objects.isNull; import static java.util.Optional.ofNullable; diff --git a/src/main/java/de/rettichlp/ucutils/common/services/CommandService.java b/src/main/java/de/rettichlp/ucutils/common/services/CommandService.java index 3bd6f81d..dc8f2ebe 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/CommandService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/CommandService.java @@ -6,7 +6,12 @@ import java.util.TimerTask; import java.util.function.Consumer; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.LOGGER; +import static de.rettichlp.ucutils.UCUtils.messageService; +import static de.rettichlp.ucutils.UCUtils.networkHandler; +import static de.rettichlp.ucutils.UCUtils.player; +import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.utilService; import static java.lang.Boolean.getBoolean; import static java.util.Objects.nonNull; import static java.util.Optional.ofNullable; diff --git a/src/main/java/de/rettichlp/ucutils/common/services/FactionService.java b/src/main/java/de/rettichlp/ucutils/common/services/FactionService.java index e32bad93..c4823154 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/FactionService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/FactionService.java @@ -1,7 +1,11 @@ package de.rettichlp.ucutils.common.services; import de.rettichlp.ucutils.common.configuration.options.NameTagOptions; -import de.rettichlp.ucutils.common.models.*; +import de.rettichlp.ucutils.common.models.BlacklistEntry; +import de.rettichlp.ucutils.common.models.ContractEntry; +import de.rettichlp.ucutils.common.models.Faction; +import de.rettichlp.ucutils.common.models.HousebanEntry; +import de.rettichlp.ucutils.common.models.WantedEntry; import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -9,11 +13,21 @@ import java.util.Optional; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.configuration; +import static de.rettichlp.ucutils.UCUtils.factionService; +import static de.rettichlp.ucutils.UCUtils.storage; import static de.rettichlp.ucutils.common.models.Color.WHITE; import static java.time.LocalDateTime.now; -import static net.minecraft.text.Text.*; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.text.Text.empty; +import static net.minecraft.text.Text.literal; +import static net.minecraft.text.Text.of; +import static net.minecraft.util.Formatting.DARK_GRAY; +import static net.minecraft.util.Formatting.DARK_GREEN; +import static net.minecraft.util.Formatting.DARK_RED; +import static net.minecraft.util.Formatting.GOLD; +import static net.minecraft.util.Formatting.GREEN; +import static net.minecraft.util.Formatting.RED; +import static net.minecraft.util.Formatting.YELLOW; public class FactionService { diff --git a/src/main/java/de/rettichlp/ucutils/common/services/MessageService.java b/src/main/java/de/rettichlp/ucutils/common/services/MessageService.java index b7a46207..bcff2e9f 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/MessageService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/MessageService.java @@ -13,7 +13,10 @@ import static java.lang.String.format; import static java.time.format.DateTimeFormatter.ofPattern; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.DARK_GRAY; +import static net.minecraft.util.Formatting.DARK_PURPLE; +import static net.minecraft.util.Formatting.LIGHT_PURPLE; +import static net.minecraft.util.Formatting.WHITE; public class MessageService { diff --git a/src/main/java/de/rettichlp/ucutils/common/services/NotificationService.java b/src/main/java/de/rettichlp/ucutils/common/services/NotificationService.java index beee8252..bb97fd31 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/NotificationService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/NotificationService.java @@ -4,12 +4,20 @@ import lombok.Data; import net.minecraft.text.Text; -import java.awt.*; +import java.awt.Color; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; import java.util.List; - -import static java.awt.Color.*; +import java.util.Objects; +import java.util.UUID; + +import static java.awt.Color.CYAN; +import static java.awt.Color.GREEN; +import static java.awt.Color.ORANGE; +import static java.awt.Color.RED; +import static java.awt.Color.WHITE; import static java.time.LocalDateTime.now; import static java.util.Objects.hash; import static java.util.Objects.nonNull; 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 6d6a406e..969aae7a 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/RenderService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/RenderService.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.joml.Matrix4f; -import java.awt.*; +import java.awt.Color; import java.util.LinkedHashSet; import java.util.Objects; import java.util.function.BiConsumer; diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/BombListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/BombListener.java index d1e66e74..11029cd0 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/BombListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/BombListener.java @@ -16,7 +16,9 @@ import static de.rettichlp.ucutils.UCUtils.player; import static de.rettichlp.ucutils.UCUtils.storage; -import static de.rettichlp.ucutils.common.models.Faction.*; +import static de.rettichlp.ucutils.common.models.Faction.FBI; +import static de.rettichlp.ucutils.common.models.Faction.POLIZEI; +import static de.rettichlp.ucutils.common.models.Faction.RETTUNGSDIENST; import static de.rettichlp.ucutils.common.models.Sound.BOMB_SOUND; import static java.lang.String.format; import static java.time.Duration.between; @@ -26,7 +28,10 @@ import static java.util.regex.Pattern.compile; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.literal; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.BOLD; +import static net.minecraft.util.Formatting.GOLD; +import static net.minecraft.util.Formatting.GRAY; +import static net.minecraft.util.Formatting.RED; @UCUtilsListener public class BombListener implements IMessageReceiveListener, IHudRenderListener { diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java index 4a2d9151..5cbaef28 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/MedicListener.java @@ -14,7 +14,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.commandService; +import static de.rettichlp.ucutils.UCUtils.configuration; +import static de.rettichlp.ucutils.UCUtils.messageService; +import static de.rettichlp.ucutils.UCUtils.player; +import static de.rettichlp.ucutils.UCUtils.storage; +import static de.rettichlp.ucutils.UCUtils.syncService; +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.System.currentTimeMillis; diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/PlantListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/PlantListener.java index d27b27a8..5c294748 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/faction/PlantListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/faction/PlantListener.java @@ -29,7 +29,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static de.rettichlp.ucutils.UCUtils.*; +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.renderService; +import static de.rettichlp.ucutils.UCUtils.storage; import static java.time.Duration.between; import static java.time.LocalDateTime.now; import static java.util.Objects.nonNull; @@ -37,11 +41,19 @@ import static net.minecraft.block.Blocks.FERN; import static net.minecraft.block.Blocks.PODZOL; import static net.minecraft.entity.EquipmentSlot.MAINHAND; -import static net.minecraft.item.Items.*; +import static net.minecraft.item.Items.BONE_MEAL; +import static net.minecraft.item.Items.PUMPKIN_SEEDS; +import static net.minecraft.item.Items.WATER_BUCKET; +import static net.minecraft.item.Items.WHEAT_SEEDS; import static net.minecraft.screen.slot.SlotActionType.PICKUP; import static net.minecraft.text.Text.empty; import static net.minecraft.text.Text.of; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.AQUA; +import static net.minecraft.util.Formatting.BLUE; +import static net.minecraft.util.Formatting.GOLD; +import static net.minecraft.util.Formatting.GRAY; +import static net.minecraft.util.Formatting.GREEN; +import static net.minecraft.util.Formatting.RED; @UCUtilsListener public class PlantListener implements IBlockRightClickListener, IEntityRenderListener, IMessageReceiveListener, IScreenOpenListener { diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/job/GarbageManListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/job/GarbageManListener.java index fbf4d695..aefd893b 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/job/GarbageManListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/job/GarbageManListener.java @@ -17,7 +17,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static de.rettichlp.ucutils.UCUtils.*; +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.utilService; import static java.lang.Double.compare; import static java.lang.System.currentTimeMillis; import static java.util.Arrays.stream; diff --git a/src/main/java/de/rettichlp/ucutils/listener/impl/job/JobListener.java b/src/main/java/de/rettichlp/ucutils/listener/impl/job/JobListener.java index 9fa645a4..c4610d1f 100644 --- a/src/main/java/de/rettichlp/ucutils/listener/impl/job/JobListener.java +++ b/src/main/java/de/rettichlp/ucutils/listener/impl/job/JobListener.java @@ -14,8 +14,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import static de.rettichlp.ucutils.UCUtils.*; -import static de.rettichlp.ucutils.common.models.Job.*; +import static de.rettichlp.ucutils.UCUtils.commandService; +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.Job.PIZZA_DELIVERY; +import static de.rettichlp.ucutils.common.models.Job.TOBACCO_PLANTATION; +import static de.rettichlp.ucutils.common.models.Job.URANIUM_TRANSPORT; import static java.lang.Integer.parseInt; import static java.time.Duration.between; import static java.time.LocalDateTime.now; diff --git a/src/main/java/de/rettichlp/ucutils/mixin/ClientPlayerEntityMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/ClientPlayerEntityMixin.java index 29c8d18f..e7b96664 100644 --- a/src/main/java/de/rettichlp/ucutils/mixin/ClientPlayerEntityMixin.java +++ b/src/main/java/de/rettichlp/ucutils/mixin/ClientPlayerEntityMixin.java @@ -10,7 +10,10 @@ import java.util.List; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.LOGGER; +import static de.rettichlp.ucutils.UCUtils.networkHandler; +import static de.rettichlp.ucutils.UCUtils.player; +import static de.rettichlp.ucutils.UCUtils.storage; import static net.minecraft.item.Items.GLASS_BOTTLE; @Mixin(ClientPlayerEntity.class) diff --git a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java index f498b107..4cc74d35 100644 --- a/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java +++ b/src/main/java/de/rettichlp/ucutils/mixin/EntityMixin.java @@ -16,7 +16,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.factionService; +import static de.rettichlp.ucutils.UCUtils.player; +import static de.rettichlp.ucutils.UCUtils.storage; import static net.minecraft.item.Items.SKELETON_SKULL; import static net.minecraft.item.Items.WITHER_SKELETON_SKULL; import static net.minecraft.text.Text.empty; diff --git a/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java b/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java index 56a0757e..4f7bdcab 100644 --- a/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java +++ b/src/main/java/de/rettichlp/ucutils/mixin/PlayerListHudMixin.java @@ -20,7 +20,13 @@ import static java.util.Comparator.comparing; import static net.minecraft.text.Text.of; import static net.minecraft.text.TextColor.fromFormatting; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.util.Formatting.BLUE; +import static net.minecraft.util.Formatting.BOLD; +import static net.minecraft.util.Formatting.DARK_BLUE; +import static net.minecraft.util.Formatting.DARK_GRAY; +import static net.minecraft.util.Formatting.DARK_RED; +import static net.minecraft.util.Formatting.GOLD; +import static net.minecraft.util.Formatting.RED; @Mixin(PlayerListHud.class) public abstract class PlayerListHudMixin { From a717a2e2c22c19d52c9ca3820df2b9550c94cc54 Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 29 Apr 2026 12:42:52 +0200 Subject: [PATCH 5/7] Revert "optimize imports" This reverts commit f168d359 --- .../de/rettichlp/ucutils/common/Storage.java | 21 +++++++++++++++++-- .../common/configuration/options/Options.java | 9 ++++++-- .../ucutils/common/services/SyncService.java | 17 ++++++++++++--- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/rettichlp/ucutils/common/Storage.java b/src/main/java/de/rettichlp/ucutils/common/Storage.java index f5a3f9b0..0b7cba0b 100644 --- a/src/main/java/de/rettichlp/ucutils/common/Storage.java +++ b/src/main/java/de/rettichlp/ucutils/common/Storage.java @@ -1,6 +1,18 @@ package de.rettichlp.ucutils.common; -import de.rettichlp.ucutils.common.models.*; +import de.rettichlp.ucutils.common.models.BlackMarket; +import de.rettichlp.ucutils.common.models.BlacklistEntry; +import de.rettichlp.ucutils.common.models.BlacklistReason; +import de.rettichlp.ucutils.common.models.ContractEntry; +import de.rettichlp.ucutils.common.models.Countdown; +import de.rettichlp.ucutils.common.models.Faction; +import de.rettichlp.ucutils.common.models.FactionEntry; +import de.rettichlp.ucutils.common.models.HousebanEntry; +import de.rettichlp.ucutils.common.models.Job; +import de.rettichlp.ucutils.common.models.PlantEntry; +import de.rettichlp.ucutils.common.models.Reinforcement; +import de.rettichlp.ucutils.common.models.ShutdownReason; +import de.rettichlp.ucutils.common.models.WantedEntry; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -8,7 +20,12 @@ import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import static de.rettichlp.ucutils.UCUtils.LOGGER; import static de.rettichlp.ucutils.UCUtils.storage; diff --git a/src/main/java/de/rettichlp/ucutils/common/configuration/options/Options.java b/src/main/java/de/rettichlp/ucutils/common/configuration/options/Options.java index 3f24cb9f..bd9a0fde 100644 --- a/src/main/java/de/rettichlp/ucutils/common/configuration/options/Options.java +++ b/src/main/java/de/rettichlp/ucutils/common/configuration/options/Options.java @@ -16,8 +16,13 @@ import static de.rettichlp.ucutils.common.configuration.options.Options.AtmInformationType.NONE; import static de.rettichlp.ucutils.common.configuration.options.Options.ReinforcementType.UNICACITYADDON; -import static net.minecraft.text.Text.*; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.text.Text.empty; +import static net.minecraft.text.Text.of; +import static net.minecraft.text.Text.translatable; +import static net.minecraft.util.Formatting.AQUA; +import static net.minecraft.util.Formatting.BLUE; +import static net.minecraft.util.Formatting.DARK_AQUA; +import static net.minecraft.util.Formatting.RED; @Getter @Setter diff --git a/src/main/java/de/rettichlp/ucutils/common/services/SyncService.java b/src/main/java/de/rettichlp/ucutils/common/services/SyncService.java index 6c251880..88f987c7 100644 --- a/src/main/java/de/rettichlp/ucutils/common/services/SyncService.java +++ b/src/main/java/de/rettichlp/ucutils/common/services/SyncService.java @@ -17,14 +17,25 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -import static de.rettichlp.ucutils.UCUtils.*; +import static de.rettichlp.ucutils.UCUtils.LOGGER; +import static de.rettichlp.ucutils.UCUtils.api; +import static de.rettichlp.ucutils.UCUtils.commandService; +import static de.rettichlp.ucutils.UCUtils.notificationService; +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.Faction.NULL; import static de.rettichlp.ucutils.common.services.CommandService.COMMAND_COOLDOWN_MILLIS; import static java.awt.Color.MAGENTA; import static java.util.Objects.nonNull; import static java.util.concurrent.TimeUnit.MINUTES; -import static net.minecraft.text.Text.*; -import static net.minecraft.util.Formatting.*; +import static net.minecraft.text.Text.empty; +import static net.minecraft.text.Text.literal; +import static net.minecraft.text.Text.translatable; +import static net.minecraft.util.Formatting.DARK_GRAY; +import static net.minecraft.util.Formatting.GRAY; +import static net.minecraft.util.Formatting.GREEN; +import static net.minecraft.util.Formatting.RED; public class SyncService { From 1b6dc27240e89ad5a60d8b510d2867b19534f379 Mon Sep 17 00:00:00 2001 From: RettichLP <97811064+rettichlp@users.noreply.github.com> Date: Wed, 29 Apr 2026 13:40:49 +0200 Subject: [PATCH 6/7] Remove blank line --- .../ucutils/common/gui/screens/options/MainOptionsScreen.java | 1 - 1 file changed, 1 deletion(-) 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 f5b6006c..7950ea4e 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 @@ -21,7 +21,6 @@ public class MainOptionsScreen extends OptionsScreen { private static final Text NOTIFICATION_SOUNDS_NAME = translatable("ucutils.options.notification_sounds.name"); private static final Text NOTIFICATION_SOUNDS_TOOLTIP = translatable("ucutils.options.notification_sounds.tooltip"); private static final Text BANK_INFORMATION_NAME = translatable("ucutils.options.atm_information.name"); - private static final Text THIRST_NAME = translatable("ucutils.options.thirst.name"); private static final Text THIRST_TOOLTIP = translatable("ucutils.options.thirst.tooltip"); From 14d8d1950366d5e101c68ef8cfd9d6ddd566ed27 Mon Sep 17 00:00:00 2001 From: RettichLP <97811064+rettichlp@users.noreply.github.com> Date: Wed, 29 Apr 2026 13:44:02 +0200 Subject: [PATCH 7/7] Add logging for new thirst field --- src/main/java/de/rettichlp/ucutils/common/Storage.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/de/rettichlp/ucutils/common/Storage.java b/src/main/java/de/rettichlp/ucutils/common/Storage.java index 0b7cba0b..6a991e01 100644 --- a/src/main/java/de/rettichlp/ucutils/common/Storage.java +++ b/src/main/java/de/rettichlp/ucutils/common/Storage.java @@ -107,7 +107,7 @@ public class Storage { @Getter @Setter - private boolean unicaCity = false; + private double thirst = -1.0; @Getter @Setter @@ -115,7 +115,7 @@ public class Storage { @Getter @Setter - private double thirst = -1.0; + private boolean unicaCity = false; { this.blackMarkets.addAll(stream(BlackMarket.Type.values()) @@ -162,10 +162,12 @@ public void print() { LOGGER.info("minecartEntityToHighlight: {}", this.minecartEntityToHighlight); // moneyAtmAmount LOGGER.info("moneyAtmAmount: {}", this.moneyAtmAmount); - // unicaCity - LOGGER.info("unicaCity: {}", this.unicaCity); + // thirst + LOGGER.info("thirst: {}", this.thirst); // toggledChat LOGGER.info("toggledChat: {}", this.toggledChat); + // unicaCity + LOGGER.info("unicaCity: {}", this.unicaCity); } public Faction getCachedFaction(String playerName) {