From 1ce4750dfc4655f5dc59284d680ec5c2182bd284 Mon Sep 17 00:00:00 2001
From: s809 <11816467-s809@users.noreply.gitlab.com>
Date: Tue, 19 Sep 2023 17:28:49 +0500
Subject: [PATCH] Fix future id collisions between c<->s (cause of occasional
 hangs on disconnection) Add packet trace logging

---
 coreSubProjects      |  2 +-
 fabric/build.gradle  |  5 ++++-
 fabric/log4j-dev.xml | 11 +++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 fabric/log4j-dev.xml

diff --git a/coreSubProjects b/coreSubProjects
index 6f4e10554..2cfc2c81c 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 6f4e105542faf024ccfaa34c868803e456dbffb5
+Subproject commit 2cfc2c81c8cd8c8ef9801ee8b9bf3f6c6e83175b
diff --git a/fabric/build.gradle b/fabric/build.gradle
index e0cf5d2ee..f99ca7e2e 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -4,7 +4,10 @@ plugins {
 
 loom {
     accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
-
+    
+    // Custom logging
+    //log4jConfigs.from(file("log4j-dev.xml"))
+    
     // "runs" isn't required, but when we do need it then it can be useful
     runs {
         client {
diff --git a/fabric/log4j-dev.xml b/fabric/log4j-dev.xml
new file mode 100644
index 000000000..8ca676dc0
--- /dev/null
+++ b/fabric/log4j-dev.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration name="Dev" monitorInterval="10">
+    <Loggers>
+        <Logger name="com.seibel.distanthorizons.core.network" level="trace" additivity="false">
+            <AppenderRef ref="DebugFile" level="${sys:fabric.log.debug.level:-debug}" />
+            <AppenderRef ref="SysOut" />
+            <AppenderRef ref="LatestFile" level="${sys:fabric.log.level:-info}" />
+            <AppenderRef ref="ServerGuiConsole" />
+        </Logger>
+    </Loggers>
+</Configuration>
\ No newline at end of file