1.21.5

florianreuth · florianreuth · commit aacdded34355 · 2025-05-03T01:33:25.000+02:00
diff --git a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/service/ProtocolAutoDetector.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/service/ProtocolAutoDetector.java
@@ -31,7 +31,6 @@
 import net.minecraft.SharedConstants;
 import net.minecraft.network.*;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.handler.*;
 import net.minecraft.network.protocol.PacketFlow;
 import net.minecraft.network.protocol.handshake.ClientIntent;
 import net.minecraft.network.protocol.handshake.ClientIntentionPacket;
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/address/client/MixinServerNameResolver.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/address/client/MixinServerNameResolver.java
@@ -34,11 +34,12 @@
 import net.minecraft.client.multiplayer.resolver.ServerNameResolver;
 
 @Mixin(ServerNameResolver.class)
-public abstract class MixinAllowedAddressResolver {
+public abstract class MixinServerNameResolver {
+
     @Shadow
-    public abstract Optional<ResolvedServerAddress> resolve(ServerAddress address);
+    public abstract Optional<ResolvedServerAddress> resolveAddress(final ServerAddress serverAddress);
 
-    @Inject(method = "resolve", at = @At(value = "HEAD"), cancellable = true)
+    @Inject(method = "resolveAddress", at = @At(value = "HEAD"), cancellable = true)
     private void resolveVF(ServerAddress address, CallbackInfoReturnable<Optional<ResolvedServerAddress>> cir) {
         AddressParser viaAddr = new AddressParser().parse(address.getHost());
         if (viaAddr.viaSuffix == null) {
@@ -47,7 +48,7 @@ private void resolveVF(ServerAddress address, CallbackInfoReturnable<Optional<Re
 
         ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress, address.getPort());
 
-        cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr.getSuffixWithOptions())));
+        cir.setReturnValue(resolveAddress(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr.getSuffixWithOptions())));
     }
 
     @Unique
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/debug/client/MixinClientPacketListener.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/debug/client/MixinClientPacketListener.java
@@ -33,18 +33,18 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ClientPacketListener.class)
-public abstract class MixinClientPlayNetworkHandler {
+public abstract class MixinClientPacketListener {
 
     @Shadow
     public abstract Connection getConnection();
 
-    @Inject(method = "onGameJoin", at = @At("RETURN"))
+    @Inject(method = "handleLogin", at = @At("RETURN"))
     public void sendConnectionDetails(ClientboundLoginPacket packet, CallbackInfo ci) {
         if (!ViaFabric.config.isSendConnectionDetails()) {
             return;
         }
 
-        @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME);
+        @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinConnectionAccessor) getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME);
         if (viaDecoder instanceof FabricDecodeHandler) {
             UserConnection connection = ((FabricDecodeHandler) viaDecoder).getInfo();
 
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/debug/client/MixinConnection.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/debug/client/MixinConnection.java
@@ -19,7 +19,7 @@
 
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.Connection;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -28,7 +28,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Connection.class)
-public abstract class MixinClientConnection {
+public abstract class MixinConnection {
 
     @Shadow
     @Final
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/debug/client/MixinConnectionAccessor.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/debug/client/MixinConnectionAccessor.java
@@ -23,7 +23,7 @@
 import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(Connection.class)
-public interface MixinClientConnectionAccessor {
+public interface MixinConnectionAccessor {
     @Accessor
     Channel getChannel();
 }
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/debug/client/MixinDebugScreenOverlay.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/debug/client/MixinDebugScreenOverlay.java
@@ -24,22 +24,22 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import io.netty.channel.ChannelHandler;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.DebugScreenOverlay;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.DebugScreenOverlay;
 
 @Mixin(DebugScreenOverlay.class)
-public class MixinDebugHud {
-    @Inject(at = @At("RETURN"), method = "getLeftText")
-    protected void getLeftText(CallbackInfoReturnable<List<String>> info) {
+public class MixinDebugScreenOverlay {
+    @Inject(at = @At("RETURN"), method = "getGameInformation")
+    protected void getGameInformation(CallbackInfoReturnable<List<String>> cir) {
         String line = "[ViaFabric] I: " + Via.getManager().getConnectionManager().getConnections().size() + " (F: "
                 + Via.getManager().getConnectionManager().getConnectedClients().size() + ")";
-        @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) Minecraft.getInstance().getConnection()
+        @SuppressWarnings("ConstantConditions") ChannelHandler viaDecoder = ((MixinConnectionAccessor) Minecraft.getInstance().getConnection()
                 .getConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME);
         if (viaDecoder instanceof FabricDecodeHandler) {
             UserConnection connection = ((FabricDecodeHandler) viaDecoder).getInfo();
@@ -51,6 +51,6 @@ protected void getLeftText(CallbackInfoReturnable<List<String>> info) {
             }
         }
 
-        info.getReturnValue().add(line);
+        cir.getReturnValue().add(line);
     }
 }
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/gui/client/MixinOnlineServerEntry.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/gui/client/MixinOnlineServerEntry.java
@@ -20,41 +20,41 @@
 import com.google.common.collect.Lists;
 import com.viaversion.fabric.common.gui.ViaServerData;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-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.ModifyArg;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
 import net.minecraft.client.gui.screens.multiplayer.ServerSelectionList;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+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.ModifyArg;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ServerSelectionList.OnlineServerEntry.class)
-public class MixinServerEntry {
+public class MixinOnlineServerEntry {
+
     @Shadow
     @Final
-    private ServerData server;
+    private ServerData serverData;
 
     @ModifyArg(method = "render", at = @At(value = "INVOKE", ordinal = 0,
-            target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"))
+        target = "Lnet/minecraft/client/gui/GuiGraphics;blitSprite(Lnet/minecraft/resources/ResourceLocation;IIII)V"))
     private ResourceLocation redirectPingIcon(ResourceLocation texture) {
-        if (((ViaServerData) this.server).viaFabric$translating() && texture.getPath().startsWith("server_list/ping")) {
-            return ResourceLocation.fromNamespaceAndPath("viafabric", texture.getPath());
+        if (((ViaServerData) this.serverData).viaFabric$translating() && texture.getPath().startsWith("server_list/ping")) {
+            return ResourceLocation.tryBuild("viafabric", texture.getPath());
         }
         return texture;
     }
 
-    @Redirect(method = "render", at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/client/gui/screen/multiplayer/MultiplayerScreen;setTooltip(Lnet/minecraft/text/Text;)V"))
-    private void addServerVer(JoinMultiplayerScreen instance, Component text) {
-        ProtocolVersion proto = ProtocolVersion.getProtocol(((ViaServerData) this.server).viaFabric$getServerVer());
+    @Redirect(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen;setTooltipForNextRenderPass(Lnet/minecraft/network/chat/Component;)V"))
+    private void addServerVer(JoinMultiplayerScreen instance, Component component) {
+        ProtocolVersion proto = ProtocolVersion.getProtocol(((ViaServerData) this.serverData).viaFabric$getServerVer());
         List<Component> lines = new ArrayList<>();
-        lines.add(text);
+        lines.add(component);
         lines.add(Component.translatable("gui.ping_version.translated", proto.getName(), proto.getVersion()));
         instance.setTooltipForNextRenderPass(Lists.transform(lines, Component::getVisualOrderText));
     }
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/gui/client/MixinServerStatusPingerListener.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/gui/client/MixinServerStatusPingerListener.java
@@ -19,32 +19,36 @@
 
 import com.viaversion.fabric.common.gui.ViaServerData;
 import com.viaversion.fabric.common.handler.FabricDecodeHandler;
-import com.viaversion.fabric.mc1215.mixin.debug.client.MixinClientConnectionAccessor;
+import com.viaversion.fabric.mc1215.mixin.debug.client.MixinConnectionAccessor;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.status.ClientStatusPacketListener;
 import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
+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;
 
-@Mixin(targets = "net.minecraft.client.network.MultiplayerServerListPinger$1")
-public abstract class MixinMultiplayerServerListPingerListener implements ClientStatusPacketListener {
-    @Accessor
-    abstract Connection getField_3774(); // Synthetic
+@Mixin(targets = "net.minecraft.client.multiplayer.ServerStatusPinger$1")
+public abstract class MixinServerStatusPingerListener implements ClientStatusPacketListener {
 
-    @Accessor
-    abstract ServerData getField_3776(); // Synthetic
+    @Shadow
+    @Final
+    ServerData val$data;
 
-    @Inject(method = "onResponse(Lnet/minecraft/network/packet/s2c/query/QueryResponseS2CPacket;)V", at = @At(value = "HEAD"))
-    private void onResponseCaptureServerInfo(ClientboundStatusResponsePacket packet, CallbackInfo ci) {
-        FabricDecodeHandler decoder = ((MixinClientConnectionAccessor) this.getField_3774()).getChannel()
+    @Shadow
+    @Final
+    Connection val$connection;
+
+    @Inject(method = "handleStatusResponse", at = @At(value = "HEAD"))
+    private void onStatusResponseCaptureServerInfo(ClientboundStatusResponsePacket clientboundStatusResponsePacket, CallbackInfo ci) {
+        FabricDecodeHandler decoder = ((MixinConnectionAccessor) this.val$connection).getChannel()
                 .pipeline().get(FabricDecodeHandler.class);
         if (decoder != null) {
-            ((ViaServerData) getField_3776()).viaFabric$setTranslating(decoder.getInfo().isActive());
-            ((ViaServerData) getField_3776()).viaFabric$setServerVer(decoder.getInfo().getProtocolInfo().getServerProtocolVersion());
+            ((ViaServerData) this.val$data).viaFabric$setTranslating(decoder.getInfo().isActive());
+            ((ViaServerData) this.val$data).viaFabric$setServerVer(decoder.getInfo().getProtocolInfo().getServerProtocolVersion());
         }
     }
 }
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/pipeline/MixinConnection.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/pipeline/MixinConnection.java
@@ -40,16 +40,16 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Connection.class)
-public class MixinClientConnection {
-	@Shadow
-	private Channel channel;
+public class MixinConnection {
+    @Shadow
+    private Channel channel;
 
-	@Inject(method = "setCompressionThreshold", at = @At("RETURN"))
-	private void reorderCompression(int compressionThreshold, boolean rejectBad, CallbackInfo ci) {
-		channel.pipeline().fireUserEventTriggered(new PipelineReorderEvent());
-	}
+    @Inject(method = "setupCompression", at = @At("RETURN"))
+    private void reorderCompression(int compressionThreshold, boolean validateDecompressed, CallbackInfo ci) {
+        channel.pipeline().fireUserEventTriggered(new PipelineReorderEvent());
+    }
 
-    @Inject(method = "addHandlers", at = @At("RETURN"))
+    @Inject(method = "configureSerialization", at = @At("RETURN"))
     private static void onAddHandlers(ChannelPipeline pipeline, PacketFlow side, boolean local, BandwidthDebugMonitor packetSizeLogger, CallbackInfo ci) {
         final Channel channel = pipeline.channel();
         if (channel instanceof SocketChannel) {
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/pipeline/client/MixinConnection.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/pipeline/client/MixinConnection.java
@@ -17,29 +17,28 @@
  */
 package com.viaversion.fabric.mc1215.mixin.pipeline.client;
 
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.viaversion.fabric.mc1215.ViaFabric;
 import com.viaversion.fabric.mc1215.service.ProtocolAutoDetector;
+import net.minecraft.util.debugchart.LocalSampleLogger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.net.InetSocketAddress;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
+import net.minecraft.network.Connection;
 
-@Mixin(targets = "net/minecraft/client/gui/screen/multiplayer/ConnectScreen$1")
-public class MixinClientConnectionThread {
-    @WrapOperation(method = "run", at = @At(value = "INVOKE", target = "Ljava/util/Optional;get()Ljava/lang/Object;"))
-    private Object onConnect(Optional instance, Operation<InetSocketAddress> original) {
-        InetSocketAddress address = original.call(instance);
+@Mixin(Connection.class)
+public class MixinConnection {
+    @Inject(method = "connectToServer", at = @At("HEAD"))
+    private static void onConnectToServer(InetSocketAddress address, boolean useEpollIfAvailable, LocalSampleLogger sampleLogger, CallbackInfoReturnable<Connection> cir) {
         try {
-            if (!ViaFabric.config.isClientSideEnabled()) return address;
+            if (!ViaFabric.config.isClientSideEnabled()) return;
             ProtocolAutoDetector.detectVersion(address).get(10, TimeUnit.SECONDS);
         } catch (Exception e) {
             ViaFabric.JLOGGER.log(Level.WARNING, "Could not auto-detect protocol for " + address + " " + e);
         }
-        return address;
     }
 }
diff --git a/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/shutdown/server/MixinMinecraftServer.java b/viafabric-mc1215/src/main/java/com/viaversion/fabric/mc1215/mixin/shutdown/server/MixinMinecraftServer.java
@@ -27,8 +27,8 @@
 
 @Mixin(MinecraftServer.class)
 public class MixinMinecraftServer {
-    @Inject(method = "stop", at = @At("TAIL"))
-    private void onStop(CallbackInfo ci) {
+    @Inject(method = "halt", at = @At("TAIL"))
+    private void onHalt(CallbackInfo ci) {
         ((ViaManagerImpl) Via.getManager()).destroy();
     }
 }
diff --git a/viafabric-mc1215/src/main/resources/mixins.viafabric1215.address.json b/viafabric-mc1215/src/main/resources/mixins.viafabric1215.address.json
@@ -5,7 +5,7 @@
   "mixins": [
   ],
   "client": [
-    "client.MixinAllowedAddressResolver"
+    "client.MixinServerNameResolver"
   ],
   "injectors": {
     "defaultRequire": 0
diff --git a/viafabric-mc1215/src/main/resources/mixins.viafabric1215.debug.json b/viafabric-mc1215/src/main/resources/mixins.viafabric1215.debug.json
@@ -6,10 +6,10 @@
     "MixinRegistrySyncManager"
   ],
   "client": [
-    "client.MixinClientConnection",
-    "client.MixinClientConnectionAccessor",
-    "client.MixinClientPlayNetworkHandler",
-    "client.MixinDebugHud",
+    "client.MixinConnection",
+    "client.MixinConnectionAccessor",
+    "client.MixinClientPacketListener",
+    "client.MixinDebugScreenOverlay",
     "client.MixinRegistrySyncManager"
   ],
   "injectors": {
diff --git a/viafabric-mc1215/src/main/resources/mixins.viafabric1215.gui.json b/viafabric-mc1215/src/main/resources/mixins.viafabric1215.gui.json
@@ -5,8 +5,8 @@
   "mixins": [
   ],
   "client": [
-    "client.MixinMultiplayerServerListPingerListener",
-    "client.MixinServerEntry",
+    "client.MixinServerStatusPingerListener",
+    "client.MixinOnlineServerEntry",
     "client.MixinServerData"
   ],
   "injectors": {
diff --git a/viafabric-mc1215/src/main/resources/mixins.viafabric1215.pipeline.json b/viafabric-mc1215/src/main/resources/mixins.viafabric1215.pipeline.json
@@ -3,10 +3,10 @@
   "compatibilityLevel": "JAVA_21",
   "package": "com.viaversion.fabric.mc1215.mixin.pipeline",
   "mixins": [
-    "MixinClientConnection"
+    "MixinConnection"
   ],
   "client": [
-    "client.MixinClientConnectionThread"
+    "client.MixinConnection"
   ],
   "injectors": {
     "defaultRequire": 1

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`import org.spongepowered.asm.mixin.gen.Accessor;`
`24`	`24`
`25`	`25`	`@Mixin(Connection.class)`
`26`		`-public interface MixinClientConnectionAccessor {`
	`26`	`+public interface MixinConnectionAccessor {`
`27`	`27`	`@Accessor`
`28`	`28`	`Channel getChannel();`
`29`	`29`	`}`