Skip to content

Commit

Permalink
Add some client events
Browse files Browse the repository at this point in the history
  • Loading branch information
senseiwells committed Dec 10, 2024
1 parent 93e373e commit 8b246d6
Show file tree
Hide file tree
Showing 12 changed files with 195 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ public enum class GlobalEventHandler(
public fun <T: Event> broadcast(event: T, phases: Set<String> = BuiltInEventPhases.DEFAULT_PHASES) {
val type = event::class.java

Minecraft.getInstance().profiledMetrics()

if (this.checkThread(event, type)) {
return
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package net.casual.arcade.events.client.mixins;

import net.casual.arcade.events.BuiltInEventPhases;
import net.casual.arcade.events.GlobalEventHandler;
import net.casual.arcade.events.client.render.GuiRenderEvent;
import net.minecraft.client.DeltaTracker;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiGraphics;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(Gui.class)
public class GuiMixin {
@Inject(
method = "render",
at = @At("HEAD")
)
private void onPreRender(GuiGraphics graphics, DeltaTracker deltas, CallbackInfo ci) {
GuiRenderEvent event = new GuiRenderEvent(graphics, deltas);
GlobalEventHandler.Client.broadcast(event, BuiltInEventPhases.PRE_PHASES);
}

@Inject(
method = "render",
at = @At("TAIL")
)
private void onPostRender(GuiGraphics graphics, DeltaTracker deltas, CallbackInfo ci) {
GuiRenderEvent event = new GuiRenderEvent(graphics, deltas);
GlobalEventHandler.Client.broadcast(event, BuiltInEventPhases.POST_PHASES);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package net.casual.arcade.events.client.mixins;

import com.llamalad7.mixinextras.sugar.Local;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalRef;
import net.casual.arcade.events.GlobalEventHandler;
import net.casual.arcade.events.client.render.LevelRenderEvent;
import net.minecraft.client.DeltaTracker;
import net.minecraft.client.renderer.LevelRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

import java.util.Set;

@Mixin(LevelRenderer.class)
public class LevelRendererMixin {
@Inject(
method = "method_62214",
at = @At(value = "CONSTANT", args = "stringValue=terrain")
)
private void onTerrain(
CallbackInfo ci,
@Local(argsOnly = true) DeltaTracker deltas,
@Share("event") LocalRef<LevelRenderEvent> eventRef
) {
LevelRenderEvent event = new LevelRenderEvent((LevelRenderer) (Object) this, deltas);
GlobalEventHandler.Client.broadcast(event, Set.of(LevelRenderEvent.TERRAIN));
eventRef.set(event);
}

@Inject(
method = "method_62214",
at = @At(value = "CONSTANT", args = "stringValue=entities")
)
private void onEntities(CallbackInfo ci, @Share("event") LocalRef<LevelRenderEvent> eventRef) {
GlobalEventHandler.Client.broadcast(eventRef.get(), Set.of(LevelRenderEvent.ENTITIES));
}

@Inject(
method = "method_62214",
at = @At(value = "CONSTANT", args = "stringValue=blockentities")
)
private void onBlockEntities(CallbackInfo ci, @Share("event") LocalRef<LevelRenderEvent> eventRef) {
GlobalEventHandler.Client.broadcast(eventRef.get(), Set.of(LevelRenderEvent.BLOCK_ENTITIES));
}

@Inject(
method = "method_62214",
at = @At(value = "CONSTANT", args = "stringValue=debug")
)
private void onDebug(CallbackInfo ci, @Share("event") LocalRef<LevelRenderEvent> eventRef) {
GlobalEventHandler.Client.broadcast(eventRef.get(), Set.of(LevelRenderEvent.DEBUG));
}

@Inject(
method = "method_62214",
at = @At(value = "CONSTANT", args = "stringValue=translucent")
)
private void onTranslucent(CallbackInfo ci, @Share("event") LocalRef<LevelRenderEvent> eventRef) {
GlobalEventHandler.Client.broadcast(eventRef.get(), Set.of(LevelRenderEvent.TRANSLUCENT));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package net.casual.arcade.events.client.mixins;

import net.casual.arcade.events.BuiltInEventPhases;
import net.casual.arcade.events.GlobalEventHandler;
import net.casual.arcade.events.client.ClientTickEvent;
import net.minecraft.client.Minecraft;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(Minecraft.class)
public class MinecraftMixin {
@Inject(
method = "tick",
at = @At("HEAD")
)
private void onPreTick(CallbackInfo ci) {
ClientTickEvent event = new ClientTickEvent((Minecraft) (Object) this);
GlobalEventHandler.Client.broadcast(event, BuiltInEventPhases.PRE_PHASES);
}

@Inject(
method = "tick",
at = @At("TAIL")
)
private void onPostTick(CallbackInfo ci) {
ClientTickEvent event = new ClientTickEvent((Minecraft) (Object) this);
GlobalEventHandler.Client.broadcast(event, BuiltInEventPhases.POST_PHASES);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package net.casual.arcade.events.client

import net.casual.arcade.events.BuiltInEventPhases
import net.casual.arcade.events.common.Event
import net.minecraft.client.Minecraft

public data class ClientTickEvent(
val client: Minecraft
): Event {
public companion object {
/**
* Runs before the client has run the tick.
*/
public const val PHASE_PRE: String = BuiltInEventPhases.PRE

/**
* Runs after the client has run the tick.
*/
public const val PHASE_POST: String = BuiltInEventPhases.POST
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package net.casual.arcade.events.client.render

import net.casual.arcade.events.BuiltInEventPhases
import net.casual.arcade.events.common.Event
import net.minecraft.client.DeltaTracker
import net.minecraft.client.gui.GuiGraphics

public data class GuiRenderEvent(
val graphics: GuiGraphics,
val deltas: DeltaTracker
): Event {
public companion object {
public const val PHASE_PRE: String = BuiltInEventPhases.PRE

public const val PHASE_POST: String = BuiltInEventPhases.POST
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package net.casual.arcade.events.client.render

import net.casual.arcade.events.common.Event
import net.minecraft.client.DeltaTracker
import net.minecraft.client.renderer.LevelRenderer

public data class LevelRenderEvent(
val renderer: LevelRenderer,
val deltas: DeltaTracker
): Event {
public companion object {
public const val TERRAIN: String = "terrain"
public const val ENTITIES: String = "entities"
public const val BLOCK_ENTITIES: String = "block-entities"
public const val DEBUG: String = "debug"
public const val TRANSLUCENT: String = "translucent"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
"package": "net.casual.arcade.events.client.mixins",
"compatibilityLevel": "JAVA_17",
"client": [

"GuiMixin",
"LevelRendererMixin",
"MinecraftMixin"
],
"injectors": {
"defaultRequire": 1
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package net.casual.arcade.events.server.network

import com.mojang.authlib.GameProfile
import net.casual.arcade.events.common.CancellableEvent
import net.casual.arcade.events.server.ServerOffThreadEvent
import net.casual.arcade.events.common.MissingExecutorEvent
import net.minecraft.network.protocol.Packet
import net.minecraft.server.MinecraftServer

public data class ClientboundPacketEvent(
val server: MinecraftServer,
val owner: GameProfile,
var packet: Packet<*>
): CancellableEvent.Default(), ServerOffThreadEvent
): CancellableEvent.Default(), MissingExecutorEvent
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.casual.arcade.events.server.network

import com.mojang.authlib.GameProfile
import net.casual.arcade.events.server.ServerOffThreadEvent
import net.casual.arcade.events.common.MissingExecutorEvent
import net.casual.arcade.events.server.player.PlayerJoinEvent
import net.minecraft.server.MinecraftServer

Expand All @@ -21,4 +21,4 @@ public data class PlayerLoginEvent(
* The profile of the player that is logging in.
*/
val profile: GameProfile
): ServerOffThreadEvent
): MissingExecutorEvent
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package net.casual.arcade.events.server.player

import net.casual.arcade.events.common.CancellableEvent
import net.casual.arcade.events.server.ServerOffThreadEvent
import net.casual.arcade.events.common.MissingExecutorEvent
import net.minecraft.network.protocol.Packet
import net.minecraft.server.level.ServerPlayer

public data class PlayerClientboundPacketEvent(
override val player: ServerPlayer,
var packet: Packet<*>
): CancellableEvent.Default(), PlayerEvent, ServerOffThreadEvent
): CancellableEvent.Default(), PlayerEvent, MissingExecutorEvent

0 comments on commit 8b246d6

Please sign in to comment.