From 6c2b59700a2e262cd5a9c1a4bc322d994f5b1ed9 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 11:50:31 -0400 Subject: Partially working, config isn't saving in modmenu --- .../nochatreports/ModMenuIntegration.java | 130 +++++++++++++++++++++ .../nochatreports/core/NoReportsConfig.java | 3 +- 2 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java (limited to 'src/main/java') 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..28c7e0e --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -0,0 +1,130 @@ +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; + +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 general = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.general")); + + // Set an option for demandOnClient + ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NoReportsConfig.demandOnClient) + .setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.demandOnClient.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Set an option for enableDebugLog + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NoReportsConfig.demandOnClient) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.enableDebugLog.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Set an option for convertToGameMessage + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.demandOnClient) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Set an option for showServerSafety + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.demandOnClient) + .setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.showServerSafety.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Set an option for hideRedChatIndicators + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.demandOnClient) + .setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.hideRedChatIndicators.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Set an option for hideYellowChatIndicators + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NoReportsConfig.demandOnClient) + .setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.hideYellowChatIndicators.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Set an option for alwaysHideReportButton + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.demandOnClient) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.alwaysHideReportButton.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Set an option for versionEasterEgg + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.versionEasterEgg"), NoReportsConfig.demandOnClient) + //.setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.versionEasterEgg.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Set an option for disableTelemetry + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NoReportsConfig.demandOnClient) + .setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.disableTelemetry.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Set an option for showReloadButton + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NoReportsConfig.demandOnClient) + .setDefaultValue(true) + .setTooltip(Component.translatable("option.NoChatReports.showReloadButton.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .build()); + + // Save config + builder.setSavingRunnable(() -> { + // Create a Property + Properties configProperties = new Properties(); + // Set the property + configProperties.setProperty("demandOnClient", String.valueOf(NoReportsConfig.demandOnClient)); + configProperties.setProperty("enableDebugLog", String.valueOf(NoReportsConfig.enableDebugLog)); + configProperties.setProperty("convertToGameMessage", String.valueOf(NoReportsConfig.convertToGameMessage)); + configProperties.setProperty("showServerSafety", String.valueOf(NoReportsConfig.showServerSafety)); + configProperties.setProperty("hideRedChatIndicators", String.valueOf(NoReportsConfig.hideRedChatIndicators)); + configProperties.setProperty("hideYellowChatIndicators", String.valueOf(NoReportsConfig.hideYellowChatIndicators)); + configProperties.setProperty("hideGrayChatIndicators", String.valueOf(NoReportsConfig.hideGrayChatIndicators)); + configProperties.setProperty("hideWarningToast", String.valueOf(NoReportsConfig.hideWarningToast)); + configProperties.setProperty("alwaysHideReportButton", String.valueOf(NoReportsConfig.alwaysHideReportButton)); + configProperties.setProperty("versionEasterEgg", String.valueOf(NoReportsConfig.versionEasterEgg)); + configProperties.setProperty("disableTelemetry", String.valueOf(NoReportsConfig.disableTelemetry)); + configProperties.setProperty("showReloadButton", String.valueOf(NoReportsConfig.showReloadButton)); + // Save the properties + NoReportsConfig.saveConfig(); + NoChatReports.LOGGER.info("line 121 logger info config"); + 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..356ee79 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -36,10 +36,11 @@ 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 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, -- cgit v1.2.3 From a8bb275158e41c22efd8ce4d382dc3be73d88ad4 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 12:33:29 -0400 Subject: still having issues non static --- .../nochatreports/ModMenuIntegration.java | 45 +++++++++++----------- .../nochatreports/core/NoReportsConfig.java | 10 ++--- .../mixins/client/MixinJoinMultiplayerScreen.java | 2 +- 3 files changed, 29 insertions(+), 28 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 28c7e0e..478eb0f 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -12,6 +12,7 @@ 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 { @@ -36,71 +37,71 @@ public class ModMenuIntegration implements ModMenuApi { .build()); // Set an option for enableDebugLog - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NoReportsConfig.demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NoReportsConfig.enableDebugLog) .setDefaultValue(false) .setTooltip(Component.translatable("option.NoChatReports.enableDebugLog.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.enableDebugLog = newValue) .build()); // Set an option for convertToGameMessage - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.convertToGameMessage) .setDefaultValue(false) .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.convertToGameMessage = newValue) .build()); // Set an option for showServerSafety - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.showServerSafety) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.showServerSafety.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.showServerSafety = newValue) .build()); // Set an option for hideRedChatIndicators - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.hideRedChatIndicators) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.hideRedChatIndicators.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.hideRedChatIndicators = newValue) .build()); // Set an option for hideYellowChatIndicators - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NoReportsConfig.demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NoReportsConfig.hideYellowChatIndicators) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.hideYellowChatIndicators.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.hideYellowChatIndicators = newValue) .build()); // Set an option for alwaysHideReportButton - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.alwaysHideReportButton) .setDefaultValue(false) .setTooltip(Component.translatable("option.NoChatReports.alwaysHideReportButton.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.alwaysHideReportButton = newValue) .build()); // Set an option for versionEasterEgg - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.versionEasterEgg"), NoReportsConfig.demandOnClient) - //.setDefaultValue(true) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.versionEasterEgg"), NoReportsConfig.versionEasterEgg) + .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.versionEasterEgg.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.versionEasterEgg = newValue) .build()); // Set an option for disableTelemetry - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NoReportsConfig.demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NoReportsConfig.disableTelemetry) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.disableTelemetry.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.disableTelemetry = newValue) .build()); // Set an option for showReloadButton - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NoReportsConfig.demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NoReportsConfig.showReloadButton) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.showReloadButton.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.showReloadButton = newValue) .build()); // Save config builder.setSavingRunnable(() -> { - // Create a Property + /* // Create a Property Properties configProperties = new Properties(); // Set the property configProperties.setProperty("demandOnClient", String.valueOf(NoReportsConfig.demandOnClient)); @@ -115,10 +116,10 @@ public class ModMenuIntegration implements ModMenuApi { configProperties.setProperty("versionEasterEgg", String.valueOf(NoReportsConfig.versionEasterEgg)); configProperties.setProperty("disableTelemetry", String.valueOf(NoReportsConfig.disableTelemetry)); configProperties.setProperty("showReloadButton", String.valueOf(NoReportsConfig.showReloadButton)); - // Save the properties + // Save the properties */ NoReportsConfig.saveConfig(); NoChatReports.LOGGER.info("line 121 logger info config"); - NoReportsConfig.loadConfig(); + NoReportsConfig.loadConfig(); }); diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index 356ee79..e98eaea 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -37,17 +37,17 @@ import net.minecraft.util.Tuple; public class NoReportsConfig { - private static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json"); + public static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json"); private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private static NoReportsConfig INSTANCE; - public static boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false, + 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 whitelistedServers; - private static NoReportsConfig getInstance() { + public static NoReportsConfig getInstance() { if (INSTANCE == null) { loadConfig(); } @@ -87,7 +87,7 @@ public class NoReportsConfig { } @Nullable - private static NoReportsConfig readFile() { + public static NoReportsConfig readFile() { if (!Files.isRegularFile(CONFIG_FILE)) return null; @@ -98,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; -- cgit v1.2.3 From c36e9e0a3a4a3fbd70302f74208c8424083a9658 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 12:49:11 -0400 Subject: now saves in game but resets when reload game --- .../com/aizistral/nochatreports/ModMenuIntegration.java | 16 ---------------- .../aizistral/nochatreports/core/NoReportsConfig.java | 6 +++--- 2 files changed, 3 insertions(+), 19 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 478eb0f..1fd6049 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -101,22 +101,6 @@ public class ModMenuIntegration implements ModMenuApi { // Save config builder.setSavingRunnable(() -> { - /* // Create a Property - Properties configProperties = new Properties(); - // Set the property - configProperties.setProperty("demandOnClient", String.valueOf(NoReportsConfig.demandOnClient)); - configProperties.setProperty("enableDebugLog", String.valueOf(NoReportsConfig.enableDebugLog)); - configProperties.setProperty("convertToGameMessage", String.valueOf(NoReportsConfig.convertToGameMessage)); - configProperties.setProperty("showServerSafety", String.valueOf(NoReportsConfig.showServerSafety)); - configProperties.setProperty("hideRedChatIndicators", String.valueOf(NoReportsConfig.hideRedChatIndicators)); - configProperties.setProperty("hideYellowChatIndicators", String.valueOf(NoReportsConfig.hideYellowChatIndicators)); - configProperties.setProperty("hideGrayChatIndicators", String.valueOf(NoReportsConfig.hideGrayChatIndicators)); - configProperties.setProperty("hideWarningToast", String.valueOf(NoReportsConfig.hideWarningToast)); - configProperties.setProperty("alwaysHideReportButton", String.valueOf(NoReportsConfig.alwaysHideReportButton)); - configProperties.setProperty("versionEasterEgg", String.valueOf(NoReportsConfig.versionEasterEgg)); - configProperties.setProperty("disableTelemetry", String.valueOf(NoReportsConfig.disableTelemetry)); - configProperties.setProperty("showReloadButton", String.valueOf(NoReportsConfig.showReloadButton)); - // Save the properties */ NoReportsConfig.saveConfig(); NoChatReports.LOGGER.info("line 121 logger info config"); NoReportsConfig.loadConfig(); diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index e98eaea..c2ce95d 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -38,9 +38,9 @@ import net.minecraft.util.Tuple; public class NoReportsConfig { public static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json"); - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private static NoReportsConfig INSTANCE; - public boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false, + public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + public static NoReportsConfig INSTANCE; + public static 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, -- cgit v1.2.3 From 1ca0280ac2f9c0bf306a34eeb48f44496b2a1253 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 13:01:44 -0400 Subject: Finally working, just need to add lang en_us stuff --- .../nochatreports/ModMenuIntegration.java | 40 +++++++++++----------- .../nochatreports/core/NoReportsConfig.java | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 1fd6049..4b7d06a 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -30,73 +30,73 @@ public class ModMenuIntegration implements ModMenuApi { // Set an option for demandOnClient ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NoReportsConfig.demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NoReportsConfig.getInstance().demandOnClient) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.demandOnClient.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.demandOnClient = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().demandOnClient = newValue) .build()); // Set an option for enableDebugLog - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NoReportsConfig.enableDebugLog) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NoReportsConfig.getInstance().enableDebugLog) .setDefaultValue(false) .setTooltip(Component.translatable("option.NoChatReports.enableDebugLog.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.enableDebugLog = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().enableDebugLog = newValue) .build()); // Set an option for convertToGameMessage - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.convertToGameMessage) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().convertToGameMessage) .setDefaultValue(false) .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.convertToGameMessage = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = newValue) .build()); // Set an option for showServerSafety - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.showServerSafety) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().showServerSafety) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.showServerSafety.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.showServerSafety = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showServerSafety = newValue) .build()); // Set an option for hideRedChatIndicators - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.hideRedChatIndicators) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.getInstance().hideRedChatIndicators) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.hideRedChatIndicators.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.hideRedChatIndicators = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideRedChatIndicators = newValue) .build()); // Set an option for hideYellowChatIndicators - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NoReportsConfig.hideYellowChatIndicators) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NoReportsConfig.getInstance().hideYellowChatIndicators) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.hideYellowChatIndicators.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.hideYellowChatIndicators = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideYellowChatIndicators = newValue) .build()); // Set an option for alwaysHideReportButton - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.alwaysHideReportButton) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.getInstance().alwaysHideReportButton) .setDefaultValue(false) .setTooltip(Component.translatable("option.NoChatReports.alwaysHideReportButton.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.alwaysHideReportButton = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().alwaysHideReportButton = newValue) .build()); // Set an option for versionEasterEgg - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.versionEasterEgg"), NoReportsConfig.versionEasterEgg) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.versionEasterEgg"), NoReportsConfig.getInstance().versionEasterEgg) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.versionEasterEgg.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.versionEasterEgg = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().versionEasterEgg = newValue) .build()); // Set an option for disableTelemetry - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NoReportsConfig.disableTelemetry) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NoReportsConfig.getInstance().disableTelemetry) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.disableTelemetry.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.disableTelemetry = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().disableTelemetry = newValue) .build()); // Set an option for showReloadButton - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NoReportsConfig.showReloadButton) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NoReportsConfig.getInstance().showReloadButton) .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.showReloadButton.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.showReloadButton = newValue) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showReloadButton = newValue) .build()); // Save config diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index c2ce95d..bdb908c 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -40,7 +40,7 @@ public class NoReportsConfig { 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 static boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false, + 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, -- cgit v1.2.3 From 78b56537b830a6f367ef4bb1293c57fd485cc09c Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 13:30:42 -0400 Subject: Ready to merge, 99% sure --- .../nochatreports/ModMenuIntegration.java | 29 ++++++++++++++-------- .../resources/assets/nochatreports/lang/en_us.json | 29 ++++++++++++++++++++-- 2 files changed, 45 insertions(+), 13 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 4b7d06a..ea6d9de 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -28,12 +28,12 @@ public class ModMenuIntegration implements ModMenuApi { // Set category ConfigCategory general = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.general")); - // Set an option for demandOnClient + // Set an option for demandOnServer ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NoReportsConfig.getInstance().demandOnClient) + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NoReportsConfig.getInstance().demandOnServer) .setDefaultValue(true) - .setTooltip(Component.translatable("option.NoChatReports.demandOnClient.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().demandOnClient = newValue) + .setTooltip(Component.translatable("option.NoChatReports.demandOnServer.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().demandOnServer = newValue) .build()); // Set an option for enableDebugLog @@ -43,13 +43,6 @@ public class ModMenuIntegration implements ModMenuApi { .setSaveConsumer(newValue -> NoReportsConfig.getInstance().enableDebugLog = newValue) .build()); - // Set an option for convertToGameMessage - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().convertToGameMessage) - .setDefaultValue(false) - .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = newValue) - .build()); - // Set an option for showServerSafety general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().showServerSafety) .setDefaultValue(true) @@ -71,6 +64,20 @@ public class ModMenuIntegration implements ModMenuApi { .setSaveConsumer(newValue -> NoReportsConfig.getInstance().hideYellowChatIndicators = newValue) .build()); + // Set an option for hideGrayChatIndicators + general.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 + general.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 general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.getInstance().alwaysHideReportButton) .setDefaultValue(false) diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index ef7e613..7ea4dfd 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -9,5 +9,30 @@ "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.general": "General Cat", + "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.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 \u0022Chat messages can't be verified\u0022 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 \u00221.19.1\u0022 should be changed to \u00221.19.84\u0022 on titlebar and title screen.", + "option.NoChatReports.disableTelemetry":"Diable 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 -- cgit v1.2.3 From 784b851773dc862affe19209c31787fd2bee347c Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 13:49:09 -0400 Subject: Remove unnecessary line --- src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index ea6d9de..3d96813 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -109,7 +109,6 @@ public class ModMenuIntegration implements ModMenuApi { // Save config builder.setSavingRunnable(() -> { NoReportsConfig.saveConfig(); - NoChatReports.LOGGER.info("line 121 logger info config"); NoReportsConfig.loadConfig(); }); -- cgit v1.2.3 From 470b71d853aebc3c6f3c4b641671694ee601f847 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 14:34:59 -0400 Subject: add convertToGameMessage for singleplayer LAN --- src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java | 7 +++++++ src/main/resources/assets/nochatreports/lang/en_us.json | 2 ++ 2 files changed, 9 insertions(+) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 3d96813..2e0e073 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -42,6 +42,13 @@ public class ModMenuIntegration implements ModMenuApi { .setTooltip(Component.translatable("option.NoChatReports.enableDebugLog.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().enableDebugLog = newValue) .build()); + + // Set an option for convertToGameMessage + general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().convertToGameMessage) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = newValue) + .build()); // Set an option for showServerSafety general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().showServerSafety) diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index aa51566..8962640 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -17,6 +17,8 @@ "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", -- cgit v1.2.3 From 49db2d98477e690f803503dfe7189bb42c718c9d Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 16:41:49 -0400 Subject: demandOnServer default set wrong --- src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 2e0e073..7f0d92d 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -31,7 +31,7 @@ public class ModMenuIntegration implements ModMenuApi { // Set an option for demandOnServer ConfigEntryBuilder entryBuilder = builder.entryBuilder(); general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NoReportsConfig.getInstance().demandOnServer) - .setDefaultValue(true) + .setDefaultValue(false) .setTooltip(Component.translatable("option.NoChatReports.demandOnServer.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().demandOnServer = newValue) .build()); -- cgit v1.2.3 From e17962d4b4179441c6925d2f7bb28809d40fad67 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Mon, 1 Aug 2022 16:44:50 -0400 Subject: convertToGameMessage was wrong default --- src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 7f0d92d..14b7ff8 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -45,7 +45,7 @@ public class ModMenuIntegration implements ModMenuApi { // Set an option for convertToGameMessage general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().convertToGameMessage) - .setDefaultValue(false) + .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = newValue) .build()); -- cgit v1.2.3 From 16a627b11a2456d0b011c8e0fd63b5530f5630c0 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Tue, 2 Aug 2022 08:43:43 -0400 Subject: Add visual and technical categories --- .../nochatreports/ModMenuIntegration.java | 31 +++++++++++----------- .../resources/assets/nochatreports/lang/en_us.json | 3 ++- 2 files changed, 18 insertions(+), 16 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 14b7ff8..69ff5c6 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -26,88 +26,89 @@ public class ModMenuIntegration implements ModMenuApi { .setTitle(Component.translatable("configuration.NoChatReports.config")); // Set category - ConfigCategory general = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.general")); + ConfigCategory visual = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.visual")); + ConfigCategory technical = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.technical")); - // Set an option for demandOnServer ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NoReportsConfig.getInstance().demandOnServer) + // 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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideYellowChatIndicators"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideGrayChatIndicators"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.versionEasterEgg"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NoReportsConfig.getInstance().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 - general.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NoReportsConfig.getInstance().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) diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 8962640..020c059 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -12,7 +12,8 @@ "gui.nochatrepords.reload_config_tooltip": "Reload No Chat Reports config. Use carefully.", "configuration.NoChatReports.config": "No Chat Reports", - "configuration.NoChatReports.category.general": "General", + "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", -- cgit v1.2.3 From 26f9abc93b22d563fac521564d56b773853f6c79 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Sun, 7 Aug 2022 08:43:41 -0400 Subject: cleanup ModMenu code and add whitelistAllServers --- .../nochatreports/ModMenuIntegration.java | 48 +++++++++++++--------- .../resources/assets/nochatreports/lang/en_us.json | 6 ++- 2 files changed, 33 insertions(+), 21 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 69ff5c6..2fd6c0a 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -30,26 +30,7 @@ public class ModMenuIntegration implements ModMenuApi { 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) @@ -98,6 +79,28 @@ public class ModMenuIntegration implements ModMenuApi { .setDefaultValue(true) .setTooltip(Component.translatable("option.NoChatReports.versionEasterEgg.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().versionEasterEgg = newValue) + .build()); + + + // 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 disableTelemetry @@ -114,6 +117,13 @@ public class ModMenuIntegration implements ModMenuApi { .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showReloadButton = newValue) .build()); + // Set an option for whitelistAllServers + technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NoReportsConfig.getInstance().whitelistAllServers) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.whitelistAllServers.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = newValue) + .build()); + // Save config builder.setSavingRunnable(() -> { NoReportsConfig.saveConfig(); diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 4a1dfd9..4f94ea4 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -18,7 +18,7 @@ "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.enableDebugLog.tooltip": "True if mod should log some additional information about its activity and message signatures.\nGenerally 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", @@ -38,5 +38,7 @@ "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." + "option.NoChatReports.showReloadButton.tooltip":"True if the configuration reload button should be displayed in multiplayer screen.", + "option.NoChatReports.whitelistAllServers":"Whitelist all servers", + "option.NoChatReports.whitelistAllServers.tooltip":"True if the full-screen warning should be skipped for servers that require chat signing, letting users simply join the server.\nBecause of that, servers will no longer be added to the whitelist." } \ No newline at end of file -- cgit v1.2.3 From 2f8974e4a673cf340a9d7a1111cb7643f90f17dd Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Sun, 7 Aug 2022 11:37:39 -0400 Subject: Update modmenu support to 1.19.2 --- build.gradle | 2 +- .../java/com/aizistral/nochatreports/ModMenuIntegration.java | 10 +--------- src/main/resources/assets/nochatreports/lang/en_us.json | 2 -- 3 files changed, 2 insertions(+), 12 deletions(-) (limited to 'src/main/java') diff --git a/build.gradle b/build.gradle index 4d2e26e..9331d5d 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ 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:4.0.5" + modImplementation "com.terraformersmc:modmenu:4.0.6" modApi("me.shedaniel.cloth:cloth-config-fabric:8.0.75") { exclude(group: "net.fabricmc.fabric-api") } diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 2fd6c0a..a77358a 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -73,15 +73,7 @@ public class ModMenuIntegration implements ModMenuApi { .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 demandOnServer technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NoReportsConfig.getInstance().demandOnServer) .setDefaultValue(false) diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 4f94ea4..5bbdaea 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -33,8 +33,6 @@ "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", -- cgit v1.2.3 From 65bf39a5017bda114aa1743971711467683768f4 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Sun, 7 Aug 2022 14:22:05 -0400 Subject: Add ability to add and remove servers in GUI --- .../nochatreports/ModMenuIntegration.java | 219 +++++++++++---------- .../nochatreports/core/NoReportsConfig.java | 2 +- .../resources/assets/nochatreports/lang/en_us.json | 7 +- 3 files changed, 120 insertions(+), 108 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index a77358a..832fd51 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -3,6 +3,7 @@ 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; @@ -20,112 +21,118 @@ public class ModMenuIntegration implements ModMenuApi { 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 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 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 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()); - - // Set an option for whitelistAllServers - technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NoReportsConfig.getInstance().whitelistAllServers) - .setDefaultValue(false) - .setTooltip(Component.translatable("option.NoChatReports.whitelistAllServers.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = newValue) - .build()); - - // Save config - builder.setSavingRunnable(() -> { - NoReportsConfig.saveConfig(); - NoReportsConfig.loadConfig(); - }); - - - return builder.build(); + // 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")); + + ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + + // 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 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 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()); + + // Set an option for whitelistAllServers + technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NoReportsConfig.getInstance().whitelistAllServers) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.whitelistAllServers.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = newValue) + .build()); + + // Add or remove whitelisted servers + whitelistedServers.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NoReportsConfig.getInstance().whitelistedServers) + .setExpanded(true) + .setInsertInFront(true) + .setTooltip(Component.translatable("option.NoChatReports.whitelistedServers.tooltip")) + .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip")) + .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistedServers = 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 60993ec..fd48230 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -45,7 +45,7 @@ public class NoReportsConfig { hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, whitelistAllServers = false; - private List whitelistedServers; + public List whitelistedServers; public static NoReportsConfig getInstance() { if (INSTANCE == null) { diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 5bbdaea..621e66c 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -15,6 +15,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.visual": "Visual", "configuration.NoChatReports.category.technical": "Technical", + "configuration.NoChatReports.category.whitelistedServers": "Whitelisted servers", "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", @@ -38,5 +39,9 @@ "option.NoChatReports.showReloadButton":"Show reload button", "option.NoChatReports.showReloadButton.tooltip":"True if the configuration reload button should be displayed in multiplayer screen.", "option.NoChatReports.whitelistAllServers":"Whitelist all servers", - "option.NoChatReports.whitelistAllServers.tooltip":"True if the full-screen warning should be skipped for servers that require chat signing, letting users simply join the server.\nBecause of that, servers will no longer be added to the whitelist." + "option.NoChatReports.whitelistAllServers.tooltip":"True if the full-screen warning should be skipped for servers that require chat signing, letting users simply join the server.\nBecause of that, servers will no longer be added to the whitelist.", + "option.NoChatReports.whitelistedServers":"Whitelisted servers", + "option.NoChatReports.whitelistedServers.tooltip":"Current list of whitelisted unsafe servers.\nUsed on client to remember which servers user disabled unsafety warnings for.", + "option.NoChatReports.whitelistedServers.addButtonTooltip":"Add server", + "option.NoChatReports.whitelistedServers.removeButtonTooltip":"Remove server" } \ No newline at end of file -- cgit v1.2.3 From 22e94861eb043a7898bc03ba8db6826c4a7041b2 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Sun, 7 Aug 2022 15:57:49 -0400 Subject: Add instructions --- src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java | 4 ++++ src/main/resources/assets/nochatreports/lang/en_us.json | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 832fd51..884bf12 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -117,6 +117,10 @@ public class ModMenuIntegration implements ModMenuApi { .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = 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"), NoReportsConfig.getInstance().whitelistedServers) .setExpanded(true) diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 621e66c..a7893ed 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -43,5 +43,6 @@ "option.NoChatReports.whitelistedServers":"Whitelisted servers", "option.NoChatReports.whitelistedServers.tooltip":"Current list of whitelisted unsafe servers.\nUsed on client to remember which servers user disabled unsafety warnings for.", "option.NoChatReports.whitelistedServers.addButtonTooltip":"Add server", - "option.NoChatReports.whitelistedServers.removeButtonTooltip":"Remove server" + "option.NoChatReports.whitelistedServers.removeButtonTooltip":"Remove server", + "option.NoChatReports.whitelistedServers.instructions":"When adding a server click below Whitelisted servers to type in the field." } \ No newline at end of file -- cgit v1.2.3 From 0ba81e90bc0b408a8a637276d8da10ac37fcc79b Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Tue, 16 Aug 2022 00:03:12 -0400 Subject: Fix config to be up to date with wiki --- .../nochatreports/ModMenuIntegration.java | 13 +++++++---- .../nochatreports/core/NoReportsConfig.java | 4 ++-- .../mixins/client/MixinJoinMultiplayerScreen.java | 2 +- .../resources/assets/nochatreports/lang/en_us.json | 27 +++++++++++----------- 4 files changed, 25 insertions(+), 21 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index 884bf12..aa9cdc5 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -8,12 +8,9 @@ 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.ClickEvent; +import net.minecraft.network.chat.HoverEvent; 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 { @@ -40,6 +37,12 @@ public class ModMenuIntegration implements ModMenuApi { .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showServerSafety = newValue) .build()); + // Add link for documentation for showServerSafety + visual.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.currentSafetyLevels") + .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 hideRedChatIndicators visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideRedChatIndicators"), NoReportsConfig.getInstance().hideRedChatIndicators) .setDefaultValue(true) diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index fd48230..76930af 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -38,8 +38,8 @@ import net.minecraft.util.Tuple; public class NoReportsConfig { 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; + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private static NoReportsConfig INSTANCE; public boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false, convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true, hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, 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 7b0e798..e9f6395 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")) - public void onInit(CallbackInfo info) { + private 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 71d35ef..8f94a0f 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -17,31 +17,32 @@ "configuration.NoChatReports.category.technical": "Technical", "configuration.NoChatReports.category.whitelistedServers": "Whitelisted Servers", "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.demandOnServer.tooltip": "Prevents the client from joining servers that don't\nhave No Chat Reports installed.", "option.NoChatReports.enableDebugLog": "Enable debug log", - "option.NoChatReports.enableDebugLog.tooltip": "True if mod should log some additional information about its activity and message signatures.\nGenerally only useful for debugging.", + "option.NoChatReports.enableDebugLog.tooltip": "Enables logging of certain debug information.\nThis is generally useless for non-developers.", "option.NoChatReports.convertToGameMessage": "Convert to game message", - "option.NoChatReports.convertToGameMessage.tooltip": "True if server should convert all player messages to system messages.", + "option.NoChatReports.convertToGameMessage.tooltip": "Makes the server convert all player messages into system\nmessages. System messages don't have any signatures\nattached and cannot be reported; on unmodified clients\nthey will display with gray bar to the left.", "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.showServerSafety.tooltip":"Allows the client to display server safety status in\nbottom-right corner of chat screen. The icon is\nhoverable for additional information:", + "option.NoChatReports.showServerSafety.currentSafetyLevels":"More information on safety levels here", "option.NoChatReports.hideRedChatIndicators":"Hide red chat indicators", - "option.NoChatReports.hideRedChatIndicators.tooltip":"True if vanilla's unsigned messages trust indicator should be removed.", + "option.NoChatReports.hideRedChatIndicators.tooltip":"Prevents the client from displaying \"Not Secure\"\nindicators, in the form of red bar to the left\nand §c§l(§r§c!§c§l)§r icon to the right of chat message.", "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.hideYellowChatIndicators.tooltip":"Prevents the client from displaying \"Modified\"\nindicators, in the form of yellow bar to the left\nand §e§l(§r§e?§e§l)§r icon to the right of chat message.", "option.NoChatReports.hideGrayChatIndicators":"Hide gray chat indicators", - "option.NoChatReports.hideGrayChatIndicators.tooltip":"True if vanilla's system messages trust indicator should be removed.", + "option.NoChatReports.hideGrayChatIndicators.tooltip":"Prevents the client from displaying special indicators\nfor system messages, in the form of gray bar to the left.", "option.NoChatReports.hideWarningToast":"Hide warning toast", - "option.NoChatReports.hideWarningToast.tooltip":"True if \"Chat messages can't be verified\" toast should be removed.", + "option.NoChatReports.hideWarningToast.tooltip":"Removes a warning toast that is displayed when entering\nservers with disabled §lenforce-secure-profile§r.", "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.alwaysHideReportButton.tooltip":"Prevents the client from ever showing report button\nin Social Interactions screen. This is disabled by\ndefault, and mod simply makes button inactive on\nservers that have No Chat Reports installed, adding\nan explanation to the tooltip of the button.", "option.NoChatReports.disableTelemetry":"Disable telemetry", - "option.NoChatReports.disableTelemetry.tooltip":"True if sending telemetry to Mojang should be disabled.", + "option.NoChatReports.disableTelemetry.tooltip":"Allows the mod to disable built-in telemetry, similar\nto how No Telemetry does.", "option.NoChatReports.showReloadButton":"Show reload button", - "option.NoChatReports.showReloadButton.tooltip":"True if the configuration reload button should be displayed in multiplayer screen.", + "option.NoChatReports.showReloadButton.tooltip":"Adds a button for config reloading to Multiplayer menu.", "option.NoChatReports.whitelistAllServers":"Whitelist all servers", - "option.NoChatReports.whitelistAllServers.tooltip":"True if the full-screen warning should be skipped for servers that require chat signing, letting users simply join the server.\nBecause of that, servers will no longer be added to the whitelist.", + "option.NoChatReports.whitelistAllServers.tooltip":"Makes the mod behave as if all servers were\nadded to §lwhitelistedServers§r list.", "option.NoChatReports.whitelistedServers":"Whitelisted Servers", - "option.NoChatReports.whitelistedServers.tooltip":"Current list of whitelisted unsafe servers.\nUsed on client to remember which servers user disabled unsafety warnings for.", + "option.NoChatReports.whitelistedServers.tooltip":"Contains servers for which \"Unsafe Server\" warning\nscreen should never display. Servers are added to\nthis list automatically when you check \"Do not show\nagain for this server\" box in that screen. Format is\nthat of a common JSON array, each entry is a string\nthat is formatted as §l:§r.", "option.NoChatReports.whitelistedServers.addButtonTooltip":"Add server", "option.NoChatReports.whitelistedServers.removeButtonTooltip":"Remove server", "option.NoChatReports.whitelistedServers.instructions":"When adding a server click below Whitelisted Servers to type in the field." -- cgit v1.2.3 From 4c8deaafb7e3c65d7ad9d0ee6c0820dca012cf4e Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Tue, 16 Aug 2022 00:45:34 -0400 Subject: Fixed en_us config settings, ready to merge in my opinion. --- src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java | 6 ++++++ .../java/com/aizistral/nochatreports/core/NoReportsConfig.java | 7 +++---- src/main/resources/assets/nochatreports/lang/en_us.json | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java index aa9cdc5..c0fada4 100644 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java @@ -12,6 +12,12 @@ import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.HoverEvent; import net.minecraft.network.chat.Component; +/** + * Implementation of ModMenu and ClothConfig support for the mod. + * + * @author MODKILLER1001 + */ + public class ModMenuIntegration implements ModMenuApi { @Override diff --git a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java index 76930af..cf3ee70 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -36,8 +36,7 @@ import net.minecraft.util.Tuple; */ public class NoReportsConfig { - - public static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("NoChatReports.json"); + 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; public boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false, @@ -87,7 +86,7 @@ public class NoReportsConfig { } @Nullable - public static NoReportsConfig readFile() { + private static NoReportsConfig readFile() { if (!Files.isRegularFile(CONFIG_FILE)) return null; @@ -98,7 +97,7 @@ public class NoReportsConfig { } } - public static void writeFile(NoReportsConfig instance) { + private static void writeFile(NoReportsConfig instance) { try (BufferedWriter writer = Files.newBufferedWriter(CONFIG_FILE)) { GSON.toJson(instance, writer); } catch (Exception ex) { diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 8f94a0f..b479e84 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -24,7 +24,7 @@ "option.NoChatReports.convertToGameMessage.tooltip": "Makes the server convert all player messages into system\nmessages. System messages don't have any signatures\nattached and cannot be reported; on unmodified clients\nthey will display with gray bar to the left.", "option.NoChatReports.showServerSafety":"Show server safety", "option.NoChatReports.showServerSafety.tooltip":"Allows the client to display server safety status in\nbottom-right corner of chat screen. The icon is\nhoverable for additional information:", - "option.NoChatReports.showServerSafety.currentSafetyLevels":"More information on safety levels here", + "option.NoChatReports.showServerSafety.currentSafetyLevels":"More information on server safety levels linked here", "option.NoChatReports.hideRedChatIndicators":"Hide red chat indicators", "option.NoChatReports.hideRedChatIndicators.tooltip":"Prevents the client from displaying \"Not Secure\"\nindicators, in the form of red bar to the left\nand §c§l(§r§c!§c§l)§r icon to the right of chat message.", "option.NoChatReports.hideYellowChatIndicators":"Hide yellow chat indicators", -- cgit v1.2.3 From bebf5bf367e129e6533d539629c824009aeb7b65 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Tue, 16 Aug 2022 08:42:48 -0400 Subject: well that was easier than i thought, thanks for the feedback and help along the way --- .../nochatreports/ModMenuIntegration.java | 151 --------------------- .../nochatreports/core/ModMenuIntegration.java | 150 ++++++++++++++++++++ .../nochatreports/core/NoReportsConfig.java | 6 +- .../resources/assets/nochatreports/lang/en_us.json | 2 +- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 155 insertions(+), 156 deletions(-) delete mode 100644 src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java create mode 100644 src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java deleted file mode 100644 index c0fada4..0000000 --- a/src/main/java/com/aizistral/nochatreports/ModMenuIntegration.java +++ /dev/null @@ -1,151 +0,0 @@ -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.ClickEvent; -import net.minecraft.network.chat.HoverEvent; -import net.minecraft.network.chat.Component; - -/** - * Implementation of ModMenu and ClothConfig support for the mod. - * - * @author MODKILLER1001 - */ - -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")); - ConfigCategory whitelistedServers = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.whitelistedServers")); - - ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - - // 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()); - - // Add link for documentation for showServerSafety - visual.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.currentSafetyLevels") - .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 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 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 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()); - - // Set an option for whitelistAllServers - technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NoReportsConfig.getInstance().whitelistAllServers) - .setDefaultValue(false) - .setTooltip(Component.translatable("option.NoChatReports.whitelistAllServers.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = 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"), NoReportsConfig.getInstance().whitelistedServers) - .setExpanded(true) - .setInsertInFront(true) - .setTooltip(Component.translatable("option.NoChatReports.whitelistedServers.tooltip")) - .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip")) - .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistedServers = 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/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java new file mode 100644 index 0000000..50d2b47 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java @@ -0,0 +1,150 @@ +package com.aizistral.nochatreports.core; + +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.ClickEvent; +import net.minecraft.network.chat.HoverEvent; +import net.minecraft.network.chat.Component; + +/** + * Implementation of ModMenu and ClothConfig support for the mod. + * + * @author MODKILLER1001 + */ + +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")); + ConfigCategory whitelistedServers = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.whitelistedServers")); + + ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + + // 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()); + + // Add link for documentation for showServerSafety + visual.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.currentSafetyLevels") + .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 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 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 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()); + + // Set an option for whitelistAllServers + technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NoReportsConfig.getInstance().whitelistAllServers) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.whitelistAllServers.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = 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"), NoReportsConfig.getInstance().whitelistedServers) + .setExpanded(true) + .setInsertInFront(true) + .setTooltip(Component.translatable("option.NoChatReports.whitelistedServers.tooltip")) + .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip")) + .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistedServers = 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 cf3ee70..97c8ade 100644 --- a/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/core/NoReportsConfig.java @@ -39,14 +39,14 @@ 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; - public boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false, + protected boolean demandOnClient = true, demandOnServer = false, enableDebugLog = false, convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true, hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, whitelistAllServers = false; - public List whitelistedServers; + protected List whitelistedServers; - public static NoReportsConfig getInstance() { + protected static NoReportsConfig getInstance() { if (INSTANCE == null) { loadConfig(); } diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index b479e84..cbd56d1 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -30,7 +30,7 @@ "option.NoChatReports.hideYellowChatIndicators":"Hide yellow chat indicators", "option.NoChatReports.hideYellowChatIndicators.tooltip":"Prevents the client from displaying \"Modified\"\nindicators, in the form of yellow bar to the left\nand §e§l(§r§e?§e§l)§r icon to the right of chat message.", "option.NoChatReports.hideGrayChatIndicators":"Hide gray chat indicators", - "option.NoChatReports.hideGrayChatIndicators.tooltip":"Prevents the client from displaying special indicators\nfor system messages, in the form of gray bar to the left.", + "option.NoChatReports.hideGrayChatIndicators.tooltip":"Prevents the client from displaying special\nindicators for system messages, in the form\nof gray bar to the left.", "option.NoChatReports.hideWarningToast":"Hide warning toast", "option.NoChatReports.hideWarningToast.tooltip":"Removes a warning toast that is displayed when entering\nservers with disabled §lenforce-secure-profile§r.", "option.NoChatReports.alwaysHideReportButton":"Always hide report button", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 31495fb..ddc4eac 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ "com.aizistral.nochatreports.NoChatReportsClient" ], "modmenu": [ - "com.aizistral.nochatreports.ModMenuIntegration" + "com.aizistral.nochatreports.core.ModMenuIntegration" ] }, "mixins": [ -- cgit v1.2.3 From e10af1444b05577a9cf0f228b885ccc0af6deadd Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Tue, 16 Aug 2022 09:11:42 -0400 Subject: Add documentation sort of, it looks neater --- src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java | 2 +- src/main/resources/assets/nochatreports/lang/en_us.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java index 50d2b47..b4beb9d 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java @@ -43,7 +43,7 @@ public class ModMenuIntegration implements ModMenuApi { .build()); // Add link for documentation for showServerSafety - visual.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.currentSafetyLevels") + 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()); diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index cbd56d1..f0f4659 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -24,7 +24,7 @@ "option.NoChatReports.convertToGameMessage.tooltip": "Makes the server convert all player messages into system\nmessages. System messages don't have any signatures\nattached and cannot be reported; on unmodified clients\nthey will display with gray bar to the left.", "option.NoChatReports.showServerSafety":"Show server safety", "option.NoChatReports.showServerSafety.tooltip":"Allows the client to display server safety status in\nbottom-right corner of chat screen. The icon is\nhoverable for additional information:", - "option.NoChatReports.showServerSafety.currentSafetyLevels":"More information on server safety levels linked here", + "option.NoChatReports.showServerSafety.moreInfo":"More information on server safety levels linked here", "option.NoChatReports.hideRedChatIndicators":"Hide red chat indicators", "option.NoChatReports.hideRedChatIndicators.tooltip":"Prevents the client from displaying \"Not Secure\"\nindicators, in the form of red bar to the left\nand §c§l(§r§c!§c§l)§r icon to the right of chat message.", "option.NoChatReports.hideYellowChatIndicators":"Hide yellow chat indicators", -- cgit v1.2.3 From 9b672fe5bc6fec25c3c5c2de3ea8fabc88d32a7d Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Wed, 17 Aug 2022 12:37:23 -0400 Subject: Fix default convert to game message --- src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java index b4beb9d..ea72d0c 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java @@ -99,7 +99,7 @@ public class ModMenuIntegration implements ModMenuApi { // Set an option for convertToGameMessage technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NoReportsConfig.getInstance().convertToGameMessage) - .setDefaultValue(true) + .setDefaultValue(false) .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = newValue) .build()); -- cgit v1.2.3 From 61f550c878fcc6a182bbf9d72060061b3520a70c Mon Sep 17 00:00:00 2001 From: Aizistral Date: Thu, 18 Aug 2022 00:26:34 +0200 Subject: Add `FontHelper` for use in mod menu integration --- .../nochatreports/core/ModMenuIntegration.java | 276 +++++++++++---------- .../aizistral/nochatreports/gui/FontHelper.java | 153 ++++++++++++ .../resources/assets/nochatreports/lang/en_us.json | 2 +- 3 files changed, 302 insertions(+), 129 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/gui/FontHelper.java (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java index ea72d0c..6b13b0c 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java @@ -1,5 +1,8 @@ package com.aizistral.nochatreports.core; +import java.util.List; + +import com.aizistral.nochatreports.gui.FontHelper; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; @@ -7,8 +10,13 @@ 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.client.gui.Font; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.locale.Language; import net.minecraft.network.chat.ClickEvent; import net.minecraft.network.chat.HoverEvent; +import net.minecraft.network.chat.Style; +import net.minecraft.util.FormattedCharSequence; import net.minecraft.network.chat.Component; /** @@ -19,132 +27,144 @@ import net.minecraft.network.chat.Component; 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")); - ConfigCategory whitelistedServers = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.whitelistedServers")); - - ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - - // 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()); - - // 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 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 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(false) - .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = 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()); - - // Set an option for whitelistAllServers - technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NoReportsConfig.getInstance().whitelistAllServers) - .setDefaultValue(false) - .setTooltip(Component.translatable("option.NoChatReports.whitelistAllServers.tooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = 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"), NoReportsConfig.getInstance().whitelistedServers) - .setExpanded(true) - .setInsertInFront(true) - .setTooltip(Component.translatable("option.NoChatReports.whitelistedServers.tooltip")) - .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip")) - .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip")) - .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistedServers = newValue) - .build()); - - // Save config - builder.setSavingRunnable(() -> { - NoReportsConfig.saveConfig(); - NoReportsConfig.loadConfig(); - }); - return builder.build(); - }; - } + private Component[] makeTooltip(String key) { + String localized = Language.getInstance().getOrDefault(key); + List 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 -> { + + // 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")); + + ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + + // Set an option for showServerSafety + visual.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NoReportsConfig.getInstance().showServerSafety) + .setDefaultValue(true) + .setTooltip(this.makeTooltip("option.NoChatReports.showServerSafety.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().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 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 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(false) + .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = 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()); + + // Set an option for whitelistAllServers + technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NoReportsConfig.getInstance().whitelistAllServers) + .setDefaultValue(false) + .setTooltip(Component.translatable("option.NoChatReports.whitelistAllServers.tooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = 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"), NoReportsConfig.getInstance().whitelistedServers) + .setExpanded(true) + .setInsertInFront(true) + .setTooltip(Component.translatable("option.NoChatReports.whitelistedServers.tooltip")) + .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip")) + .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip")) + .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistedServers = 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/gui/FontHelper.java b/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java new file mode 100644 index 0000000..838749b --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java @@ -0,0 +1,153 @@ +package com.aizistral.nochatreports.gui; + +import java.util.Arrays; +import java.util.List; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Font; +import net.minecraft.util.FormattedCharSequence; + +/** + * I couldn't find a way to properly convert {@link FormattedCharSequence} back into + * normal string. Lol. + * + * @author Aizistral + */ + +@Environment(EnvType.CLIENT) +public final class FontHelper { + + private FontHelper() { + throw new IllegalStateException("Can't touch this"); + } + + /** + * Breaks a string into a list of pieces that will fit a specified width. + */ + + public static List wrap(Font font, String str, int wrapWidth) { + return Arrays.asList(wrapFormattedStringToWidth(font, str, wrapWidth).split("\n")); + } + + /** + * Inserts newline and formatting into a string to wrap it within the specified + * width. + */ + + private static String wrapFormattedStringToWidth(Font font, String str, int wrapWidth) { + int j = sizeStringToWidth(font, str, wrapWidth); + + if (str.length() <= j) + return str; + else { + String s1 = str.substring(0, j); + char c0 = str.charAt(j); + boolean flag = c0 == 32 || c0 == 10; + String s2 = getFormatFromString(s1) + str.substring(j + (flag ? 1 : 0)); + return s1 + "\n" + wrapFormattedStringToWidth(font, s2, wrapWidth); + } + } + + /** + * Determines how many characters from the string will fit into the specified + * width. + */ + + private static int sizeStringToWidth(Font font, String str, int wrapWidth) { + int j = str.length(); + int k = 0; + int l = 0; + int i1 = -1; + + for (boolean flag = false; l < j; ++l) { + char c0 = str.charAt(l); + + switch (c0) { + case 10: + --l; + break; + case 167: + if (l < j - 1) { + ++l; + char c1 = str.charAt(l); + + if (c1 != 108 && c1 != 76) { + if (c1 == 114 || c1 == 82 || isFormatColor(c1)) { + flag = false; + } + } else { + flag = true; + } + } + + break; + case 32: + i1 = l; + default: + k += font.width(String.valueOf(c0)); + + if (flag) { + ++k; + } + } + + if (c0 == 10) { + ++l; + i1 = l; + break; + } + + if (k > wrapWidth) { + break; + } + } + + return l != j && i1 != -1 && i1 < l ? i1 : l; + } + + /** + * Checks if the char code is a hexadecimal character, used to set colour. + */ + + private static boolean isFormatColor(char colorChar) { + return colorChar >= 48 && colorChar <= 57 || colorChar >= 97 && colorChar <= 102 + || colorChar >= 65 && colorChar <= 70; + } + + /** + * Checks if the char code is O-K...lLrRk-o... used to set special formatting. + */ + + private static boolean isFormatSpecial(char formatChar) { + return formatChar >= 107 && formatChar <= 111 || formatChar >= 75 && formatChar <= 79 || formatChar == 114 + || formatChar == 82; + } + + /** + * Digests a string for nonprinting formatting characters then returns a string + * containing only that formatting. + */ + + private static String getFormatFromString(String text) { + String s1 = ""; + int i = -1; + int j = text.length(); + + while ((i = text.indexOf(167, i + 1)) != -1) { + if (i < j - 1) { + char c0 = text.charAt(i + 1); + + if (isFormatColor(c0)) { + s1 = "\u00a7" + c0; + } else if (isFormatSpecial(c0)) { + s1 = s1 + "\u00a7" + c0; + } + } + } + + return s1; + } + +} diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index f649a23..00ba5bd 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -17,7 +17,7 @@ "configuration.NoChatReports.category.technical": "Technical", "configuration.NoChatReports.category.whitelistedServers": "Whitelisted Servers", "option.NoChatReports.showServerSafety": "Show server safety", - "option.NoChatReports.showServerSafety.tooltip": "Allows the client to display server safety status in\nbottom-right corner of chat screen. The icon is\nhoverable for additional information.", + "option.NoChatReports.showServerSafety.tooltip": "Allows the client to display server safety status in bottom-right corner of chat screen. The icon is hoverable for additional information.", "option.NoChatReports.showServerSafety.moreInfo": "§bClick here to read more about server safety levels", "option.NoChatReports.hideRedChatIndicators": "Hide red chat indicators", "option.NoChatReports.hideRedChatIndicators.tooltip": "Prevents the client from displaying \"Not Secure\"\nindicators, in the form of red bar to the left\nand §c§l(§r§c!§c§l)§r icon to the right of chat message.", -- cgit v1.2.3 From 0a609d698ff69ee77c7601e69f29ad80ef677c70 Mon Sep 17 00:00:00 2001 From: MODKILLER1001 Date: Wed, 17 Aug 2022 18:47:14 -0400 Subject: tooltip wrapping --- .../nochatreports/core/ModMenuIntegration.java | 24 +++++++++++----------- .../resources/assets/nochatreports/lang/en_us.json | 22 ++++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java index 6b13b0c..c7724bb 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/core/ModMenuIntegration.java @@ -71,77 +71,77 @@ public class ModMenuIntegration implements ModMenuApi { // 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")) + .setTooltip(this.makeTooltip("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")) + .setTooltip(this.makeTooltip("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")) + .setTooltip(this.makeTooltip("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")) + .setTooltip(this.makeTooltip("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")) + .setTooltip(this.makeTooltip("option.NoChatReports.alwaysHideReportButton.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().alwaysHideReportButton = newValue) .build()); // 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")) + .setTooltip(this.makeTooltip("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")) + .setTooltip(this.makeTooltip("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(false) - .setTooltip(Component.translatable("option.NoChatReports.convertToGameMessage.tooltip")) + .setTooltip(this.makeTooltip("option.NoChatReports.convertToGameMessage.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().convertToGameMessage = 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")) + .setTooltip(this.makeTooltip("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")) + .setTooltip(this.makeTooltip("option.NoChatReports.showReloadButton.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().showReloadButton = newValue) .build()); // Set an option for whitelistAllServers technical.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.whitelistAllServers"), NoReportsConfig.getInstance().whitelistAllServers) .setDefaultValue(false) - .setTooltip(Component.translatable("option.NoChatReports.whitelistAllServers.tooltip")) + .setTooltip(this.makeTooltip("option.NoChatReports.whitelistAllServers.tooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistAllServers = newValue) .build()); @@ -153,7 +153,7 @@ public class ModMenuIntegration implements ModMenuApi { whitelistedServers.addEntry(entryBuilder.startStrList(Component.translatable("option.NoChatReports.whitelistedServers"), NoReportsConfig.getInstance().whitelistedServers) .setExpanded(true) .setInsertInFront(true) - .setTooltip(Component.translatable("option.NoChatReports.whitelistedServers.tooltip")) + .setTooltip(this.makeTooltip("option.NoChatReports.whitelistedServers.tooltip")) .setAddButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.addButtonTooltip")) .setRemoveButtonTooltip(Component.translatable("option.NoChatReports.whitelistedServers.removeButtonTooltip")) .setSaveConsumer(newValue -> NoReportsConfig.getInstance().whitelistedServers = newValue) diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 00ba5bd..3c037d7 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -20,29 +20,29 @@ "option.NoChatReports.showServerSafety.tooltip": "Allows the client to display server safety status in bottom-right corner of chat screen. The icon is hoverable for additional information.", "option.NoChatReports.showServerSafety.moreInfo": "§bClick here to read more about server safety levels", "option.NoChatReports.hideRedChatIndicators": "Hide red chat indicators", - "option.NoChatReports.hideRedChatIndicators.tooltip": "Prevents the client from displaying \"Not Secure\"\nindicators, in the form of red bar to the left\nand §c§l(§r§c!§c§l)§r icon to the right of chat message.", + "option.NoChatReports.hideRedChatIndicators.tooltip": "Prevents the client from displaying \"Not Secure\" indicators, in the form of red bar to the left and §c§l(§r§c!§c§l)§r icon to the right of chat message.", "option.NoChatReports.hideYellowChatIndicators": "Hide yellow chat indicators", - "option.NoChatReports.hideYellowChatIndicators.tooltip": "Prevents the client from displaying \"Modified\"\nindicators, in the form of yellow bar to the left\nand §e§l(§r§e?§e§l)§r icon to the right of chat message.", + "option.NoChatReports.hideYellowChatIndicators.tooltip": "Prevents the client from displaying \"Modified\" indicators, in the form of yellow bar to the left and §e§l(§r§e?§e§l)§r icon to the right of chat message.", "option.NoChatReports.hideGrayChatIndicators": "Hide gray chat indicators", - "option.NoChatReports.hideGrayChatIndicators.tooltip": "Prevents the client from displaying special\nindicators for system messages, in the form\nof gray bar to the left.", + "option.NoChatReports.hideGrayChatIndicators.tooltip": "Prevents the client from displaying special indicators for system messages, in the form of gray bar to the left.", "option.NoChatReports.hideWarningToast": "Hide warning toast", - "option.NoChatReports.hideWarningToast.tooltip": "Removes a warning toast that is displayed when entering\nservers with disabled §oenforce-secure-profile§r.", + "option.NoChatReports.hideWarningToast.tooltip": "Removes a warning toast that is displayed when entering servers with disabled §oenforce-secure-profile§r.", "option.NoChatReports.alwaysHideReportButton": "Always hide report button", - "option.NoChatReports.alwaysHideReportButton.tooltip": "Prevents the client from ever showing report button\nin Social Interactions screen. This is disabled by\ndefault, and mod simply makes button inactive on\nservers that have No Chat Reports installed, adding\nan explanation to the tooltip of the button.", + "option.NoChatReports.alwaysHideReportButton.tooltip": "Prevents the client from ever showing report button in Social Interactions screen. This is disabled by default, and mod simply makes button inactive on servers that have No Chat Reports installed, adding an explanation to the tooltip of the button.", "option.NoChatReports.demandOnServer": "Demand on server", - "option.NoChatReports.demandOnServer.tooltip": "Prevents the client from joining servers that don't\nhave No Chat Reports installed.", + "option.NoChatReports.demandOnServer.tooltip": "Prevents the client from joining servers that don't have No Chat Reports installed.", "option.NoChatReports.enableDebugLog": "Enable debug log", - "option.NoChatReports.enableDebugLog.tooltip": "Enables logging of certain debug information.\nThis is generally useless for non-developers.", + "option.NoChatReports.enableDebugLog.tooltip": "Enables logging of certain debug information. This is generally useless for non-developers.", "option.NoChatReports.convertToGameMessage": "Convert to game message", - "option.NoChatReports.convertToGameMessage.tooltip": "Makes the server convert all player messages into system\nmessages. System messages don't have any signatures\nattached and cannot be reported; on unmodified clients\nthey will display with gray bar to the left.", + "option.NoChatReports.convertToGameMessage.tooltip": "Makes the server convert all player messages into system messages. System messages don't have any signatures attached and cannot be reported; on unmodified clients they will display with gray bar to the left.", "option.NoChatReports.disableTelemetry": "Disable telemetry", - "option.NoChatReports.disableTelemetry.tooltip": "Allows the mod to disable built-in telemetry, similar\nto how No Telemetry does.", + "option.NoChatReports.disableTelemetry.tooltip": "Allows the mod to disable built-in telemetry, similar to how No Telemetry does.", "option.NoChatReports.showReloadButton": "Show reload button", "option.NoChatReports.showReloadButton.tooltip": "Adds a button for config reloading to Multiplayer menu.", "option.NoChatReports.whitelistAllServers": "Whitelist all servers", - "option.NoChatReports.whitelistAllServers.tooltip": "Makes the mod behave as if all servers were\nadded to §oWhitelisted Servers§r list.", + "option.NoChatReports.whitelistAllServers.tooltip": "Makes the mod behave as if all servers were added to §oWhitelisted Servers§r list.", "option.NoChatReports.whitelistedServers": "Whitelisted Servers", - "option.NoChatReports.whitelistedServers.tooltip": "Contains servers for which \"Unsafe Server\" warning\nscreen should never display. Servers are added to\nthis list automatically when you check \"Do not show\nagain for this server\" box in that screen.\nEach entry is a string that is formatted as\n§l:§r.", + "option.NoChatReports.whitelistedServers.tooltip": "Contains servers for which \"Unsafe Server\" warning screen should never display. Servers are added to this list automatically when you check \"Do not show again for this server\" box in that screen. Each entry is a string that is formatted as §l:§r.", "option.NoChatReports.whitelistedServers.addButtonTooltip": "Add server", "option.NoChatReports.whitelistedServers.removeButtonTooltip": "Remove server", "option.NoChatReports.whitelistedServers.instructions": "When adding a server click below Whitelisted Servers to type in the field." -- cgit v1.2.3