Skip to content

Commit

Permalink
1.21???
Browse files Browse the repository at this point in the history
  • Loading branch information
adryd325 committed Jun 20, 2024
1 parent 1ccbf35 commit 964c935
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 15 deletions.
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true

# Fabric Properties
minecraft_version=1.20.3-pre4
yarn_mappings=1.20.3-pre4+build.2
loader_version=0.14.25
minecraft_version=1.21
yarn_mappings=1.21+build.2
loader_version=0.15.11

# Mod Properties
mod_version = 1.0.12
mod_version = 1.0.13
maven_group = com.adryd
archives_base_name = sneaky
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Jun 20 17:58:23 EDT 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
import com.adryd.sneaky.Config;
import com.adryd.sneaky.IPList;
import net.minecraft.network.ClientConnection;
import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerHandshakeNetworkHandler;
import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
import org.spongepowered.asm.mixin.injection.Redirect;

@Mixin(ServerHandshakeNetworkHandler.class)
public class MixinServerHandshakeNetworkHandler {
Expand All @@ -21,15 +19,22 @@ public class MixinServerHandshakeNetworkHandler {
@Final
private ClientConnection connection;

@Shadow
@Final
private MinecraftServer server;

@Shadow
@Final
private static Text IGNORING_STATUS_REQUEST_MESSAGE;

@Inject(method = "onHandshake", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;setS2CPacketHandler(Lnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V", ordinal = 1), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true)
private void acceptsQuery(HandshakeC2SPacket packet, CallbackInfo ci) {
if (Config.INSTANCE.getDisableAllPingsUntilLogin() && !IPList.INSTANCE.canPing(this.connection.getAddress())) {
this.connection.disconnect(IGNORING_STATUS_REQUEST_MESSAGE);
ci.cancel();
@Redirect(method = "onHandshake", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;acceptsStatusQuery()Z"))
private boolean acceptsQuery(MinecraftServer instance) {
if (this.server.acceptsStatusQuery()) {
if (Config.INSTANCE.getDisableAllPingsUntilLogin() && !IPList.INSTANCE.canPing(this.connection.getAddress())) {
return false;
}
return true;
}
return false;
}
}

0 comments on commit 964c935

Please sign in to comment.