summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.gradle8
-rw-r--r--gradle.properties2
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java520
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java8
-rw-r--r--src/main/resources/fabric.mod.json2
5 files changed, 269 insertions, 271 deletions
diff --git a/build.gradle b/build.gradle
index 70ae911..b4feed9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,10 +27,10 @@ dependencies {
mappings loom.officialMojangMappings()
modImplementation "net.fabricmc:fabric-loader:${project.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 de07668..1ff0c4f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=22w43a+build.5
loader_version=0.14.10
# Mod Properties
-mod_version=1.19.2-v1.13.11
+mod_version=1.19.3-v1.14.0-indev
maven_group=com.aizistral.nochatreports
archives_base_name=NoChatReports-FABRIC
diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
index 6ddd81b..08a4884 100644
--- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
+++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java
@@ -1,260 +1,260 @@
-package com.aizistral.nochatreports.config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.aizistral.nochatreports.core.ServerSafetyLevel;
-import com.aizistral.nochatreports.core.ServerSafetyState;
-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.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 Component[] makeTooltip(String key) {
- String localized = Language.getInstance().getOrDefault(key);
- List<String> list = FontHelper.wrap(Minecraft.getInstance().font, localized, 250);
- Component[] tooltip = new Component[list.size()];
-
- for (int i = 0; i < list.size(); i++) {
- tooltip[i] = Component.literal(list.get(i));
- }
-
- return tooltip;
- }
-
- @Override
- public ConfigScreenFactory<?> getModConfigScreenFactory() {
- return screen -> {
-
- // TODO Sort config options into client and common instead of visual and technical
-
- // Get the previous screen
- ConfigBuilder builder = ConfigBuilder.create()
- .setParentScreen(Minecraft.getInstance().screen)
- .setTitle(Component.translatable("configuration.NoChatReports.config"));
-
- // Set category
- ConfigCategory visual = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.visual"));
- ConfigCategory technical = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.technical"));
- ConfigCategory whitelistedServers = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.whitelistedServers"));
- ConfigCategory lanOptions = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lanOptions"));
-
- ConfigEntryBuilder entryBuilder = builder.entryBuilder();
-
- // Set an option for showServerSafety
- visual.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
- visual.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 verifiedIconEnabled
- visual.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
- visual.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
- visual.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());
-
- // Set an option for hideRedChatIndicators
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NCRConfig.getClient().hideInsecureMessageIndicators)
- .setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.hideRedChatIndicators.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().hideInsecureMessageIndicators = newValue)
- .build());
-
- // Set an option for hideYellowChatIndicators
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NCRConfig.getClient().hideModifiedMessageIndicators)
- .setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.hideYellowChatIndicators.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().hideModifiedMessageIndicators = newValue)
- .build());
-
- // Set an option for hideGrayChatIndicators
- visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideGrayChatIndicators"), NCRConfig.getClient().hideSystemMessageIndicators)
- .setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.hideGrayChatIndicators.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().hideSystemMessageIndicators = newValue)
- .build());
-
- // Set an option for hideWarningToast
- visual.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 alwaysHideReportButton
- visual.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
- technical.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
- technical.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
- technical.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 showReloadButton
- technical.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 whitelistAllServers
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NCRConfig.getClient().whitelistAllServers)
- .setDefaultValue(false)
- .setTooltip(this.makeTooltip("option.NoChatReports.whitelistAllServers.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().whitelistAllServers = newValue)
- .build());
-
- // Set an option for showNCRButton
- technical.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());
-
- // Set an option for enableMod
- technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod)
- .setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip"))
- .setSaveConsumer(newValue -> {
- NCRConfig.getClient().enableMod = newValue;
- ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN);
- })
- .build());
-
- // Set an option for reconnectAwaitSeconds
- technical.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.reconnectAwaitSeconds"), NCRConfig.getClient().reconnectAwaitSeconds)
- .setDefaultValue(4)
- .setTooltip(this.makeTooltip("option.NoChatReports.reconnectAwaitSeconds.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().reconnectAwaitSeconds = newValue)
- .build());
-
- // Set an option for postDisconnectAwaitSeconds
- technical.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.postDisconnectAwaitSeconds"), NCRConfig.getClient().postDisconnectAwaitSeconds)
- .setDefaultValue(10)
- .setTooltip(this.makeTooltip("option.NoChatReports.postDisconnectAwaitSeconds.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().postDisconnectAwaitSeconds = newValue)
- .build());
-
- // Set an option for signingCheckDelaySeconds
- technical.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.signingCheckDelaySeconds"), NCRConfig.getClient().signingCheckDelaySeconds)
- .setDefaultValue(43200)
- .setTooltip(this.makeTooltip("option.NoChatReports.signingCheckDelaySeconds.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getClient().signingCheckDelaySeconds = newValue)
- .build());
-
- // Warning for showEncryptionButton
- technical.addEntry(entryBuilder.startTextDescription(Component.translatable("gui.NoChatReports.showEncryptionButtonWarning"))
- .build());
-
- // Set an option for showEncryptionButton
- technical.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());
-
- // Instructions for adding servers
- whitelistedServers.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.whitelistedServers.instructions"))
- .build());
-
- // Add or remove whitelisted servers
- whitelistedServers.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NCRConfig.getServerWhitelist().whitelistedServers)
- .setExpanded(true)
- .setInsertInFront(true)
- .setDefaultValue(NCRServerWhitelist.DEFAULT_WHITELISTED_SERVERS)
- .setTooltip(this.makeTooltip("option.NoChatReports.whitelistedServers.tooltip"))
- .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip"))
- .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getServerWhitelist().whitelistedServers = newValue)
- .setCreateNewInstance(baseListEntry -> new StringListListEntry.StringListCell(Language.getInstance().getOrDefault(("option.NoChatReports.whitelistedServers.serverAddress")), baseListEntry))
- .build());
-
- // Set an option for demandOnClient
- lanOptions.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NCRConfig.getCommon().demandOnClient)
- .setDefaultValue(true)
- .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClient.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClient = newValue)
- .build());
-
- // Set an option for convertToGameMessage
- lanOptions.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NCRConfig.getCommon().convertToGameMessage)
- .setDefaultValue(false)
- .setTooltip(this.makeTooltip("option.NoChatReports.convertToGameMessage.tooltip"))
- .setSaveConsumer(newValue -> NCRConfig.getCommon().convertToGameMessage = newValue)
- .build());
-
- // Set an option for addQueryData
- lanOptions.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.config;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//import com.aizistral.nochatreports.core.ServerSafetyLevel;
+//import com.aizistral.nochatreports.core.ServerSafetyState;
+//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.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 Component[] makeTooltip(String key) {
+// String localized = Language.getInstance().getOrDefault(key);
+// List<String> list = FontHelper.wrap(Minecraft.getInstance().font, localized, 250);
+// Component[] tooltip = new Component[list.size()];
+//
+// for (int i = 0; i < list.size(); i++) {
+// tooltip[i] = Component.literal(list.get(i));
+// }
+//
+// return tooltip;
+// }
+//
+// @Override
+// public ConfigScreenFactory<?> getModConfigScreenFactory() {
+// return screen -> {
+//
+// // TODO Sort config options into client and common instead of visual and technical
+//
+// // Get the previous screen
+// ConfigBuilder builder = ConfigBuilder.create()
+// .setParentScreen(Minecraft.getInstance().screen)
+// .setTitle(Component.translatable("configuration.NoChatReports.config"));
+//
+// // Set category
+// ConfigCategory visual = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.visual"));
+// ConfigCategory technical = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.technical"));
+// ConfigCategory whitelistedServers = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.whitelistedServers"));
+// ConfigCategory lanOptions = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lanOptions"));
+//
+// ConfigEntryBuilder entryBuilder = builder.entryBuilder();
+//
+// // Set an option for showServerSafety
+// visual.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
+// visual.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 verifiedIconEnabled
+// visual.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
+// visual.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
+// visual.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());
+//
+// // Set an option for hideRedChatIndicators
+// visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NCRConfig.getClient().hideInsecureMessageIndicators)
+// .setDefaultValue(true)
+// .setTooltip(this.makeTooltip("option.NoChatReports.hideRedChatIndicators.tooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getClient().hideInsecureMessageIndicators = newValue)
+// .build());
+//
+// // Set an option for hideYellowChatIndicators
+// visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NCRConfig.getClient().hideModifiedMessageIndicators)
+// .setDefaultValue(true)
+// .setTooltip(this.makeTooltip("option.NoChatReports.hideYellowChatIndicators.tooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getClient().hideModifiedMessageIndicators = newValue)
+// .build());
+//
+// // Set an option for hideGrayChatIndicators
+// visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideGrayChatIndicators"), NCRConfig.getClient().hideSystemMessageIndicators)
+// .setDefaultValue(true)
+// .setTooltip(this.makeTooltip("option.NoChatReports.hideGrayChatIndicators.tooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getClient().hideSystemMessageIndicators = newValue)
+// .build());
+//
+// // Set an option for hideWarningToast
+// visual.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 alwaysHideReportButton
+// visual.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
+// technical.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
+// technical.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
+// technical.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 showReloadButton
+// technical.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 whitelistAllServers
+// technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NCRConfig.getClient().whitelistAllServers)
+// .setDefaultValue(false)
+// .setTooltip(this.makeTooltip("option.NoChatReports.whitelistAllServers.tooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getClient().whitelistAllServers = newValue)
+// .build());
+//
+// // Set an option for showNCRButton
+// technical.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());
+//
+// // Set an option for enableMod
+// technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod)
+// .setDefaultValue(true)
+// .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip"))
+// .setSaveConsumer(newValue -> {
+// NCRConfig.getClient().enableMod = newValue;
+// ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN);
+// })
+// .build());
+//
+// // Set an option for reconnectAwaitSeconds
+// technical.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.reconnectAwaitSeconds"), NCRConfig.getClient().reconnectAwaitSeconds)
+// .setDefaultValue(4)
+// .setTooltip(this.makeTooltip("option.NoChatReports.reconnectAwaitSeconds.tooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getClient().reconnectAwaitSeconds = newValue)
+// .build());
+//
+// // Set an option for postDisconnectAwaitSeconds
+// technical.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.postDisconnectAwaitSeconds"), NCRConfig.getClient().postDisconnectAwaitSeconds)
+// .setDefaultValue(10)
+// .setTooltip(this.makeTooltip("option.NoChatReports.postDisconnectAwaitSeconds.tooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getClient().postDisconnectAwaitSeconds = newValue)
+// .build());
+//
+// // Set an option for signingCheckDelaySeconds
+// technical.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.signingCheckDelaySeconds"), NCRConfig.getClient().signingCheckDelaySeconds)
+// .setDefaultValue(43200)
+// .setTooltip(this.makeTooltip("option.NoChatReports.signingCheckDelaySeconds.tooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getClient().signingCheckDelaySeconds = newValue)
+// .build());
+//
+// // Warning for showEncryptionButton
+// technical.addEntry(entryBuilder.startTextDescription(Component.translatable("gui.NoChatReports.showEncryptionButtonWarning"))
+// .build());
+//
+// // Set an option for showEncryptionButton
+// technical.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());
+//
+// // Instructions for adding servers
+// whitelistedServers.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.whitelistedServers.instructions"))
+// .build());
+//
+// // Add or remove whitelisted servers
+// whitelistedServers.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NCRConfig.getServerWhitelist().whitelistedServers)
+// .setExpanded(true)
+// .setInsertInFront(true)
+// .setDefaultValue(NCRServerWhitelist.DEFAULT_WHITELISTED_SERVERS)
+// .setTooltip(this.makeTooltip("option.NoChatReports.whitelistedServers.tooltip"))
+// .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip"))
+// .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getServerWhitelist().whitelistedServers = newValue)
+// .setCreateNewInstance(baseListEntry -> new StringListListEntry.StringListCell(Language.getInstance().getOrDefault(("option.NoChatReports.whitelistedServers.serverAddress")), baseListEntry))
+// .build());
+//
+// // Set an option for demandOnClient
+// lanOptions.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NCRConfig.getCommon().demandOnClient)
+// .setDefaultValue(true)
+// .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClient.tooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClient = newValue)
+// .build());
+//
+// // Set an option for convertToGameMessage
+// lanOptions.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NCRConfig.getCommon().convertToGameMessage)
+// .setDefaultValue(false)
+// .setTooltip(this.makeTooltip("option.NoChatReports.convertToGameMessage.tooltip"))
+// .setSaveConsumer(newValue -> NCRConfig.getCommon().convertToGameMessage = newValue)
+// .build());
+//
+// // Set an option for addQueryData
+// lanOptions.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/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
index 3c4cc5c..b776a81 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java
@@ -39,10 +39,8 @@ public class MixinChatListener {
*/
@Inject(method = "evaluateTrustLevel", at = @At("HEAD"), cancellable = true)
- private void onEvaluateTrustLevel(PlayerChatMessage playerChatMessage, Component component, PlayerInfo playerInfo,
- Instant instant, CallbackInfoReturnable<ChatTrustLevel> info) {
-
- if (this.isSenderLocalPlayer(playerChatMessage.link().sender())) {
+ private void onEvaluateTrustLevel(PlayerChatMessage playerChatMessage, Component component, Instant instant, CallbackInfoReturnable<ChatTrustLevel> info) {
+ if (this.isSenderLocalPlayer(playerChatMessage.sender())) {
info.setReturnValue(ChatTrustLevel.SECURE);
} else {
var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, instant);
@@ -59,7 +57,7 @@ public class MixinChatListener {
NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}",
Component.Serializer.toStableJson(playerChatMessage.unsignedContent()),
playerChatMessage.link().sender(),
- Base64.getEncoder().encodeToString(playerChatMessage.signature().bytes()));
+ Base64.getEncoder().encodeToString(playerChatMessage.signature() != null ? playerChatMessage.signature().bytes() : new byte[0]));
}
}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 9ff7627..f8aae8d 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -39,7 +39,7 @@
"fabric-screen-api-v1": "*",
"fabric-rendering-v1": "*",
"fabric-resource-loader-v0": "*",
- "minecraft": [ "=1.19.1", "=1.19.2" ],
+ "minecraft": [ "=1.19.3-alpha.22.43.a" ],
"java": ">=17"
},
"suggests": {},