Merge pull request #1 from Junn1o/test

Junn1o · web-flow · commit 4fc3cca4794b · 2025-05-20T18:19:15.000+07:00
test
diff --git a/build.gradle b/build.gradle
@@ -17,16 +17,18 @@ repositories {
 	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
 	// for more information about repositories.
 	maven { url "https://jitpack.io" }
+	maven {
+		name = "Terraformers"
+		url = "https://maven.terraformersmc.com/"
+	}
 	maven { url "https://maven.shedaniel.me/" }
-	maven { url "https://maven.terraformersmc.com/releases/" }
-
 }
 
 loom {
 	splitEnvironmentSourceSets()
 
 	mods {
-		"antifreecam" {
+		"anticonfig" {
 			sourceSet sourceSets.main
 			sourceSet sourceSets.client
 		}
@@ -47,9 +49,9 @@ dependencies {
 	implementation include('com.electronwill.night-config:core:3.6.6')
 	implementation include('com.electronwill.night-config:toml:3.6.6')
 	implementation include('com.electronwill.night-config:json:3.6.6')
-	modCompileOnly ("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}") {
-		exclude(group: "net.fabricmc.fabric-api")
-	}
+	modImplementation("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}")
+	//modImplementation "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
+	//include "me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}"
 }
 
 processResources {
diff --git a/gradle.properties b/gradle.properties
@@ -11,8 +11,8 @@ loom_version=1.10-SNAPSHOT
 
 # Mod Properties
 mod_version=1.0.0
-maven_group=com.junnio.antifreecam
-archives_base_name=antifreecam
+maven_group=com.junnio.anticonfig
+archives_base_name=anticonfig
 
 # Dependencies
 fabric_version=0.119.2+1.21.4
diff --git a/src/client/java/com/junnio/anticonfig/AnticonfigClient.java b/src/client/java/com/junnio/anticonfig/AnticonfigClient.java
@@ -1,46 +1,54 @@
-package com.junnio.antifreecam;
+package com.junnio.anticonfig;
 
-import com.junnio.antifreecam.config.ConfigSync;
-import com.junnio.antifreecam.config.ModConfig;
+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 me.shedaniel.clothconfig2.gui.ClothConfigScreen;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.networking.v1.ClientLoginNetworking;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.network.PacketByteBuf;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-public class AntifreecamClient implements ClientModInitializer {
-	private static final Logger LOGGER = LoggerFactory.getLogger("AntiFreecam");
+public class AnticonfigClient implements ClientModInitializer {
+	private static final Logger LOGGER = LoggerFactory.getLogger("ClientModInitializer");
 
 	@Override
 	public void onInitializeClient() {
-		// Load mod config
-		ModConfig.load();
-
-		// Register configs from ModConfig
-		ModConfig config = ModConfig.getInstance();
-		for (String configFile : config.getConfigFilesToCheck()) {
-			ConfigSync.registerConfigToCheck(configFile);
-		}
-
 		// Register config sync handler
 		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();
+
+			// Read only the configs that server requested
 			for (String filename : serverConfigs.keySet()) {
-				String content = ConfigSync.getConfigContent(filename);
-				if (content != null) {
-					clientConfigs.put(filename, content);
-				} else {
+				Path configPath = configDir.resolve(filename);
+				try {
+					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();
+					clientConfigs.put(filename, config.valueMap().toString());
+				} catch (Exception e) {
 					LOGGER.warn("Failed to read client config: {}", filename);
 				}
 			}
@@ -51,12 +59,15 @@ 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("Cloth Config screen closed!");
+					System.out.println("Screen closed");
+					ConfigScreenHandler.onConfigScreenClose();
 				});
 			}
 		});
 	}
+
 }
diff --git a/src/client/java/com/junnio/anticonfig/ConfigScreenHandler.java b/src/client/java/com/junnio/anticonfig/ConfigScreenHandler.java
@@ -0,0 +1,66 @@
+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;
+import com.junnio.anticonfig.net.ConfigSyncPayload;
+import me.shedaniel.clothconfig2.api.ConfigScreen;
+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() {
+        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() {
+        Map<String, String> configsToSync = new HashMap<>();
+        Path configDir = FabricLoader.getInstance().getConfigDir();
+
+        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());
+                }
+            }
+
+            ConfigSyncPayload payload = new ConfigSyncPayload(configsToSync);
+            ClientPlayNetworking.send(payload);
+
+        } catch (Exception e) {
+            LOGGER.error("Failed to sync configs after screen close", e);
+        }
+    }
+}
diff --git a/src/client/java/com/junnio/anticonfig/mixin/client/ExampleClientMixin.java b/src/client/java/com/junnio/anticonfig/mixin/client/ExampleClientMixin.java
@@ -1,4 +1,4 @@
-package com.junnio.antifreecam.mixin.client;
+package com.junnio.anticonfig.mixin.client;
 
 import net.minecraft.client.MinecraftClient;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/client/resources/anticonfig.client.mixins.json b/src/client/resources/anticonfig.client.mixins.json
@@ -1,6 +1,6 @@
 {
 	"required": true,
-	"package": "com.junnio.antifreecam.mixin.client",
+	"package": "com.junnio.anticonfig.mixin.client",
 	"compatibilityLevel": "JAVA_21",
 	"client": [
 		"ExampleClientMixin"
diff --git a/src/main/java/com/junnio/anticonfig/Anticonfig.java b/src/main/java/com/junnio/anticonfig/Anticonfig.java
@@ -1,22 +1,24 @@
-package com.junnio.antifreecam;
+package com.junnio.anticonfig;
 
-import com.junnio.antifreecam.config.ConfigSync;
-import com.junnio.antifreecam.config.ModConfig;
-import com.junnio.antifreecam.net.NetworkManager;
+import com.junnio.anticonfig.config.ConfigSync;
+import com.junnio.anticonfig.config.ModConfig;
+import com.junnio.anticonfig.net.ConfigScreenSync;
+import com.junnio.anticonfig.net.NetworkManager;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Antifreecam implements ModInitializer {
-	public static final String MODID = "antifreecam";
+public class Anticonfig implements ModInitializer {
+	public static final String MODID = "anticonfig";
 	public static final Logger LOGGER = LoggerFactory.getLogger(MODID);
 
 	@Override
 	public void onInitialize() {
 		ModConfig.load();
 		NetworkManager.init();
 		ConfigSync.registerConfigsFromModConfig();
+		ConfigScreenSync.initServer();
 	}
 
 	public static Identifier id(String path) {
diff --git a/src/main/java/com/junnio/anticonfig/config/ConfigSync.java b/src/main/java/com/junnio/anticonfig/config/ConfigSync.java
@@ -1,4 +1,4 @@
-package com.junnio.antifreecam.config;
+package com.junnio.anticonfig.config;
 
 import com.electronwill.nightconfig.core.Config;
 import com.electronwill.nightconfig.core.file.FileConfig;
@@ -16,8 +16,8 @@
 import java.util.Map;
 
 public class ConfigSync {
-    private static final Logger LOGGER = LoggerFactory.getLogger("AntiFreecam");
-    public static final Identifier CONFIG_SYNC_ID = Identifier.of("antifreecam", "config_sync");
+    private static final Logger LOGGER = LoggerFactory.getLogger("AntiConfig");
+    public static final Identifier CONFIG_SYNC_ID = Identifier.of("anticonfig", "config_sync");
     private static final Map<String, FileConfig> CONFIGS_TO_CHECK = new HashMap<>();
 
     public static void registerConfigToCheck(String filename) {
diff --git a/src/main/java/com/junnio/anticonfig/config/ModConfig.java b/src/main/java/com/junnio/anticonfig/config/ModConfig.java
@@ -1,4 +1,4 @@
-package com.junnio.antifreecam.config;
+package com.junnio.anticonfig.config;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -13,8 +13,8 @@
 import java.util.List;
 
 public class ModConfig {
-    private static final Logger LOGGER = LoggerFactory.getLogger("AntiFreecam");
-    private static final String CONFIG_FILE = "antifreecam.json";
+    private static final Logger LOGGER = LoggerFactory.getLogger("AntiConfig");
+    private static final String CONFIG_FILE = "anticonfig.json";
     private static ModConfig INSTANCE;
     private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
 
@@ -43,7 +43,7 @@ public static void load() {
             try {
                 String json = Files.readString(configPath);
                 INSTANCE = GSON.fromJson(json, ModConfig.class);
-                LOGGER.info("Loaded AntiFreecam config");
+                LOGGER.info("Loaded AntiConfig config");
             } catch (IOException e) {
                 LOGGER.error("Failed to read config file", e);
                 INSTANCE = new ModConfig();
@@ -59,7 +59,7 @@ public static void save() {
         try {
             String json = GSON.toJson(INSTANCE);
             Files.writeString(configPath, json);
-            LOGGER.info("Saved AntiFreecam config");
+            LOGGER.info("Saved AntiConfig config");
         } catch (IOException e) {
             LOGGER.error("Failed to save config file", e);
         }
diff --git a/src/main/java/com/junnio/anticonfig/mixin/ExampleMixin.java b/src/main/java/com/junnio/anticonfig/mixin/ExampleMixin.java
@@ -1,4 +1,4 @@
-package com.junnio.antifreecam.mixin;
+package com.junnio.anticonfig.mixin;
 
 import net.minecraft.server.MinecraftServer;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/junnio/anticonfig/net/ConfigScreenSync.java b/src/main/java/com/junnio/anticonfig/net/ConfigScreenSync.java
@@ -0,0 +1,73 @@
+package com.junnio.anticonfig.net;
+
+import com.electronwill.nightconfig.core.file.FileConfig;
+import com.electronwill.nightconfig.json.JsonFormat;
+import com.electronwill.nightconfig.toml.TomlFormat;
+import com.junnio.anticonfig.config.ModConfig;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.text.Text;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+import static net.fabricmc.fabric.impl.networking.NetworkingImpl.LOGGER;
+
+public class ConfigScreenSync {
+    public static void initServer() {
+        // Register the payload type
+        PayloadTypeRegistry.playC2S().register(ConfigSyncPayload.ID, ConfigSyncPayload.CODEC);
+
+        // Register the receiver
+        ServerPlayNetworking.registerGlobalReceiver(ConfigSyncPayload.ID, (payload, context) -> {
+            context.server().execute(() -> {
+                boolean mismatch = false;
+                StringBuilder mismatched = new StringBuilder();
+                Map<String, String> serverConfigs = new HashMap<>();
+                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)) {
+                        FileConfig fileConfig;
+                        if (filename.endsWith(".json")) {
+                            fileConfig = FileConfig.of(configPath, JsonFormat.minimalInstance());
+                        } else if (filename.endsWith(".toml")) {
+                            fileConfig = FileConfig.of(configPath, TomlFormat.instance());
+                        } else {
+                            LOGGER.warn("Unsupported config format for file: {}", filename);
+                            continue;
+                        }
+                        fileConfig.load();
+                        serverConfigs.put(filename, fileConfig.valueMap().toString());
+                    }
+                }
+
+                // 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! 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));
+                }
+            });
+        });
+    }
+}
diff --git a/src/main/java/com/junnio/anticonfig/net/ConfigSyncPayload.java b/src/main/java/com/junnio/anticonfig/net/ConfigSyncPayload.java
diff --git a/src/main/java/com/junnio/anticonfig/net/NetworkManager.java b/src/main/java/com/junnio/anticonfig/net/NetworkManager.java
diff --git a/src/main/resources/anticonfig.mixins.json b/src/main/resources/anticonfig.mixins.json
diff --git a/src/main/resources/assets/anticonfig/icon.png b/src/main/resources/assets/anticonfig/icon.png
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.junnio.antifreecam.mixin.client;`
	`1`	`+package com.junnio.anticonfig.mixin.client;`
`2`	`2`
`3`	`3`	`import net.minecraft.client.MinecraftClient;`
`4`	`4`	`import org.spongepowered.asm.mixin.Mixin;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"required": true,`
`3`		`- "package": "com.junnio.antifreecam.mixin.client",`
	`3`	`+ "package": "com.junnio.anticonfig.mixin.client",`
`4`	`4`	`"compatibilityLevel": "JAVA_21",`
`5`	`5`	`"client": [`
`6`	`6`	`"ExampleClientMixin"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.junnio.antifreecam.mixin;`
	`1`	`+package com.junnio.anticonfig.mixin;`
`2`	`2`
`3`	`3`	`import net.minecraft.server.MinecraftServer;`
`4`	`4`	`import org.spongepowered.asm.mixin.Mixin;`