Merge branch 'fork/bigsir24/8.0' into test-events

Author: MartinSVK12

src/main/java/turniplabs/halplibe/event/defs/ClientEvents.java

@@ -14,14 +14,14 @@
 
 @Environment(EnvType.CLIENT)
 public final class ClientEvents {
-    public static SingleEvent<Runnable> BEFORE_CLIENT_START = new SingleEvent<>("BeforeClientStart");
-    public static SingleEvent<Runnable> AFTER_CLIENT_START = new SingleEvent<>("AfterClientStart");
+    public static final SingleEvent<Runnable> BEFORE_CLIENT_START = new SingleEvent<>("BeforeClientStart");
+    public static final SingleEvent<Runnable> AFTER_CLIENT_START = new SingleEvent<>("AfterClientStart");
 
-    public static BaseEvent<Consumer<BlockModelDispatcher>> BLOCK_MODEL_RELOAD = new BaseEvent<>();
-    public static BaseEvent<Consumer<ItemModelDispatcher>> ITEM_MODEL_RELOAD = new BaseEvent<>();
-    public static BaseEvent<Consumer<EntityRendererDispatcher>> ENTITY_RENDERER_RELOAD = new BaseEvent<>();
-    public static BaseEvent<Consumer<TileEntityRenderDispatcher>> TILE_ENTITY_RENDERER_RELOAD = new BaseEvent<>();
-    public static BaseEvent<Consumer<BlockColorDispatcher>> BLOCK_COLOR_RELOAD = new BaseEvent<>();
+    public static final BaseEvent<Consumer<BlockModelDispatcher>> BLOCK_MODEL_RELOAD = new BaseEvent<>();
+    public static final BaseEvent<Consumer<ItemModelDispatcher>> ITEM_MODEL_RELOAD = new BaseEvent<>();
+    public static final BaseEvent<Consumer<EntityRendererDispatcher>> ENTITY_RENDERER_RELOAD = new BaseEvent<>();
+    public static final BaseEvent<Consumer<TileEntityRenderDispatcher>> TILE_ENTITY_RENDERER_RELOAD = new BaseEvent<>();
+    public static final BaseEvent<Consumer<BlockColorDispatcher>> BLOCK_COLOR_RELOAD = new BaseEvent<>();
 
     private ClientEvents() {}
 }

src/main/java/turniplabs/halplibe/event/defs/CommonEvents.java

@@ -3,14 +3,14 @@
 import turniplabs.halplibe.event.impl.SingleEvent;
 
 public final class CommonEvents {
-    public static SingleEvent<Runnable> BEFORE_GAME_START = new SingleEvent<>("BeforeGameStart");
-    public static SingleEvent<Runnable> AFTER_GAME_START = new SingleEvent<>("AfterGameStart");
+    public static final SingleEvent<Runnable> BEFORE_GAME_START = new SingleEvent<>("BeforeGameStart");
+    public static final SingleEvent<Runnable> AFTER_GAME_START = new SingleEvent<>("AfterGameStart");
 
-    public static SingleEvent<Runnable> AFTER_BLOCK_INIT = new SingleEvent<>("AfterBlockInit");
-    public static SingleEvent<Runnable> AFTER_ITEM_INIT = new SingleEvent<>("AfterItemInit");
+    public static final SingleEvent<Runnable> AFTER_BLOCK_INIT = new SingleEvent<>("AfterBlockInit");
+    public static final SingleEvent<Runnable> AFTER_ITEM_INIT = new SingleEvent<>("AfterItemInit");
 
-    public static SingleEvent<Runnable> RECIPES_NAMESPACE_INIT = new SingleEvent<>("RecipesNamespaceInit");
-    public static SingleEvent<Runnable> RECIPES_READY = new SingleEvent<>("RecipesReady");
+    public static final SingleEvent<Runnable> RECIPES_NAMESPACE_INIT = new SingleEvent<>("RecipesNamespaceInit");
+    public static final SingleEvent<Runnable> RECIPES_READY = new SingleEvent<>("RecipesReady");
 
     private CommonEvents() {}
 }

src/main/java/turniplabs/halplibe/event/defs/ServerEvents.java

@@ -6,8 +6,8 @@
 
 @Environment(EnvType.SERVER)
 public final class ServerEvents {
-    public static SingleEvent<Runnable> BEFORE_SERVER_START = new SingleEvent<>("BeforeServerStart");
-    public static SingleEvent<Runnable> AFTER_SERVER_START = new SingleEvent<>("AfterServerStart");
+    public static final SingleEvent<Runnable> BEFORE_SERVER_START = new SingleEvent<>("BeforeServerStart");
+    public static final SingleEvent<Runnable> AFTER_SERVER_START = new SingleEvent<>("AfterServerStart");
 
     private ServerEvents() {}
 }

src/main/java/turniplabs/halplibe/event/impl/CustomEvent.java

@@ -10,17 +10,17 @@
 
 @SuppressWarnings("unused")
 public class CustomEvent<L, E> implements IndirectEmitter<E>, Event<L> {
-    protected final @NonNull Function<List<L>, E> emitter;
+    protected final @NonNull E emitter;
     protected final @NonNull List<L> listeners;
 
     public CustomEvent(@NonNull final Function<List<L>, E> emitter) {
-        this.emitter = emitter;
         this.listeners = new ArrayList<>();
+        this.emitter = emitter.apply(this.listeners);
     }
 
     @Override
     public @NonNull E getEmitter() {
-        return emitter.apply(listeners);
+        return emitter;
     }
 
     @Override