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/com') 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