summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.gradle10
-rw-r--r--gradle.properties12
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java548
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java2
4 files changed, 286 insertions, 286 deletions
diff --git a/build.gradle b/build.gradle
index 936b25a..2302473 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
import org.apache.tools.ant.taskdefs.condition.Os
plugins {
- id 'fabric-loom' version '1.0-SNAPSHOT'
+ id 'fabric-loom' version '1.1-SNAPSHOT'
id 'maven-publish'
id "com.modrinth.minotaur" version "2.+"
id "com.matthewprenger.cursegradle" version "1.+"
@@ -74,10 +74,10 @@ dependencies {
mappings loom.officialMojangMappings()
modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
- //modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
- //modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
- // exclude(group: "net.fabricmc.fabric-api")
- //}
+ modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
+ modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
+ exclude(group: "net.fabricmc.fabric-api")
+ }
include(fabricApi.module("fabric-api-base", project.fabric_version))
modImplementation include(fabricApi.module("fabric-networking-api-v1", project.fabric_version))
diff --git a/gradle.properties b/gradle.properties
index c713116..54d0218 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=false
# Toolchain Properties
-minecraft_version=1.19.4-pre1
-yarn_mappings=1.19.4-pre1+build.2
-fabric_loader_version=0.14.14
+minecraft_version=1.19.4-rc2
+yarn_mappings=1.19.4-rc2+build.1
+fabric_loader_version=0.14.17
forge_version=1.19.3-44.0.48
# Mod Properties
@@ -22,9 +22,9 @@ mod_icon=assets/nochatreports/textures/misc/NCR_logo.png
mod_license=WTFPL
# Dependencies
-fabric_version=0.74.2+1.19.4
-mod_menu_version=5.0.0-alpha.4
-cloth_config_version=9.0.94
+fabric_version=0.75.3+1.19.4
+mod_menu_version=6.1.0-beta.3
+cloth_config_version=10.0.95
# Dependencies in mods.toml
dep_forge=[37,)
diff --git a/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java
index 44b12d9..5546ff3 100644
--- a/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java
@@ -1,274 +1,274 @@
-//package com.aizistral.nochatreports.common.config;
-//
-//import java.util.Arrays;
-//import java.util.List;
-//import java.util.stream.Stream;
-//
-//import com.aizistral.nochatreports.common.core.ServerSafetyState;
-//import com.aizistral.nochatreports.common.core.SigningMode;
-//import com.aizistral.nochatreports.common.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 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;
-//
-///**
-// * Implementation of ModMenu and ClothConfig support for the mod.
-// * @author MODKILLER1001
-// */
-//
-//@Environment(EnvType.CLIENT)
-//public final class ModMenuIntegration implements ModMenuApi {
-//
-// 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++) {
-// tooltip[i] = Component.literal(list.get(i));
-// }
-//
-// return tooltip;
-// }
-//
-// private Component[] makeTooltip(String key) {
-// return this.wrapTooltip(this.translateKey(key));
-// }
-//
-// @Override
-// public ConfigScreenFactory<?> getModConfigScreenFactory() {
-// return screen -> {
-//
-// // Get the previous screen
-// ConfigBuilder builder = ConfigBuilder.create()
-// .setParentScreen(Minecraft.getInstance().screen)
-// .setTitle(Component.translatable("configuration.NoChatReports.config"));
-//
-// // Set category
-// ConfigCategory client = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.client"));
-// ConfigCategory lan = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lan"));
-//
-// ConfigEntryBuilder entryBuilder = builder.entryBuilder();
-//
-// // Set an option for enableMod
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip"))
-// .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() -> {
-// NCRConfig.getClient().enableMod = newValue;
-// NCRConfig.getClient().saveFile();
-// }))
-// .build());
-//
-// // Set an option for showNCRButton
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showNCRButton"), NCRConfig.getClient().showNCRButton)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.showNCRButton.tooltip"))
-// .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)
-// .setTooltip(this.makeTooltip("option.NoChatReports.showReloadButton.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().showReloadButton = newValue)
-// .build());
-//
-// // Set an option for verifiedIconEnabled
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.verifiedIconEnabled"), NCRConfig.getClient().verifiedIconEnabled)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconEnabled.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconEnabled = newValue)
-// .build());
-//
-// // Set an option for verifiedIconOffsetX
-// client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetX"), NCRConfig.getClient().verifiedIconOffsetX)
-// .setDefaultValue(0)
-// .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetX.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetX = newValue)
-// .build());
-//
-// // Set an option for verifiedIconOffsetY
-// client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetY"), NCRConfig.getClient().verifiedIconOffsetY)
-// .setDefaultValue(0)
-// .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetY.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetY = newValue)
-// .build());
-//
-// // Warning for showEncryptionButton
-// client.addEntry(entryBuilder.startTextDescription(Component.translatable("gui.NoChatReports.showEncryptionButtonWarning"))
-// .build());
-//
-// // Set an option for showEncryptionButton
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionButton"), NCRConfig.getEncryption().showEncryptionButton)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionButton.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionButton = newValue)
-// .build());
-//
-// // Set an option for showEncryptionIndicators
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionIndicators"), NCRConfig.getEncryption().showEncryptionIndicators)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionIndicators.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionIndicators = newValue)
-// .build());
-//
-// // Set an option for showServerSafety
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NCRConfig.getClient().showServerSafety)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.showServerSafety.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().showServerSafety = newValue)
-// .build());
-//
-// // Add link for documentation for showServerSafety
-// client.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.moreInfo")
-// .withStyle(s -> s
-// .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.translatable("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))).withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))))
-// .build());
-//
-// // Set an option for hideInsecureMessageIndicators
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideInsecureMessageIndicators"), NCRConfig.getClient().hideInsecureMessageIndicators)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.hideInsecureMessageIndicators.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().hideInsecureMessageIndicators = newValue)
-// .build());
-//
-// // Set an option for hideModifiedMessageIndicators
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideModifiedMessageIndicators"), NCRConfig.getClient().hideModifiedMessageIndicators)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.hideModifiedMessageIndicators.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().hideModifiedMessageIndicators = newValue)
-// .build());
-//
-// // Set an option for hideSystemMessageIndicators
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSystemMessageIndicators"), NCRConfig.getClient().hideSystemMessageIndicators)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.hideSystemMessageIndicators.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().hideSystemMessageIndicators = newValue)
-// .build());
-//
-// // Set an option for hideWarningToast
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NCRConfig.getClient().hideWarningToast)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.hideWarningToast.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().hideWarningToast = newValue)
-// .build());
-//
-// // Set an option for hideSigningRequestMessage
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSigningRequestMessage"), NCRConfig.getClient().hideSigningRequestMessage)
-// .setDefaultValue(false)
-// .setTooltip(this.makeTooltip("option.NoChatReports.hideSigningRequestMessage.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().hideSigningRequestMessage = newValue)
-// .build());
-//
-// // Set an option for alwaysHideReportButton
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NCRConfig.getClient().alwaysHideReportButton)
-// .setDefaultValue(false)
-// .setTooltip(this.makeTooltip("option.NoChatReports.alwaysHideReportButton.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().alwaysHideReportButton = newValue)
-// .build());
-//
-// // Set an option for demandOnServer
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NCRConfig.getClient().demandOnServer)
-// .setDefaultValue(false)
-// .setTooltip(this.makeTooltip("option.NoChatReports.demandOnServer.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().demandOnServer = newValue)
-// .build());
-//
-// // Set an option for enableDebugLog
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NCRConfig.getCommon().enableDebugLog)
-// .setDefaultValue(false)
-// .setTooltip(this.makeTooltip("option.NoChatReports.enableDebugLog.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getCommon().enableDebugLog = newValue)
-// .build());
-//
-// // Set an option for disableTelemetry
-// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NCRConfig.getClient().disableTelemetry)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.disableTelemetry.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getClient().disableTelemetry = newValue)
-// .build());
-//
-// // Set an option for demandOnClient
-// lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NCRConfig.getCommon().demandOnClient)
-// .setDefaultValue(false)
-// .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClient.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClient = newValue)
-// .build());
-//
-// // Set an option for demandOnClientMessage
-// lan.addEntry(entryBuilder.startStrField(Component.translatable("option.NoChatReports.demandOnClientMessage"), NCRConfig.getCommon().demandOnClientMessage)
-// .setDefaultValue(NCRConfig.getCommon().demandOnClientMessage)
-// .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClientMessage.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClientMessage = newValue)
-// .build());
-//
-// // Set an option for convertToGameMessage
-// lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NCRConfig.getCommon().convertToGameMessage)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.convertToGameMessage.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getCommon().convertToGameMessage = newValue)
-// .build());
-//
-// // Set an option for addQueryData
-// lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.addQueryData"), NCRConfig.getCommon().addQueryData)
-// .setDefaultValue(true)
-// .setTooltip(this.makeTooltip("option.NoChatReports.addQueryData.tooltip"))
-// .setSaveConsumer(newValue -> NCRConfig.getCommon().addQueryData = newValue)
-// .build());
-//
-// // Save config
-// builder.setSavingRunnable(NCRConfig::save);
-// return builder.build();
-// };
-// }
-//
-//} \ No newline at end of file
+package com.aizistral.nochatreports.common.config;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+import com.aizistral.nochatreports.common.core.ServerSafetyState;
+import com.aizistral.nochatreports.common.core.SigningMode;
+import com.aizistral.nochatreports.common.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 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;
+
+/**
+ * Implementation of ModMenu and ClothConfig support for the mod.
+ * @author MODKILLER1001
+ */
+
+@Environment(EnvType.CLIENT)
+public final class ModMenuIntegration implements ModMenuApi {
+
+ 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++) {
+ tooltip[i] = Component.literal(list.get(i));
+ }
+
+ return tooltip;
+ }
+
+ private Component[] makeTooltip(String key) {
+ return this.wrapTooltip(this.translateKey(key));
+ }
+
+ @Override
+ public ConfigScreenFactory<?> getModConfigScreenFactory() {
+ return screen -> {
+
+ // Get the previous screen
+ ConfigBuilder builder = ConfigBuilder.create()
+ .setParentScreen(Minecraft.getInstance().screen)
+ .setTitle(Component.translatable("configuration.NoChatReports.config"));
+
+ // Set category
+ ConfigCategory client = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.client"));
+ ConfigCategory lan = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lan"));
+
+ ConfigEntryBuilder entryBuilder = builder.entryBuilder();
+
+ // Set an option for enableMod
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip"))
+ .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() -> {
+ NCRConfig.getClient().enableMod = newValue;
+ NCRConfig.getClient().saveFile();
+ }))
+ .build());
+
+ // Set an option for showNCRButton
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showNCRButton"), NCRConfig.getClient().showNCRButton)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showNCRButton.tooltip"))
+ .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)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showReloadButton.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().showReloadButton = newValue)
+ .build());
+
+ // Set an option for verifiedIconEnabled
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.verifiedIconEnabled"), NCRConfig.getClient().verifiedIconEnabled)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconEnabled.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconEnabled = newValue)
+ .build());
+
+ // Set an option for verifiedIconOffsetX
+ client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetX"), NCRConfig.getClient().verifiedIconOffsetX)
+ .setDefaultValue(0)
+ .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetX.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetX = newValue)
+ .build());
+
+ // Set an option for verifiedIconOffsetY
+ client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetY"), NCRConfig.getClient().verifiedIconOffsetY)
+ .setDefaultValue(0)
+ .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetY.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetY = newValue)
+ .build());
+
+ // Warning for showEncryptionButton
+ client.addEntry(entryBuilder.startTextDescription(Component.translatable("gui.NoChatReports.showEncryptionButtonWarning"))
+ .build());
+
+ // Set an option for showEncryptionButton
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionButton"), NCRConfig.getEncryption().showEncryptionButton)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionButton.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionButton = newValue)
+ .build());
+
+ // Set an option for showEncryptionIndicators
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionIndicators"), NCRConfig.getEncryption().showEncryptionIndicators)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionIndicators = newValue)
+ .build());
+
+ // Set an option for showServerSafety
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NCRConfig.getClient().showServerSafety)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.showServerSafety.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().showServerSafety = newValue)
+ .build());
+
+ // Add link for documentation for showServerSafety
+ client.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.moreInfo")
+ .withStyle(s -> s
+ .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.translatable("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))).withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))))
+ .build());
+
+ // Set an option for hideInsecureMessageIndicators
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideInsecureMessageIndicators"), NCRConfig.getClient().hideInsecureMessageIndicators)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.hideInsecureMessageIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().hideInsecureMessageIndicators = newValue)
+ .build());
+
+ // Set an option for hideModifiedMessageIndicators
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideModifiedMessageIndicators"), NCRConfig.getClient().hideModifiedMessageIndicators)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.hideModifiedMessageIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().hideModifiedMessageIndicators = newValue)
+ .build());
+
+ // Set an option for hideSystemMessageIndicators
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSystemMessageIndicators"), NCRConfig.getClient().hideSystemMessageIndicators)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.hideSystemMessageIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().hideSystemMessageIndicators = newValue)
+ .build());
+
+ // Set an option for hideWarningToast
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NCRConfig.getClient().hideWarningToast)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.hideWarningToast.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().hideWarningToast = newValue)
+ .build());
+
+ // Set an option for hideSigningRequestMessage
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSigningRequestMessage"), NCRConfig.getClient().hideSigningRequestMessage)
+ .setDefaultValue(false)
+ .setTooltip(this.makeTooltip("option.NoChatReports.hideSigningRequestMessage.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().hideSigningRequestMessage = newValue)
+ .build());
+
+ // Set an option for alwaysHideReportButton
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NCRConfig.getClient().alwaysHideReportButton)
+ .setDefaultValue(false)
+ .setTooltip(this.makeTooltip("option.NoChatReports.alwaysHideReportButton.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().alwaysHideReportButton = newValue)
+ .build());
+
+ // Set an option for demandOnServer
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NCRConfig.getClient().demandOnServer)
+ .setDefaultValue(false)
+ .setTooltip(this.makeTooltip("option.NoChatReports.demandOnServer.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().demandOnServer = newValue)
+ .build());
+
+ // Set an option for enableDebugLog
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NCRConfig.getCommon().enableDebugLog)
+ .setDefaultValue(false)
+ .setTooltip(this.makeTooltip("option.NoChatReports.enableDebugLog.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getCommon().enableDebugLog = newValue)
+ .build());
+
+ // Set an option for disableTelemetry
+ client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NCRConfig.getClient().disableTelemetry)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.disableTelemetry.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getClient().disableTelemetry = newValue)
+ .build());
+
+ // Set an option for demandOnClient
+ lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NCRConfig.getCommon().demandOnClient)
+ .setDefaultValue(false)
+ .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClient.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClient = newValue)
+ .build());
+
+ // Set an option for demandOnClientMessage
+ lan.addEntry(entryBuilder.startStrField(Component.translatable("option.NoChatReports.demandOnClientMessage"), NCRConfig.getCommon().demandOnClientMessage)
+ .setDefaultValue(NCRConfig.getCommon().demandOnClientMessage)
+ .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClientMessage.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClientMessage = newValue)
+ .build());
+
+ // Set an option for convertToGameMessage
+ lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NCRConfig.getCommon().convertToGameMessage)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.convertToGameMessage.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getCommon().convertToGameMessage = newValue)
+ .build());
+
+ // Set an option for addQueryData
+ lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.addQueryData"), NCRConfig.getCommon().addQueryData)
+ .setDefaultValue(true)
+ .setTooltip(this.makeTooltip("option.NoChatReports.addQueryData.tooltip"))
+ .setSaveConsumer(newValue -> NCRConfig.getCommon().addQueryData = newValue)
+ .build());
+
+ // Save config
+ builder.setSavingRunnable(NCRConfig::save);
+ return builder.build();
+ };
+ }
+
+} \ No newline at end of file
diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java
index 7e24c33..8286b19 100644
--- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java
+++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java
@@ -139,7 +139,7 @@ public class AdvancedTooltip extends Tooltip {
s = q;
for (t = 0; t < list.size(); ++t) {
clientTooltipComponent2 = list.get(t);
- clientTooltipComponent2.renderImage(screen.font, p, s, poseStack, screen.itemRenderer, 400);
+ clientTooltipComponent2.renderImage(screen.font, p, s, poseStack, screen.itemRenderer);
s += clientTooltipComponent2.getHeight() + /*(t == 0 ? 2 : 0)*/ 0;
}
}