[PlaybackController] Replace a method with event

Author: ScribbleTAS

src/main/java/com/minecrafttas/tasmod/events/EventClient.java

@@ -3,6 +3,7 @@
 import com.minecrafttas.mctcommon.events.EventListenerRegistry.EventBase;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
 
 /**
  * TASmod specific events fired on the client side
@@ -22,6 +23,17 @@ public static interface EventDrawHotbar extends EventBase {
 		public void onDrawHotbar();
 	}
 
+	/**
+	 * Fired when a screen in a gui is drawn
+	 */
+	@FunctionalInterface
+	public static interface EventDrawScreen extends EventBase {
+		/**
+		 * Fired when a screen in a gui is drawn
+		 */
+		public void onDrawScreen(GuiScreen screen, int xCoordinate, int yCoordinate);
+	}
+
 	/**
 	 * Fired when drawing something on screen. Ignores F1
 	 */

src/main/java/com/minecrafttas/tasmod/mixin/playbackhooks/MixinGuiScreen.java

@@ -7,7 +7,9 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import com.minecrafttas.mctcommon.events.EventListenerRegistry;
 import com.minecrafttas.tasmod.TASmodClient;
+import com.minecrafttas.tasmod.events.EventClient.EventDrawScreen;
 import com.minecrafttas.tasmod.util.Ducks.GuiScreenDuck;
 import com.minecrafttas.tasmod.virtual.VirtualInput;
 import com.minecrafttas.tasmod.virtual.event.VirtualKeyboardEvent;
@@ -107,7 +109,7 @@ private static boolean redirectIsAltKeyDown(int i) {
 
 	@Inject(method = "drawScreen", at = @At("HEAD"))
 	private void injectDrawScreen(int i, int j, float f, CallbackInfo ci) {
-		TASmodClient.controller.onDrawScreen((GuiScreen) (Object) this, i, j); // TODO Replace with event
+		EventListenerRegistry.fireEvent(EventDrawScreen.class, (GuiScreen) (Object) this, i, j);
 	}
 
 	@Shadow

src/main/java/com/minecrafttas/tasmod/playback/PlaybackControllerClient.java

@@ -38,6 +38,7 @@
 import com.minecrafttas.tasmod.TASmod;
 import com.minecrafttas.tasmod.TASmodClient;
 import com.minecrafttas.tasmod.events.EventClient.EventClientTickPost;
+import com.minecrafttas.tasmod.events.EventClient.EventDrawScreen;
 import com.minecrafttas.tasmod.events.EventPlaybackClient;
 import com.minecrafttas.tasmod.events.EventPlaybackClient.EventControllerStateChange;
 import com.minecrafttas.tasmod.events.EventPlaybackClient.EventPlaybackJoinedWorld;
@@ -95,6 +96,7 @@ public class PlaybackControllerClient implements
 
 	EventClientInit,
 	EventClientTickPost,
+	EventDrawScreen,
 
 	EventVirtualInput.EventVirtualKeyboardTick,
 	EventVirtualInput.EventVirtualMouseTick,
@@ -429,8 +431,10 @@ public VirtualCameraAngle onVirtualCameraTick(VirtualCameraAngle vcamera) {
 	}
 
 	/**
-	 * Updates the cursor location on screen
+	 * {@inheritDoc}
+	 * <p>Updates the cursor location on screen
 	 */
+	@Override
 	public void onDrawScreen(GuiScreen screen, int x, int y) {
 		if (!isPlayingback())
 			return;