移植1.20.4

xia-mc · xia-mc · commit be17f474cb23 · 2024-05-29T17:51:57.000+08:00
diff --git a/gradle.properties b/gradle.properties
@@ -3,13 +3,13 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.1
+minecraft_version=1.20.4
 loader_version=0.14.23
 
 # Mod Properties
 mod_version = 2.10.1
 maven_group = top.infsky
-archives_base_name = CheatDetector
+archives_base_name = CheatDetector-nextgen
 
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
diff --git a/src/main/java/top/infsky/cheatdetector/config/Advanced3Config.java b/src/main/java/top/infsky/cheatdetector/config/Advanced3Config.java
@@ -241,9 +241,6 @@ public class Advanced3Config {
     @Config(category = ConfigCategory.ADVANCED3, predicate = ConfigPredicate.DangerMode.class)
     public static boolean airStuckAntiKick = false;
 
-    @Config(category = ConfigCategory.ADVANCED3)
-    public static String clientSpoofBrand = "vanilla";
-
     @Numeric(minValue = 0, maxValue = 5)
     @Config(category = ConfigCategory.ADVANCED3, predicate = ConfigPredicate.DangerMode.class)
     public static double flyAcceptTeleportMaxDistance = 1;
diff --git a/src/main/java/top/infsky/cheatdetector/config/ModuleConfig.java b/src/main/java/top/infsky/cheatdetector/config/ModuleConfig.java
@@ -72,10 +72,6 @@ public class ModuleConfig {
     @Config(category = ConfigCategory.MODULES)
     public static boolean debugEnabled = false;
 
-    @Hotkey
-    @Config(category = ConfigCategory.MODULES)
-    public static boolean clientSpoofEnabled = false;
-
     @Hotkey
     @Config(category = ConfigCategory.MODULES)
     public static boolean noJumpDelayEnabled = false;
diff --git a/src/main/java/top/infsky/cheatdetector/impl/fixes/ServerFreeze.java b/src/main/java/top/infsky/cheatdetector/impl/fixes/ServerFreeze.java
@@ -6,7 +6,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
-import net.minecraft.network.protocol.game.ServerboundPongPacket;
+import net.minecraft.network.protocol.common.ServerboundPongPacket;
 import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import top.infsky.cheatdetector.CheatDetector;
diff --git a/src/main/java/top/infsky/cheatdetector/impl/modules/common/ClientSpoof.java b/src/main/java/top/infsky/cheatdetector/impl/modules/common/ClientSpoof.java
diff --git a/src/main/java/top/infsky/cheatdetector/impl/modules/common/Rotation.java b/src/main/java/top/infsky/cheatdetector/impl/modules/common/Rotation.java
@@ -2,7 +2,6 @@
 
 import lombok.Getter;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
@@ -54,7 +53,7 @@ public void _onTick() {
         }
     }
 
-    public void onFinallyPacketSend(ConnectionAccessor connection, Packet<?> basePacket, @Nullable PacketSendListener packetSendListener, ConnectionProtocol connectionProtocol, ConnectionProtocol connectionProtocol2, CallbackInfo ci) {
+    public void onFinallyPacketSend(ConnectionAccessor connection, Packet<?> basePacket, @Nullable PacketSendListener packetSendListener, CallbackInfo ci) {
         if (isDisabled()) return;
         if (FabricLoader.getInstance().isModLoaded("replaymod")) {
             if (ReplaymodHelper.isFromReplayMod(packetSendListener)) return;
@@ -81,13 +80,13 @@ public void onFinallyPacketSend(ConnectionAccessor connection, Packet<?> basePac
             }
 
             if (basePacket instanceof Pos) {
-                send(connection, new Pos(packet.getX(player.fabricPlayer.getX()), packet.getY(player.fabricPlayer.getY()), packet.getZ(player.fabricPlayer.getZ()), packet.isOnGround()), packetSendListener, connectionProtocol, connectionProtocol2);
+                send(connection, new Pos(packet.getX(player.fabricPlayer.getX()), packet.getY(player.fabricPlayer.getY()), packet.getZ(player.fabricPlayer.getZ()), packet.isOnGround()), packetSendListener);
             } else if (basePacket instanceof Rot) {
-                send(connection, new Rot(getYaw(packet), getPitch(packet), packet.isOnGround()), packetSendListener, connectionProtocol, connectionProtocol2);
+                send(connection, new Rot(getYaw(packet), getPitch(packet), packet.isOnGround()), packetSendListener);
             } else if (basePacket instanceof PosRot) {
-                send(connection, new PosRot(packet.getX(player.fabricPlayer.getX()), packet.getY(player.fabricPlayer.getY()), packet.getZ(player.fabricPlayer.getZ()), getYaw(packet), getPitch(packet), packet.isOnGround()), packetSendListener, connectionProtocol, connectionProtocol2);
+                send(connection, new PosRot(packet.getX(player.fabricPlayer.getX()), packet.getY(player.fabricPlayer.getY()), packet.getZ(player.fabricPlayer.getZ()), getYaw(packet), getPitch(packet), packet.isOnGround()), packetSendListener);
             } else if (basePacket instanceof StatusOnly) {
-                send(connection, new StatusOnly(packet.isOnGround()), packetSendListener, connectionProtocol, connectionProtocol2);
+                send(connection, new StatusOnly(packet.isOnGround()), packetSendListener);
             }
         }
         if (basePacket instanceof ServerboundPlayerCommandPacket packet) {
@@ -111,9 +110,9 @@ private float getPitch(@NotNull ServerboundMovePlayerPacket packet) {
         return result;
     }
 
-    private void send(@NotNull ConnectionAccessor connection, Packet<?> packet, @Nullable PacketSendListener packetSendListener, ConnectionProtocol connectionProtocol, ConnectionProtocol connectionProtocol2) {
+    private void send(@NotNull ConnectionAccessor connection, Packet<?> packet, @Nullable PacketSendListener packetSendListener) {
         sending = packet;
-        connection.doSendPacket(packet, packetSendListener, connectionProtocol, connectionProtocol2);
+        connection.doSendPacket(packet, packetSendListener, true);
     }
 
     @Override
diff --git a/src/main/java/top/infsky/cheatdetector/impl/modules/danger/AirStuck.java b/src/main/java/top/infsky/cheatdetector/impl/modules/danger/AirStuck.java
@@ -7,6 +7,7 @@
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.*;
+import net.minecraft.network.protocol.common.*;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/top/infsky/cheatdetector/impl/utils/packet/PacketHandler.java b/src/main/java/top/infsky/cheatdetector/impl/utils/packet/PacketHandler.java
@@ -29,7 +29,7 @@ public void tick(int delay) {
             if (player.getUpTime() < packet.sentTime() + Math.round(delay / 50.0)) {
                 break;
             }
-            ((ConnectionAccessor) packet.connection()).sendPacket(packet.packet(), packet.listener());
+            ((ConnectionAccessor) packet.connection()).sendPacket(packet.packet(), packet.listener(), true);
             outgoingPackets.remove(packet);
         }
         while (!incomingPackets.isEmpty()) {
@@ -50,7 +50,7 @@ public void releaseAll(boolean cancel) {
         if (!cancel) {
             while (!outgoingPackets.isEmpty()) {
                 final OutgoingPacket packet = outgoingPackets.poll();
-                ((ConnectionAccessor) packet.connection()).sendPacket(packet.packet(), packet.listener());
+                ((ConnectionAccessor) packet.connection()).sendPacket(packet.packet(), packet.listener(), true);
             }
             while (!incomingPackets.isEmpty()) {
                 final IncomingPacket packet = incomingPackets.poll();
diff --git a/src/main/java/top/infsky/cheatdetector/impl/utils/packet/PacketUtils.java b/src/main/java/top/infsky/cheatdetector/impl/utils/packet/PacketUtils.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.*;
+import net.minecraft.network.protocol.common.*;
 
 import java.util.List;
 
diff --git a/src/main/java/top/infsky/cheatdetector/impl/utils/world/EntityUtils.java b/src/main/java/top/infsky/cheatdetector/impl/utils/world/EntityUtils.java
@@ -44,7 +44,7 @@ public static AttributeMap getAttributes(LivingEntity entity) {
 
         // Status effects
         for (var statusEffect : entity.getActiveEffectsMap().values()) {
-            statusEffect.getEffect().addAttributeModifiers(entity, attributes, statusEffect.getAmplifier());
+            statusEffect.getEffect().addAttributeModifiers(attributes, statusEffect.getAmplifier());
         }
 
         return attributes;
diff --git a/src/main/java/top/infsky/cheatdetector/mixins/ConnectionAccessor.java b/src/main/java/top/infsky/cheatdetector/mixins/ConnectionAccessor.java
@@ -3,7 +3,6 @@
 
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.Connection;
-import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.protocol.Packet;
 import org.jetbrains.annotations.Nullable;
@@ -13,9 +12,9 @@
 @Mixin(Connection.class)
 public interface ConnectionAccessor {
     @Invoker("sendPacket")
-    void sendPacket(Packet<?> basePacket, PacketSendListener listener);
+    void sendPacket(Packet<?> basePacket, PacketSendListener listener, boolean bl);
     @Invoker("doSendPacket")
-    void doSendPacket(Packet<?> packet, @Nullable PacketSendListener packetSendListener, ConnectionProtocol connectionProtocol, ConnectionProtocol connectionProtocol2);
+    void doSendPacket(Packet<?> packet, @Nullable PacketSendListener packetSendListener, boolean bl);
     @Invoker("channelRead0")
     void channelRead0(ChannelHandlerContext channelHandlerContext, Packet<?> packet);
 }
diff --git a/src/main/java/top/infsky/cheatdetector/mixins/MixinConnection.java b/src/main/java/top/infsky/cheatdetector/mixins/MixinConnection.java
@@ -3,15 +3,13 @@
 
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.Connection;
-import net.minecraft.network.ConnectionProtocol;
 import net.minecraft.network.PacketSendListener;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
 import net.minecraft.network.protocol.game.ClientboundPlayerPositionPacket;
 import net.minecraft.network.protocol.game.ServerGamePacketListener;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.world.phys.Vec2;
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -40,11 +38,11 @@ public void send(Packet<?> basePacket, PacketSendListener listener, CallbackInfo
     }
 
     @Inject(method = "doSendPacket", at = @At(value = "HEAD"), cancellable = true)
-    public void doSendPacket(Packet<?> packet, @Nullable PacketSendListener packetSendListener, ConnectionProtocol connectionProtocol, ConnectionProtocol connectionProtocol2, CallbackInfo ci) {
+    public void doSendPacket(Packet<?> packet, PacketSendListener packetSendListener, boolean bl, CallbackInfo ci) {
         Rotation rotation = (Rotation) Rotation.getInstance();
 
         if (rotation != null) {
-            rotation.onFinallyPacketSend((ConnectionAccessor) this, packet, packetSendListener, connectionProtocol, connectionProtocol2, ci);
+            rotation.onFinallyPacketSend((ConnectionAccessor) this, packet, packetSendListener, ci);
         }
     }
 
diff --git a/src/main/java/top/infsky/cheatdetector/utils/CheckManager.java b/src/main/java/top/infsky/cheatdetector/utils/CheckManager.java
@@ -124,7 +124,6 @@ public CheckManager(@NotNull Map<Class<? extends Check>, Check> preChecks,
         post.put(Debug.class, new Debug(player));
         post.put(Nuker.class, new Nuker(player));
         post.put(AirStuck.class, new AirStuck(player));
-        pre.put(ClientSpoof.class, new ClientSpoof(player));
         post.put(Fly.class, new Fly(player));
         pre.put(NoJumpDelay.class, new NoJumpDelay(player));
         post.put(Writer.class, new Writer(player));

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import lombok.Getter;`
`4`	`4`	`import net.fabricmc.loader.api.FabricLoader;`
`5`		`-import net.minecraft.network.ConnectionProtocol;`
`6`	`5`	`import net.minecraft.network.PacketSendListener;`
`7`	`6`	`import net.minecraft.network.protocol.Packet;`
`8`	`7`	`import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;`
`@@ -54,7 +53,7 @@ public void _onTick() {`
`54`	`53`	`}`
`55`	`54`	`}`
`56`	`55`
`57`		`- public void onFinallyPacketSend(ConnectionAccessor connection, Packet<?> basePacket, @Nullable PacketSendListener packetSendListener, ConnectionProtocol connectionProtocol, ConnectionProtocol connectionProtocol2, CallbackInfo ci) {`
	`56`	`+ public void onFinallyPacketSend(ConnectionAccessor connection, Packet<?> basePacket, @Nullable PacketSendListener packetSendListener, CallbackInfo ci) {`
`58`	`57`	`if (isDisabled()) return;`
`59`	`58`	`if (FabricLoader.getInstance().isModLoaded("replaymod")) {`
`60`	`59`	`if (ReplaymodHelper.isFromReplayMod(packetSendListener)) return;`
`@@ -81,13 +80,13 @@ public void onFinallyPacketSend(ConnectionAccessor connection, Packet<?> basePac`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`if (basePacket instanceof Pos) {`
`84`		`- send(connection, new Pos(packet.getX(player.fabricPlayer.getX()), packet.getY(player.fabricPlayer.getY()), packet.getZ(player.fabricPlayer.getZ()), packet.isOnGround()), packetSendListener, connectionProtocol, connectionProtocol2);`
	`83`	`+ send(connection, new Pos(packet.getX(player.fabricPlayer.getX()), packet.getY(player.fabricPlayer.getY()), packet.getZ(player.fabricPlayer.getZ()), packet.isOnGround()), packetSendListener);`
`85`	`84`	`} else if (basePacket instanceof Rot) {`
`86`		`- send(connection, new Rot(getYaw(packet), getPitch(packet), packet.isOnGround()), packetSendListener, connectionProtocol, connectionProtocol2);`
	`85`	`+ send(connection, new Rot(getYaw(packet), getPitch(packet), packet.isOnGround()), packetSendListener);`
`87`	`86`	`} else if (basePacket instanceof PosRot) {`
`88`		`- send(connection, new PosRot(packet.getX(player.fabricPlayer.getX()), packet.getY(player.fabricPlayer.getY()), packet.getZ(player.fabricPlayer.getZ()), getYaw(packet), getPitch(packet), packet.isOnGround()), packetSendListener, connectionProtocol, connectionProtocol2);`
	`87`	`+ send(connection, new PosRot(packet.getX(player.fabricPlayer.getX()), packet.getY(player.fabricPlayer.getY()), packet.getZ(player.fabricPlayer.getZ()), getYaw(packet), getPitch(packet), packet.isOnGround()), packetSendListener);`
`89`	`88`	`} else if (basePacket instanceof StatusOnly) {`
`90`		`- send(connection, new StatusOnly(packet.isOnGround()), packetSendListener, connectionProtocol, connectionProtocol2);`
	`89`	`+ send(connection, new StatusOnly(packet.isOnGround()), packetSendListener);`
`91`	`90`	`}`
`92`	`91`	`}`
`93`	`92`	`if (basePacket instanceof ServerboundPlayerCommandPacket packet) {`
`@@ -111,9 +110,9 @@ private float getPitch(@NotNull ServerboundMovePlayerPacket packet) {`
`111`	`110`	`return result;`
`112`	`111`	`}`
`113`	`112`
`114`		`- private void send(@NotNull ConnectionAccessor connection, Packet<?> packet, @Nullable PacketSendListener packetSendListener, ConnectionProtocol connectionProtocol, ConnectionProtocol connectionProtocol2) {`
	`113`	`+ private void send(@NotNull ConnectionAccessor connection, Packet<?> packet, @Nullable PacketSendListener packetSendListener) {`
`115`	`114`	`sending = packet;`
`116`		`- connection.doSendPacket(packet, packetSendListener, connectionProtocol, connectionProtocol2);`
	`115`	`+ connection.doSendPacket(packet, packetSendListener, true);`
`117`	`116`	`}`
`118`	`117`
`119`	`118`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void tick(int delay) {`
`29`	`29`	`if (player.getUpTime() < packet.sentTime() + Math.round(delay / 50.0)) {`
`30`	`30`	`break;`
`31`	`31`	`}`
`32`		`- ((ConnectionAccessor) packet.connection()).sendPacket(packet.packet(), packet.listener());`
	`32`	`+ ((ConnectionAccessor) packet.connection()).sendPacket(packet.packet(), packet.listener(), true);`
`33`	`33`	`outgoingPackets.remove(packet);`
`34`	`34`	`}`
`35`	`35`	`while (!incomingPackets.isEmpty()) {`
`@@ -50,7 +50,7 @@ public void releaseAll(boolean cancel) {`
`50`	`50`	`if (!cancel) {`
`51`	`51`	`while (!outgoingPackets.isEmpty()) {`
`52`	`52`	`final OutgoingPacket packet = outgoingPackets.poll();`
`53`		`- ((ConnectionAccessor) packet.connection()).sendPacket(packet.packet(), packet.listener());`
	`53`	`+ ((ConnectionAccessor) packet.connection()).sendPacket(packet.packet(), packet.listener(), true);`
`54`	`54`	`}`
`55`	`55`	`while (!incomingPackets.isEmpty()) {`
`56`	`56`	`final IncomingPacket packet = incomingPackets.poll();`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public static AttributeMap getAttributes(LivingEntity entity) {`
`44`	`44`
`45`	`45`	`// Status effects`
`46`	`46`	`for (var statusEffect : entity.getActiveEffectsMap().values()) {`
`47`		`- statusEffect.getEffect().addAttributeModifiers(entity, attributes, statusEffect.getAmplifier());`
	`47`	`+ statusEffect.getEffect().addAttributeModifiers(attributes, statusEffect.getAmplifier());`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`return attributes;`