summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java129
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java15
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java2
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json32
-rw-r--r--src/main/resources/fabric.mod.json16
5 files changed, 182 insertions, 12 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java
new file mode 100644
index 0000000..69ff5c6
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java
@@ -0,0 +1,129 @@
+package com.aizistral.nochatreports;
+
+import com.aizistral.nochatreports.core.NoReportsConfig;
+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.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Style;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.contents.TranslatableContents;
+
+import java.util.Properties;
+import java.util.Optional;
+
+public class ModMenuIntegration implements ModMenuApi {
+
+ @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 visual = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.visual"));
+ ConfigCategory technical = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.technical"));
+
+ ConfigEntryBuilder entryBuilder = builder.entryBuilder();
+ // Set an option for demandOnServer
+ technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NoReportsConfig.getInstance().demandOnServer)
+ .setDefaultValue(false)
+ .setTooltip(Component.translatable("option.NoChatReports.demandOnServer.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().demandOnServer = newValue)
+ .build());
+
+ // Set an option for enableDebugLog
+ technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NoReportsConfig.getInstance().enableDebugLog)
+ .setDefaultValue(false)
+ .setTooltip(Component.translatable("option.NoChatReports.enableDebugLog.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().enableDebugLog = newValue)
+ .build());
+
+ // Set an option for convertToGameMessage
+ technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().convertToGameMessage)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = newValue)
+ .build());
+
+ // Set an option for showServerSafety
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().showServerSafety)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.showServerSafety.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showServerSafety = newValue)
+ .build());
+
+ // Set an option for hideRedChatIndicators
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.getInstance().hideRedChatIndicators)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.hideRedChatIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideRedChatIndicators = newValue)
+ .build());
+
+ // Set an option for hideYellowChatIndicators
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NoReportsConfig.getInstance().hideYellowChatIndicators)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.hideYellowChatIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideYellowChatIndicators = newValue)
+ .build());
+
+ // Set an option for hideGrayChatIndicators
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideGrayChatIndicators"), NoReportsConfig.getInstance().hideGrayChatIndicators)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.hideGrayChatIndicators.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideGrayChatIndicators = newValue)
+ .build());
+
+ // Set an option for hideWarningToast
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NoReportsConfig.getInstance().hideWarningToast)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.hideWarningToast.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideWarningToast = newValue)
+ .build());
+
+ // Set an option for alwaysHideReportButton
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.getInstance().alwaysHideReportButton)
+ .setDefaultValue(false)
+ .setTooltip(Component.translatable("option.NoChatReports.alwaysHideReportButton.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().alwaysHideReportButton = newValue)
+ .build());
+
+ // Set an option for versionEasterEgg
+ visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.versionEasterEgg"), NoReportsConfig.getInstance().versionEasterEgg)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.versionEasterEgg.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().versionEasterEgg = newValue)
+ .build());
+
+ // Set an option for disableTelemetry
+ technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NoReportsConfig.getInstance().disableTelemetry)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.disableTelemetry.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().disableTelemetry = newValue)
+ .build());
+
+ // Set an option for showReloadButton
+ technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NoReportsConfig.getInstance().showReloadButton)
+ .setDefaultValue(true)
+ .setTooltip(Component.translatable("option.NoChatReports.showReloadButton.tooltip"))
+ .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showReloadButton = newValue)
+ .build());
+
+ // Save config
+ builder.setSavingRunnable(() -> {
+ NoReportsConfig.saveConfig();
+ NoReportsConfig.loadConfig();
+ });
+
+
+ return builder.build();
+ };
+ }
+
+
+} \ No newline at end of file
diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
index 20491e5..bdb908c 100644
--- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java
@@ -36,17 +36,18 @@ import net.minecraft.util.Tuple;
*/
public class NoReportsConfig {
- private static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json");
- private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
- private static NoReportsConfig INSTANCE;
- private boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false,
+
+ public static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json");
+ public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+ public static NoReportsConfig INSTANCE;
+ public boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false,
convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true,
hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true,
alwaysHideReportButton = false, versionEasterEgg = true, disableTelemetry = true,
showReloadButton = true;
private List<String> whitelistedServers;
- private static NoReportsConfig getInstance() {
+ public static NoReportsConfig getInstance() {
if (INSTANCE == null) {
loadConfig();
}
@@ -86,7 +87,7 @@ public class NoReportsConfig {
}
@Nullable
- private static NoReportsConfig readFile() {
+ public static NoReportsConfig readFile() {
if (!Files.isRegularFile(CONFIG_FILE))
return null;
@@ -97,7 +98,7 @@ public class NoReportsConfig {
}
}
- private static void writeFile(NoReportsConfig instance) {
+ public static void writeFile(NoReportsConfig instance) {
try (BufferedWriter writer = Files.newBufferedWriter(CONFIG_FILE)) {
GSON.toJson(instance, writer);
} catch (Exception ex) {
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
index e9f6395..7b0e798 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
@@ -44,7 +44,7 @@ public abstract class MixinJoinMultiplayerScreen extends Screen {
}
@Inject(method = "init", at = @At("HEAD"))
- private void onInit(CallbackInfo info) {
+ public void onInit(CallbackInfo info) {
if (!NoReportsConfig.showReloadButton())
return;
diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json
index ef7e613..020c059 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -9,5 +9,33 @@
"gui.nochatreports.unsafe_server.header": "Caution: Unsafe Server",
"gui.nochatreports.unsafe_server.contents": "This server requires all chat messages to be signed, which means they can be reported to Mojang, which may result in a ban from all multiplayer servers. This likely means that the server owner kept \"enforce-secure-profile\" enabled in the server.properties, which is the default since 1.19.1. You can choose to play anyway, but No Chat Reports will not be able to protect you.",
"gui.nochatreports.unsafe_server.check": "Do not show again for this server",
- "gui.nochatrepords.reload_config_tooltip": "Reload No Chat Reports config. Use carefully."
-}
+ "gui.nochatrepords.reload_config_tooltip": "Reload No Chat Reports config. Use carefully.",
+
+ "configuration.NoChatReports.config": "No Chat Reports",
+ "configuration.NoChatReports.category.visual": "Visual",
+ "configuration.NoChatReports.category.technical": "Technical",
+ "option.NoChatReports.demandOnServer": "Demand on server",
+ "option.NoChatReports.demandOnServer.tooltip": "True if client with No Chat Reports installed should demand that mod is present on every server that it tries to join.",
+ "option.NoChatReports.enableDebugLog": "Enable debug log",
+ "option.NoChatReports.enableDebugLog.tooltip": "True if mod should log some additional information about its activity and message signatures. Generally only useful for debugging.",
+ "option.NoChatReports.convertToGameMessage": "Convert to game message",
+ "option.NoChatReports.convertToGameMessage.tooltip": "True if server should convert all player messages to system messages.",
+ "option.NoChatReports.showServerSafety":"Show server safety",
+ "option.NoChatReports.showServerSafety.tooltip":"True if current server safety level should be indicated on client by an icon in the bottom-right corner of chat screen.",
+ "option.NoChatReports.hideRedChatIndicators":"Hide red chat indicators",
+ "option.NoChatReports.hideRedChatIndicators.tooltip":"True if vanilla's unsigned messages trust indicator should be removed.",
+ "option.NoChatReports.hideYellowChatIndicators":"Hide yellow chat indicators",
+ "option.NoChatReports.hideYellowChatIndicators.tooltip":"True if vanilla's modified/hidden messages trust indicator should be removed.",
+ "option.NoChatReports.hideGrayChatIndicators":"Hide gray chat indicators",
+ "option.NoChatReports.hideGrayChatIndicators.tooltip":"True if vanilla's system messages trust indicator should be removed.",
+ "option.NoChatReports.hideWarningToast":"Hide warning toast",
+ "option.NoChatReports.hideWarningToast.tooltip":"True if \"Chat messages can't be verified\" toast should be removed.",
+ "option.NoChatReports.alwaysHideReportButton":"Always hide report button",
+ "option.NoChatReports.alwaysHideReportButton.tooltip":"True if reporting buttons should always be hidden from social interactions screen.",
+ "option.NoChatReports.versionEasterEgg":"Version easter egg",
+ "option.NoChatReports.versionEasterEgg.tooltip":"True if \"1.19.1\" should be changed to \"1.19.84\" on titlebar and title screen.",
+ "option.NoChatReports.disableTelemetry":"Disable telemetry",
+ "option.NoChatReports.disableTelemetry.tooltip":"True if sending telemetry to Mojang should be disabled.",
+ "option.NoChatReports.showReloadButton":"Show reload button",
+ "option.NoChatReports.showReloadButton.tooltip":"True if the configuration reload button should be displayed in multiplayer screen."
+} \ No newline at end of file
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index f1fbb09..a78c3cd 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -22,8 +22,11 @@
"main": [
"com.aizistral.nochatreports.NoChatReports"
],
- "client": [
+ "client": [
"com.aizistral.nochatreports.NoChatReportsClient"
+ ],
+ "modmenu": [
+ "com.aizistral.nochatreports.ModMenuIntegration"
]
},
"mixins": [
@@ -37,5 +40,14 @@
"java": ">=17"
},
"suggests": {},
- "accessWidener" : "nochatreports.accesswidener"
+ "accessWidener" : "nochatreports.accesswidener",
+
+ "custom": {
+ "modmenu": {
+ "links": {
+ "modmenu.modrinth": "https://modrinth.com/mod/no-chat-reports",
+ "modmenu.curseforge": "https://www.curseforge.com/minecraft/mc-mods/no-chat-reports"
+ }
+ }
+ }
}