From f16472c415ff8c463c61901d9a9b0ef5232e6040 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 17 Feb 2023 08:33:49 -0600 Subject: [PATCH 1/2] rename serverApi.serverLoad/Unload event methods --- coreSubProjects | 2 +- .../main/java/com/seibel/lod/fabric/FabricServerProxy.java | 4 ++-- .../src/main/java/com/seibel/lod/forge/ForgeServerProxy.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coreSubProjects b/coreSubProjects index 49b345776..1adeaad23 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 49b345776fa93a492c45223a0e1aca541e432c2f +Subproject commit 1adeaad2319c7efc571f5d69211f132713322c46 diff --git a/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java b/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java index 0ca5de7d3..326002a3c 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java +++ b/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java @@ -73,11 +73,11 @@ public class FabricServerProxy { // ServerWorldLoadEvent //TODO: Check if both of this use the correct timed events. (i.e. is it 'ed' or 'ing' one?) ServerLifecycleEvents.SERVER_STARTING.register((server) -> { - if (isValidTime()) ServerApi.INSTANCE.serverWorldLoadEvent(isDedicated); + if (isValidTime()) ServerApi.INSTANCE.serverLoadEvent(isDedicated); }); // ServerWorldUnloadEvent ServerLifecycleEvents.SERVER_STOPPED.register((server) -> { - if (isValidTime()) ServerApi.INSTANCE.serverWorldUnloadEvent(); + if (isValidTime()) ServerApi.INSTANCE.serverUnloadEvent(); }); // ServerLevelLoadEvent diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java b/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java index 4f05aa047..dbfadd16a 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java +++ b/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java @@ -55,13 +55,13 @@ public class ForgeServerProxy { // ServerWorldLoadEvent @SubscribeEvent private void dedicatedWorldLoadEvent(ServerStartedEvent event) { - if (isValidTime()) serverApi.serverWorldLoadEvent(isDedicated); + if (isValidTime()) serverApi.serverLoadEvent(isDedicated); } // ServerWorldUnloadEvent @SubscribeEvent private void serverWorldUnloadEvent(ServerStoppingEvent event) { - if (isValidTime()) serverApi.serverWorldUnloadEvent(); + if (isValidTime()) serverApi.serverUnloadEvent(); } // ServerLevelLoadEvent From 7ca81fe281c35230dcccfd93447b5bcd40ce1788 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 18 Feb 2023 08:56:28 -0600 Subject: [PATCH 2/2] Update coreSubProjects --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 1adeaad23..a97f9cf9b 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 1adeaad2319c7efc571f5d69211f132713322c46 +Subproject commit a97f9cf9b46cb5bdf0b1d552b234bc29ca50e168