diff options
| author | Aizistral | 2026-11-19 00:29:01 +0100 |
|---|---|---|
| committer | Aizistral | 2026-11-19 00:29:01 +0100 |
| commit | 701a2aedc6837cfc505df0b12bfae24b8ac3d0c6 (patch) | |
| tree | 8d09e6109bf625ad37e9c92651cb96bb3d6544d2 /src | |
| parent | 25438bdfb9c1d56e06eb09d9b62dd98f20b11bf3 (diff) | |
Make enableMod a startup-only switch in common config
Diffstat (limited to 'src')
39 files changed, 166 insertions, 160 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java index 589210b..e1559d9 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 06949f7..4eef76f 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.isOnClient()) { @@ -39,7 +44,7 @@ public class NCRCore { LOGGER.debug("KONNICHIWA ZA WARUDO!"); LOGGER.debug("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<String> myTargets, Set<String> otherTargets) { + } + + @Override + public List<String> 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/ClothConfigIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java index 5f23c88..d8b2c55 100644 --- a/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/ClothConfigIntegration.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; @@ -72,19 +71,24 @@ public final class ClothConfigIntegration { .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 = translateKey("option.NoChatReports.enableMod.tooltip"); + + if (NCRConfig.getCommon().getSavedEnableMod() != NCRConfig.isModRunning()) { + enableModTooltip += "\n" + 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(makeTooltip("option.NoChatReports.enableMod.tooltip")) - .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() -> { - NCRConfig.getClient().enableMod = newValue; - NCRConfig.getClient().saveFile(); - })) + .setTooltip(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/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java index 12a9937..c7c236f 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 extends JSONConfig> T loadConfig(Class<T> configClass, Supplier<T> freshInstance, String fileName) { NCRCore.LOGGER.debug("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 <T extends JSONConfig> Optional<T> readFile(String fileName, Class<T> configClass) { + private static <T extends JSONConfig> Optional<T> readFile(String fileName, Class<T> 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 <T> 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); @@ -98,10 +101,6 @@ public abstract class JSONConfig { } }); - if (NCRCore.getProvider().isOnClient()) { - builder.registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE); - } - return builder.create(); } 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 14289d4..064238b 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 extends JSONConfig> T checkLoaded(Supplier<T> 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().isOnClient()) { - 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<JSONConfig> configs = NCRCore.getProvider().isOnClient() + ? List.of(getCommon(), getClient(), getServerPreferences()) + : List.of(getCommon()); - if (NCRCore.getProvider().isOnClient()) { - 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 @@ -162,14 +158,6 @@ public final class NCRConfigClient extends JSONConfig { } /** - * @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.<br><br> 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<ServerAddress, SigningMode> 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<Runnable> RESET_ACTIONS = new ArrayList<>(); private static final List<Runnable> 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 cf56ca1..24d26a2 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 @@ -88,7 +88,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, SwitchableSprites.of( GUIShenanigans.getSprites("safety_state/insecure"), 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 f938b73..e6b5cc0 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 @@ -29,9 +29,6 @@ public class MixinConnectScreen { @Inject(method = "startConnecting", at = @At("HEAD")) private static void onStartConnecting(Screen screen, Minecraft minecraft, ServerAddress serverAddress, @Nullable ServerData serverData, boolean quickplay, @Nullable TransferState transferState, 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 c3c0d33..5f3a484 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; import com.aizistral.nochatreports.common.gui.GUIShenanigans; @@ -17,7 +16,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.resources.ResourceLocation; +import net.minecraft.network.chat.MutableComponent; /** * This is responsible for adding mod toggle button to server selection menu. @@ -26,7 +25,6 @@ import net.minecraft.resources.ResourceLocation; @Mixin(JoinMultiplayerScreen.class) public abstract class MixinJoinMultiplayerScreen extends Screen { - private static final ResourceLocation TOGGLE_TEXTURE = new ResourceLocation("nochatreports", "textures/gui/ncr_toggle_button.png"); protected MixinJoinMultiplayerScreen() { super(null); @@ -35,27 +33,33 @@ 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 - 30, 20, 20, SwitchableSprites.of( GUIShenanigans.getSprites("ncr_active_button"), GUIShenanigans.getSprites("ncr_inactive_button") - ).setIndex(NCRConfig.getClient().enableMod() ? 0 : 1), + ).setIndex(NCRConfig.getCommon().getSavedEnableMod() ? 0 : 1), btn -> { - NCRConfig.getClient().toggleMod(); - boolean enabled = NCRConfig.getClient().enableMod(); + boolean enabled = !NCRConfig.getCommon().getSavedEnableMod(); + NCRConfig.getCommon().setSavedEnableMod(enabled); if (enabled) { ((AdvancedImageButton)btn).useSprites(0); } else { ((AdvancedImageButton)btn).useSprites(1); } - - 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 enabled = NCRConfig.getCommon().getSavedEnableMod(); + MutableComponent tooltip = Component.translatable("gui.nochatreports.ncr_toggle_tooltip", + Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (enabled ? "on" : "off"))); + + if (enabled != 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<ProfileKeyPairManager> 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<OptionInstance<Boolean>> 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 bdeee8d..6bdf5a5 100644 --- a/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java +++ b/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java @@ -13,6 +13,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 4dcb517..8339bed 100644 --- a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java @@ -32,9 +32,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/de_de.json b/src/main/resources/assets/nochatreports/lang/de_de.json index 111ff7e..306dc0d 100644 --- a/src/main/resources/assets/nochatreports/lang/de_de.json +++ b/src/main/resources/assets/nochatreports/lang/de_de.json @@ -21,7 +21,6 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "Nachrichten-Signaturen sind für diese Sitzung deaktiviert, werden jedoch aktiviert, sobald du eine Nachricht schickst.", "gui.nochatreports.signing_status.disabled_offline": "Nachrichten-Signaturen sind deaktiviert, da dies ein Offline-Server ist.", "gui.nochatreports.verified_server": "§a§lSicherer Server§r\nDieser Server hat No Chat Reports installiert oder verhindert das Melden von Nachrichten auf eine andere bekannte Weise. Du kannst dort sicher chatten.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nDe- oder aktiviere die meisten der clientseitigen Funktionen dieser Mod. Dies kann notwendig sein, um sich mit einigen Paper/Velocity-Server zu verbinden, da diese dafür bekannt sind, Probleme mit NCR zu verursachen.\nBestimmte, nicht verbindungsbezogene Funktionen wie Verschlüsselung, Chat Trust Status Anpassungen und das Entfernen von Vanillas \"Chatnachrichten können nicht verifiziert werden\"-Meldung funktionieren weiterhin, können aber in der Konfigurationsdatei individuell deaktiviert werden.", "gui.nochatreports.ncr_state_on": "§a§lAktiviert§r", "gui.nochatreports.ncr_state_off": "§c§lDeaktiviert§r", "gui.nochatreports.encryption_warning.learn_more": "Mehr erfahren", @@ -53,9 +52,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "Client", "option.NoChatReports.enableMod": "Mod aktivieren", - "option.NoChatReports.enableMod.tooltip": "Aktiviert den Großteil der clientseitigen Funktionen der Mod. Wenn du dies umstellst, während du auf einem Server bist, musst du ihm erneut beitreten.", "option.NoChatReports.showNCRButton": "NCR-Button anzeigen", - "option.NoChatReports.showNCRButton.tooltip": "Fügt einen Button zum Mehrspieler-Menü hinzu, der die meisten der clientseitigen Funktionen der Mod de- und aktiviert.", "option.NoChatReports.defaultSigningMode": "Standard Signaturmodus", "option.NoChatReports.defaultSigningMode.tooltip": "Legt den Standard Signaturmodus für Server, die Chat-Signierung erzwingen oder erlauben fest.", "option.NoChatReports.verifiedIconEnabled": "Verifiziert-Icon anzeigen", 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 2865c40..a0e4995 100644 --- a/src/main/resources/assets/nochatreports/lang/en_us.json +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -21,7 +21,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 safely there.", - "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 to cause 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", @@ -51,11 +52,12 @@ "gui.nochatreports.signing_mode.on_demand.tooltip": "Similar to prompt mode, but instead of showing a pop-up screen, signing will just be enabled automatically as soon as the 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 the 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/es_mx.json b/src/main/resources/assets/nochatreports/lang/es_mx.json index 045345c..714f663 100644 --- a/src/main/resources/assets/nochatreports/lang/es_mx.json +++ b/src/main/resources/assets/nochatreports/lang/es_mx.json @@ -21,7 +21,6 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "La firma de mensajes está desactivada para esta sesión, pero se habilitará una vez que envíes cualquier mensaje.", "gui.nochatreports.signing_status.disabled_offline": "La firma de mensajes está desactivada ya que este es un servidor sin conexión.", "gui.nochatreports.verified_server": "§a§lServidor seguro§r\nHemos verificado que este servidor tiene instalado No Chat Reports, o evita los informes de chat de alguna otra manera conocida. Puedes chatear de forma segura allí.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nDesactiva o activa la mayoría de las funcionalidades del mod en el lado del cliente. Es posible que debas hacer esto para unirte a algunos servidores de Paper/Velocity, ya que se sabe que causan problemas con NCR.\nCiertas cosas no relacionadas con la red, como el cifrado, los ajustes de confianza del chat y la eliminación del mensaje emergente \"Los mensajes de chat no se pueden verificar\" de vanilla, seguirán funcionando; se pueden desactivar individualmente en la configuración.", "gui.nochatreports.ncr_state_on": "§a§lHabilitado§r", "gui.nochatreports.ncr_state_off": "§c§lDeshabilitado§r", "gui.nochatreports.encryption_warning.learn_more": "Más información", @@ -53,9 +52,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "Cliente", "option.NoChatReports.enableMod": "Habilitar mod", - "option.NoChatReports.enableMod.tooltip": "Permite habilitar la funcionalidad del mod en el lado del cliente. Será necesario volver a unirse al servidor para que tenga efecto si se cambia durante la sesión.", "option.NoChatReports.showNCRButton": "Mostrar botón NCR", - "option.NoChatReports.showNCRButton.tooltip": "Agrega un botón que activa/desactiva la funcionalidad del mod en el lado del cliente en el menú multijugador.", "option.NoChatReports.defaultSigningMode": "Modo de firma predeterminado", "option.NoChatReports.defaultSigningMode.tooltip": "Establece el modo de firma predeterminado para los servidores que exigen o permiten la firma de chat.", "option.NoChatReports.verifiedIconEnabled": "Icono de verificación habilitado", 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/ja_jp.json b/src/main/resources/assets/nochatreports/lang/ja_jp.json index 921cf46..1579265 100644 --- a/src/main/resources/assets/nochatreports/lang/ja_jp.json +++ b/src/main/resources/assets/nochatreports/lang/ja_jp.json @@ -23,7 +23,6 @@ "gui.nochatreports.status_whitelist_yes": "§a§lOK", "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モジュールのクライアント機能の大部分を無効化または有効化します。NCRの問題を引き起こすため、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": "詳細を表示", @@ -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/assets/nochatreports/lang/ko_kr.json b/src/main/resources/assets/nochatreports/lang/ko_kr.json index c755fe6..b75bb8c 100644 --- a/src/main/resources/assets/nochatreports/lang/ko_kr.json +++ b/src/main/resources/assets/nochatreports/lang/ko_kr.json @@ -21,7 +21,6 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "이 세션에서 메시지 서명이 비활성화되어 있습니다. 메시지를 전송하면 활성화됩니다.", "gui.nochatreports.signing_status.disabled_offline": "오프라인 서버기 때문에 메시지 서명을 비활성화합니다.", "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": "더 알아보기", @@ -53,9 +52,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "클라이언트", "option.NoChatReports.enableMod": "모드 활성화", - "option.NoChatReports.enableMod.tooltip": "모드의 대부분의 클라이언트 기능을 활성화합니다. 세션 중에 변경되었다면 서버를 다시 접속해야 적용됩니다.", "option.NoChatReports.showNCRButton": "NCR 버튼 표시", - "option.NoChatReports.showNCRButton.tooltip": "멀티플레이 메뉴에 모드의 대부분의 클라이언트 기능을 토글하는 버튼을 추가합니다.", "option.NoChatReports.defaultSigningMode": "기본 서명 모드", "option.NoChatReports.defaultSigningMode.tooltip": "대화 서명을 강제하거나 허용하는 서버에서의 기본 서명 모드를 설정합니다.", "option.NoChatReports.verifiedIconEnabled": "확인됨 아이콘 활성화", diff --git a/src/main/resources/assets/nochatreports/lang/pl_pl.json b/src/main/resources/assets/nochatreports/lang/pl_pl.json index 483017c..fc20d8e 100644 --- a/src/main/resources/assets/nochatreports/lang/pl_pl.json +++ b/src/main/resources/assets/nochatreports/lang/pl_pl.json @@ -21,7 +21,6 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "Podpisywanie wiadomości jest wyłączone dla tej sesji, ale zostanie włączone po wysłaniu jakiejkolwiek wiadomości.", "gui.nochatreports.signing_status.disabled_offline": "Podpisywanie wiadomości jest wyłączone, ponieważ jest to serwer offline.", "gui.nochatreports.verified_server": "§a§lBezpieczny serwer§r\nMożemy potwierdzić, że ten serwer ma zainstalowany No Chat Reports, lub w inny znany sposób uniemożliwia raportowanie czatu. Możesz tam bezpiecznie czatować.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nWyłącz lub włącz większość funkcjonalności modu po stronie klienta. Może to być konieczne, aby dołączyć do niektórych serwerów Paper/Velocity, ponieważ są znane z powodowania problemów z NCR.\nPewne rzeczy związane z siecią, takie jak szyfrowanie, dostosowania statusu zaufania czatu i usuwanie \"Toastu\" Vanilla \"Wiadomości czatu nie mogą być zweryfikowane\", będą nadal działać; można je wyłączyć indywidualnie w pliku konfiguracyjnym.", "gui.nochatreports.ncr_state_on": "§a§lWłączone§r", "gui.nochatreports.ncr_state_off": "§c§lWyłączone§r", "gui.nochatreports.encryption_warning.learn_more": "Dowiedz się więcej", @@ -53,9 +52,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "Klient", "option.NoChatReports.enableMod": "Włącz modyfikację", - "option.NoChatReports.enableMod.tooltip": "Odpowiada za większość funkcjonalności modyfikacji po stronie klienta. Jeśli zostanie włączony w trakcie sesji, konieczne będzie ponowne dołączenie do serwera, aby zmiany zaczęły działać.", "option.NoChatReports.showNCRButton": "Pokaż przycisk NCR", - "option.NoChatReports.showNCRButton.tooltip": "Dodaje przycisk przełączający większość funkcjonalności modyfikacji po stronie klienta do menu wieloosobowego.", "option.NoChatReports.defaultSigningMode": "Domyślny tryb podpisywania", "option.NoChatReports.defaultSigningMode.tooltip": "Ustawia domyślny tryb podpisywania dla serwerów, które wymuszają lub pozwalają na podpisywanie wiadomości czatu.", "option.NoChatReports.verifiedIconEnabled": "Włącz ikonę zweryfikowanego serwera", 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 99fe582..5610369 100644 --- a/src/main/resources/assets/nochatreports/lang/ru_ru.json +++ b/src/main/resources/assets/nochatreports/lang/ru_ru.json @@ -21,7 +21,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, поскольку известно, что они вызывают проблемы с No Chat Reports.\nНекоторые не связанные с сетью вещи, такие как шифрование, настройки статуса доверия в чате и удаление всплывающего сообщения vanilla «Сообщения чата не могут быть проверены», по-прежнему будут работать; они могут может быть отключен в конфигурации индивидуально.",
"gui.nochatreports.ncr_state_on": "§a§lВключено§r",
"gui.nochatreports.ncr_state_off": "§c§lОтключено§r",
"gui.nochatreports.encryption_warning.learn_more": "Узнать больше",
@@ -53,9 +52,7 @@ "configuration.NoChatReports.config": "Настройки No Chat Reports",
"configuration.NoChatReports.category.client": "Клиент",
"option.NoChatReports.enableMod": "Включить мод",
- "option.NoChatReports.enableMod.tooltip": "Отвечает за включение большей части клиентских функций мода. Потребуется повторное подключение к серверу, чтобы оно вступило в силу, если переключено в середине сеанса.",
"option.NoChatReports.showNCRButton": "Показать кнопку No Chat Reports",
- "option.NoChatReports.showNCRButton.tooltip": "Добавляет кнопку, которая переключает большую часть клиентских функций мода в меню многопользовательской игры.",
"option.NoChatReports.defaultSigningMode": "Режим подписи по умолчанию",
"option.NoChatReports.defaultSigningMode.tooltip": "Устанавливает режим подписи по умолчанию для серверов, которые принудительно или разрешают подписание в чате.",
"option.NoChatReports.verifiedIconEnabled": "Значок подтверждения включен",
diff --git a/src/main/resources/assets/nochatreports/lang/th_th.json b/src/main/resources/assets/nochatreports/lang/th_th.json index 65e72e6..29b3a92 100644 --- a/src/main/resources/assets/nochatreports/lang/th_th.json +++ b/src/main/resources/assets/nochatreports/lang/th_th.json @@ -21,7 +21,6 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "การลงนามข้อความถูกปิดในเซสชันนี้ แต่จะถูกเปิดอีกครั้งเมื่อคุณเข้าใหม่", "gui.nochatreports.signing_status.disabled_offline": "การลงนามข้อความถูกปิดเนื่องจากเซิร์ฟเวอร์นี้เป็นเซิร์ฟเวอร์แบบออฟไลน์", "gui.nochatreports.verified_server": "§l§a§lเซิร์ฟเวอร์ปลอดภัย§r\nเรายืนยันได้ว่าเซิร์ฟเวอร์นี้ได้ติดตั้งม็อด No Chat Report ไว้ หรือป้องกันการรายงานแช็ตในทางใดทางหนึ่ง คุณสามารถพูดคุยในเซิร์ฟเวอร์ดังกล่าวได้อย่างปลอดภัย", - "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": "เรียนรู้เพิ่มเติม", @@ -53,9 +52,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "ฝั่งไคลเอนต์", "option.NoChatReports.enableMod": "เปิดการใช้งานม็อด", - "option.NoChatReports.enableMod.tooltip": "มีหน้าที่เปิดหรือปิดฟังก์ชันส่วนใหญ่ของม็อดฝั่งไคลเอนต์ หากถูกปิด/เปิดกลางเซสชัน คุณต้องเข้าเซิร์ฟเวอร์ใหม่เพื่อให้เกิดผลตามการตั้งค่าที่เปลี่ยนไป", "option.NoChatReports.showNCRButton": "แสดงปุ่ม NCR", - "option.NoChatReports.showNCRButton.tooltip": "เพิ่มปุ่มที่สามารถเปิดปิดฟังก์ชันส่วนใหญ่ของม็อดฝั่งไคลเอนต์ได้เข้าไปในหน้าเมนูผู้เล่นหลายคน", "option.NoChatReports.defaultSigningMode": "โหมดการลงนามแบบค่าเริ่มต้น", "option.NoChatReports.defaultSigningMode.tooltip": "ตั้งให้โหมดการลงนามเป็นค่าเริ่มต้นให้เซิร์ฟเวอร์ที่บังคับหรืออนุญาตให้ใช้การลงนามแช็ต", "option.NoChatReports.verifiedIconEnabled": "เปิดการแสดงไอคอนการยืนยัน", diff --git a/src/main/resources/assets/nochatreports/lang/uk_ua.json b/src/main/resources/assets/nochatreports/lang/uk_ua.json index 4f44302..6f11476 100644 --- a/src/main/resources/assets/nochatreports/lang/uk_ua.json +++ b/src/main/resources/assets/nochatreports/lang/uk_ua.json @@ -21,7 +21,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, бо відомо що вони можуть викликати проблеми з модифікацією.\nДеякі не-мережеві речі, як шифрування, зміни до стану безпеки чату і видалення попередження \"Неможливо перевірити повідомлення\" все ще будуть працювати; їх можна окремо вимкнути у конфігурації.", "gui.nochatreports.ncr_state_on": "§a§lУвімкнено§r", "gui.nochatreports.ncr_state_off": "§c§lВимкнено§r", "gui.nochatreports.encryption_warning.learn_more": "Дізнатися більше", @@ -53,9 +52,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "Клієнт", "option.NoChatReports.enableMod": "Увімкнути модифікацію", - "option.NoChatReports.enableMod.tooltip": "Відповідає за увімкнення більшості функціоналу модифікації зі сторони клієнта. Вимагає повторне з'єднання до сервера, якщо змінюється під час сесії.", "option.NoChatReports.showNCRButton": "Показувати кнопку NCR", - "option.NoChatReports.showNCRButton.tooltip": "Додає кнопку у меню багато-осібної гри, яка перемикає більшість функціоналу модифікації зі сторони клієнта.", "option.NoChatReports.defaultSigningMode": "Стандартний режим підписування", "option.NoChatReports.defaultSigningMode.tooltip": "Змінює стандартний режим підписування для серверів які вимагають або дозволяють підписування повідомлень.", "option.NoChatReports.verifiedIconEnabled": "Значок перевірення увімкнено", diff --git a/src/main/resources/assets/nochatreports/lang/vi_vn.json b/src/main/resources/assets/nochatreports/lang/vi_vn.json index 309e69f..9f83af6 100644 --- a/src/main/resources/assets/nochatreports/lang/vi_vn.json +++ b/src/main/resources/assets/nochatreports/lang/vi_vn.json @@ -21,7 +21,6 @@ "gui.nochatreports.signing_status.disabled_allowance_pending": "Tính năng ký thư bị tắt cho phiên này, nhưng nó sẽ được bật sau khi bạn gửi bất kỳ thư nào.", "gui.nochatreports.signing_status.disabled_offline": "Tính năng ký tin nhắn bị tắt vì đây là máy chủ ngoại tuyến.", "gui.nochatreports.verified_server": "§a§lMáy chủ an toàn§r\nChúng tôi có thể xác minh rằng máy chủ này đã cài đặt No Chat Reports hoặc ngăn báo cáo trò chuyện theo một số cách đã biết khác. Bạn có thể trò chuyện ở đó một cách an toàn.", - "gui.nochatreports.ncr_toggle_tooltip": "§lNo Chat Reports:§r %1$s\nTắt hoặc bật hầu hết chức năng phía máy khách của mod. Bạn có thể phải thực hiện việc này để tham gia một số máy chủ Paper/Velocity, vì chúng được biết là gây ra sự cố với NCR.\nMột số thứ không liên quan đến mạng, chẳng hạn như mã hóa, điều chỉnh trạng thái tin cậy của trò chuyện và xóa toast \"Tin nhắn trò chuyện không thể được xác minh\" vanilla sẽ vẫn hoạt động; chúng có thể bị vô hiệu hóa trong cấu hình riêng lẻ.", "gui.nochatreports.ncr_state_on": "§a§Đã bật§r", "gui.nochatreports.ncr_state_off": "§c§Đã tắt§r", "gui.nochatreports.encryption_warning.learn_more": "Tìm hiểu thêm", @@ -53,9 +52,7 @@ "configuration.NoChatReports.config": "No Chat Reports", "configuration.NoChatReports.category.client": "Máy khách", "option.NoChatReports.enableMod": "Bật mod", - "option.NoChatReports.enableMod.tooltip": "Chịu trách nhiệm kích hoạt hầu hết các chức năng phía máy khách của mod. Sẽ yêu cầu tham gia lại máy chủ để có hiệu lực nếu bật giữa phiên.", "option.NoChatReports.showNCRButton": "Hiện nút NCR", - "option.NoChatReports.showNCRButton.tooltip": "Thêm một nút chuyển đổi hầu hết chức năng phía máy khách của mod sang menu nhiều người chơi.", "option.NoChatReports.defaultSigningMode": "Chế độ ký mặc định", "option.NoChatReports.defaultSigningMode.tooltip": "Đặt chế độ ký mặc định cho các máy chủ buộc hoặc cho phép ký trò chuyện.", "option.NoChatReports.verifiedIconEnabled": "Đã bật biểu tượng đã xác minh", diff --git a/src/main/resources/assets/nochatreports/lang/zh_cn.json b/src/main/resources/assets/nochatreports/lang/zh_cn.json index 8b482b1..3b0be37 100644 --- a/src/main/resources/assets/nochatreports/lang/zh_cn.json +++ b/src/main/resources/assets/nochatreports/lang/zh_cn.json @@ -21,7 +21,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服务器,因为它们会导致模组出现问题。某些与网络无关的事情,如加密、聊天信任状态调整和删除原版的“聊天消息无法验证”警告弹窗仍然有效;它们可以在配置中单独禁用。", "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 @@ "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 6deed22..154cb88 100644 --- a/src/main/resources/assets/nochatreports/lang/zh_tw.json +++ b/src/main/resources/assets/nochatreports/lang/zh_tw.json @@ -22,7 +22,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 伺服器,因為它們已知會與「No Chat Reports」產生問題。\n某些與網路不相關的功能,如加密、聊天信任狀態調整和移除原版的「無法驗證聊天訊息」彈出提示框,仍可以正常運作;它們可以在設定中單獨停用。",
"gui.nochatreports.ncr_state_on": "§a§l已啟用§r",
"gui.nochatreports.ncr_state_off": "§c§l已停用§r",
"gui.nochatreports.encryption_warning.learn_more": "了解更多",
@@ -54,9 +53,7 @@ "configuration.NoChatReports.config": "No Chat Reports",
"configuration.NoChatReports.category.client": "用戶端",
"option.NoChatReports.enableMod": "啟用模組",
- "option.NoChatReports.enableMod.tooltip": "負責啟用此模組大部分用戶端的功能。如果在中途切換,將需要重新加入伺服器才能生效。",
"option.NoChatReports.showNCRButton": "顯示 NCR 按鈕",
- "option.NoChatReports.showNCRButton.tooltip": "在多人遊戲選單中新增一個按鈕,用於切換此模組大部分的用戶端功能。",
"option.NoChatReports.defaultSigningMode": "預設簽章模式",
"option.NoChatReports.defaultSigningMode.tooltip": "設定伺服器的預設簽章模式,來強制或允許聊天簽章。",
"option.NoChatReports.verifiedIconEnabled": "啟用已驗證圖示",
diff --git a/src/main/resources/mixins/common/nochatreports.mixins.json b/src/main/resources/mixins/common/nochatreports.mixins.json index ad5ecb7..d8c3866 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_18", "mixins": [ "common.MixinServerStatus", diff --git a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json index 8352ca8..364a244 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_18", "mixins": [ ], |
