wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix forge config loading too late

Browse Source
This commit is contained in:
s809
2024-05-17 23:02:36 +05:00
parent 7c07c1e5bd
commit 6f87e22048
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java
+6 -5
View File
@@ -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(); }
}
}
neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java
+2 -2
View File
@@ -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(); }
}
}
verifyall.sh
+6 -3
View File
@@ -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[*]}"