From 4ebb538435cae4921230298ac8b40ee5372cc6d3 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Thu, 19 Nov 2026 01:02:48 +0100 Subject: Make enableMod a startup-only switch in common config --- .../aizistral/nochatreports/common/NCRClient.java | 6 --- .../aizistral/nochatreports/common/NCRCore.java | 7 ++- .../nochatreports/common/NCRMixinPlugin.java | 46 ++++++++++++++++++++ .../nochatreports/common/config/JSONConfig.java | 25 ++++++----- .../common/config/ModMenuIntegration.java | 18 +++++--- .../nochatreports/common/config/NCRConfig.java | 50 +++++++++++----------- .../common/config/NCRConfigClient.java | 14 +----- .../common/config/NCRConfigCommon.java | 10 +++++ .../common/config/NCRServerPreferences.java | 8 ++++ .../common/core/ServerSafetyState.java | 7 --- .../mixins/client/MixinChatOptionsScreen.java | 8 +--- .../common/mixins/client/MixinChatScreen.java | 2 +- .../common/mixins/client/MixinConnectScreen.java | 3 -- .../mixins/client/MixinJoinMultiplayerScreen.java | 26 ++++++----- .../common/mixins/client/MixinMinecraft.java | 3 -- .../common/mixins/client/MixinOptions.java | 4 -- .../common/mixins/client/MixinRealmsConnect.java | 4 -- .../common/platform/PlatformProvider.java | 2 - .../nochatreports/fabric/NoChatReports.java | 5 --- .../nochatreports/fabric/NoChatReportsClient.java | 4 ++ .../nochatreports/loader/LoaderPaths.java | 17 ++++++++ .../resources/assets/nochatreports/lang/en_pt.json | 3 -- .../resources/assets/nochatreports/lang/en_us.json | 8 ++-- .../resources/assets/nochatreports/lang/et_ee.json | 3 -- .../resources/assets/nochatreports/lang/fi_fi.json | 3 -- .../resources/assets/nochatreports/lang/ko_kr.json | 3 -- .../resources/assets/nochatreports/lang/pl_pl.json | 3 -- .../resources/assets/nochatreports/lang/pt_br.json | 3 -- .../resources/assets/nochatreports/lang/ru_ru.json | 3 -- .../resources/assets/nochatreports/lang/th_th.json | 3 -- .../resources/assets/nochatreports/lang/zh_cn.json | 3 -- .../resources/assets/nochatreports/lang/zh_tw.json | 3 -- .../mixins/common/nochatreports.mixins.json | 1 + .../mixins/fabric/nochatreports-fabric.mixins.json | 1 + 34 files changed, 166 insertions(+), 143 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/common/NCRMixinPlugin.java create mode 100644 src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java (limited to 'src') diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java index 7f5d177..5b339f0 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java @@ -31,9 +31,6 @@ public class NCRClient { } private static void onDisconnect(Minecraft client) { - if (!NCRConfig.getClient().enableMod()) - return; - if (NCRConfig.getCommon().enableDebugLog()) { NCRCore.LOGGER.info("Disconnected from server, resetting safety state!"); } @@ -42,9 +39,6 @@ public class NCRClient { } private static void onPlayReady(ClientPacketListener handler, Minecraft client) { - if (!NCRConfig.getClient().enableMod()) - return; - client.execute(() -> { if (!client.isLocalServer()) { if (ServerSafetyState.isOnRealms()) { diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java index 257835b..77c0777 100644 --- a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java @@ -28,6 +28,11 @@ public class NCRCore { Preconditions.checkArgument(provider == null, "NCRCore already awake"); provider = platformProvider; + if (!NCRConfig.isModRunning()) { + LOGGER.info("No Chat Reports is disabled in its config and will not initialize."); + return; + } + setup(); if (provider.getEnvironment() == EnvType.CLIENT) { @@ -39,7 +44,7 @@ public class NCRCore { LOGGER.info("KONNICHIWA ZA WARUDO!"); LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); - NCRConfig.load(); + NCRConfig.save(); } @Environment(EnvType.CLIENT) diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRMixinPlugin.java b/src/main/java/com/aizistral/nochatreports/common/NCRMixinPlugin.java new file mode 100644 index 0000000..1155ead --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/NCRMixinPlugin.java @@ -0,0 +1,46 @@ +package com.aizistral.nochatreports.common; + +import java.util.List; +import java.util.Set; + +import org.objectweb.asm.tree.ClassNode; +import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; +import org.spongepowered.asm.mixin.extensibility.IMixinInfo; + +import com.aizistral.nochatreports.common.config.NCRConfig; + +public class NCRMixinPlugin implements IMixinConfigPlugin { + private static final String TOGGLE_BUTTON_MIXIN = "com.aizistral.nochatreports.common.mixins.client.MixinJoinMultiplayerScreen"; + + @Override + public void onLoad(String mixinPackage) { + } + + @Override + public String getRefMapperConfig() { + return null; + } + + @Override + public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { + return NCRConfig.isModRunning() || TOGGLE_BUTTON_MIXIN.equals(mixinClassName); + } + + @Override + public void acceptTargets(Set myTargets, Set otherTargets) { + } + + @Override + public List getMixins() { + return null; + } + + @Override + public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + + @Override + public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java index 258b340..52c5ee3 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java @@ -8,16 +8,14 @@ import java.util.Optional; import java.util.function.Supplier; import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.loader.LoaderPaths; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.fabricmc.api.EnvType; -import net.minecraft.client.multiplayer.resolver.ServerAddress; - public abstract class JSONConfig { - protected static final Path CONFIG_DIR = NCRCore.getProvider().getConfigDir(); + protected static final Path CONFIG_DIR = LoaderPaths.getConfigDir(); protected static final Gson GSON = createGson(); protected final String fileName; @@ -37,6 +35,10 @@ public abstract class JSONConfig { writeFile(this.fileName, this); } + protected Gson getGson() { + return GSON; + } + protected void uponLoad() { // NO-OP } @@ -45,19 +47,20 @@ public abstract class JSONConfig { public static T loadConfig(Class configClass, Supplier freshInstance, String fileName) { NCRCore.LOGGER.info("Reading config file {}...", fileName); - T config = readFile(fileName, configClass).orElseGet(freshInstance); + T defaults = freshInstance.get(); + T config = readFile(fileName, configClass, defaults.getGson()).orElse(defaults); config.uponLoad(); return config; } - private static Optional readFile(String fileName, Class configClass) { + private static Optional readFile(String fileName, Class configClass, Gson gson) { Path file = CONFIG_DIR.resolve(fileName); if (!Files.isRegularFile(file)) return Optional.empty(); try (BufferedReader reader = Files.newBufferedReader(file)) { - return Optional.of(GSON.fromJson(reader, configClass)); + return Optional.of(gson.fromJson(reader, configClass)); } catch (Exception ex) { NCRCore.LOGGER.fatal("Could not read config file: {}", file); NCRCore.LOGGER.fatal("This likely indicates the file is corrupted. " @@ -67,13 +70,13 @@ public abstract class JSONConfig { } } - private static void writeFile(String fileName, T config) { + private static void writeFile(String fileName, JSONConfig config) { Path file = CONFIG_DIR.resolve(fileName); try { Files.createDirectories(file.getParent()); try (BufferedWriter writer = Files.newBufferedWriter(file)) { - GSON.toJson(config, writer); + config.getGson().toJson(config, writer); } } catch (Exception ex) { NCRCore.LOGGER.fatal("Could not write config file: {}", file); @@ -96,10 +99,6 @@ public abstract class JSONConfig { } }); - if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { - builder.registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE); - } - return builder.create(); } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java index ebe2f01..20a8bff 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java @@ -4,7 +4,6 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.core.SigningMode; import com.aizistral.nochatreports.common.gui.FontHelper; import com.terraformersmc.modmenu.api.ConfigScreenFactory; @@ -59,19 +58,24 @@ public final class ModMenuIntegration implements ModMenuApi { .setTitle(Component.translatable("configuration.NoChatReports.config")); // Set category + ConfigCategory common = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.common")); ConfigCategory client = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.client")); ConfigCategory lan = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lan")); ConfigEntryBuilder entryBuilder = builder.entryBuilder(); + String enableModTooltip = this.translateKey("option.NoChatReports.enableMod.tooltip"); + + if (NCRConfig.getCommon().getSavedEnableMod() != NCRConfig.isModRunning()) { + enableModTooltip += "\n" + this.translateKey("gui.nochatreports.ncr_toggle_restart_pending"); + } + // Set an option for enableMod - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod) + common.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getCommon().getSavedEnableMod()) .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip")) - .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() -> { - NCRConfig.getClient().enableMod = newValue; - NCRConfig.getClient().saveFile(); - })) + .setTooltip(this.wrapTooltip(enableModTooltip)) + .requireRestart() + .setSaveConsumer(newValue -> NCRConfig.getCommon().setSavedEnableMod(newValue)) .build()); // Set an option for showNCRButton diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java index 55098f2..168bbf4 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java @@ -3,7 +3,7 @@ package com.aizistral.nochatreports.common.config; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.util.function.Supplier; +import java.util.List; import com.aizistral.nochatreports.common.NCRCore; @@ -14,51 +14,51 @@ public final class NCRConfig { private static NCRConfigCommon common = null; private static NCRConfigClient client = null; private static NCRServerPreferences serverPreferences = null; + private static boolean modRunning = false; private NCRConfig() { throw new IllegalStateException("Can't touch this"); } - public static NCRConfigCommon getCommon() { - return checkLoaded(() -> common); - } + public static synchronized NCRConfigCommon getCommon() { + if (common == null) { + common = JSONConfig.loadConfig(NCRConfigCommon.class, NCRConfigCommon::new, NCRConfigCommon.FILE_NAME); + modRunning = common.getSavedEnableMod(); + NCRCore.LOGGER.info("Mod Enabled: {}", modRunning); + } - @Environment(EnvType.CLIENT) - public static NCRConfigClient getClient() { - return checkLoaded(() -> client); + return common; } - @Environment(EnvType.CLIENT) - public static NCRServerPreferences getServerPreferences() { - return checkLoaded(() -> serverPreferences); + public static boolean isModRunning() { + getCommon(); + return modRunning; } - private static T checkLoaded(Supplier config) { - if (config.get() == null) { - load(); + @Environment(EnvType.CLIENT) + public static synchronized NCRConfigClient getClient() { + if (client == null) { + client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME); } - return config.get(); + return client; } - public static void load() { - common = JSONConfig.loadConfig(NCRConfigCommon.class, NCRConfigCommon::new, NCRConfigCommon.FILE_NAME); - - if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { - client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME); + @Environment(EnvType.CLIENT) + public static synchronized NCRServerPreferences getServerPreferences() { + if (serverPreferences == null) { serverPreferences = JSONConfig.loadConfig(NCRServerPreferences.class, NCRServerPreferences::new, NCRServerPreferences.FILE_NAME); } - save(); + return serverPreferences; } public static void save() { - checkLoaded(() -> common).saveFile(); + List configs = NCRCore.getProvider().getEnvironment() == EnvType.CLIENT + ? List.of(getCommon(), getClient(), getServerPreferences()) + : List.of(getCommon()); - if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { - checkLoaded(() -> client).saveFile(); - checkLoaded(() -> serverPreferences).saveFile(); - } + configs.forEach(JSONConfig::saveFile); Path readme = JSONConfig.CONFIG_DIR.resolve("NoChatReports/README.md"); try { diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java index 7363581..87482a5 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java @@ -9,7 +9,7 @@ public final class NCRConfigClient extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Client.json"; protected SigningMode defaultSigningMode = SigningMode.PROMPT; - protected boolean enableMod = true, showNCRButton = true, + protected boolean showNCRButton = true, verifiedIconEnabled = true, showServerSafety = true, hideInsecureMessageIndicators = true, hideModifiedMessageIndicators = true, hideSystemMessageIndicators = true, hideWarningToast = true, hideSigningRequestMessage = false, alwaysHideReportButton = false, @@ -26,10 +26,6 @@ public final class NCRConfigClient extends JSONConfig { return new NCRConfigClient(); } - public void toggleMod() { - this.enableMod = !this.enableMod; - } - /** * @return True if client with No Chat Reports installed should demand that mod is present on * every server that it tries to join. In that case client will not be able to join servers that @@ -161,14 +157,6 @@ public final class NCRConfigClient extends JSONConfig { return this.showNCRButton; } - /** - * @return Whether or not No Chat Reports should provide networking-related functionality. - */ - - public boolean enableMod() { - return this.enableMod; - } - /** * @return Whether warning on entering Realms screen should not be displayed. */ diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java index 9242d90..9da10bb 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java @@ -3,6 +3,7 @@ package com.aizistral.nochatreports.common.config; public final class NCRConfigCommon extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Common.json"; + protected boolean enableMod = true; protected String demandOnClientMessage = "You do not have No Chat Reports, and this server is" + " configured to require it on client!"; protected boolean demandOnClient = false, convertToGameMessage = true, @@ -17,6 +18,15 @@ public final class NCRConfigCommon extends JSONConfig { return new NCRConfigCommon(); } + public boolean getSavedEnableMod() { + return this.enableMod; + } + + public void setSavedEnableMod(boolean enableMod) { + this.enableMod = enableMod; + this.saveFile(); + } + /** * @return True if server with No Chat Reports installed should demand that mod is present on * every client that tries to join. Mod's installation on client is optional otherwise.

diff --git a/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java index 77b12c1..8589c9e 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java @@ -7,11 +7,14 @@ import org.jetbrains.annotations.Nullable; import com.aizistral.nochatreports.common.NCRClient; import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.core.SigningMode; +import com.google.gson.Gson; import net.minecraft.client.multiplayer.resolver.ServerAddress; public class NCRServerPreferences extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-ServerPreferences.json"; + private static final Gson PREFERENCES_GSON = GSON.newBuilder() + .registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE).create(); protected HashMap signingModes = new HashMap<>(); protected NCRServerPreferences() { @@ -23,6 +26,11 @@ public class NCRServerPreferences extends JSONConfig { return new NCRServerPreferences(); } + @Override + protected Gson getGson() { + return PREFERENCES_GSON; + } + public SigningMode getModeRaw(@Nullable ServerAddress address) { return this.signingModes.get(address); } diff --git a/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java index 4b056ff..bcd3e5c 100644 --- a/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java @@ -21,7 +21,6 @@ import net.minecraft.client.multiplayer.resolver.ServerAddress; @Environment(EnvType.CLIENT) public final class ServerSafetyState { - private static final List RESET_ACTIONS = new ArrayList<>(); private static final List SIGNING_ACTIONS = new ArrayList<>(); private static final AtomicBoolean ALLOW_CHAT_SIGNING = new AtomicBoolean(false); private volatile static ServerSafetyLevel current = ServerSafetyLevel.UNDEFINED; @@ -92,10 +91,6 @@ public final class ServerSafetyState { lastMessage = message; } - public static void scheduleResetAction(Runnable action) { - RESET_ACTIONS.add(action); - } - public static void scheduleSigningAction(Runnable action) { SIGNING_ACTIONS.add(action); } @@ -106,8 +101,6 @@ public final class ServerSafetyState { ALLOW_CHAT_SIGNING.set(false); UnsafeServerScreen.setHideThisSession(false); - RESET_ACTIONS.forEach(Runnable::run); - RESET_ACTIONS.clear(); SIGNING_ACTIONS.clear(); } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java index 24e5fad..e58d251 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java @@ -4,8 +4,6 @@ import java.util.Optional; import org.spongepowered.asm.mixin.Mixin; -import com.aizistral.nochatreports.common.config.NCRConfig; - import net.minecraft.client.Minecraft; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; @@ -33,10 +31,8 @@ public class MixinChatOptionsScreen extends SimpleOptionsSubScreen { protected void init() { super.init(); - if (NCRConfig.getClient().enableMod()) { - Optional.ofNullable(this.list.findOption(Minecraft.getInstance().options.onlyShowSecureChat())) - .ifPresent(option -> option.active = false); - } + Optional.ofNullable(this.list.findOption(Minecraft.getInstance().options.onlyShowSecureChat())) + .ifPresent(option -> option.active = false); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index b7be2fb..cec848a 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -63,7 +63,7 @@ public abstract class MixinChatScreen extends Screen { private void onInit(CallbackInfo info) { int buttonX = this.width - 23; - if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) { + if (NCRConfig.getClient().showServerSafety()) { this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(), 0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> { if (!NCRClient.areSigningKeysPresent()) diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java index 8f94138..3fcc0af 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java @@ -28,9 +28,6 @@ public class MixinConnectScreen { @Inject(method = "startConnecting", at = @At("HEAD")) private static void onStartConnecting(Screen screen, Minecraft minecraft, ServerAddress serverAddress, @Nullable ServerData serverData, CallbackInfo info) { - if (!NCRConfig.getClient().enableMod()) - return; - ServerSafetyState.reset(); ServerSafetyState.setLastServer(serverAddress); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java index fd5ba8c..f05519a 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java @@ -6,7 +6,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.common.config.NCRConfig; -import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.aizistral.nochatreports.common.gui.AdvancedImageButton; import com.aizistral.nochatreports.common.gui.AdvancedTooltip; @@ -15,6 +14,7 @@ import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; /** @@ -33,24 +33,30 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { @Inject(method = "init", at = @At("HEAD")) private void onInit(CallbackInfo info) { - if (NCRConfig.getClient().showNCRButton()) { + if (!NCRConfig.isModRunning() || NCRConfig.getClient().showNCRButton()) { var button = new AdvancedImageButton(this.width/2 + 158, this.height - 28, 20, 20, - NCRConfig.getClient().enableMod() ? 0 : 20, 0, 20, TOGGLE_TEXTURE, 64, 64, + NCRConfig.getCommon().getSavedEnableMod() ? 0 : 20, 0, 20, TOGGLE_TEXTURE, 64, 64, btn -> { - NCRConfig.getClient().toggleMod(); - boolean enabled = NCRConfig.getClient().enableMod(); + NCRConfig.getCommon().setSavedEnableMod(!NCRConfig.getCommon().getSavedEnableMod()); + boolean enabled = NCRConfig.getCommon().getSavedEnableMod(); if (enabled) { ((ImageButton)btn).xTexStart = 0; } else { ((ImageButton)btn).xTexStart = 20; } - - ServerSafetyState.reset(); }, Component.translatable("gui.nochatreports.ncr_toggle"), this); - button.setTooltip(new AdvancedTooltip(() -> Component.translatable("gui.nochatreports.ncr_toggle_tooltip", - Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (NCRConfig.getClient() - .enableMod() ? "on" : "off")))).setMaxWidth(250)); + button.setTooltip(new AdvancedTooltip(() -> { + boolean saved = NCRConfig.getCommon().getSavedEnableMod(); + MutableComponent tooltip = Component.translatable("gui.nochatreports.ncr_toggle_tooltip", + Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (saved ? "on" : "off"))); + + if (saved != NCRConfig.isModRunning()) { + tooltip.append("\n").append(Component.translatable("gui.nochatreports.ncr_toggle_restart_pending")); + } + + return tooltip; + }).setMaxWidth(250)); button.active = true; button.visible = true; this.addRenderableWidget(button); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java index ca36de9..28d8ff2 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java @@ -29,9 +29,6 @@ public class MixinMinecraft { @Inject(method = "getProfileKeyPairManager", at = @At("HEAD"), cancellable = true) private void onGetProfileKeyPairManager(CallbackInfoReturnable info) { - if (!NCRConfig.getClient().enableMod()) - return; - if (!ServerSafetyState.allowChatSigning()) { info.setReturnValue(ProfileKeyPairManager.EMPTY_KEY_MANAGER); } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java index e2ffe8c..6c0e205 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java @@ -6,7 +6,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.aizistral.nochatreports.common.config.NCRConfig; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; @@ -26,9 +25,6 @@ public class MixinOptions { @Inject(method = "onlyShowSecureChat", at = @At("RETURN"), cancellable = true) private void onlyShowSecureChat(CallbackInfoReturnable> cir) { - if (!NCRConfig.getClient().enableMod()) - return; - if (this.alternativeOption == null) { this.alternativeOption = new OptionInstance<>("options.onlyShowSecureChat", OptionInstance.cachedConstantTooltip(SECURE_CHAT_TOOLTIP), diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java index a6f16ef..2a97ae3 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java @@ -5,7 +5,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerSafetyLevel; import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.mojang.realmsclient.dto.RealmsServer; @@ -23,9 +22,6 @@ public class MixinRealmsConnect { @Inject(method = "connect", at = @At("HEAD")) private void onConnect(RealmsServer realmsServer, ServerAddress serverAddress, CallbackInfo info) { - if (!NCRConfig.getClient().enableMod()) - return; - ServerSafetyState.reset(); ServerSafetyState.updateCurrent(ServerSafetyLevel.REALMS); ServerSafetyState.setAllowChatSigning(true); diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java b/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java index 5dc064e..aa28b3b 100644 --- a/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java +++ b/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java @@ -11,6 +11,4 @@ public interface PlatformProvider { public Path getMinecraftDir(); - public Path getConfigDir(); - } diff --git a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java index 2092a78..3f9bca6 100644 --- a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java @@ -27,9 +27,4 @@ public class NoChatReports implements ModInitializer, PlatformProvider { return FabricLoader.getInstance().getGameDir(); } - @Override - public Path getConfigDir() { - return FabricLoader.getInstance().getConfigDir(); - } - } diff --git a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java index 2ae4236..b84adf5 100644 --- a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.fabric; +import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.platform.events.ClientEvents; import net.fabricmc.api.ClientModInitializer; @@ -12,6 +13,9 @@ public class NoChatReportsClient implements ClientModInitializer { @Override public void onInitializeClient() { + if (!NCRConfig.isModRunning()) + return; + ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> ClientEvents.PLAY_READY.invoker().handle(handler, client)); diff --git a/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java b/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java new file mode 100644 index 0000000..762ab74 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/loader/LoaderPaths.java @@ -0,0 +1,17 @@ +package com.aizistral.nochatreports.loader; + +import java.nio.file.Path; + +import net.fabricmc.loader.api.FabricLoader; + +public final class LoaderPaths { + + private LoaderPaths() { + throw new IllegalStateException("Can't touch this"); + } + + public static Path getConfigDir() { + return FabricLoader.getInstance().getConfigDir(); + } + +} diff --git a/src/main/resources/assets/nochatreports/lang/en_pt.json b/src/main/resources/assets/nochatreports/lang/en_pt.json index 6985c40..f239adf 100644 --- a/src/main/resources/assets/nochatreports/lang/en_pt.json +++ b/src/main/resources/assets/nochatreports/lang/en_pt.json @@ -12,7 +12,6 @@ "gui.nochatreports.unsafe_server.contents": "This here 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 here likely means that there the server owner kept \"enforce-secure-profile\" enabled in the server.properties, which be the default since 1.19.1. Ye can choose to play anyway, but No Chat Reports will not be able to protect ye.", "gui.nochatreports.unsafe_server.check": "Do not show again fer this here server", "gui.nochatreports.verified_server": "§a§lSafe Server§r\nWe could verify that there this here server 'as No Chat Reports installed, or prevents chat reports in some other known way. Ye can chat there safely.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nDisable or enable most o' the mod's client-sided functionality. Ye may 'ave to do this here to join some Paper/Velocity servers, as they be known fer causin' issues with NCR.\nCertain networking-unrelated things, such as chat trust status tweaks an' removal o' vanilla's \"Chat messages can't be verified\" toast will still work; they can be disabled in config individually.", "gui.nochatreports.ncr_state_on": "§a§lEnabled§r", "gui.nochatreports.ncr_state_off": "§c§lDisabled§r", @@ -51,9 +50,7 @@ "option.NoChatReports.whitelistAllServers": "Whitelist all servers", "option.NoChatReports.whitelistAllServers.tooltip": "Makes the mod behave as if all servers was added to §oWhitelisted Servers§r list.", "option.NoChatReports.showNCRButton": "Show NCR button", - "option.NoChatReports.showNCRButton.tooltip": "Adds a button that there toggles most o' the mod's client-sided functionality to multiplayer menu.", "option.NoChatReports.enableMod": "Enable mod", - "option.NoChatReports.enableMod.tooltip": "Responsible fer enablin' most o' the mod's client-sided functionality, see option above.", "configuration.NoChatReports.category.whitelistedServers": "Whitelisted Servers", diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json index 8ea046d..ceda16a 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -19,7 +19,8 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "Message signing is disabled for this session, but it will be enabled once you send any message.", "gui.nochatreports.signing_status.disabled_offline": "Message signing is disabled since this is an offline server.", "gui.nochatreports.verified_server": "§a§lSafe Server§r\nWe could verify that this server has No Chat Reports installed, or prevents chat reports in some other known way. You can chat there safely.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nDisable or enable most of the mod's client-sided functionality. You may have to do this to join some Paper/Velocity servers, as they are known for causing issues with NCR.\nCertain networking-unrelated things, such as encryption, chat trust status tweaks and removal of vanilla's \"Chat messages can't be verified\" toast will still work; they can be disabled in config individually.", + "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nCompletely enables or disables the mod. Takes effect only after restarting the game.", + "gui.nochatreports.ncr_toggle_restart_pending": "§6Restart pending: restart the game to apply this change.§r", "gui.nochatreports.ncr_state_on": "§a§lEnabled§r", "gui.nochatreports.ncr_state_off": "§c§lDisabled§r", "gui.nochatreports.encryption_warning.learn_more": "Learn More", @@ -49,11 +50,12 @@ "gui.nochatreports.signing_mode.on_demand.tooltip": "Similar to prompt mode, but instead of showing pop-up screen signing will just be enabled automatically as soon as server demands it.", "configuration.NoChatReports.config": "No Chat Reports", + "configuration.NoChatReports.category.common": "Common", "configuration.NoChatReports.category.client": "Client", "option.NoChatReports.enableMod": "Enable mod", - "option.NoChatReports.enableMod.tooltip": "Responsible for enabling most of the mod's client-sided functionality. Will require re-joining the server to take effect if toggled mid-session.", + "option.NoChatReports.enableMod.tooltip": "Completely enables or disables the mod. Takes effect only after restarting the game.", "option.NoChatReports.showNCRButton": "Show NCR button", - "option.NoChatReports.showNCRButton.tooltip": "Adds a button that toggles most of the mod's client-sided functionality to multiplayer menu.", + "option.NoChatReports.showNCRButton.tooltip": "Adds a button that completely enables or disables the mod to the multiplayer menu. The button is always shown while the mod is disabled.", "option.NoChatReports.defaultSigningMode": "Default signing mode", "option.NoChatReports.defaultSigningMode.tooltip": "Sets the signing mode default for servers that force or allow chat signing.", "option.NoChatReports.verifiedIconEnabled": "Verified icon enabled", diff --git a/src/main/resources/assets/nochatreports/lang/et_ee.json b/src/main/resources/assets/nochatreports/lang/et_ee.json index ef0cce7..79ed5b6 100644 --- a/src/main/resources/assets/nochatreports/lang/et_ee.json +++ b/src/main/resources/assets/nochatreports/lang/et_ee.json @@ -19,7 +19,6 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "Sõnumite signeerimine on selle seansi jaoks keelatud, kuid lubatakse mistahes sõnumi saatmisel.", "gui.nochatreports.signing_status.disabled_offline": "Sõnumite signeerimine on keelatud, kuna tegu on võrguta serveriga.", "gui.nochatreports.verified_server": "§a§lTurvaline server§r\nKinnitasime, et serverile on paigaldatud mod No Chat Reports või see piirab sõnumitest teatamist mõnel muul teadaoleval viisil. Sa saad turvaliselt vestelda.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nKeela või luba enamus modi kliendipoolsest funktsionaalsusest. See võib olla vajalik teatud Paper/Velocity serveritega ühendumiseks, kuna need on teadaolevalt NCRiga probleeme põhjustanud.\nTeatud võrguga mitteseonduvad asjad, nagu serveri turvataseme kuvamine ning vanilli \"Vestlussõnumeid ei saa kinnitada\" hüpiku eemaldus töötavad siiski; neid saab seadistustes individuaalselt lülitada.", "gui.nochatreports.ncr_state_on": "§a§llubatud§r", "gui.nochatreports.ncr_state_off": "§c§lkeelatud§r", "gui.nochatreports.encryption_warning.learn_more": "Lisateave", @@ -51,9 +50,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "Klient", "option.NoChatReports.enableMod": "Mod lubatud", - "option.NoChatReports.enableMod.tooltip": "Vastutab enamiku modi kliendipoolse funktsionaalsuse eest. Seansi ajal ümber lülitades on muudatuste rakendamiseks vajalik serveriga taasliitumine.", "option.NoChatReports.showNCRButton": "Kuva NCRi nupp", - "option.NoChatReports.showNCRButton.tooltip": "Lisab mitmikmängumenüüsse nupu, mis lülitab enamikku modi kliendipoolsest funktsionaalsusest.", "option.NoChatReports.defaultSigningMode": "Vaikimisi signeerimisrežiim", "option.NoChatReports.defaultSigningMode.tooltip": "Määrab signeerimisrežiimi vaikeväärtuse serveritele, mis nõuavad või lubavad vestluse signeerimist.", "option.NoChatReports.verifiedIconEnabled": "Kuva kinnitatuse ikoon", diff --git a/src/main/resources/assets/nochatreports/lang/fi_fi.json b/src/main/resources/assets/nochatreports/lang/fi_fi.json index c0c83fa..eefbd8e 100644 --- a/src/main/resources/assets/nochatreports/lang/fi_fi.json +++ b/src/main/resources/assets/nochatreports/lang/fi_fi.json @@ -27,7 +27,6 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "Viestien sähköinen allekirjoittaminen poistettiin käytöstä täksi istunnoksi, mutta otetaan käyttöön, kun lähetät viestin.", "gui.nochatreports.signing_status.disabled_offline": "Viestien sähköinen allekirjoittaminen on pois käytöstä, koska palvelin ei ole verkossa.", "gui.nochatreports.verified_server": "§a§lTurvallinen palvelin\nPystymme varmistamaan, että tällä palvelimella on No Chat Reports tai se estää viestien ilmiannon muulla tunnetulla tavalla. Voit keskustella siellä turvallisesti.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports§r %1$s\nLaita suurin osa modin asiakasohjelman puoleisesta toiminnallisuudesta käyttöön tai pois käytöstä. Saatat joutua tekemään tämän liittyäksesi joillekin Paper- tai Velocity-palvelimille, sillä niiden tiedetään aiheuttavan ongelmia NCR:n kanssa.\nJotkin verkkotyöskentelyyn liittymättömät asiat, kuten salaus, keskustelun luotettavuustilan muokkaukset sekä \"Keskusteluviestejä ei voida todentaa\"-ilmoituksen poistaminen toimivat silti; ne voidaan laittaa pois määrityksistä yksitellen.", "gui.nochatreports.ncr_state_on": "§a§lKäytössä§r", "gui.nochatreports.ncr_state_off": "§c§lPois käytöstä§r", "gui.nochatreports.encryption_warning.learn_more": "Lue lisää", @@ -61,9 +60,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "Asiakasohjelma", "option.NoChatReports.enableMod": "Modin käyttö", - "option.NoChatReports.enableMod.tooltip": "Pitää käytössä suurimman osan modin asiakasohjelman puoleisesta toiminnallisuudesta. Vaatii palvelimelle uudelleen liittymistä muutosten voimaan astumiseksi kesken istunnon.", "option.NoChatReports.showNCRButton": "Näytä NCR-painike", - "option.NoChatReports.showNCRButton.tooltip": "Lisää moninpelivalikkoon painikkeen, jolla voidaan valita suurin osa modin asiakasohjelman puoleisesta toiminnallisuudesta päälle ja pois.", "option.NoChatReports.defaultSigningMode": "Sähköisen allekirjoittamisen oletusvalinta", "option.NoChatReports.defaultSigningMode.tooltip": "Asettaa oletusvalinnan sähköisestä allekirjoittamisesta palvelimilla, jotka pakottavat tai sallivat sähköisen allekirjoittamisen.", "option.NoChatReports.verifiedIconEnabled": "Vahvistuskuvake päällä", diff --git a/src/main/resources/assets/nochatreports/lang/ko_kr.json b/src/main/resources/assets/nochatreports/lang/ko_kr.json index 387bc57..079f7ac 100644 --- a/src/main/resources/assets/nochatreports/lang/ko_kr.json +++ b/src/main/resources/assets/nochatreports/lang/ko_kr.json @@ -12,7 +12,6 @@ "gui.nochatreports.unsafe_server.contents": "이 서버는 모든 대화 메시지에 서명할 것을 요구하며, 이는 대화 메시지가 Mojang에 신고될 수 있다는 것을 의미합니다. 서버 소유자가 1.19.1 이후 기본값인 server.properties 내의 'enforce-secure-profile'을 켰을 수 있습니다. 이를 무시하고 플레이할 수 있지만 No Chat Reports는 당신을 보호할 수 없습니다.", "gui.nochatreports.unsafe_server.check": "이 서버에 대해 이 화면을 다시 보지 않기", "gui.nochatreports.verified_server": "§a§l안전한 서버§r\nNo Chat Reports가 설치되어 있거나 다른 알려진 방식으로 대화 메시지를 신고하는 것을 방지하는 것을 확인할 수 있습니다. 안전하게 대화할 수 있습니다.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\n모드의 대부분의 클라이언트 기능들을 활성화하거나 비활성화합니다. No Chat Reports와 문제를 일으키는 것으로 알려진 일부 Paper/Velocity 서버에 접속하기 위해 모드를 비활성화해야할 수 있습니다.\n암호화, 대화 신뢰 상태 조정 및 바닐라의 \"대화 메세지가 검증될 수 없습니다.\" 알림 제거 등 네트워킹과 관련이 없는 일부 기능은 작동하며 모드 설정에서 개별적으로 비활성화할 수 있습니다.", "gui.nochatreports.ncr_state_on": "§a§l활성화됨§r", "gui.nochatreports.ncr_state_off": "§c§l비활성화됨§r", "gui.nochatreports.encryption_warning.learn_more": "더 알아보기", @@ -52,9 +51,7 @@ "option.NoChatReports.whitelistAllServers": "모든 서버를 화이트리스트에 추가", "option.NoChatReports.whitelistAllServers.tooltip": "모드가 모든 서버가 §o서버 화이트리스트§r 목록에 추가된 것처럼 작동하게 합니다.", "option.NoChatReports.showNCRButton": "NCR 버튼 표시", - "option.NoChatReports.showNCRButton.tooltip": "멀티플레이 메뉴에 모드의 대부분의 클라이언트 측 기능을 토글하는 버튼을 추가합니다.", "option.NoChatReports.enableMod": "모드 활성화", - "option.NoChatReports.enableMod.tooltip": "모드의 대부분의 클라이언트 측 기능을 활성화합니다. 위의 설정을 보십시오.", "configuration.NoChatReports.category.whitelistedServers": "서버 화이트리스트", diff --git a/src/main/resources/assets/nochatreports/lang/pl_pl.json b/src/main/resources/assets/nochatreports/lang/pl_pl.json index b584508..8adf89c 100644 --- a/src/main/resources/assets/nochatreports/lang/pl_pl.json +++ b/src/main/resources/assets/nochatreports/lang/pl_pl.json @@ -20,7 +20,6 @@ "gui.nochatreports.status_whitelist_yes": "§a§lTak", "gui.nochatreports.status_whitelist_no": "§c§lNie", "gui.nochatreports.verified_server": "§a§lBezpieczny serwer§r\nSprawdziliśmy, czy na tym serwerze zainstalowano No Chat Reports lub w inny znany sposób zapobiega się raportowaniu czatu. Możesz tam bezpiecznie czatować.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nWyłącz lub włącz większość funkcji po stronie klienta moda. Być może będziesz musiał to zrobić, aby dołączyć do niektórych serwerów Paper/Velocity, ponieważ są one znane z powodowania problemów z NCR.\nNiektóre rzeczy niezwiązane z siecią, takie jak szyfrowanie, poprawianie stanu zaufania czatu i usuwane z vanilii \"Wiadomości na czacie nie mogą być zweryfikowane\" toasty nadal będą działać; można je wyłączyć w konfiguracji indywidualnie.", "gui.nochatreports.ncr_state_on": "§a§lWłączony§r", "gui.nochatreports.ncr_state_off": "§c§lWyłączony§r", "gui.nochatreports.encryption_warning.learn_more": "Dowiedz się więcej", @@ -71,9 +70,7 @@ "option.NoChatReports.skipSigningWarning": "Podpisz automatycznie na żądanie", "option.NoChatReports.skipSigningWarning.tooltip": "Pomija ostrzeżenie \"Prośba o podpisanie czatu\" i automatycznie podpisuje czat, gdy wymaga tego serwer.", "option.NoChatReports.showNCRButton": "Pokaż przycisk NCR", - "option.NoChatReports.showNCRButton.tooltip": "Dodaje przycisk, który przełącza większość funkcjonalności moda po stronie klienta do menu gry wieloosobowej.", "option.NoChatReports.enableMod": "Włącz modyfikacje", - "option.NoChatReports.enableMod.tooltip": "Odpowiedzialny za włączenie większości funkcjonalności modów po stronie klienta, patrz opcja powyżej.", "option.NoChatReports.reconnectAwaitSeconds": "Sekundy przed ponownym połączeniem", "option.NoChatReports.reconnectAwaitSeconds.tooltip": "Liczba sekund, przez które klient powinien czekać przed automatycznym ponownym połączeniem, gdy serwer odrzuci połączenie bez klucza podpisywania czatu, zakładając, że użytkownik zgodził się wejść na niebezpieczny serwer.", "option.NoChatReports.postDisconnectAwaitSeconds": "Po rozłączeniu czekaj sekund", diff --git a/src/main/resources/assets/nochatreports/lang/pt_br.json b/src/main/resources/assets/nochatreports/lang/pt_br.json index 0ec9f3d..d9f7a64 100644 --- a/src/main/resources/assets/nochatreports/lang/pt_br.json +++ b/src/main/resources/assets/nochatreports/lang/pt_br.json @@ -14,7 +14,6 @@ "gui.nochatreports.unsafe_server.contents": "Este servidor exige que todas as mensagens de bate-papo sejam assinadas, o que significa que elas podem ser relatadas ao Mojang, o que pode resultar em uma proibição de todos os servidores multiplayer.Isso provavelmente significa que o proprietário do servidor manteve \"enforce-secure-profile\" ativado no server.properties, que é o padrão desde 1.19.1.Você pode optar por jogar de qualquer maneira, mas nenhum relatório de bate-papo não será capaz de protegê -lo.", "gui.nochatreports.unsafe_server.check": "Não mostre novamente para este servidor", "gui.nochatreports.verified_server": "§a§lServidor seguro§r\nPoderíamos verificar se este servidor não possui relatórios de bate-papo instalados ou evita relatórios de bate-papo de outra maneira conhecida.Você pode conversar lá com segurança.", - "gui.nochatreports.ncr_toggle_tooltip": "§lSem relatórios de bate-papo:§r %1$s\nDesative ou habilite a maioria da funcionalidade do lado do cliente do MOD.Você pode ter que fazer isso para ingressar em alguns servidores de papel/velocidade, pois eles são conhecidos por causar problemas com a NCR.\nCerta networking-unrelated things, como criptografia, ajustes de status de confiança de bate-papo e remoção de vanilla \"As mensagens de bate-papo não podem ser verificadas\" A torrada ainda funcionará;Eles podem ser desativados na configuração individualmente.", "gui.nochatreports.ncr_state_on": "§a§lHabilitada§r", "gui.nochatreports.ncr_state_off": "§c§lDesabilitada§r", "gui.nochatreports.encryption_warning.learn_more": "Saber mais", @@ -60,9 +59,7 @@ "option.NoChatReports.whitelistAllServers": "Whitelist todos os servidores", "option.NoChatReports.whitelistAllServers.tooltip": "Faz com que o mod se comporte como se todos os servidores fossem adicionados a §oServidores de permissões na lista de permissões§r Lista.", "option.NoChatReports.showNCRButton": "Mostre o botão NCR", - "option.NoChatReports.showNCRButton.tooltip": "Adiciona um botão que alterna a maior parte da funcionalidade do lado do Mod ao menu multiplayer.", "option.NoChatReports.enableMod": "Ativar mod", - "option.NoChatReports.enableMod.tooltip": "Responsável por ativar a maioria da funcionalidade do lado do Mod, consulte a opção acima.", "option.NoChatReports.reconnectAwaitSeconds": "Reconectar aguardar segundos", "option.NoChatReports.reconnectAwaitSeconds.tooltip": "Número de segundos, qual cliente deve esperar antes da reconectar automática assim que o servidor rejeitar a conexão sem a chave de assinatura de bate-papo, assumindo que o usuário concordasse em inserir o servidor inseguro.", "option.NoChatReports.postDisconnectAwaitSeconds": "Pós -desconexão aguarda segundos", diff --git a/src/main/resources/assets/nochatreports/lang/ru_ru.json b/src/main/resources/assets/nochatreports/lang/ru_ru.json index 93f6b59..ba60191 100644 --- a/src/main/resources/assets/nochatreports/lang/ru_ru.json +++ b/src/main/resources/assets/nochatreports/lang/ru_ru.json @@ -13,7 +13,6 @@ "gui.nochatreports.unsafe_server.contents": "Сервер требует, чтобы все сообщения игроков были подписаны, поэтому они могут быть отправлены в Mojang, что может для вас обернуться §lглобальным баном§r. Скорее всего, владелец сервера не отключил \"enforce-secure-profile\" в \"server.properties\" (включено по умолчанию с 1.19.1). Это предупреждение можно проигнорировать, но тогда No Chat Reports не сможет защитить вас.", "gui.nochatreports.unsafe_server.check": "Больше не предупреждать об этом сервере", "gui.nochatreports.verified_server": "§a§lБезопасный сервер§r\nБыло обнаружено, что сервер либо содержит No Chat Reports, либо предотвращает возможность отправки жалоб иным известным способом. Здесь можно общаться безопасно.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nПереключение большей части клиентского функционала мода. Это может быть необходимо для игры на серверах с Paper/Velocity, так как они известны своими проблемами с NCR.\nНекоторые несвязанные с сетевым взаимодействием функции, такие как \"удаление запугивающих уведомлений\", всё ещё могут работать и быть настроены индивидуально.", "gui.nochatreports.ncr_state_on": "§a§lВключено§r", "gui.nochatreports.ncr_state_off": "§c§lВыключено§r", @@ -52,9 +51,7 @@ "option.NoChatReports.whitelistAllServers": "Разрешить все серверы", "option.NoChatReports.whitelistAllServers.tooltip": "Считать каждый сервер добавленным в §oБелый список§r серверов.", "option.NoChatReports.showNCRButton": "Показать кнопку переключения", - "option.NoChatReports.showNCRButton.tooltip": "Добавить на экран сетевой игры кнопку для переключения большинства клиентских функций мода.", "option.NoChatReports.enableMod": "Включить мод", - "option.NoChatReports.enableMod.tooltip": "Ручное переключение большей части функций мода на стороне клиента.", "configuration.NoChatReports.category.whitelistedServers": "Белый список", diff --git a/src/main/resources/assets/nochatreports/lang/th_th.json b/src/main/resources/assets/nochatreports/lang/th_th.json index 1acebf1..4e27522 100644 --- a/src/main/resources/assets/nochatreports/lang/th_th.json +++ b/src/main/resources/assets/nochatreports/lang/th_th.json @@ -13,7 +13,6 @@ "gui.nochatreports.unsafe_server.contents": "เซิร์ฟเวอร์นี้ต้องการการลงนามข้อความแช็ตทุกข้อความ หมายความว่าข้อความเหล่านั้นมีสิทธิ์ที่จะถูกรายงานไปยัง Mojang ได้ ซึ่งอาจส่งผลให้ถูกแบนจากเซิร์ฟเวอร์ผู้เล่นหลายคนทุกเซิร์ฟเวอร์ สิ่งนี้มีความเป็นไปได้ว่าเจ้าของเซิร์ฟเวอร์ได้เปิดคุณสมบัติ \"enforce-secure-profile\" ไว้ในไฟล์ที่ชื่อว่า server.properties ซึ่งเป็นค่าเริ่มต้นตั้งแต่เวอร์ชั่น 1.19.1 ของเกม คุณสามารถเลือกที่จะเล่นต่อไปได้ แต่ม็อด No Chat Reports จะไม่สามารถปกป้องคุณได้ทุกกรณี", "gui.nochatreports.unsafe_server.check": "ไม่ต้องแสดงอีกสำหรับเซิร์ฟเวอร์นี้", "gui.nochatreports.verified_server": "§a§lเซิร์ฟเวอร์ดังกล่าวปลอดภัย§r\nเรายืนยันได้ว่าเซิร์ฟเวอร์นี้มีม็อด No Chat Reports ติดตั้งไว้ หรือมีการป้องการการรายงานแช็ตไม่ทางใดก็ทางหนึ่ง คุณสามารถพูดคุยผ่านแช็ตได้อย่างปลอดภัยหายห่วง", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nปิดหรือเปิดฟังก์ชันต่าง ๆ ของม็อดฝั่งไคลเอนต์ ซึ่งคุณอาจจำเป็นต้องเปิดหรือปิดตัวเลือกนี้เพื่อให้สามารถเข้าเล่นเซิร์ฟเวอร์ของ Paper หรือ Velocity บางเซิร์ฟเวอร์ได้, เนื่องมาจากเซิร์ฟเวอร์เหล่านี้มักมีปัญหากับม็อดนี้.\nฟีเจอร์บางอย่างที่ไม่เกี่ยวข้องกับเครือข่าย เช่น การเข้ารหัส การปรับปรุงสถานะความน่าเชื่อถือของแช็ต และการนำโทสต์ \"ไม่สามารถยืนยันข้อความแช็ตได้\" ออก จะยังคงใช้งานได้ตามปกติ ฟีเจอร์เหล่านี้สามารถปิดแยกแต่ละฟีเจอร์ได้", "gui.nochatreports.ncr_state_on": "§a§lเปิด§r", "gui.nochatreports.ncr_state_off": "§c§lปิด§r", "gui.nochatreports.encryption_warning.learn_more": "เรียนรู้เพิ่มเติม", @@ -55,9 +54,7 @@ "option.NoChatReports.whitelistAllServers": "อนุญาตทุกเซิร์ฟเวอร์", "option.NoChatReports.whitelistAllServers.tooltip": "ทำให้ม็อดทำตัวราวกับว่าเซิร์ฟเวอร์ทุกเซิร์ฟเวอร์ได้ถูกเพิ่มเข้าไปในรายการ §oเซิร์ฟเวอร์ที่ได้รับอนุญาต§r แล้ว", "option.NoChatReports.showNCRButton": "แสดงปุ่ม NCR", - "option.NoChatReports.showNCRButton.tooltip": "เพิ่มปุ่มที่สามารถเปิดปิดฟังก์ชันส่วนใหญ่ของม็อดฝั่งไคลเอนต์ได้เข้าไปในหน้าเมนูผู้เล่นหลายคน", "option.NoChatReports.enableMod": "เปิดการใช้งานม็อด", - "option.NoChatReports.enableMod.tooltip": "มีหน้าที่เปิดหรือปิดฟังก์ชันส่วนใหญ่ของม็อดฝั่งไคลเอนต์ โปรดดูตัวเลือกได้ทางด้านบนของตัวเลือก", "configuration.NoChatReports.category.whitelistedServers": "เซิร์ฟเวอร์ที่ได้รับอนุญาต", diff --git a/src/main/resources/assets/nochatreports/lang/zh_cn.json b/src/main/resources/assets/nochatreports/lang/zh_cn.json index 2c02ee2..b68ec6d 100644 --- a/src/main/resources/assets/nochatreports/lang/zh_cn.json +++ b/src/main/resources/assets/nochatreports/lang/zh_cn.json @@ -19,7 +19,6 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "此会话已禁用聊天签名,但一旦你发送任何消息,它就会启用。", "gui.nochatreports.signing_status.disabled_offline": "聊天签名已被禁用,因为这是一个离线服务器。", "gui.nochatreports.verified_server": "§a§l安全的服务器§\r\n我们可以确定此服务器安装了No Chat Reports,或者以其他已知方式阻止聊天举报。你可以安全地聊天。", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r%1$s\n禁用或启用模组的大部分客户端功能。你可能必须这样做才能加入一些Paper/Velocity服务器,因为它们会导致NCR问题。某些与网络无关的事情,如加密、聊天信任状态调整和删除原版的“聊天消息无法验证”警告弹窗仍然有效;它们可以在配置中单独禁用。", "gui.nochatreports.ncr_state_on": "§a§l启用§r", "gui.nochatreports.ncr_state_off": "§c§l禁用§r", "gui.nochatreports.encryption_warning.learn_more": "了解更多", @@ -51,9 +50,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "客户端", "option.NoChatReports.enableMod": "启用模组", - "option.NoChatReports.enableMod.tooltip": "负责启用模组的大部分客户端功能。如果在会话中途切换,则需要重新加入服务器才能生效。", "option.NoChatReports.showNCRButton": "显示模组按钮", - "option.NoChatReports.showNCRButton.tooltip": "添加一个按钮,可以在多人游戏菜单中切换模组大部分客户端功能的启用状态。", "option.NoChatReports.defaultSigningMode": "默认签名模式", "option.NoChatReports.defaultSigningMode.tooltip": "为强制或允许聊天签名的服务器设置签名模式的默认值。", "option.NoChatReports.verifiedIconEnabled": "启用验证图标", diff --git a/src/main/resources/assets/nochatreports/lang/zh_tw.json b/src/main/resources/assets/nochatreports/lang/zh_tw.json index 55745f4..2d0e648 100644 --- a/src/main/resources/assets/nochatreports/lang/zh_tw.json +++ b/src/main/resources/assets/nochatreports/lang/zh_tw.json @@ -23,7 +23,6 @@ "gui.nochatreports.status_whitelist_yes": "§a§l是", "gui.nochatreports.status_whitelist_no": "§c§l否", "gui.nochatreports.verified_server": "§a§l安全的伺服器§r\n我們可以確定此伺服器安裝了No Chat Reports,或者以其他已知方式阻止聊天舉報。你可以安全地聊天。", - "gui.nochatreports.ncr_toggle_tooltip": "No Chat Reports:%1$s\n禁用或啟用模組的大部分用戶端功能。你可能必須這樣做才能加入一些Paper/Velocity伺服器,因為它們會導致NCR問題。\n某些與網路無關的事情,如加密、聊天信任狀態調整和刪除原版的“聊天消息無法驗證”警告彈窗仍然有效;它們可以在配置中單獨禁用。", "gui.nochatreports.ncr_state_on": "§a§l啟用§r", "gui.nochatreports.ncr_state_off": "§c§l禁用§r", "gui.nochatreports.encryption_warning.learn_more": "瞭解更多", @@ -77,9 +76,7 @@ "option.NoChatReports.skipSigningWarning": "請求時自動簽名", "option.NoChatReports.skipSigningWarning.tooltip": "跳過“要求聊天簽名”警告,並在伺服器需要時自動簽名聊天。", "option.NoChatReports.showNCRButton": "顯示模組按鈕", - "option.NoChatReports.showNCRButton.tooltip": "添加一個按鈕,可以在多人遊戲功能表中切換模組大部分用戶端功能的啟用狀態。", "option.NoChatReports.enableMod": "啟用模組", - "option.NoChatReports.enableMod.tooltip": "負責啟用模組的大部分用戶端功能。如果在會話中途切換,則需要重新加入伺服器才能生效。", "option.NoChatReports.reconnectAwaitSeconds": "重連等待秒數", "option.NoChatReports.reconnectAwaitSeconds.tooltip": "假設用戶同意進入不安全的伺服器,在伺服器拒絕無聊天簽名金鑰的連接後,用戶端在自動重新連接之前應等待的秒數。", "option.NoChatReports.postDisconnectAwaitSeconds": "斷開後等待秒數", diff --git a/src/main/resources/mixins/common/nochatreports.mixins.json b/src/main/resources/mixins/common/nochatreports.mixins.json index 0dcedb3..b5374c9 100644 --- a/src/main/resources/mixins/common/nochatreports.mixins.json +++ b/src/main/resources/mixins/common/nochatreports.mixins.json @@ -2,6 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.common.mixins", + "plugin": "com.aizistral.nochatreports.common.NCRMixinPlugin", "compatibilityLevel": "JAVA_17", "verbose": true, "mixins": [ diff --git a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json index ed7497e..fa1de2f 100644 --- a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json +++ b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json @@ -2,6 +2,7 @@ "required": true, "minVersion": "0.8", "package": "com.aizistral.nochatreports.fabric.mixins", + "plugin": "com.aizistral.nochatreports.common.NCRMixinPlugin", "compatibilityLevel": "JAVA_17", "verbose": true, "mixins": [ -- cgit v1.2.3