summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/aizistral/nochatreports
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/aizistral/nochatreports')
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java54
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/SigningMode.java27
2 files changed, 69 insertions, 12 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
index 6ab9f60..7a90aa8 100644
--- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
@@ -1,22 +1,26 @@
package com.aizistral.nochatreports.config;
import com.aizistral.nochatreports.core.ServerSafetyState;
+import com.aizistral.nochatreports.core.SigningMode;
import com.aizistral.nochatreports.gui.FontHelper;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
import me.shedaniel.clothconfig2.api.ConfigBuilder;
import me.shedaniel.clothconfig2.api.ConfigCategory;
import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
-import me.shedaniel.clothconfig2.gui.entries.StringListListEntry;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
+import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.locale.Language;
import net.minecraft.network.chat.ClickEvent;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.HoverEvent;
+import net.minecraft.network.chat.MutableComponent;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Stream;
/**
* Implementation of ModMenu and ClothConfig support for the mod.
@@ -27,9 +31,12 @@ import java.util.List;
@Environment(EnvType.CLIENT)
public final class ModMenuIntegration implements ModMenuApi {
- private Component[] makeTooltip(String key) {
- String localized = Language.getInstance().getOrDefault(key);
- List<String> list = FontHelper.wrap(Minecraft.getInstance().font, localized, 250);
+ private String translateKey(String key) {
+ return Language.getInstance().getOrDefault(key);
+ }
+
+ private Component[] wrapTooltip(String text) {
+ List<String> list = FontHelper.wrap(Minecraft.getInstance().font, text, 250);
Component[] tooltip = new Component[list.size()];
for (int i = 0; i < list.size(); i++) {
@@ -39,6 +46,10 @@ public final class ModMenuIntegration implements ModMenuApi {
return tooltip;
}
+ private Component[] makeTooltip(String key) {
+ return this.wrapTooltip(this.translateKey(key));
+ }
+
@Override
public ConfigScreenFactory<?> getModConfigScreenFactory() {
return screen -> {
@@ -51,7 +62,6 @@ public final class ModMenuIntegration implements ModMenuApi {
// Set category
ConfigCategory client = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.client"));
ConfigCategory lan = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lan"));
- ConfigCategory whitelist = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.whitelist"));
ConfigEntryBuilder entryBuilder = builder.entryBuilder();
@@ -72,6 +82,40 @@ public final class ModMenuIntegration implements ModMenuApi {
.setSaveConsumer(newValue -> NCRConfig.getClient().showNCRButton = newValue)
.build());
+
+ String signingTooltip = this.translateKey("option.NoChatReports.defaultSigningMode.tooltip")
+ + "\n ";
+
+ for (SigningMode mode : SigningMode.values()) {
+ if (mode.isSelectableGlobally()) {
+ signingTooltip += "\n\n";
+ signingTooltip += ChatFormatting.AQUA;
+ signingTooltip += ChatFormatting.BOLD;
+ signingTooltip += ChatFormatting.UNDERLINE;
+ signingTooltip += this.translateKey(mode.getNameKey());
+ signingTooltip += ChatFormatting.RESET;
+ signingTooltip += "\n";
+ signingTooltip += this.translateKey(mode.getTooltipKey());
+ }
+ }
+
+ // Dropdown for defaultSigningMode
+ client.addEntry(
+ entryBuilder.startStringDropdownMenu(Component.translatable("option.NoChatReports.defaultSigningMode"),
+ NCRConfig.getClient().defaultSigningMode.getName().getString())
+ .setTooltip(this.wrapTooltip(signingTooltip))
+ .setDefaultValue(SigningMode.PROMPT.getName().getString())
+ .setSelections(Stream.of(SigningMode.values()).filter(SigningMode::isSelectableGlobally)
+ .map(mode -> mode.getName().getString()).toList())
+ .setSaveConsumer(newValue -> {
+ NCRConfig.getClient().defaultSigningMode = Arrays.stream(SigningMode.values())
+ .filter(mode -> mode.getName().getString().equals(newValue))
+ .findFirst().get();
+ })
+ .setSuggestionMode(false)
+ .build()
+ );
+
// Set an option for showReloadButton
client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NCRConfig.getClient().showReloadButton)
.setDefaultValue(true)
diff --git a/src/main/java/com/aizistral/nochatreports/core/SigningMode.java b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java
index 3d7aa3d..3402d6c 100644
--- a/src/main/java/com/aizistral/nochatreports/core/SigningMode.java
+++ b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java
@@ -53,18 +53,23 @@ public enum SigningMode {
*/
NEVER_FORCED;
- public MutableComponent getName() {
- String key = "gui.nochatreports.signing_mode." + this.name().toLowerCase();
+ public String getNameKey() {
+ return "gui.nochatreports.signing_mode." + this.name().toLowerCase();
+ }
+ public MutableComponent getName() {
if (this != DEFAULT)
- return Component.translatable(key);
+ return Component.translatable(this.getNameKey());
else
- return Component.translatable(key, NCRConfig.getClient().defaultSigningMode().getName());
+ return Component.translatable(this.getNameKey(), NCRConfig.getClient().defaultSigningMode().getName());
+ }
+
+ public String getTooltipKey() {
+ return "gui.nochatreports.signing_mode." + this.name().toLowerCase() + ".tooltip";
}
public MutableComponent getTooltip() {
- return Component.translatable("gui.nochatreports.signing_mode." + this.name().toLowerCase() +
- ".tooltip");
+ return Component.translatable(this.getTooltipKey());
}
public SigningMode next() {
@@ -76,7 +81,7 @@ public enum SigningMode {
result = values()[this.ordinal() + 1];
}
- return result == NEVER_FORCED ? result.next() : result;
+ return result.isSelectable() ? result : result.next();
}
public SigningMode resolve() {
@@ -87,6 +92,14 @@ public enum SigningMode {
};
}
+ public boolean isSelectable() {
+ return this != NEVER_FORCED;
+ }
+
+ public boolean isSelectableGlobally() {
+ return this.isSelectable() && this != DEFAULT;
+ }
+
public static SigningMode nullable(@Nullable SigningMode mode) {
return mode == null ? DEFAULT : mode;
}