Merge branch 'master' into 1.20.1

Author: EthanRStokes

src/main/java/net/frozenblock/lib/config/api/instance/ConfigModification.java

@@ -56,14 +56,7 @@ public static <T> T modifyConfig(Config<T> config, T original, boolean excludeNo
 			config.setSynced(false);
 			for (Map.Entry<ConfigModification<T>, Integer> modification : list) {
 				var consumer = modification.getKey().modification;
-				if (consumer instanceof ConfigSyncModification) {
-					if (FrozenNetworking.connectedToServer()) {
-						config.setSynced(true);
-						modification.getKey().modification.accept(instance);
-					} else {
-						FrozenLogUtils.logError("Attempted to sync config " + config.path() + " for mod " + config.modId() + " outside a server!");
-					}
-				} else if (!excludeNonSync) {
+				if (consumer instanceof ConfigSyncModification || !excludeNonSync) {
 					modification.getKey().modification.accept(instance);
 				}
 			}

src/main/java/net/frozenblock/lib/config/impl/network/ConfigSyncModification.java

@@ -22,11 +22,13 @@
 import java.util.function.Consumer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.frozenblock.lib.FrozenLogUtils;
 import net.frozenblock.lib.config.api.annotation.LockWhenSynced;
 import net.frozenblock.lib.config.api.annotation.UnsyncableEntry;
 import net.frozenblock.lib.config.api.instance.Config;
 import net.frozenblock.lib.config.api.instance.ConfigModification;
 import net.frozenblock.lib.config.api.network.ConfigSyncData;
+import net.frozenblock.lib.networking.FrozenNetworking;
 import net.minecraft.client.Minecraft;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -40,8 +42,12 @@ public record ConfigSyncModification<T>(Config<T> config, DataSupplier<T> dataSu
 	public void accept(T destination) {
 		try {
 			ConfigSyncData<T> syncData = dataSupplier.get(config);
-			if (syncData == null) return;
+			if (syncData == null || !FrozenNetworking.connectedToServer()) {
+				FrozenLogUtils.logError("Attempted to sync config " + config.path() + " for mod " + config.modId() + " outside a server!");
+				return;
+			}
 			T source = syncData.instance();
+			config.setSynced(true);
 			ConfigModification.copyInto(source, destination, true);
 		} catch (NullPointerException ignored) {}
 	}