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

Update to 1.20.4 (#7)

Browse Source 
* Updated Gradle Version

* Updated Loom Version

* Updated GradleProperties to 1.21.4

* Updated needed classes to 1.21.4

* Update mod version

---------

Co-authored-by: CPTProgrammer <46586216+CPTProgrammer@users.noreply.github.com>
This commit is contained in:
Bloemenpot 2025-01-25 11:35:20 +01:00 committed by GitHub
parent ed5e4a7ea7
commit a94415e427
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.5-SNAPSHOT' id 'fabric-loom' version '1.9-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }

10
gradle.properties
View File

@ -4,14 +4,14 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.20.4 minecraft_version=1.21.4
yarn_mappings=1.20.4+build.3 yarn_mappings=1.21.4+build.8
loader_version=0.15.6 loader_version=0.16.9
# Mod Properties # Mod Properties
mod_version=0.20.3 mod_version=0.21.0
maven_group=cn.revaria.chatplus maven_group=cn.revaria.chatplus
archives_base_name=chat-plus archives_base_name=chat-plus
# Dependencies # Dependencies
fabric_version=0.95.1+1.20.4 fabric_version=0.115.0+1.21.4

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

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": "*"
}, },