Impl ServerTickEvent and RenderTickEvent (#158)

* Impl TickEvent.ServerTickEvent with FAPI Lifecycle Events V1

* Impl TickEvent.RenderTickEvent

* Add ServerTick and RenderTick events to BasicEventHooks

* Fix style

* Shift hookRenderTickEnd to match Forge

* Fix style after merge conflict resolution

* Reduce ordinal on hookRenderTickEvent with slice

Author: GammaWhiskey

patchwork-events-lifecycle/src/main/java/net/minecraftforge/event/TickEvent.java

@@ -45,11 +45,11 @@ public enum Phase {
 		START, END;
 	}
 
-	/* TODO public static class ServerTickEvent extends TickEvent {
+	public static class ServerTickEvent extends TickEvent {
 		public ServerTickEvent(Phase phase) {
 			super(Type.SERVER, LogicalSide.SERVER, phase);
 		}
-	}*/
+	}
 
 	public static class ClientTickEvent extends TickEvent {
 		public ClientTickEvent(Phase phase) {
@@ -77,12 +77,12 @@ public PlayerTickEvent(Phase phase, PlayerEntity player) {
 		}
 	}
 
-	/* TODO public static class RenderTickEvent extends TickEvent {
+	public static class RenderTickEvent extends TickEvent {
 		public final float renderTickTime;
 
 		public RenderTickEvent(Phase phase, float renderTickTime) {
 			super(Type.RENDER, LogicalSide.CLIENT, phase);
 			this.renderTickTime = renderTickTime;
 		}
-	}*/
+	}
 }

patchwork-events-lifecycle/src/main/java/net/patchworkmc/impl/event/lifecycle/LifecycleEvents.java

@@ -42,6 +42,7 @@
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.server.ServerStartCallback;
 import net.fabricmc.fabric.api.event.world.WorldTickCallback;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 
 public class LifecycleEvents implements ModInitializer {
 	private static Runnable loadCompleteCallback;
@@ -57,6 +58,15 @@ public static void fireClientTickEvent(TickEvent.Phase phase) {
 		MinecraftForge.EVENT_BUS.post(new TickEvent.ClientTickEvent(phase));
 	}
 
+	public static void fireRenderTickEvent(TickEvent.Phase phase, float renderTickTime) {
+		// TODO - Call net.minecraftforge.client.model.animation.Animation#setClientPartialTickTime on start phase
+		MinecraftForge.EVENT_BUS.post(new TickEvent.RenderTickEvent(phase, renderTickTime));
+	}
+
+	public static void fireServerTickEvent(TickEvent.Phase phase) {
+		MinecraftForge.EVENT_BUS.post(new TickEvent.ServerTickEvent(phase));
+	}
+
 	public static void firePlayerTickEvent(TickEvent.Phase phase, PlayerEntity player) {
 		MinecraftForge.EVENT_BUS.post(new TickEvent.PlayerTickEvent(phase, player));
 	}
@@ -126,5 +136,8 @@ public void onInitialize() {
 				throw new UnsupportedOperationException("A mod tried to set the server's motd during handling FMLServerStartedEvent, this isn't implemented yet.");
 			}
 		});
+
+		ServerTickEvents.START_SERVER_TICK.register(server -> fireServerTickEvent(TickEvent.Phase.START));
+		ServerTickEvents.END_SERVER_TICK.register(server -> fireServerTickEvent(TickEvent.Phase.END));
 	}
 }

patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinMinecraftClient.java

@@ -19,14 +19,18 @@
 
 package net.patchworkmc.mixin.event.lifecycle;
 
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.objectweb.asm.Opcodes;
 import net.minecraftforge.event.TickEvent;
 
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.RenderTickCounter;
 
 import net.patchworkmc.impl.event.lifecycle.LifecycleEvents;
 
@@ -51,4 +55,33 @@ private void hookClientTickEnd(CallbackInfo info) {
 	private void hookClientInit(CallbackInfo ci) {
 		LifecycleEvents.handleLoadComplete();
 	}
+
+	@Shadow
+	@Final
+	private RenderTickCounter renderTickCounter;
+
+	// Note: for some reason, ordinal does not consider ldc, which means ldc is completely useless here.
+	// It's kept here for the sake of reference/readability only.
+	@Inject(method = "render", at = @At(
+			value = "INVOKE_STRING",
+			target = "net/minecraft/util/profiler/DisableableProfiler.swap(Ljava/lang/String;)V",
+			args = "ldc=gameRenderer",
+			ordinal = 1))
+	private void hookRenderTickStart(CallbackInfo ci) {
+		LifecycleEvents.fireRenderTickEvent(TickEvent.Phase.START, this.renderTickCounter.tickDelta);
+	}
+
+	@Inject(method = "render",
+			slice = @Slice(from = @At(
+					value = "INVOKE_STRING",
+					target = "net/minecraft/util/profiler/DisableableProfiler.swap(Ljava/lang/String;)V",
+					args = "ldc=toasts")),
+			at = @At(
+			value = "INVOKE",
+			target = "net/minecraft/util/profiler/DisableableProfiler.pop()V",
+			shift = At.Shift.AFTER,
+			ordinal = 0))
+	private void hookRenderTickEnd(CallbackInfo ci) {
+		LifecycleEvents.fireRenderTickEvent(TickEvent.Phase.END, this.renderTickCounter.tickDelta);
+	}
 }

patchwork-events-lifecycle/src/main/resources/fabric.mod.json

@@ -14,6 +14,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.8.4",
+    "fabric": ">=0.15.0",
     "patchwork-fml": "*"
   },
   "entrypoints": {

patchwork-god-classes/src/main/java/net/minecraftforge/fml/hooks/BasicEventHooks.java

@@ -91,6 +91,19 @@ public static void onPostClientTick() {
 		LifecycleEvents.fireClientTickEvent(TickEvent.Phase.END);
 	}
 
-	// TODO: onPreServerTick
-	// TODO: onPostServerTick
+	public static void onPreServerTick() {
+		LifecycleEvents.fireServerTickEvent(TickEvent.Phase.START);
+	}
+
+	public static void onPostServerTick() {
+		LifecycleEvents.fireServerTickEvent(TickEvent.Phase.END);
+	}
+
+	public static void onRenderTickStart(float timer) {
+		LifecycleEvents.fireRenderTickEvent(TickEvent.Phase.START, timer);
+	}
+
+	public static void onRenderTickEnd(float timer) {
+		LifecycleEvents.fireRenderTickEvent(TickEvent.Phase.END, timer);
+	}
 }