4
4
import com .lx862 .svrutil .commands .afk ;
5
5
import com .lx862 .svrutil .feature .FancyMessageFeature ;
6
6
import com .lx862 .svrutil .feature .FeatureSet ;
7
- import net .minecraft .command . argument . MessageArgumentType ;
7
+ import net .minecraft .network . message . SignedMessage ;
8
8
import net .minecraft .server .command .MessageCommand ;
9
9
import net .minecraft .server .command .ServerCommandSource ;
10
10
import net .minecraft .server .network .ServerPlayerEntity ;
11
11
import net .minecraft .sound .SoundCategory ;
12
12
import net .minecraft .sound .SoundEvent ;
13
- import net .minecraft .sound .SoundEvents ;
14
13
import net .minecraft .text .Text ;
15
14
import net .minecraft .util .Formatting ;
16
15
import net .minecraft .util .Identifier ;
17
16
import org .spongepowered .asm .mixin .Mixin ;
18
17
import org .spongepowered .asm .mixin .injection .At ;
19
18
import org .spongepowered .asm .mixin .injection .Inject ;
20
- import org .spongepowered .asm .mixin .injection .callback .CallbackInfoReturnable ;
19
+ import org .spongepowered .asm .mixin .injection .callback .CallbackInfo ;
21
20
22
21
import java .util .Collection ;
23
22
import java .util .List ;
24
23
25
24
@ Mixin (MessageCommand .class )
26
25
public class MessageCommandMixin {
27
26
@ Inject (method = "execute" , at = @ At ("HEAD" ), cancellable = true )
28
- private static void execute (ServerCommandSource source , Collection <ServerPlayerEntity > targets , MessageArgumentType . SignedMessage signedMessage , CallbackInfoReturnable < Integer > cir ) {
27
+ private static void execute (ServerCommandSource source , Collection <ServerPlayerEntity > targets , SignedMessage message , CallbackInfo ci ) {
29
28
String playerName = source .getName ();
30
29
31
30
SvrUtil .lastReply .put (source .getName (), targets .stream ().map (e -> e .getGameProfile ().getName ()).toList ());
@@ -35,24 +34,22 @@ private static void execute(ServerCommandSource source, Collection<ServerPlayerE
35
34
}
36
35
37
36
if (FeatureSet .FANCY_MESSAGE .feature .enabled ) {
38
- signedMessage .decorate (source , message -> {
39
- for (ServerPlayerEntity target : targets ) {
40
- Text msgContent = message .getContent ();
37
+ for (ServerPlayerEntity target : targets ) {
38
+ Text msgContent = message .getContent ();
41
39
42
- source .sendFeedback (Text .literal (String .format ("§6[me §r-> §6%s]: " , target .getGameProfile ().getName ())).append (msgContent ), false );
43
- target .sendMessage (Text .literal (String .format ("§6[%s §r-> §6me]: " , playerName )).append (msgContent ), false );
40
+ source .sendFeedback (Text .literal (String .format ("§6[me §r-> §6%s]: " , target .getGameProfile ().getName ())).append (msgContent ), false );
41
+ target .sendMessage (Text .literal (String .format ("§6[%s §r-> §6me]: " , playerName )).append (msgContent ), false );
44
42
45
- Identifier soundEffect = ((FancyMessageFeature )FeatureSet .FANCY_MESSAGE .feature ).getMessageSound ();
46
- if (soundEffect != null ) {
47
- target .playSound (new SoundEvent (soundEffect ), SoundCategory .MASTER , 1 , 1 );
48
- }
43
+ Identifier soundEffect = ((FancyMessageFeature )FeatureSet .FANCY_MESSAGE .feature ).getMessageSound ();
44
+ if (soundEffect != null ) {
45
+ target .playSound (SoundEvent . of (soundEffect ), SoundCategory .MASTER , 1 , 1 );
46
+ }
49
47
50
- if (afk .afkList .containsKey (target .getUuid ()) && source .isExecutedByPlayer ()) {
51
- source .getPlayer ().sendMessageToClient (Text .literal ("" ).append (target .getDisplayName ()).append (" are AFK and may not be available at the moment." ).formatted (Formatting .YELLOW ), true );
52
- }
48
+ if (afk .afkList .containsKey (target .getUuid ()) && source .isExecutedByPlayer ()) {
49
+ source .getPlayer ().sendMessageToClient (Text .literal ("" ).append (target .getDisplayName ()).append (" are AFK and may not be available at the moment." ).formatted (Formatting .YELLOW ), true );
53
50
}
54
- });
55
- cir . setReturnValue ( 1 );
51
+ }
52
+ ci . cancel ( );
56
53
}
57
54
}
58
55
}
0 commit comments