firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

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

Browse Source
This commit is contained in:
HypherionSA
2024-03-17 20:41:36 +02:00
parent eda7bf4bf2
commit 9d9217485b
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/ServerGamePacketListenerImplMixin.java
View File

@@ -13,18 +13,23 @@ 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;
@Mixin(ServerGamePacketListenerImpl.class) @Mixin(value = ServerGamePacketListenerImpl.class, priority = Integer.MIN_VALUE)
public class ServerGamePacketListenerImplMixin { public class ServerGamePacketListenerImplMixin {
@Shadow public ServerPlayer player; @Shadow
public ServerPlayer player;
@Inject(method = "handleChat(Lnet/minecraft/server/network/TextFilter$FilteredText;)V", at = @At("HEAD"), cancellable = true) @Inject(
private void injectChatEvent(TextFilter.FilteredText filteredText, CallbackInfo ci) { method = "handleChat(Lnet/minecraft/server/network/TextFilter$FilteredText;)V",
Component message = new TextComponent(filteredText.getRaw()); at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/TextFilter$FilteredText;getFiltered()Ljava/lang/String;"),
cancellable = true
)
private void injectChatEvent(TextFilter.FilteredText arg, CallbackInfo ci) {
Component message = new TextComponent(arg.getRaw());
if (message.getString().startsWith("/")) if (message.getString().startsWith("/"))
return; return;
CraterServerChatEvent event = new CraterServerChatEvent(this.player, message.getString(), message); CraterServerChatEvent event = new CraterServerChatEvent(this.player, arg.getFiltered(), message);
CraterEventBus.INSTANCE.postEvent(event); CraterEventBus.INSTANCE.postEvent(event);
if (event.wasCancelled()) if (event.wasCancelled())
ci.cancel(); ci.cancel();

2
gradle.properties
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