fabric-1.17: restore web chat functionality

This commit is contained in:
Kosma Moczek 2021-06-27 19:35:32 +02:00
parent 2dbd5d94c7
commit f4e3a1a52e
2 changed files with 6 additions and 4 deletions

View file

@ -1,5 +1,6 @@
package org.dynmap.fabric_1_17.mixin; package org.dynmap.fabric_1_17.mixin;
import net.minecraft.server.filter.TextStream;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import org.dynmap.fabric_1_17.event.ServerChatEvents; import org.dynmap.fabric_1_17.event.ServerChatEvents;
@ -15,14 +16,14 @@ public abstract class ServerPlayNetworkHandlerMixin {
public ServerPlayerEntity player; public ServerPlayerEntity player;
@Inject( @Inject(
method = "method_31286", method = "handleMessage",
at = @At( at = @At(
value = "INVOKE", value = "INVOKE",
target = "Lnet/minecraft/server/PlayerManager;broadcastChatMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/MessageType;Ljava/util/UUID;)V", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Ljava/util/function/Function;Lnet/minecraft/network/MessageType;Ljava/util/UUID;)V",
shift = At.Shift.BEFORE shift = At.Shift.BEFORE
) )
) )
public void onGameMessage(String string, CallbackInfo info) { public void onGameMessage(TextStream.Message message, CallbackInfo info) {
ServerChatEvents.EVENT.invoker().onChatMessage(player, string); ServerChatEvents.EVENT.invoker().onChatMessage(player, message.getRaw());
} }
} }

View file

@ -8,6 +8,7 @@
"MinecraftServerMixin", "MinecraftServerMixin",
"PlayerManagerMixin", "PlayerManagerMixin",
"ServerPlayerEntityMixin", "ServerPlayerEntityMixin",
"ServerPlayNetworkHandlerMixin",
"ThreadedAnvilChunkStorageAccessor", "ThreadedAnvilChunkStorageAccessor",
"ThreadedAnvilChunkStorageMixin", "ThreadedAnvilChunkStorageMixin",
"WorldChunkMixin" "WorldChunkMixin"