[Events] Add ServerStart Event

This event is fired before ServerInit when worlds are alredy loaded

Author: ScribbleTAS

src/main/java/com/minecrafttas/mctcommon/events/EventServer.java

@@ -13,6 +13,19 @@
  */
 public interface EventServer {
 
+	/**
+	 * Fired, just before the server initialised, for both integrated and dedicated server.
+	 */
+	@FunctionalInterface
+	public static interface EventServerStart extends EventBase {
+
+		/**
+		 * Fired, when the server is initialised, for both integrated and dedicated server.
+		 * @param server The server 
+		 */
+		public void onServerStart(MinecraftServer server);
+	}
+
 	/**
 	 * Fired, when the server is initialised, for both integrated and dedicated server.
 	 */

src/main/java/com/minecrafttas/mctcommon/mixin/MixinMinecraftServer.java

@@ -9,6 +9,7 @@
 import com.minecrafttas.mctcommon.events.EventListenerRegistry;
 import com.minecrafttas.mctcommon.events.EventServer.EventServerGameLoop;
 import com.minecrafttas.mctcommon.events.EventServer.EventServerInit;
+import com.minecrafttas.mctcommon.events.EventServer.EventServerStart;
 import com.minecrafttas.mctcommon.events.EventServer.EventServerStop;
 import com.minecrafttas.mctcommon.events.EventServer.EventServerTick;
 
@@ -17,6 +18,11 @@
 @Mixin(MinecraftServer.class)
 public class MixinMinecraftServer {
 
+	@Inject(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;init()Z"))
+	public void inject_initStart(CallbackInfo ci) {
+		EventListenerRegistry.fireEvent(EventServerStart.class, (MinecraftServer) (Object) this);
+	}
+
 	@Inject(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;init()Z", shift = Shift.AFTER))
 	public void inject_init(CallbackInfo ci) {
 		EventListenerRegistry.fireEvent(EventServerInit.class, (MinecraftServer) (Object) this);

src/main/java/com/minecrafttas/tasmod/TASmod.java

@@ -8,6 +8,7 @@
 import com.minecrafttas.mctcommon.CommandRegistry;
 import com.minecrafttas.mctcommon.events.EventListenerRegistry;
 import com.minecrafttas.mctcommon.events.EventServer.EventServerInit;
+import com.minecrafttas.mctcommon.events.EventServer.EventServerStart;
 import com.minecrafttas.mctcommon.events.EventServer.EventServerStop;
 import com.minecrafttas.mctcommon.networking.PacketHandlerRegistry;
 import com.minecrafttas.mctcommon.networking.Server;
@@ -32,8 +33,8 @@
 import com.minecrafttas.tasmod.registries.TASmodPackets;
 import com.minecrafttas.tasmod.savestates.SavestateHandlerServer;
 import com.minecrafttas.tasmod.savestates.handlers.SavestateResourcePackHandler;
-import com.minecrafttas.tasmod.savestates.storage.builtin.KTRNGSeedStorage;
 import com.minecrafttas.tasmod.savestates.storage.builtin.ClientMotionStorage;
+import com.minecrafttas.tasmod.savestates.storage.builtin.KTRNGSeedStorage;
 import com.minecrafttas.tasmod.tickratechanger.TickrateChangerServer;
 import com.minecrafttas.tasmod.ticksync.TickSyncServer;
 import com.minecrafttas.tasmod.util.LoggerMarkers;
@@ -49,7 +50,7 @@
  *
  * @author Scribble
  */
-public class TASmod implements ModInitializer, EventServerInit, EventServerStop {
+public class TASmod implements ModInitializer, EventServerStart, EventServerInit, EventServerStop {
 
 	public static final Logger LOGGER = LogManager.getLogger("TASmod");
 
@@ -138,6 +139,12 @@ public void onInitialize() {
 		registerSavestateStorage();
 	}
 
+	@Override
+	public void onServerStart(MinecraftServer server) {
+		globalRandomness = new GlobalRandomnessTimer();
+		EventListenerRegistry.register(globalRandomness);
+	}
+
 	@Override
 	public void onServerInit(MinecraftServer server) {
 		LOGGER.info("Initializing server");
@@ -162,9 +169,6 @@ public void onServerInit(MinecraftServer server) {
 		PacketHandlerRegistry.register(savestateHandlerServer);
 		PacketHandlerRegistry.register(savestateHandlerServer.getPlayerHandler());
 
-		globalRandomness = new GlobalRandomnessTimer();
-		EventListenerRegistry.register(globalRandomness);
-
 		if (!server.isDedicatedServer()) {
 			TASmod.tickratechanger.ticksPerSecond = 0F;
 			TASmod.tickratechanger.tickrateSaved = 20F;

src/main/java/com/minecrafttas/tasmod/registries/TASmodAPIRegistry.java

@@ -20,6 +20,7 @@ public class TASmodAPIRegistry {
 	 * savestate/rerecord count and category.
 	 * 
 	 * <p>Any custom class has to implement PlaybackMetadataExtension
+	 * <p><strong>Side: Client</strong></p>
 	 */
 	public static final PlaybackMetadataRegistry PLAYBACK_METADATA = new PlaybackMetadataRegistry();
 
@@ -28,7 +29,7 @@ public class TASmodAPIRegistry {
 	 * 
 	 * <p>File commands give the opportunity to run commands on each recorded tick and each played back tick.<br>
 	 * File commands also have access to the TASfile so that data can be stored and read in/from the TASfile.
-	 * 
+	 * <p><strong>Side: Client</strong></p>
 	 */
 	public static final PlaybackFileCommandsRegistry PLAYBACK_FILE_COMMAND = new PlaybackFileCommandsRegistry();
 
@@ -39,6 +40,7 @@ public class TASmodAPIRegistry {
 	 * or extend an existing flavor (like {@link Beta1Flavor}) and overwrite parts of the methods.
 	 * 
 	 * <p>The resulting flavor can be registered here and can be found as a saving option with /saveTAS
+	 * <p><strong>Side: Client</strong></p>
 	 */
 	public static final SerialiserFlavorRegistry SERIALISER_FLAVOR = new SerialiserFlavorRegistry();
 
@@ -47,13 +49,15 @@ public class TASmodAPIRegistry {
 	 * 
 	 * <p>Create a new ClientCommand by extending {@link ClientCommandBase},<br>
 	 * then create a command like normal, as it extends from the vanilla {@link CommandBase}
+	 * <p><strong>Side: Client</strong></p>
 	 */
 	public static final ClientCommandRegistry CLIENT_COMMANDS = new ClientCommandRegistry();
 
 	/**
 	 * <p>Registry for registering additional data that should be stored or loaded during a Savestate or Loadstate respectively
 	 * 
 	 * <p>Create a new SavestateStorageExtension by extending {@link SavestateStorageExtensionBase}
+	 * <p><strong>Side: Server</strong></p>
 	 */
 	public static final SavestateStorageExtensionRegistry SAVESTATE_STORAGE = new SavestateStorageExtensionRegistry();
 }