summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/aizistral/nochatreports/NCRMixinPlugin.java46
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReports.java17
-rw-r--r--src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java22
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/JSONConfig.java13
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfig.java54
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java14
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java10
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java7
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java2
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java3
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java28
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java7
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java4
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java13
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java4
16 files changed, 127 insertions, 121 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NCRMixinPlugin.java b/src/main/java/com/aizistral/nochatreports/NCRMixinPlugin.java
new file mode 100644
index 0000000..ab2ca85
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/NCRMixinPlugin.java
@@ -0,0 +1,46 @@
+package com.aizistral.nochatreports;
+
+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.config.NCRConfig;
+
+public class NCRMixinPlugin implements IMixinConfigPlugin {
+ private static final String TOGGLE_BUTTON_MIXIN = "com.aizistral.nochatreports.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/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
index 1d5f054..f702d92 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java
@@ -14,6 +14,7 @@ import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.server.network.ServerLoginPacketListenerImpl;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
+import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
@@ -24,6 +25,7 @@ import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.loading.FMLEnvironment;
import net.minecraftforge.network.NetworkRegistry;
import net.minecraftforge.network.event.EventNetworkChannel;
import net.minecraftforge.network.simple.SimpleChannel;
@@ -39,6 +41,11 @@ public class NoChatReports {
private static boolean detectedOnClient = false, detectedOnServer = false;
public NoChatReports() {
+ if (!NCRConfig.isModRunning()) {
+ LOGGER.info("No Chat Reports is disabled in its config and will not initialize.");
+ return;
+ }
+
LOGGER.info("KONNICHIWA ZA WARUDO!");
LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName());
@@ -49,7 +56,12 @@ public class NoChatReports {
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onLoadComplete);
MinecraftForge.EVENT_BUS.register(this);
- NCRConfig.load();
+
+ if (FMLEnvironment.dist == Dist.CLIENT) {
+ NoChatReportsClient.registerListeners();
+ }
+
+ NCRConfig.save();
}
private void onLoadComplete(FMLLoadCompleteEvent event) {
@@ -60,9 +72,6 @@ public class NoChatReports {
channel = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(MODID, "main"))
.networkProtocolVersion(() -> PTC_VERSION)
.clientAcceptedVersions(version -> {
- if (!NCRConfig.getClient().enableMod())
- return true;
-
detectedOnServer = !isAbsentOrVanilla(version);
return NCRConfig.getClient().demandOnServer() ? PTC_VERSION.equals(version) : true;
})
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
index 27cdb64..684973d 100644
--- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
+++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java
@@ -25,12 +25,9 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.ClientPlayerNetworkEvent;
import net.minecraftforge.client.event.ScreenEvent;
+import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
-@EventBusSubscriber(modid = NoChatReports.MODID, bus = Bus.FORGE)
public class NoChatReportsClient {
private static final List<String> KEY_DISCONNECT_REASONS = ImmutableList.of(
"multiplayer.disconnect.missing_public_key",
@@ -49,15 +46,17 @@ public class NoChatReportsClient {
throw new IllegalStateException("Can't touch this");
}
- @SubscribeEvent
+ @OnlyIn(Dist.CLIENT)
+ public static void registerListeners() {
+ MinecraftForge.EVENT_BUS.addListener(NoChatReportsClient::onScreenInit);
+ MinecraftForge.EVENT_BUS.addListener(NoChatReportsClient::onPlayReady);
+ }
+
@OnlyIn(Dist.CLIENT)
public static void onScreenInit(ScreenEvent.Init.Post event) {
Minecraft client = Minecraft.getInstance();
Screen screen = event.getScreen();
- if (!NCRConfig.getClient().enableMod())
- return;
-
if (screen instanceof AccessorDisconnectedScreen dsc) {
if (screenOverride || ServerSafetyState.isOnServer() || screen.getTitle() == CONNECT_FAILED_NCR)
return;
@@ -117,9 +116,6 @@ public class NoChatReportsClient {
@OnlyIn(Dist.CLIENT)
public static void onDisconnect(Minecraft client) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
if (NCRConfig.getCommon().enableDebugLog()) {
NoChatReports.LOGGER.info("Disconnected from server, resetting safety state!");
}
@@ -128,14 +124,10 @@ public class NoChatReportsClient {
ServerSafetyState.setDisconnectMillis(Util.getMillis());
}
- @SubscribeEvent
@OnlyIn(Dist.CLIENT)
public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) {
Minecraft client = Minecraft.getInstance();
- if (!NCRConfig.getClient().enableMod())
- return;
-
client.execute(() -> {
ServerSafetyState.setReconnectCount(0);
ServerSafetyState.setOnServer(true);
diff --git a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
index e92a067..fc0b2cb 100644
--- a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java
@@ -8,7 +8,9 @@ import java.nio.file.Path;
import java.util.Optional;
import java.util.function.Supplier;
-import com.aizistral.nochatreports.NoChatReports;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
@@ -17,6 +19,7 @@ import com.google.gson.GsonBuilder;
import net.minecraftforge.fml.loading.FMLPaths;
public abstract class JSONConfig {
+ protected static final Logger LOGGER = LogManager.getLogger("NoChatReports");
protected static final Path CONFIG_DIR = FMLPaths.CONFIGDIR.get();
protected static final Gson GSON = new GsonBuilder().setPrettyPrinting()
.setExclusionStrategies(new ExclusionStrategy() {
@@ -44,7 +47,7 @@ public abstract class JSONConfig {
}
public void saveFile() {
- NoChatReports.LOGGER.info("Writing config file {}...", this.fileName);
+ LOGGER.info("Writing config file {}...", this.fileName);
writeFile(this.fileName, this);
}
@@ -55,7 +58,7 @@ public abstract class JSONConfig {
public abstract JSONConfig getDefault();
public static <T extends JSONConfig> T loadConfig(Class<T> configClass, Supplier<T> freshInstance, String fileName) {
- NoChatReports.LOGGER.info("Reading config file {}...", fileName);
+ LOGGER.info("Reading config file {}...", fileName);
T config = readFile(fileName, configClass).orElseGet(freshInstance);
config.uponLoad();
return config;
@@ -70,7 +73,7 @@ public abstract class JSONConfig {
try (BufferedReader reader = Files.newBufferedReader(file)) {
return Optional.of(GSON.fromJson(reader, configClass));
} catch (IOException ex) {
- NoChatReports.LOGGER.fatal("Could not read config file: {}", file);
+ LOGGER.fatal("Could not read config file: {}", file);
ex.printStackTrace();
return null;
}
@@ -85,7 +88,7 @@ public abstract class JSONConfig {
GSON.toJson(config, writer);
}
} catch (Exception ex) {
- NoChatReports.LOGGER.fatal("Could not write config file: {}", file);
+ LOGGER.fatal("Could not write config file: {}", file);
throw new RuntimeException(ex);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
index 548cc15..5120e53 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java
@@ -5,12 +5,10 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Objects;
-import java.util.function.Supplier;
+import java.util.List;
import javax.annotation.Nullable;
-import com.aizistral.nochatreports.NoChatReports;
-
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.loading.FMLEnvironment;
@@ -19,51 +17,51 @@ public final class NCRConfig {
private static NCRConfigCommon common = null;
private static NCRConfigClient client = null;
private static NCRServerWhitelist whitelist = 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();
+ JSONConfig.LOGGER.info("Mod Enabled: {}", modRunning);
+ }
- @OnlyIn(Dist.CLIENT)
- public static NCRConfigClient getClient() {
- return checkLoaded(() -> client);
+ return common;
}
- @OnlyIn(Dist.CLIENT)
- public static NCRServerWhitelist getServerWhitelist() {
- return checkLoaded(() -> whitelist);
+ public static boolean isModRunning() {
+ getCommon();
+ return modRunning;
}
- private static <T extends JSONConfig> T checkLoaded(Supplier<T> config) {
- if (config.get() == null) {
- load();
+ @OnlyIn(Dist.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 (FMLEnvironment.dist == Dist.CLIENT) {
- client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME);
+ @OnlyIn(Dist.CLIENT)
+ public static synchronized NCRServerWhitelist getServerWhitelist() {
+ if (whitelist == null) {
whitelist = JSONConfig.loadConfig(NCRServerWhitelist.class, NCRServerWhitelist::new, NCRServerWhitelist.FILE_NAME);
}
- save();
+ return whitelist;
}
public static void save() {
- checkLoaded(() -> common).saveFile();
+ List<JSONConfig> configs = FMLEnvironment.dist == Dist.CLIENT
+ ? List.of(getCommon(), getClient(), getServerWhitelist())
+ : List.of(getCommon());
- if (FMLEnvironment.dist == Dist.CLIENT) {
- checkLoaded(() -> client).saveFile();
- checkLoaded(() -> whitelist).saveFile();
- }
+ configs.forEach(JSONConfig::saveFile);
Path readme = JSONConfig.CONFIG_DIR.resolve("NoChatReports/README.md");
try {
@@ -73,7 +71,7 @@ public final class NCRConfig {
https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files
""", StandardCharsets.UTF_8);
} catch (Exception ex) {
- NoChatReports.LOGGER.fatal("Could not write README file: {}", readme);
+ JSONConfig.LOGGER.fatal("Could not write README file: {}", readme);
throw new RuntimeException(ex);
}
}
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
index 7f0e5e3..3c1294e 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java
@@ -22,7 +22,7 @@ public final class NCRConfigClient extends JSONConfig {
hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true,
alwaysHideReportButton = false, disableTelemetry = true,
whitelistAllServers = false, verifiedIconEnabled = true, showNCRButton = true,
- enableMod = true, skipRealmsWarning = false;
+ skipRealmsWarning = false;
protected int verifiedIconOffsetX = 0, verifiedIconOffsetY = 0, reconnectAwaitSeconds = 4,
postDisconnectAwaitSeconds = 10, signingCheckDelaySeconds = 43200;
@@ -37,10 +37,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
@@ -185,14 +181,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 How many seconds No Chat Reports should wait before attemting automatic reconnects.
* @see <a href="https://github.com/Aizistral-Studios/No-Chat-Reports/issues/190">Issue #190</a>
*/
diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
index 7aa0322..3b2b02f 100644
--- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
+++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java
@@ -8,6 +8,7 @@ import com.google.common.base.Preconditions;
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 = true, enableDebugLog = false, convertToGameMessage = false,
@@ -22,6 +23,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/mixins/client/MixinChatOptionsScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java
index 6b3d0f5..cbde922 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java
@@ -5,7 +5,6 @@ import java.util.List;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.asm.mixin.Mixin;
-import com.aizistral.nochatreports.config.NCRConfig;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.Minecraft;
@@ -45,9 +44,6 @@ public class MixinChatOptionsScreen extends SimpleOptionsSubScreen {
protected void init() {
super.init();
- if (!NCRConfig.getClient().enableMod())
- return;
-
this.secureChatTooltip = Minecraft.getInstance().font.split(Component.translatable("gui.nochatreport.secureChat"), 200);
this.onlyShowSecureChat = this.list.findOption(Minecraft.getInstance().options.onlyShowSecureChat());
@@ -66,9 +62,6 @@ public class MixinChatOptionsScreen extends SimpleOptionsSubScreen {
public void render(@NotNull PoseStack poseStack, int x, int y, float f) {
super.render(poseStack, x, y, f);
- if (!NCRConfig.getClient().enableMod())
- return;
-
if (this.onlyShowSecureChat != null && this.onlyShowSecureChat.visible && x >= (double) this.onlyShowSecureChat.x && y >= (double) this.onlyShowSecureChat.y && x < (double) (this.onlyShowSecureChat.x + this.onlyShowSecureChat.getWidth()) && y < (double) (this.onlyShowSecureChat.y + this.onlyShowSecureChat.getHeight())) {
this.renderTooltip(poseStack, this.secureChatTooltip, x, y);
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
index 6d11d92..b9e02cb 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java
@@ -49,7 +49,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()) {
ServerSafetyLevel trust = this.minecraft.isLocalServer() ? ServerSafetyLevel.SECURE : ServerSafetyState.getCurrent();
var button = new ImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(trust),
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
index 82df5af..36989e8 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientboundHelloPacket.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.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.core.ServerSafetyState;
@@ -24,9 +23,6 @@ public class MixinClientboundHelloPacket {
@Inject(method = "handle", at = @At("HEAD"))
private void onHandle(ClientLoginPacketListener listener, CallbackInfo info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
ServerSafetyState.setSessionRequestedKey(true);
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
index 947729d..a371689 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java
@@ -30,9 +30,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.updateCurrent(ServerSafetyLevel.UNDEFINED); // just to be 100% sure
ServerSafetyState.setLastConnectedServer(serverAddress, serverData);
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
index 3f37f45..6c022d8 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java
@@ -6,13 +6,13 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import com.aizistral.nochatreports.config.NCRConfig;
-import com.aizistral.nochatreports.core.ServerSafetyState;
import net.minecraft.client.gui.components.ImageButton;
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;
/**
@@ -31,27 +31,29 @@ 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 ImageButton(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;
}
+ }, (btn, poseStack, i, j) -> {
+ boolean enabled = NCRConfig.getCommon().getSavedEnableMod();
+ MutableComponent tooltip = Component.translatable("gui.nochatreports.ncr_toggle_tooltip",
+ Language.getInstance().getOrDefault("gui.nochatreports.ncr_state_" + (enabled ? "on" : "off")));
- ServerSafetyState.reset();
- }, (btn, poseStack, i, j) -> this.renderTooltip(poseStack,
- this.minecraft.font.split(
- Component.translatable("gui.nochatreports.ncr_toggle_tooltip",
- Language.getInstance()
- .getOrDefault("gui.nochatreports.ncr_state_"
- + (NCRConfig.getClient().enableMod()
- ? "on" : "off"))), 250), i, j),
+ if (enabled != NCRConfig.isModRunning()) {
+ tooltip.append("\n").append(Component.translatable("gui.nochatreports.ncr_toggle_restart_pending"));
+ }
+
+ this.renderTooltip(poseStack, this.minecraft.font.split(tooltip, 250), i, j);
+ },
Component.translatable("gui.nochatreports.ncr_toggle"));
button.active = true;
button.visible = true;
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
index 9e43d68..1f7d3be 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinLocalPlayer.java
@@ -7,7 +7,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.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
import com.mojang.brigadier.ParseResults;
@@ -31,9 +30,6 @@ public class MixinLocalPlayer {
@Inject(method = "signMessage", at = @At("HEAD"), cancellable = true)
private void onSignMessage(MessageSigner signer, ChatMessageContent message, LastSeenMessages messages, CallbackInfoReturnable<MessageSignature> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
if (!ServerSafetyState.forceSignedMessages()) {
info.setReturnValue(MessageSignature.EMPTY);
}
@@ -46,9 +42,6 @@ public class MixinLocalPlayer {
@Inject(method = "signCommandArguments", at = @At("HEAD"), cancellable = true)
private void onSignCommand(MessageSigner signer, ParseResults<SharedSuggestionProvider> results, @Nullable Component component, LastSeenMessages messages, CallbackInfoReturnable<ArgumentSignatures> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
if (!ServerSafetyState.forceSignedMessages()) {
info.setReturnValue(ArgumentSignatures.EMPTY);
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java
index 8bbdbfb..b6cde14 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java
+++ b/src/main/java/com/aizistral/nochatreports/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.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(Component.translatable("gui.nochatreport.secureChat")),
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
index 407a7ed..b9b4731 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinProfileKeyPairManager.java
@@ -8,7 +8,6 @@ import org.spongepowered.asm.mixin.injection.Group;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import com.aizistral.nochatreports.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyState;
import com.mojang.authlib.yggdrasil.response.KeyPairResponse;
@@ -28,9 +27,6 @@ public class MixinProfileKeyPairManager {
@Inject(method = "profilePublicKey", at = @At("HEAD"), cancellable = true)
private void onProfilePublicKey(CallbackInfoReturnable<Optional<ProfilePublicKey>> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
if (!ServerSafetyState.allowsUnsafeServer()) {
info.setReturnValue(Optional.empty());
}
@@ -45,9 +41,6 @@ public class MixinProfileKeyPairManager {
@Group(min = 1, max = 2)
@Inject(method = "parsePublicKey", at = @At("HEAD"), cancellable = true)
private static void onParsePublicKey(KeyPairResponse response, CallbackInfoReturnable<ProfilePublicKey.Data> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
if (!ServerSafetyState.allowsUnsafeServer()) {
info.setReturnValue(null);
}
@@ -62,9 +55,6 @@ public class MixinProfileKeyPairManager {
@Group(min = 1, max = 2)
@Inject(method = { "profilePublicKeyData", "method_43784" }, at = @At("HEAD"), cancellable = true, remap = false)
private void onProfilePublicKeyData(CallbackInfoReturnable<Optional<ProfilePublicKey.Data>> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
if (!ServerSafetyState.allowsUnsafeServer()) {
info.setReturnValue(Optional.empty());
}
@@ -78,9 +68,6 @@ public class MixinProfileKeyPairManager {
@Inject(method = "signer", at = @At("HEAD"), cancellable = true)
private void onSigner(CallbackInfoReturnable<Optional<Signer>> info) {
- if (!NCRConfig.getClient().enableMod())
- return;
-
if (!ServerSafetyState.allowsUnsafeServer()) {
info.setReturnValue(null);
}
diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java
index 5fd58dd..cc26877 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java
+++ b/src/main/java/com/aizistral/nochatreports/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.config.NCRConfig;
import com.aizistral.nochatreports.core.ServerSafetyLevel;
import com.aizistral.nochatreports.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.setLastConnectedServer(serverAddress, null);
ServerSafetyState.updateCurrent(ServerSafetyLevel.REALMS);
ServerSafetyState.setAllowsUnsafeServer(true);