From d0f43a67607a51380a09c56d10ab69644f9ce3f1 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 16 Sep 2022 22:55:21 -0500 Subject: [PATCH] re-add level event parameters --- .../java/com/seibel/lod/core/api/internal/ClientApi.java | 8 ++++---- .../java/com/seibel/lod/core/api/internal/ServerApi.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java index c0af2a774..36497f974 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java +++ b/core/src/main/java/com/seibel/lod/core/api/internal/ClientApi.java @@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit; * Specifically for the client. * * @author James Seibel - * @version 2022-9-10 + * @version 2022-9-16 */ public class ClientApi { @@ -155,7 +155,7 @@ public class ClientApi //TODO: Implement // TODO: potentially add a list of chunks that were updated during the save - DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelSaveEvent.class, new DhApiLevelSaveEvent.EventParam(null)); // TODO create a wrapper object to pass back + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelSaveEvent.class, new DhApiLevelSaveEvent.EventParam(level)); } } @@ -166,7 +166,7 @@ public class ClientApi if (SharedApi.currentWorld != null) { SharedApi.currentWorld.unloadLevel(level); - DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(null)); // TODO create a wrapper object to pass back + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level)); } } @@ -177,7 +177,7 @@ public class ClientApi if (SharedApi.currentWorld != null) { SharedApi.currentWorld.getOrLoadLevel(level); - DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(null)); // TODO create a wrapper object to pass back + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(level)); } } diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java index cce8bf6a3..b6f6eac1e 100644 --- a/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java +++ b/core/src/main/java/com/seibel/lod/core/api/internal/ServerApi.java @@ -42,7 +42,7 @@ import java.lang.invoke.MethodHandles; * Forge, etc.). Specifically server events. * * @author James Seibel - * @version 2022-8-23 + * @version 2022-9-16 */ public class ServerApi { @@ -102,7 +102,7 @@ public class ServerApi if (SharedApi.currentWorld != null) { SharedApi.currentWorld.getOrLoadLevel(level); - DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(null)); // TODO create a wrapper object to pass back + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(level)); } } public void serverLevelUnloadEvent(IServerLevelWrapper level) { @@ -110,7 +110,7 @@ public class ServerApi if (SharedApi.currentWorld != null) { SharedApi.currentWorld.unloadLevel(level); - DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(null)); // TODO create a wrapper object to pass back + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level)); } } @@ -123,7 +123,7 @@ public class ServerApi for (ILevel level : SharedApi.currentWorld.getAllLoadedLevels()) { - DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelSaveEvent.class, new DhApiLevelSaveEvent.EventParam(null)); // TODO create a wrapper object to pass back + DhApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelSaveEvent.class, new DhApiLevelSaveEvent.EventParam(level.getLevelWrapper())); } } }