GitHub-Repo/ChatPlus
1
0
Fork 0
mirror of https://github.com/CPTProgrammer/ChatPlus.git synced 2025-05-13 07:18:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated needed classes to 1.21.4

Browse Source
This commit is contained in:
Bloemenpot 2025-01-24 11:01:35 +01:00
parent 4ef1b1de74
commit 3bc6ec5477
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/cn/revaria/chatplus/mixin/MixinChat.java
View File

@ -1,7 +1,6 @@
package cn.revaria.chatplus.mixin; package cn.revaria.chatplus.mixin;
import net.minecraft.MinecraftVersion; import net.minecraft.MinecraftVersion;
import net.minecraft.SharedConstants;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.network.ClientConnection; import net.minecraft.network.ClientConnection;
import net.minecraft.network.message.*; import net.minecraft.network.message.*;
@ -14,6 +13,7 @@ import net.minecraft.server.network.ServerPlayNetworkHandler;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.MutableText; import net.minecraft.text.MutableText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.StringHelper;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@ -44,7 +44,9 @@ public abstract class MixinChat extends ServerCommonNetworkHandler {
@Shadow @Shadow
public ServerPlayerEntity player; public ServerPlayerEntity player;
@Shadow protected abstract Optional<LastSeenMessageList> validateMessage(LastSeenMessageList.Acknowledgment acknowledgment); // @Shadow protected abstract Optional<LastSeenMessageList> validateMessage(LastSeenMessageList.Acknowledgment acknowledgment);
@Shadow protected abstract Optional<LastSeenMessageList> validateAcknowledgment(LastSeenMessageList.Acknowledgment acknowledgment);
@Shadow protected abstract SignedMessage getSignedMessage(ChatMessageC2SPacket packet, LastSeenMessageList lastSeenMessages) throws MessageChain.MessageChainException; @Shadow protected abstract SignedMessage getSignedMessage(ChatMessageC2SPacket packet, LastSeenMessageList lastSeenMessages) throws MessageChain.MessageChainException;
@ -61,8 +63,7 @@ public abstract class MixinChat extends ServerCommonNetworkHandler {
if (hasIllegalCharacter(packet.chatMessage())) { if (hasIllegalCharacter(packet.chatMessage())) {
disconnect(Text.translatable("multiplayer.disconnect.illegal_characters")); disconnect(Text.translatable("multiplayer.disconnect.illegal_characters"));
} else { } else {
Optional<LastSeenMessageList> optional = this.validateMessage(packet.acknowledgment()); Optional<LastSeenMessageList> optional = this.validateAcknowledgment(packet.acknowledgment()); if (optional.isPresent()) {
if (optional.isPresent()) {
if (!packet.chatMessage().startsWith("/")){ if (!packet.chatMessage().startsWith("/")){
String changedMessage = packet.chatMessage().replace('&', '§'); String changedMessage = packet.chatMessage().replace('&', '§');
@ -158,7 +159,7 @@ public abstract class MixinChat extends ServerCommonNetworkHandler {
private static boolean hasIllegalCharacter(String message) { private static boolean hasIllegalCharacter(String message) {
for(int i = 0; i < message.length(); ++i) { for(int i = 0; i < message.length(); ++i) {
if (!SharedConstants.isValidChar(message.charAt(i))) { if (!StringHelper.isValidChar(message.charAt(i))) {
return true; return true;
} }
} }

4
src/main/resources/fabric.mod.json
View File

@ -28,8 +28,8 @@
} }
], ],
"depends": { "depends": {
"fabricloader": ">=0.14.21", "fabricloader": ">=0.16.9",
"minecraft": "~1.20.4", "minecraft": "~1.21.4",
"java": ">=17", "java": ">=17",
"fabric-api": "*" "fabric-api": "*"
}, },