Sulkta-OSS/dynmap-neoforge
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

fabric-1.19.1: fix mixins for 1.19.1

Browse source
This commit is contained in:
Kosma Moczek 2022-07-30 00:29:25 +02:00
parent 8d51647470
commit 088d78f63c
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/FabricServer.java
View file

@ -293,7 +293,7 @@ public class FabricServer extends DynmapServerInterface {
@Override @Override
public void broadcastMessage(String msg) { public void broadcastMessage(String msg) {
Text component = Text.literal(msg); Text component = Text.literal(msg);
server.getPlayerManager().broadcast(component, MessageType.SYSTEM); server.getPlayerManager().broadcast(component, false);
Log.info(stripChatColor(msg)); Log.info(stripChatColor(msg));
} }

10
fabric-1.19.1/src/main/java/org/dynmap/fabric_1_19_1/mixin/ServerPlayNetworkHandlerMixin.java
View file

@ -34,13 +34,11 @@ public abstract class ServerPlayNetworkHandlerMixin {
@Inject( @Inject(
method = "handleDecoratedMessage", method = "handleDecoratedMessage",
at = @At( at = @At(
value = "INVOKE", value = "HEAD"
target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/server/filter/FilteredMessage;Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/util/registry/RegistryKey;)V",
shift = At.Shift.BEFORE
) )
) )
public void onGameMessage(FilteredMessage<SignedMessage> message, CallbackInfo ci) { public void onGameMessage(SignedMessage signedMessage, CallbackInfo ci) {
ServerChatEvents.EVENT.invoker().onChatMessage(player, message.raw().getContent().getString()); ServerChatEvents.EVENT.invoker().onChatMessage(player, signedMessage.getContent().getString());
} }
@Inject( @Inject(
@ -52,7 +50,7 @@ public abstract class ServerPlayNetworkHandlerMixin {
), ),
locals = LocalCapture.CAPTURE_FAILHARD locals = LocalCapture.CAPTURE_FAILHARD
) )
public void onSignUpdate(UpdateSignC2SPacket packet, List<FilteredMessage<String>> signText, CallbackInfo info, public void onSignUpdate(UpdateSignC2SPacket packet, List<FilteredMessage> signText, CallbackInfo info,
ServerWorld serverWorld, BlockPos blockPos, BlockState blockState, BlockEntity blockEntity, SignBlockEntity signBlockEntity) ServerWorld serverWorld, BlockPos blockPos, BlockState blockState, BlockEntity blockEntity, SignBlockEntity signBlockEntity)
{ {
// Pull the raw text from the input. // Pull the raw text from the input.