prevent bypass

Author: Junn1o

src/client/java/com/junnio/anticonfig/AnticonfigClient.java

@@ -29,7 +29,7 @@ public void onInitializeClient() {
 		ClientLoginNetworking.registerGlobalReceiver(ConfigSync.CONFIG_SYNC_ID, (client, handler, buf, listenerAdder) -> {
 			// Read server configs
 			Map<String, String> serverConfigs = buf.readMap(PacketByteBuf::readString, PacketByteBuf::readString);
-
+			ConfigScreenHandler.setServerConfigs(serverConfigs);
 			// Prepare client configs
 			Map<String, String> clientConfigs = new HashMap<>();
 			Path configDir = FabricLoader.getInstance().getConfigDir();
@@ -59,11 +59,11 @@ public void onInitializeClient() {
 
 			return CompletableFuture.completedFuture(response);
 		});
-
 		// Screen events for config changes
 		ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
 			if (screen instanceof ClothConfigScreen) {
 				ScreenEvents.remove(screen).register((closedScreen) -> {
+					System.out.println("Screen closed");
 					ConfigScreenHandler.onConfigScreenClose();
 				});
 			}

src/client/java/com/junnio/anticonfig/ConfigScreenHandler.java

@@ -1,5 +1,8 @@
 package com.junnio.anticonfig;
 
+import com.electronwill.nightconfig.core.file.FileConfig;
+import com.electronwill.nightconfig.json.JsonFormat;
+import com.electronwill.nightconfig.toml.TomlFormat;
 import com.junnio.anticonfig.config.ConfigSync;
 import com.junnio.anticonfig.config.ModConfig;
 import com.junnio.anticonfig.net.ConfigScreenSync;
@@ -8,32 +11,56 @@
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.network.PacketByteBuf;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 
 public class ConfigScreenHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger("ConfigScreenHandler");
+    private static Map<String, String> lastServerConfigs = new HashMap<>();
+
     public static void init() {
-        // Register the payload type on client side
         PayloadTypeRegistry.playC2S().register(ConfigSyncPayload.ID, ConfigSyncPayload.CODEC);
     }
 
+    // Method to store server's config list when received during login
+    public static void setServerConfigs(Map<String, String> serverConfigs) {
+        lastServerConfigs = new HashMap<>(serverConfigs);
+    }
+
     public static void onConfigScreenClose() {
-        // Create config map
         Map<String, String> configsToSync = new HashMap<>();
-        ModConfig config = ModConfig.getInstance();
+        Path configDir = FabricLoader.getInstance().getConfigDir();
 
-        // Gather current config states
-        for (String filename : config.getConfigFilesToCheck()) {
-            String content = ConfigSync.getConfigContent(filename);
-            if (content != null) {
-                configsToSync.put(filename, content);
+        try {
+            // Only read configs that were requested by server during login
+            for (String filename : lastServerConfigs.keySet()) {
+                Path configPath = configDir.resolve(filename);
+                if (Files.exists(configPath)) {
+                    FileConfig config;
+                    if (filename.endsWith(".json")) {
+                        config = FileConfig.of(configPath, JsonFormat.minimalInstance());
+                    } else if (filename.endsWith(".toml")) {
+                        config = FileConfig.of(configPath, TomlFormat.instance());
+                    } else {
+                        continue;
+                    }
+                    config.load();
+                    configsToSync.put(filename, config.valueMap().toString());
+                }
             }
-        }
 
-        // Create and send payload
-        ConfigSyncPayload payload = new ConfigSyncPayload(configsToSync);
-        ClientPlayNetworking.send(payload);
+            ConfigSyncPayload payload = new ConfigSyncPayload(configsToSync);
+            ClientPlayNetworking.send(payload);
+
+        } catch (Exception e) {
+            LOGGER.error("Failed to sync configs after screen close", e);
+        }
     }
 }

src/main/java/com/junnio/anticonfig/net/ConfigScreenSync.java

@@ -30,6 +30,7 @@ public static void initServer() {
                 ModConfig config = ModConfig.getInstance();
                 Path configDir = FabricLoader.getInstance().getConfigDir();
 
+                // Get current server configs
                 for (String filename : config.getConfigFilesToCheck()) {
                     Path configPath = configDir.resolve(filename);
                     if (Files.exists(configPath)) {
@@ -47,9 +48,24 @@ public static void initServer() {
                     }
                 }
 
+                // Compare with client configs
+                Map<String, String> clientConfigs = payload.configs();
+                for (Map.Entry<String, String> entry : serverConfigs.entrySet()) {
+                    String filename = entry.getKey();
+                    String serverContent = entry.getValue();
+                    String clientContent = clientConfigs.get(filename);
+
+                    if (!serverContent.equals(clientContent)) {
+                        mismatch = true;
+                        mismatched.append(filename).append(", ");
+                    }
+                }
+
                 if (mismatch) {
                     String files = mismatched.substring(0, mismatched.length() - 2);
-                    context.player().sendMessage(Text.literal("§cConfig mismatch detected! Some settings will not take effect."));
+                    context.player().sendMessage(Text.literal("§cConfig mismatch detected! Please make sure these configs match the server: " + files));
+                    // Optionally kick the player if configs don't match
+                    context.player().networkHandler.disconnect(Text.literal("Config mismatch! Please make sure these configs match the server: " + files));
                 }
             });
         });