Move Night Config Shutdown to Fabric Server Lifecycle Event, updates

JT122406 · JT122406 · commit 78f291528af6 · 2025-07-20T19:53:22.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 6.0.0.2
+- Move Night Config Shutdown to Fabric Server Lifecycle Event
+
 # 6.0.0.1
 * Fix concurrency issues with random scheduled ticks.
 * Update Night Config
diff --git a/Common/src/main/java/corgitaco/corgilib/mixin/MixinServerLevel.java b/Common/src/main/java/corgitaco/corgilib/mixin/MixinServerLevel.java
@@ -33,6 +33,5 @@ private void tickScheduledRandomTicks(LevelChunk chunk, int randomTickSpeed, Cal
         original.clear();
 
         tmp.forEach(scheduledPos -> chunk.getBlockState(scheduledPos).randomTick((ServerLevel) (Object) this, scheduledPos, this.random));
-        ;
     }
 }
diff --git a/Fabric/src/main/java/corgitaco/corgilib/fabric/CorgiLibFabric.java b/Fabric/src/main/java/corgitaco/corgilib/fabric/CorgiLibFabric.java
@@ -1,10 +1,12 @@
 package corgitaco.corgilib.fabric;
 
+import com.electronwill.nightconfig.core.file.FileWatcher;
 import corgitaco.corgilib.CorgiLib;
 import corgitaco.corgilib.fabric.network.FabricNetworkHandler;
 import corgitaco.corgilib.server.commands.CorgiLibCommands;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 
 import java.util.Objects;
 
@@ -27,5 +29,6 @@ public static void initializeCorgiLib(String initializedFrom) {
         CorgiLib.init();
         FabricNetworkHandler.init();
         CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> CorgiLibCommands.registerCommands(dispatcher, registryAccess));
+        ServerLifecycleEvents.SERVER_STOPPED.register(server -> FileWatcher.defaultInstance().stop());
     }
 }
diff --git a/Fabric/src/main/java/corgitaco/corgilib/fabric/mixin/DedicatedServerMixin.java b/Fabric/src/main/java/corgitaco/corgilib/fabric/mixin/DedicatedServerMixin.java
diff --git a/Fabric/src/main/resources/corgilib-fabric.mixins.json b/Fabric/src/main/resources/corgilib-fabric.mixins.json
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
@@ -9,8 +9,9 @@
     "Joseph T. McQuigg (JT122406)"
   ],
   "contact": {
-    "homepage": "https://github.com/CorgiTaco/CorgiLib",
-    "sources": "https://github.com/CorgiTaco/CorgiLib"
+    "homepage": "https://github.com/CorgiTaco-MC/CorgiLib",
+    "sources": "https://github.com/CorgiTaco-MC/CorgiLib",
+    "issues": "https://github.com/CorgiTaco-MC/CorgiLib/issues"
   },
   "license": "LGPLv3",
   "icon": "assets/corgilib/corgilib.png",
@@ -24,8 +25,7 @@
     ]
   },
   "mixins": [
-    "corgilib-common.mixins.json",
-    "corgilib-fabric.mixins.json"
+    "corgilib-common.mixins.json"
   ],
   "depends": {
     "fabricloader": ">=0.16",
diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml
@@ -1,7 +1,7 @@
 modLoader="javafml"
 loaderVersion="[46,)"
 license="LGPLv3"
-issueTrackerURL="https://github.com/CorgiTaco/CorgiLib/issues"
+issueTrackerURL="https://github.com/CorgiTaco-MC/CorgiLib/issues"
 [[mods]]
 modId="corgilib"
 version="${version}" #mandatory
diff --git a/Forge/src/main/resources/pack.mcmeta b/Forge/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
     "pack": {
-        "description": "CorgiLib",
+        "description": "CorgiLib Resources",
         "pack_format": 61
     }
-}
+}
diff --git a/NeoForge/src/main/resources/META-INF/neoforge.mods.toml b/NeoForge/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,7 +1,7 @@
 modLoader="javafml"
 loaderVersion="[4,)"
 license="LGPLv3"
-issueTrackerURL="https://github.com/CorgiTaco/CorgiLib/issues"
+issueTrackerURL="https://github.com/CorgiTaco-MC/CorgiLib/issues"
 [[mods]]
 modId="corgilib"
 version="${version}" #mandatory
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI
 plugins {
     id("architectury-plugin") version "3.4-SNAPSHOT"
     id("dev.architectury.loom") version "1.10-SNAPSHOT" apply false
-    id("com.gradleup.shadow") version "8.3.6" apply false
+    id("com.gradleup.shadow") version "8.3.8" apply false
     java
     idea
     `maven-publish`
diff --git a/gradle.properties b/gradle.properties
@@ -14,7 +14,7 @@ minecraft_version=1.21.4
 forge_version=54.1.3
 
 # Neoforge
-neoforge_version=21.4.141
+neoforge_version=21.4.147
 
 # Fabric
 fabric_loader_version=0.16.14
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/jitpack.yml b/jitpack.yml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement.repositories {
 }
 
 plugins {
-    id("com.gradle.develocity") version("4.0.2")
+    id("com.gradle.develocity") version("4.1")
 }
 
 develocity.buildScan {

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,5 @@ private void tickScheduledRandomTicks(LevelChunk chunk, int randomTickSpeed, Cal`
`33`	`33`	`original.clear();`
`34`	`34`
`35`	`35`	`tmp.forEach(scheduledPos -> chunk.getBlockState(scheduledPos).randomTick((ServerLevel) (Object) this, scheduledPos, this.random));`
`36`		`- ;`
`37`	`36`	`}`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"pack": {`
`3`		`- "description": "CorgiLib",`
	`3`	`+ "description": "CorgiLib Resources",`
`4`	`4`	`"pack_format": 61`
`5`	`5`	`}`
`6`		`-}`
	`6`	`+}`