Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/main/java/de/rettichlp/ucutils/UCUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(() -> {
Expand All @@ -74,19 +73,18 @@ public void onInitialize() {
}
});

syncService.checkThirst();

ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> this.registry.registerCommands(dispatcher));

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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/de/rettichlp/ucutils/command/MiCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/de/rettichlp/ucutils/command/MiaCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 2 additions & 9 deletions src/main/java/de/rettichlp/ucutils/command/ModCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
25 changes: 6 additions & 19 deletions src/main/java/de/rettichlp/ucutils/common/Storage.java
Original file line number Diff line number Diff line change
@@ -1,31 +1,14 @@
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 net.minecraft.text.Text;
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;
Expand Down Expand Up @@ -113,6 +96,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))
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/de/rettichlp/ucutils/common/api/Api.java
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand All @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Loading