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 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