From 6f87e2204807e9ebb59fb2c2dde5b90ab4bbdcbf Mon Sep 17 00:00:00 2001
From: s809 <11816467-s809@users.noreply.gitlab.com>
Date: Fri, 17 May 2024 23:02:36 +0500
Subject: [PATCH] Fix forge config loading too late

---
 .../com/seibel/distanthorizons/forge/ForgeMain.java   | 11 ++++++-----
 .../seibel/distanthorizons/neoforge/NeoforgeMain.java |  4 ++--
 verifyall.sh                                          |  9 ++++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java
index 91c563781..4740f6296 100644
--- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java
+++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java
@@ -35,15 +35,16 @@ import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
+import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.*;
 #if MC_VER == MC_1_16_5
-import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
+import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
 #elif MC_VER == MC_1_17_1
-import net.minecraftforge.fmlserverevents.FMLServerStartingEvent;
+import net.minecraftforge.fmlserverevents.FMLServerAboutToStartEvent;
 #else
-import net.minecraftforge.event.server.ServerStartingEvent;
+import net.minecraftforge.event.server.ServerAboutToStartEvent;
 #endif
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 #if MC_VER < MC_1_17_1
@@ -126,7 +127,7 @@ public class ForgeMain extends AbstractModInitializer
 	@Override
 	protected void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler)
 	{
-		MinecraftForge.EVENT_BUS.addListener((#if MC_VER >= MC_1_18_2 ServerStartingEvent #else FMLServerStartingEvent #endif e) ->
+		MinecraftForge.EVENT_BUS.addListener(EventPriority.HIGH, (#if MC_VER >= MC_1_18_2 ServerAboutToStartEvent #else FMLServerAboutToStartEvent #endif e) ->
 		{
 			eventHandler.accept(e.getServer());
 		});
@@ -135,4 +136,4 @@ public class ForgeMain extends AbstractModInitializer
 	@Override
 	protected void runDelayedSetup() { SingletonInjector.INSTANCE.runDelayedSetup(); }
 	
-}
+}
\ No newline at end of file
diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java
index 8d14afb66..80b38f294 100644
--- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java
+++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java
@@ -120,10 +120,10 @@ public class NeoforgeMain extends AbstractModInitializer
 	@Override
 	protected void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler)
 	{
-		NeoForge.EVENT_BUS.addListener((ServerStartingEvent e) -> { eventHandler.accept(e.getServer()); });
+		NeoForge.EVENT_BUS.addListener(EventPriority.HIGH, (ServerStartingEvent e) -> { eventHandler.accept(e.getServer()); });
 	}
 	
 	@Override
 	protected void runDelayedSetup() { SingletonInjector.INSTANCE.runDelayedSetup(); }
 	
-}
+}
\ No newline at end of file
diff --git a/verifyall.sh b/verifyall.sh
index a4892814b..0a13f0584 100755
--- a/verifyall.sh
+++ b/verifyall.sh
@@ -24,9 +24,12 @@ for version in $(ls ./versionProperties/); do
     result+=$version
     result+="\e[0m"
     
-    echo "#"
+    version_length=${#version}
+    top_chars=$(printf '^%.0s' $(seq 1 $version_length))
+    bottom_chars=$(printf '=%.0s' $(seq 1 $version_length))
+    echo "# $top_chars"
     echo "# $version"
-    echo "#"
+    echo "# $bottom_chars"
     echo -e "\e[0m"
     
     completed_builds+=($result)
@@ -37,4 +40,4 @@ done
 
 echo
 echo -e "\e[1mBuild results:\e[0m"
-echo -e "${completed_builds[*]}"
+echo -e "${completed_builds[*]}"
\ No newline at end of file