[CHANGE] Change hook in point for ChatEvent to fix compat with chat modification mods

This commit is contained in:
2024-03-17 20:35:59 +02:00
parent 76d4b1c37e
commit b4aab1e760
2 changed files with 14 additions and 5 deletions

View File

@@ -2,24 +2,33 @@ package com.hypherionmc.craterlib.mixin.events;
import com.hypherionmc.craterlib.api.event.server.CraterServerChatEvent; import com.hypherionmc.craterlib.api.event.server.CraterServerChatEvent;
import com.hypherionmc.craterlib.core.event.CraterEventBus; import com.hypherionmc.craterlib.core.event.CraterEventBus;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.PlayerChatMessage; import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.FilteredText;
import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.server.network.ServerGamePacketListenerImpl;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(ServerGamePacketListenerImpl.class) import java.util.concurrent.CompletableFuture;
@Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
public class ServerGamePacketListenerImplMixin { public class ServerGamePacketListenerImplMixin {
@Shadow @Shadow
public ServerPlayer player; public ServerPlayer player;
@Inject(method = "broadcastChatMessage", at = @At("HEAD"), cancellable = true) @Inject(
private void injectChatEvent(PlayerChatMessage chatMessage, CallbackInfo ci) { method = "lambda$handleChat$9",
CraterServerChatEvent event = new CraterServerChatEvent(this.player, chatMessage.serverContent().getString(), chatMessage.serverContent()); at = @At("HEAD"),
cancellable = true
)
private void injectChatEvent(PlayerChatMessage arg, CallbackInfoReturnable<CompletableFuture> ci) {
CraterServerChatEvent event = new CraterServerChatEvent(this.player, arg.serverContent().getString(), arg.serverContent());
CraterEventBus.INSTANCE.postEvent(event); CraterEventBus.INSTANCE.postEvent(event);
if (event.wasCancelled()) if (event.wasCancelled())
ci.cancel(); ci.cancel();

View File

@@ -1,7 +1,7 @@
#Project #Project
version_major=1 version_major=1
version_minor=1 version_minor=1
version_patch=1 version_patch=2
project_group=com.hypherionmc.craterlib project_group=com.hypherionmc.craterlib
#Mod #Mod