Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit c7aed52

Browse files
committed
Move ClientTickEvent firing to LifecycleEvents
1 parent 77aae0b commit c7aed52

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ public static void fireWorldTickEvent(TickEvent.Phase phase, World world) {
5151
MinecraftForge.EVENT_BUS.post(event);
5252
}
5353

54+
public static void fireClientTickEvent(TickEvent.Phase phase) {
55+
MinecraftForge.EVENT_BUS.post(new TickEvent.ClientTickEvent(phase));
56+
}
57+
5458
public static void onPlayerPreTick(PlayerEntity player) {
5559
MinecraftForge.EVENT_BUS.post(new TickEvent.PlayerTickEvent(TickEvent.Phase.START, player));
5660
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.spongepowered.asm.mixin.injection.Inject;
2525
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
2626
import org.objectweb.asm.Opcodes;
27-
import net.minecraftforge.common.MinecraftForge;
2827
import net.minecraftforge.event.TickEvent;
2928

3029
import net.minecraft.client.MinecraftClient;
@@ -40,14 +39,12 @@ public class MixinMinecraftClient {
4039
@Inject(method = "tick()V", at = @At(value = "FIELD", opcode = Opcodes.H_GETFIELD, ordinal = 0,
4140
target = "Lnet/minecraft/client/MinecraftClient;profiler:Lnet/minecraft/util/profiler/DisableableProfiler;"))
4241
private void hookClientTickStart(CallbackInfo info) {
43-
TickEvent.ClientTickEvent event = new TickEvent.ClientTickEvent(TickEvent.Phase.START);
44-
MinecraftForge.EVENT_BUS.post(event);
42+
LifecycleEvents.fireClientTickEvent(TickEvent.Phase.START);
4543
}
4644

4745
@Inject(method = "tick()V", at = @At("RETURN"))
4846
private void hookClientTickEnd(CallbackInfo info) {
49-
TickEvent.ClientTickEvent event = new TickEvent.ClientTickEvent(TickEvent.Phase.END);
50-
MinecraftForge.EVENT_BUS.post(event);
47+
LifecycleEvents.fireClientTickEvent(TickEvent.Phase.END);
5148
}
5249

5350
@Inject(method = "init", at = @At("RETURN"))

0 commit comments

Comments
 (0)