From 6d2620520e90e2c1ef3fa81b1253dc46eba40701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ampflower=20=F0=9F=8C=BA?= Date: Sun, 18 Aug 2024 19:56:02 -0700 Subject: [PATCH 1/4] Rewrite AddressParser - Port support - Prefix support to allow IPv6 usage in modern versions --- build.gradle | 7 + .../fabric/common/AddressParser.java | 269 +++++++++++++++--- .../protocol/HostnameParserProtocol.java | 5 +- .../AbstractFabricVersionProvider.java | 11 +- .../fabric/common/AddressParserTest.java | 253 ++++++++++++++++ .../client/MixinConnectScreenThread.java | 9 +- .../address/client/MixinServerAddress.java | 31 +- .../address/client/MixinServerPinger.java | 9 +- .../mc1144/service/ProtocolAutoDetector.java | 22 +- .../client/MixinConnectScreenThread.java | 9 +- .../address/client/MixinServerAddress.java | 31 +- .../address/client/MixinServerPinger.java | 9 +- .../mc1152/service/ProtocolAutoDetector.java | 22 +- .../client/MixinConnectScreenThread.java | 9 +- .../address/client/MixinServerAddress.java | 29 +- .../address/client/MixinServerPinger.java | 9 +- .../mc1165/service/ProtocolAutoDetector.java | 22 +- .../client/MixinAllowedAddressResolver.java | 16 +- .../address/client/MixinServerAddress.java | 49 ++++ .../mc1171/service/ProtocolAutoDetector.java | 22 +- .../mixins.viafabric1171.address.json | 3 +- .../client/MixinAllowedAddressResolver.java | 16 +- .../address/client/MixinServerAddress.java | 49 ++++ .../mc1182/service/ProtocolAutoDetector.java | 22 +- .../mixins.viafabric1182.address.json | 3 +- .../client/MixinAllowedAddressResolver.java | 16 +- .../address/client/MixinServerAddress.java | 49 ++++ .../mc1194/service/ProtocolAutoDetector.java | 22 +- .../mixins.viafabric1194.address.json | 3 +- .../client/MixinAllowedAddressResolver.java | 16 +- .../address/client/MixinServerAddress.java | 49 ++++ .../mc1201/service/ProtocolAutoDetector.java | 22 +- .../mixins.viafabric1201.address.json | 3 +- .../client/MixinAllowedAddressResolver.java | 16 +- .../address/client/MixinServerAddress.java | 49 ++++ .../mc1204/service/ProtocolAutoDetector.java | 20 +- .../mixins.viafabric1204.address.json | 3 +- .../client/MixinAllowedAddressResolver.java | 16 +- .../address/client/MixinServerAddress.java | 49 ++++ .../mc1206/service/ProtocolAutoDetector.java | 24 +- .../mixins.viafabric1206.address.json | 3 +- .../client/MixinAllowedAddressResolver.java | 16 +- .../address/client/MixinServerAddress.java | 49 ++++ .../mc1211/service/ProtocolAutoDetector.java | 8 +- .../mixins.viafabric1211.address.json | 3 +- 45 files changed, 1122 insertions(+), 250 deletions(-) create mode 100644 src/test/java/com/viaversion/fabric/common/AddressParserTest.java create mode 100644 viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinServerAddress.java create mode 100644 viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinServerAddress.java create mode 100644 viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinServerAddress.java create mode 100644 viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinServerAddress.java create mode 100644 viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinServerAddress.java create mode 100644 viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinServerAddress.java create mode 100644 viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinServerAddress.java diff --git a/build.gradle b/build.gradle index 2ea2147f..863ba5d0 100644 --- a/build.gradle +++ b/build.gradle @@ -142,6 +142,8 @@ dependencies { includeJ8("com.viaversion:viaversion:${rootProject.viaver_version}") include("com.github.TinfoilMC:ClientCommands:1.1.0") + + testImplementation("org.testng:testng:6.13.1") } remapJar { @@ -169,6 +171,11 @@ processResources { } } +test { + // Minimal insurance to make sure we get expected results. + useTestNG() +} + List mcReleases = Arrays.stream(rootProject.publish_mc_versions.toString().split(",")) .map({ it -> it.trim() }) .collect(Collectors.toList()) diff --git a/src/main/java/com/viaversion/fabric/common/AddressParser.java b/src/main/java/com/viaversion/fabric/common/AddressParser.java index 5c65d741..bef2b042 100644 --- a/src/main/java/com/viaversion/fabric/common/AddressParser.java +++ b/src/main/java/com/viaversion/fabric/common/AddressParser.java @@ -20,85 +20,286 @@ import com.google.common.collect.Lists; import com.google.common.primitives.Ints; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; +import com.viaversion.viaversion.libs.fastutil.ints.IntArrayList; +import com.viaversion.viaversion.libs.fastutil.ints.IntImmutableList; +import com.viaversion.viaversion.libs.fastutil.ints.IntList; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.VisibleForTesting; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; +import java.util.stream.Collectors; // Based on VIAaaS parser public class AddressParser { - public Integer protocol; - public String viaSuffix; - public String serverAddress; - public String viaOptions; + private static final String VIA = "viafabric"; + private static final Pattern DOT_SUFFIX = Pattern.compile("\\.$"); - public AddressParser parse(String address) { - return parse(address, "viafabric"); + // Retaining a list for now; not exposing it to the end consumer. + // An idea tossed about is to retry the server for the given protocols. + @Nullable + @VisibleForTesting + final IntList protocols; + @NotNull + private final String serverAddress; + @Nullable + private final Integer port; + + private AddressParser(@NotNull String address, @Nullable Integer port) { + this(address, null, port); } - public String getSuffixWithOptions() { - if (viaOptions != null && !viaOptions.isEmpty()) { - return viaOptions + "." + viaSuffix; - } - return viaSuffix; + private AddressParser(@NotNull String address, @Nullable IntList protocols, @Nullable Integer port) { + this.serverAddress = address; + this.port = port; + this.protocols = protocols; + } + + @NotNull + public static AddressParser parse(String address) { + return parse(address, VIA); } - public AddressParser parse(String address, String viaHostName) { + @NotNull + private static AddressParser parse(String address, String viaHostName) { + int portIndex = address.lastIndexOf(':'); + Integer port = portIndex >= 0 ? Ints.tryParse(address.substring(portIndex + 1)) : null; + + if (port != null && port >= 0 && port < 65536) { + if (address.charAt(portIndex - 1) == '.') { + // Let's not allocate an intermediate string. + portIndex -= 1; + } else if (port < 10000 && + // I don't like this but there's not really a better way of doing this + address.lastIndexOf(':', portIndex - 1) > Math.max( + address.lastIndexOf(']', portIndex - 1), + address.lastIndexOf('.', portIndex - 1) + )) { + // We parsed an IPv6, a port isn't ideal here. + port = null; + } + + // Keeping a sane flow control. + if (port != null) { + // Truncate the port off, as that interferes. + address = address.substring(0, portIndex); + } + } + address = StringUtils.removeEnd(address, "."); - String suffixRemoved = StringUtils.removeEnd(address, "." + viaHostName); - if (suffixRemoved.equals(address)) { - serverAddress = address; - return this; + String truncated = StringUtils.removeEnd(address, '.' + viaHostName); + if (!address.equals(truncated)) { + return parseSuffix(truncated, port); + } + + truncated = StringUtils.removeStart(address, viaHostName + '.'); + if (!address.equals(truncated)) { + final AddressParser addr = parsePrefix(truncated, port); + if (addr != null) { + return addr; + } } + return new AddressParser(address, port); + } + + @NotNull + private static AddressParser parseSuffix(String address, Integer port) { boolean stopOptions = false; - List optionsParts = new ArrayList<>(); + IntList protocolParts = new IntArrayList(); List serverParts = new ArrayList<>(); - for (String part : Lists.reverse(Arrays.asList(suffixRemoved.split(Pattern.quote("."))))) { - if (!stopOptions && parseOption(part)) { - optionsParts.add(part); + Integer protocol; + for (String part : Lists.reverse(Arrays.asList(address.split("\\.")))) { + if (!stopOptions && (protocol = parseSuffixOption(part)) != null) { + protocolParts.add(protocol.intValue()); continue; } stopOptions = true; serverParts.add(part); } - serverAddress = String.join(".", Lists.reverse(serverParts)); - viaOptions = String.join(".", Lists.reverse(optionsParts)); - viaSuffix = viaHostName; + return new AddressParser( + String.join(".", Lists.reverse(serverParts)), + new IntImmutableList(Lists.reverse(protocolParts)), + port + ); + } + + // Fail condition = returns null; caller must fall through. + @Nullable + private static AddressParser parsePrefix(String address, Integer port) { + IntList protocols = new IntArrayList(); + int index = 0, lastIndex, colonIndex = address.indexOf(';'); + + if (colonIndex < 0) { + return null; + } + + while ((index = address.indexOf('+', lastIndex = index)) >= 0 && index < colonIndex) { + parseAndAdd(address.substring(lastIndex, index), protocols); + index++; + } + + parseAndAdd(address.substring(lastIndex, colonIndex), protocols); + + return new AddressParser( + address.substring(colonIndex + 1), + new IntImmutableList(protocols), + port + ); + } + + private static void parseAndAdd(String part, IntList protocols) { + final Integer protocol = parseSchemeOption(part); + if (protocol != null) { + protocols.add(protocol.intValue()); + } + } + + public String getSuffixWithOptions() { + if (protocols == null) { + return ""; + } + if (protocols.isEmpty()) { + return VIA; + } + return protocols.intStream() + .mapToObj(AddressParser::toProtocolName) + .map(str -> str.replace('.', '_')) + .collect(Collectors.joining("._v", "_v", "." + VIA)); + } + + public String getPrefixWithOptions() { + if (protocols == null) { + return ""; + } + if (protocols.isEmpty()) { + return VIA; + } + return protocols.intStream() + .mapToObj(AddressParser::toProtocolName) + .collect(Collectors.joining("+v", VIA + ".v", "")); + } + + public boolean hasViaMetadata() { + return protocols != null; + } + + public boolean hasProtocol() { + return protocols != null && !protocols.isEmpty(); + } + + public Integer protocol() { + if (protocols != null && !protocols.isEmpty()) { + return protocols.getInt(0); + } + return null; + } + + @NotNull + public String serverAddress() { + return this.serverAddress; + } + + @Nullable + public Integer port() { + return this.port; + } + + public String toAddress() { + if (port != null) { + return serverAddress + ':' + port; + } + return serverAddress; + } + + public String toSuffixedViaAddress() { + final String address = addAddressSuffix(serverAddress); + if (port != null) { + return address + ':' + port; + } + return address; + } + + public InetAddress resolve() throws UnknownHostException { + return this.addAddressSuffix(InetAddress.getByName(serverAddress)); + } - return this; + public InetSocketAddress addAddressSuffix(InetSocketAddress address) throws UnknownHostException { + return new InetSocketAddress(addAddressSuffix(address.getAddress()), address.getPort()); } - public boolean parseOption(String part) { + public InetAddress addAddressSuffix(InetAddress address) throws UnknownHostException { + return InetAddress.getByAddress(addAddressSuffix(address.getHostName()), address.getAddress()); + } + + public String addAddressSuffix(String input) { + if (!this.hasViaMetadata()) { + return input; + } + return DOT_SUFFIX.matcher(input).replaceAll("") + '.' + this.getSuffixWithOptions(); + } + + private static Integer parseSuffixOption(String part) { String option; if (part.length() < 2) { - return false; + return null; } else if (part.startsWith("_")) { option = String.valueOf(part.charAt(1)); } else if (part.charAt(1) == '_') { option = String.valueOf(part.charAt(0)); } else { - return false; + return null; } String arg = part.substring(2); if ("v".equals(option)) { - parseProtocol(arg); + return parseProtocol(arg); + } + + return null; + } + + private static Integer parseSchemeOption(String part) { + if (part.length() < 2) { + return null; } + if (!part.startsWith("v")) { + return null; + } + return parseProtocol(part.substring(1)); + } - return true; + private static Integer parseProtocol(String arg) { + final Integer protocol = Ints.tryParse(arg); + if (protocol != null) { + return protocol; + } + ProtocolVersion ver = ProtocolVersion.getClosest(arg.replace('_', '.')); + if (ver != null) { + return ver.getVersion(); + } + return null; } - public void parseProtocol(String arg) { - protocol = Ints.tryParse(arg); - if (protocol == null) { - ProtocolVersion ver = ProtocolVersion.getClosest(arg.replace("_", ".")); - if (ver != null) protocol = ver.getVersion(); + private static String toProtocolName(int protocol) { + if (protocol < 0 || !ProtocolVersion.isRegistered(protocol)) { + return Integer.toString(protocol); } + return ProtocolVersion.getProtocol(protocol).getIncludedVersions().iterator().next(); + } + + @Override + public String toString() { + return "AddressParser{" + this.toSuffixedViaAddress() + '}'; } } \ No newline at end of file diff --git a/src/main/java/com/viaversion/fabric/common/protocol/HostnameParserProtocol.java b/src/main/java/com/viaversion/fabric/common/protocol/HostnameParserProtocol.java index 3a5e5d5e..d818cf44 100644 --- a/src/main/java/com/viaversion/fabric/common/protocol/HostnameParserProtocol.java +++ b/src/main/java/com/viaversion/fabric/common/protocol/HostnameParserProtocol.java @@ -20,10 +20,9 @@ import com.viaversion.fabric.common.AddressParser; import com.viaversion.viaversion.api.protocol.AbstractSimpleProtocol; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; +import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.protocol.remapper.ValueTransformer; -import com.viaversion.viaversion.api.type.Type; -import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.type.Types; import com.viaversion.viaversion.protocols.base.ServerboundHandshakePackets; @@ -39,7 +38,7 @@ protected void register() { map(Types.STRING, new ValueTransformer(Types.STRING) { @Override public String transform(PacketWrapper packetWrapper, String s) { - return new AddressParser().parse(s).serverAddress; + return AddressParser.parse(s).serverAddress(); } }); } diff --git a/src/main/java/com/viaversion/fabric/common/provider/AbstractFabricVersionProvider.java b/src/main/java/com/viaversion/fabric/common/provider/AbstractFabricVersionProvider.java index dfd63d4f..661bb4ed 100644 --- a/src/main/java/com/viaversion/fabric/common/provider/AbstractFabricVersionProvider.java +++ b/src/main/java/com/viaversion/fabric/common/provider/AbstractFabricVersionProvider.java @@ -28,7 +28,6 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.Types; import com.viaversion.viaversion.exception.CancelException; import com.viaversion.viaversion.protocol.version.BaseVersionProvider; @@ -42,7 +41,11 @@ import java.lang.reflect.Method; import java.net.InetSocketAddress; import java.net.SocketAddress; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.TreeSet; import java.util.concurrent.CompletableFuture; import java.util.logging.Logger; import java.util.stream.IntStream; @@ -93,8 +96,8 @@ public ProtocolVersion getClosestServerProtocol(UserConnection connection) throw SocketAddress addr = connection.getChannel().remoteAddress(); if (addr instanceof InetSocketAddress) { - AddressParser parser = new AddressParser(); - Integer addrVersion = parser.parse(((InetSocketAddress) addr).getHostName()).protocol; + AddressParser parser = AddressParser.parse(((InetSocketAddress) addr).getHostName()); + Integer addrVersion = parser.protocol(); if (addrVersion != null) { serverVer = addrVersion; } diff --git a/src/test/java/com/viaversion/fabric/common/AddressParserTest.java b/src/test/java/com/viaversion/fabric/common/AddressParserTest.java new file mode 100644 index 00000000..3984c5ac --- /dev/null +++ b/src/test/java/com/viaversion/fabric/common/AddressParserTest.java @@ -0,0 +1,253 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.common; + +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; +import com.viaversion.viaversion.libs.fastutil.ints.IntArrayList; +import com.viaversion.viaversion.libs.fastutil.ints.IntList; +import org.jetbrains.annotations.CheckReturnValue; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import java.util.Arrays; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; + +/** + * Tests AddressParser's capability to parse addresses into a useful form, + * extracting Via metadata and providing addresses Minecraft and Guava can parse. + *

+ * Test cases include seemingly malformed data that previous versions of ViaFabric + * would accept as valid, and asserting that it would parse and treat it the same way. + * + * @author Ampflower + **/ +public class AddressParserTest { + + private static IntList of(ProtocolVersion... versions) { + return Arrays.stream(versions).mapToInt(ProtocolVersion::getVersion) + .collect(IntArrayList::new, IntList::add, IntList::addAll); + } + + /** + * Ensures that: + *

    + *
  • {@link AddressParser#hasViaMetadata()} returns true, as via metadata is provided.
    • + *
  • {@link AddressParser#hasProtocol()} returns false when {@code versions} is empty, true otherwise.
    • + *
  • {@link AddressParser#protocols} returns all parsed protocols and matches {@code versions}
    • + *
  • {@link AddressParser#protocol()} matches the first protocol listed. Subject to change.
    • + *
+ */ + @Test(dataProvider = "viaAddrProvider", timeOut = 1000L) + public void viaAddrHarness(String rawAddress, String address, Integer port, ProtocolVersion... versions) { + final AddressParser viaAddr = AddressParser.parse(rawAddress); + assertFundamentals(viaAddr, address, port); + + assertTrue(viaAddr.hasViaMetadata(), "hasViaMetadata"); + + // Tests protocol parsing to ensure it is returning expected values. + assertEquals(viaAddr.protocols, of(versions)); + if (versions.length == 0) { + assertFalse(viaAddr.hasProtocol(), "hasProtocol"); + assertNull(viaAddr.protocol()); + } else { + assertTrue(viaAddr.hasProtocol(), "hasProtocol"); + assertNotNull(viaAddr.protocol(), "protocol"); + assertEquals((int) viaAddr.protocol(), versions[0].getVersion()); + } + } + + /** + * Ensures that: + *
    + *
  • {@link AddressParser#hasViaMetadata()} returns false, as via metadata is not provided.
    • + *
  • {@link AddressParser#hasProtocol()} returns false.
    • + *
  • {@link AddressParser#protocols} is null. Subject to change.
    • + *
  • {@link AddressParser#protocol()} is null.
    • + *
+ */ + @Test(dataProvider = "addrProvider", timeOut = 1000L) + public void addrHarness(String rawAddress, String address, Integer port) { + final AddressParser viaAddr = AddressParser.parse(rawAddress); + assertFundamentals(viaAddr, address, port); + + assertFalse(viaAddr.hasViaMetadata(), "hasViaMetadata"); + assertFalse(viaAddr.hasProtocol(), "hasProtocol"); + assertNull(viaAddr.protocols, "protocols"); + assertNull(viaAddr.protocol(), "protocol"); + } + + /** + * Ensures that: + *
    + *
  • {@link AddressParser#serverAddress()} is the address valid for DNS, matching {@code address}
    • + *
  • {@link AddressParser#port()} is a valid port matching {@code port}, should there be one declared.
    • + *
  • {@link AddressParser#toAddress()} matches the expected address without Via metadata.
    • + *
+ */ + private static void assertFundamentals(AddressParser viaAddr, String address, Integer port) { + assertEquals(viaAddr.serverAddress(), address); + assertEquals(viaAddr.port(), port); + + // Tests toAddress to ensure it is returning the port as expected for Minecraft's parser. + if (port == null) { + assertEquals(viaAddr.toAddress(), address); + } else { + assertEquals(viaAddr.toAddress(), address + ':' + port); + } + } + + @CheckReturnValue + private static Object[] params(String address, String expected, Integer port, ProtocolVersion... versions) { + return new Object[]{address, expected, port, versions}; + } + + @DataProvider + public static Object[][] viaAddrProvider() { + // NOTE: Before touching values in here, consider making sure that the parser is functioning as expected. + // If the semantic change is expected, carry on. Otherwise, fix the parser, not the test. + return new Object[][]{ + // == Suffixes == + params("[::]._v1_8.viafabric", "[::]", null, + ProtocolVersion.v1_8), + + params("localhost._v1_7_2._v1_16_5.viafabric", "localhost", null, + ProtocolVersion.v1_7_2, ProtocolVersion.v1_16_4), + + params("0.0.0.0._v1_8._v1_9.v_1_21.viafabric", "0.0.0.0", null, + ProtocolVersion.v1_8, ProtocolVersion.v1_9, ProtocolVersion.v1_21), + + params("[::1]._v-2.viafabric", "[::1]", null, + ProtocolVersion.getProtocol(-2)), + + params("127.0.0.1.viafabric", "127.0.0.1", null), + + // Ports + params("[::].v_1_8.viafabric:25565", "[::]", 25565, + ProtocolVersion.v1_8), + + params("0.0.0.0.v_-2.viafabric:53", "0.0.0.0", 53, + ProtocolVersion.getProtocol(-2)), + + params("localhost.viafabric:853", "localhost", 853), + + // IPv6 + params("[fe80::1]._v-2.viafabric:8192", "[fe80::1]", 8192, + ProtocolVersion.getProtocol(-2)), + + params("::.v_-2.viafabric", "::", null, + ProtocolVersion.getProtocol(-2)), + + params("fe80::1._v-2.viafabric", "fe80::1", null, + ProtocolVersion.getProtocol(-2)), + + + // == Prefixes == + params("viafabric.v1.8;[::]", "[::]", null, + ProtocolVersion.v1_8), + + params("viafabric.v1.7.2+v1.16.5;localhost", "localhost", null, + ProtocolVersion.v1_7_2, ProtocolVersion.v1_16_4), + + params("viafabric.v1.8+v1.9+v1.21;0.0.0.0", "0.0.0.0", null, + ProtocolVersion.v1_8, ProtocolVersion.v1_9, ProtocolVersion.v1_21), + + params("viafabric.v-2;[::1]", "[::1]", null, + ProtocolVersion.getProtocol(-2)), + + // Ports + params("viafabric.v1.8;[::]:25565", "[::]", 25565, + ProtocolVersion.v1_8), + + params("viafabric.v-2;0.0.0.0:53", "0.0.0.0", 53, + ProtocolVersion.getProtocol(-2)), + + params("viafabric.;localhost.:853", "localhost", 853), + + // IPv6 + params("viafabric.v-2;[fe80::1]:8192", "[fe80::1]", 8192, + ProtocolVersion.getProtocol(-2)), + + params("viafabric.v-2;::", "::", null, + ProtocolVersion.getProtocol(-2)), + + params("viafabric.v-2;fe80::1", "fe80::1", null, + ProtocolVersion.getProtocol(-2)), + + // == Malformed == + + params("viafabric.v-2;[::]+:25565", "[::]+", 25565, + ProtocolVersion.getProtocol(-2)), + params("viafabric.v-2;0.0.0.0+:25565", "0.0.0.0+", 25565, + ProtocolVersion.getProtocol(-2)), + params("viafabric.v-2;localhost+:25565", "localhost+", 25565, + ProtocolVersion.getProtocol(-2)), + params("viafabric.v-2;[::]+", "[::]+", null, + ProtocolVersion.getProtocol(-2)), + params("viafabric.v-2;0.0.0.0+", "0.0.0.0+", null, + ProtocolVersion.getProtocol(-2)), + params("viafabric.v-2;localhost+", "localhost+", null, + ProtocolVersion.getProtocol(-2)), + }; + } + + @CheckReturnValue + private static Object[] addrParams(String address, String expected, Integer port) { + return new Object[]{address, expected, port}; + } + + @DataProvider + public static Object[][] addrProvider() { + return new Object[][]{ + // Port + addrParams("[::]:25565", "[::]", 25565), + addrParams("[fe80::1]:25565", "[fe80::1]", 25565), + addrParams("localhost:53", "localhost", 53), + addrParams("0.0.0.0:853", "0.0.0.0", 853), + + // No port + addrParams("[::1]", "[::1]", null), + addrParams("[fe80::1]", "[fe80::1]", null), + addrParams("localhost.", "localhost", null), + addrParams("127.0.0.1", "127.0.0.1", null), + + // IPv6 + addrParams("::", "::", null), + addrParams("fe80::1", "fe80::1", null), + + // Malformed + addrParams("viafabric.v-2:[::]:25565", "viafabric.v-2:[::]", 25565), + addrParams("viafabric.v-2:0.0.0.0:25565", "viafabric.v-2:0.0.0.0", 25565), + addrParams("viafabric.v-2:localhost:25565", "viafabric.v-2:localhost", 25565), + addrParams("viafabric.v-2:[::]", "viafabric.v-2:[::]", null), + addrParams("viafabric.v-2:0.0.0.0", "viafabric.v-2:0.0.0.0", null), + addrParams("viafabric.v-2:localhost", "viafabric.v-2:localhost", null), + + addrParams("viafabric.v-2:[::]+:25565", "viafabric.v-2:[::]+", 25565), + addrParams("viafabric.v-2:0.0.0.0+:25565", "viafabric.v-2:0.0.0.0+", 25565), + addrParams("viafabric.v-2:localhost+:25565", "viafabric.v-2:localhost+", 25565), + addrParams("viafabric.v-2:[::]+", "viafabric.v-2:[::]+", null), + addrParams("viafabric.v-2:0.0.0.0+", "viafabric.v-2:0.0.0.0+", null), + addrParams("viafabric.v-2:localhost+", "viafabric.v-2:localhost+", null), + }; + } +} diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinConnectScreenThread.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinConnectScreenThread.java index cb4e40db..334e8372 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinConnectScreenThread.java +++ b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinConnectScreenThread.java @@ -29,13 +29,12 @@ public class MixinConnectScreenThread { @Redirect(method = "run()V", at = @At(value = "INVOKE", target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;")) - private InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { - AddressParser viaAddr = new AddressParser().parse(address); - if (viaAddr.viaSuffix == null) { + private static InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { + AddressParser viaAddr = AddressParser.parse(address); + if (!viaAddr.hasViaMetadata()) { return InetAddress.getByName(address); } - InetAddress resolved = InetAddress.getByName(viaAddr.serverAddress); - return InetAddress.getByAddress(resolved.getHostName() + "." + viaAddr.getSuffixWithOptions(), resolved.getAddress()); + return viaAddr.resolve(); } } \ No newline at end of file diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerAddress.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerAddress.java index e166c4fb..ea6a910f 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerAddress.java +++ b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerAddress.java @@ -17,30 +17,31 @@ */ package com.viaversion.fabric.mc1144.mixin.address.client; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; import com.viaversion.fabric.common.AddressParser; import net.minecraft.network.ServerAddress; 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.Redirect; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; @Mixin(ServerAddress.class) public abstract class MixinServerAddress { - @Shadow - private static String[] resolveSrv(String address) { - throw new AssertionError(); + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); } - @Redirect(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ServerAddress;resolveSrv(Ljava/lang/String;)[Ljava/lang/String;")) - private static String[] modifySrvAddr(String address) { - AddressParser viaAddr = new AddressParser().parse(address); - if (viaAddr.viaSuffix == null) { - return resolveSrv(address); + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ServerAddress;(Ljava/lang/String;I)V")) + private static String injectViaMetadata(String original, int port, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; } - - String[] resolvedSrv = resolveSrv(viaAddr.serverAddress); - resolvedSrv[0] = resolvedSrv[0].replaceAll("\\.$", "") + "." + viaAddr.getSuffixWithOptions(); - - return resolvedSrv; + return parser.addAddressSuffix(original); } } diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerPinger.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerPinger.java index b60851e3..64f6d11b 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerPinger.java +++ b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinServerPinger.java @@ -30,13 +30,12 @@ public class MixinServerPinger { @Redirect(method = "add", at = @At(value = "INVOKE", target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;")) - private InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { - AddressParser viaAddr = new AddressParser().parse(address); - if (viaAddr.viaSuffix == null) { + private static InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { + AddressParser viaAddr = AddressParser.parse(address); + if (!viaAddr.hasViaMetadata()) { return InetAddress.getByName(address); } - InetAddress resolved = InetAddress.getByName(viaAddr.serverAddress); - return InetAddress.getByAddress(resolved.getHostName() + "." + viaAddr.getSuffixWithOptions(), resolved.getAddress()); + return viaAddr.resolve(); } } diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/service/ProtocolAutoDetector.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/service/ProtocolAutoDetector.java index 2a9be7e3..4ee3cf3f 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/service/ProtocolAutoDetector.java +++ b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/service/ProtocolAutoDetector.java @@ -17,18 +17,29 @@ */ package com.viaversion.fabric.mc1144.service; -import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1144.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.viaversion.fabric.common.AddressParser; +import com.viaversion.fabric.mc1144.ViaFabric; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.network.*; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.DecoderHandler; +import net.minecraft.network.NetworkSide; +import net.minecraft.network.NetworkState; +import net.minecraft.network.PacketEncoder; +import net.minecraft.network.SizePrepender; +import net.minecraft.network.SplitterHandler; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import net.minecraft.network.packet.c2s.query.QueryRequestC2SPacket; @@ -37,7 +48,6 @@ import net.minecraft.server.ServerMetadata; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -131,7 +141,7 @@ public ClientConnection getConnection() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinConnectScreenThread.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinConnectScreenThread.java index bd3b78b1..a007a648 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinConnectScreenThread.java +++ b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinConnectScreenThread.java @@ -29,13 +29,12 @@ public class MixinConnectScreenThread { @Redirect(method = "run()V", at = @At(value = "INVOKE", target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;")) - private InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { - AddressParser viaAddr = new AddressParser().parse(address); - if (viaAddr.viaSuffix == null) { + private static InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { + AddressParser viaAddr = AddressParser.parse(address); + if (!viaAddr.hasViaMetadata()) { return InetAddress.getByName(address); } - InetAddress resolved = InetAddress.getByName(viaAddr.serverAddress); - return InetAddress.getByAddress(resolved.getHostName() + "." + viaAddr.getSuffixWithOptions(), resolved.getAddress()); + return viaAddr.resolve(); } } \ No newline at end of file diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerAddress.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerAddress.java index fb5f683e..64bf01cc 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerAddress.java +++ b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerAddress.java @@ -17,30 +17,31 @@ */ package com.viaversion.fabric.mc1152.mixin.address.client; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; import com.viaversion.fabric.common.AddressParser; import net.minecraft.network.ServerAddress; 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.Redirect; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; @Mixin(ServerAddress.class) public abstract class MixinServerAddress { - @Shadow - private static String[] resolveSrv(String address) { - throw new AssertionError(); + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); } - @Redirect(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ServerAddress;resolveSrv(Ljava/lang/String;)[Ljava/lang/String;")) - private static String[] modifySrvAddr(String address) { - AddressParser viaAddr = new AddressParser().parse(address); - if (viaAddr.viaSuffix == null) { - return resolveSrv(address); + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ServerAddress;(Ljava/lang/String;I)V")) + private static String injectViaMetadata(String original, int port, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; } - - String[] resolvedSrv = resolveSrv(viaAddr.serverAddress); - resolvedSrv[0] = resolvedSrv[0].replaceAll("\\.$", "") + "." + viaAddr.getSuffixWithOptions(); - - return resolvedSrv; + return parser.addAddressSuffix(original); } } diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerPinger.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerPinger.java index fb65bc15..ea92f396 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerPinger.java +++ b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinServerPinger.java @@ -30,13 +30,12 @@ public class MixinServerPinger { @Redirect(method = "add", at = @At(value = "INVOKE", target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;")) - private InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { - AddressParser viaAddr = new AddressParser().parse(address); - if (viaAddr.viaSuffix == null) { + private static InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { + AddressParser viaAddr = AddressParser.parse(address); + if (!viaAddr.hasViaMetadata()) { return InetAddress.getByName(address); } - InetAddress resolved = InetAddress.getByName(viaAddr.serverAddress); - return InetAddress.getByAddress(resolved.getHostName() + "." + viaAddr.getSuffixWithOptions(), resolved.getAddress()); + return viaAddr.resolve(); } } diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/service/ProtocolAutoDetector.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/service/ProtocolAutoDetector.java index 8b340e68..9224fd64 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/service/ProtocolAutoDetector.java +++ b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/service/ProtocolAutoDetector.java @@ -17,18 +17,29 @@ */ package com.viaversion.fabric.mc1152.service; -import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1152.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.viaversion.fabric.common.AddressParser; +import com.viaversion.fabric.mc1152.ViaFabric; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.network.*; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.DecoderHandler; +import net.minecraft.network.NetworkSide; +import net.minecraft.network.NetworkState; +import net.minecraft.network.PacketEncoder; +import net.minecraft.network.SizePrepender; +import net.minecraft.network.SplitterHandler; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import net.minecraft.network.packet.c2s.query.QueryRequestC2SPacket; @@ -37,7 +48,6 @@ import net.minecraft.server.ServerMetadata; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -131,7 +141,7 @@ public ClientConnection getConnection() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinConnectScreenThread.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinConnectScreenThread.java index f13ca63b..0d81a7ad 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinConnectScreenThread.java +++ b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinConnectScreenThread.java @@ -29,13 +29,12 @@ public class MixinConnectScreenThread { @Redirect(method = "run()V", at = @At(value = "INVOKE", target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;")) - private InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { - AddressParser viaAddr = new AddressParser().parse(address); - if (viaAddr.viaSuffix == null) { + private static InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { + AddressParser viaAddr = AddressParser.parse(address); + if (!viaAddr.hasViaMetadata()) { return InetAddress.getByName(address); } - InetAddress resolved = InetAddress.getByName(viaAddr.serverAddress); - return InetAddress.getByAddress(resolved.getHostName() + "." + viaAddr.getSuffixWithOptions(), resolved.getAddress()); + return viaAddr.resolve(); } } \ No newline at end of file diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerAddress.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerAddress.java index 4cb9ac1a..10b41460 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerAddress.java +++ b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerAddress.java @@ -17,28 +17,31 @@ */ package com.viaversion.fabric.mc1165.mixin.address.client; -import com.mojang.datafixers.util.Pair; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; import com.viaversion.fabric.common.AddressParser; import net.minecraft.client.network.ServerAddress; 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.Redirect; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; @Mixin(ServerAddress.class) public abstract class MixinServerAddress { - @Shadow - private static Pair resolveServer(String address) { - throw new AssertionError(); + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); } - @Redirect(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;resolveServer(Ljava/lang/String;)Lcom/mojang/datafixers/util/Pair;")) - private static Pair modifySrvAddr(String address) { - AddressParser viaAddr = new AddressParser().parse(address); - if (viaAddr.viaSuffix == null) { - return resolveServer(address); + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;(Ljava/lang/String;I)V")) + private static String injectViaMetadata(String original, int port, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; } - - return resolveServer(viaAddr.serverAddress).mapFirst(it -> it.replaceAll("\\.$", "") + "." + viaAddr.getSuffixWithOptions()); + return parser.addAddressSuffix(original); } } diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerPinger.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerPinger.java index 7601388b..cca7fdcf 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerPinger.java +++ b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinServerPinger.java @@ -30,13 +30,12 @@ public class MixinServerPinger { @Redirect(method = "add", at = @At(value = "INVOKE", target = "Ljava/net/InetAddress;getByName(Ljava/lang/String;)Ljava/net/InetAddress;")) - private InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { - AddressParser viaAddr = new AddressParser().parse(address); - if (viaAddr.viaSuffix == null) { + private static InetAddress resolveViaFabricAddr(String address) throws UnknownHostException { + AddressParser viaAddr = AddressParser.parse(address); + if (!viaAddr.hasViaMetadata()) { return InetAddress.getByName(address); } - InetAddress resolved = InetAddress.getByName(viaAddr.serverAddress); - return InetAddress.getByAddress(resolved.getHostName() + "." + viaAddr.getSuffixWithOptions(), resolved.getAddress()); + return viaAddr.resolve(); } } diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/service/ProtocolAutoDetector.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/service/ProtocolAutoDetector.java index fcd25322..653413c2 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/service/ProtocolAutoDetector.java +++ b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/service/ProtocolAutoDetector.java @@ -17,18 +17,29 @@ */ package com.viaversion.fabric.mc1165.service; -import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1165.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.viaversion.fabric.common.AddressParser; +import com.viaversion.fabric.mc1165.ViaFabric; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.network.*; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.DecoderHandler; +import net.minecraft.network.NetworkSide; +import net.minecraft.network.NetworkState; +import net.minecraft.network.PacketEncoder; +import net.minecraft.network.SizePrepender; +import net.minecraft.network.SplitterHandler; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import net.minecraft.network.packet.c2s.query.QueryRequestC2SPacket; @@ -37,7 +48,6 @@ import net.minecraft.server.ServerMetadata; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -131,7 +141,7 @@ public ClientConnection getConnection() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinAllowedAddressResolver.java index 5415c0cc..7e1d2ba3 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinAllowedAddressResolver.java @@ -28,8 +28,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.Optional; @@ -40,22 +38,20 @@ public abstract class MixinAllowedAddressResolver { @Inject(method = "resolve", at = @At(value = "HEAD"), cancellable = true) private void resolveVF(ServerAddress address, CallbackInfoReturnable> cir) { - AddressParser viaAddr = new AddressParser().parse(address.getAddress()); - if (viaAddr.viaSuffix == null) { + AddressParser viaAddr = AddressParser.parse(address.getAddress()); + if (!viaAddr.hasViaMetadata()) { return; } - ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress, address.getPort()); + ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress(), address.getPort()); - cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr.getSuffixWithOptions()))); + cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr))); } @Unique - private Address viaFabric$addSuffix(Address it, String viaSuffix) { + private static Address viaFabric$addSuffix(Address it, AddressParser viaAddr) { try { - return Address.create(new InetSocketAddress( - InetAddress.getByAddress(it.getHostName() + "." + viaSuffix, - it.getInetSocketAddress().getAddress().getAddress()), it.getPort())); + return Address.create(viaAddr.addAddressSuffix(it.getInetSocketAddress())); } catch (UnknownHostException e) { throw new RuntimeException(e); } diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinServerAddress.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinServerAddress.java new file mode 100644 index 00000000..da8842fa --- /dev/null +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinServerAddress.java @@ -0,0 +1,49 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1171.mixin.address.client; + +import com.google.common.net.HostAndPort; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.client.network.ServerAddress; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Mixin(ServerAddress.class) +public abstract class MixinServerAddress { + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); + } + + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;(Lcom/google/common/net/HostAndPort;)V")) + private static HostAndPort injectViaMetadata(HostAndPort original, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; + } + + return HostAndPort.fromParts(parser.addAddressSuffix(original.getHost()), original.getPort()); + } +} diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/service/ProtocolAutoDetector.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/service/ProtocolAutoDetector.java index c38b2e61..22823226 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/service/ProtocolAutoDetector.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/service/ProtocolAutoDetector.java @@ -17,18 +17,29 @@ */ package com.viaversion.fabric.mc1171.service; -import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1171.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.viaversion.fabric.common.AddressParser; +import com.viaversion.fabric.mc1171.ViaFabric; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.network.*; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.DecoderHandler; +import net.minecraft.network.NetworkSide; +import net.minecraft.network.NetworkState; +import net.minecraft.network.PacketEncoder; +import net.minecraft.network.SizePrepender; +import net.minecraft.network.SplitterHandler; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import net.minecraft.network.packet.c2s.query.QueryRequestC2SPacket; @@ -37,7 +48,6 @@ import net.minecraft.server.ServerMetadata; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -131,7 +141,7 @@ public ClientConnection getConnection() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json index 92b02816..f548e889 100644 --- a/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json +++ b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json @@ -5,7 +5,8 @@ "mixins": [ ], "client": [ - "client.MixinAllowedAddressResolver" + "client.MixinAllowedAddressResolver", + "client.MixinServerAddress" ], "injectors": { "defaultRequire": 0 diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinAllowedAddressResolver.java index e43b7322..9c61f393 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinAllowedAddressResolver.java @@ -28,8 +28,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.Optional; @@ -40,22 +38,20 @@ public abstract class MixinAllowedAddressResolver { @Inject(method = "resolve", at = @At(value = "HEAD"), cancellable = true) private void resolveVF(ServerAddress address, CallbackInfoReturnable> cir) { - AddressParser viaAddr = new AddressParser().parse(address.getAddress()); - if (viaAddr.viaSuffix == null) { + AddressParser viaAddr = AddressParser.parse(address.getAddress()); + if (!viaAddr.hasViaMetadata()) { return; } - ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress, address.getPort()); + ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress(), address.getPort()); - cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr.getSuffixWithOptions()))); + cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr))); } @Unique - private Address viaFabric$addSuffix(Address it, String viaSuffix) { + private Address viaFabric$addSuffix(Address it, AddressParser viaAddr) { try { - return Address.create(new InetSocketAddress( - InetAddress.getByAddress(it.getHostName() + "." + viaSuffix, - it.getInetSocketAddress().getAddress().getAddress()), it.getPort())); + return Address.create(viaAddr.addAddressSuffix(it.getInetSocketAddress())); } catch (UnknownHostException e) { throw new RuntimeException(e); } diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinServerAddress.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinServerAddress.java new file mode 100644 index 00000000..fc826029 --- /dev/null +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinServerAddress.java @@ -0,0 +1,49 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1182.mixin.address.client; + +import com.google.common.net.HostAndPort; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.client.network.ServerAddress; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Mixin(ServerAddress.class) +public abstract class MixinServerAddress { + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); + } + + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;(Lcom/google/common/net/HostAndPort;)V")) + private static HostAndPort injectViaMetadata(HostAndPort original, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; + } + + return HostAndPort.fromParts(parser.addAddressSuffix(original.getHost()), original.getPort()); + } +} diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/service/ProtocolAutoDetector.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/service/ProtocolAutoDetector.java index 9d56a44e..5b922326 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/service/ProtocolAutoDetector.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/service/ProtocolAutoDetector.java @@ -17,18 +17,29 @@ */ package com.viaversion.fabric.mc1182.service; -import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1182.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.viaversion.fabric.common.AddressParser; +import com.viaversion.fabric.mc1182.ViaFabric; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.network.*; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.DecoderHandler; +import net.minecraft.network.NetworkSide; +import net.minecraft.network.NetworkState; +import net.minecraft.network.PacketEncoder; +import net.minecraft.network.SizePrepender; +import net.minecraft.network.SplitterHandler; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import net.minecraft.network.packet.c2s.query.QueryRequestC2SPacket; @@ -37,7 +48,6 @@ import net.minecraft.server.ServerMetadata; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -131,7 +141,7 @@ public ClientConnection getConnection() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json index 74b21484..9571e2f4 100644 --- a/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json +++ b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json @@ -5,7 +5,8 @@ "mixins": [ ], "client": [ - "client.MixinAllowedAddressResolver" + "client.MixinAllowedAddressResolver", + "client.MixinServerAddress" ], "injectors": { "defaultRequire": 0 diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinAllowedAddressResolver.java index 8d9d37d5..1cf11031 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinAllowedAddressResolver.java @@ -28,8 +28,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.Optional; @@ -40,22 +38,20 @@ public abstract class MixinAllowedAddressResolver { @Inject(method = "resolve", at = @At(value = "HEAD"), cancellable = true) private void resolveVF(ServerAddress address, CallbackInfoReturnable> cir) { - AddressParser viaAddr = new AddressParser().parse(address.getAddress()); - if (viaAddr.viaSuffix == null) { + AddressParser viaAddr = AddressParser.parse(address.getAddress()); + if (!viaAddr.hasViaMetadata()) { return; } - ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress, address.getPort()); + ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress(), address.getPort()); - cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr.getSuffixWithOptions()))); + cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr))); } @Unique - private Address viaFabric$addSuffix(Address it, String viaSuffix) { + private static Address viaFabric$addSuffix(Address it, AddressParser viaAddr) { try { - return Address.create(new InetSocketAddress( - InetAddress.getByAddress(it.getHostName() + "." + viaSuffix, - it.getInetSocketAddress().getAddress().getAddress()), it.getPort())); + return Address.create(viaAddr.addAddressSuffix(it.getInetSocketAddress())); } catch (UnknownHostException e) { throw new RuntimeException(e); } diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinServerAddress.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinServerAddress.java new file mode 100644 index 00000000..b56401ed --- /dev/null +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinServerAddress.java @@ -0,0 +1,49 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1194.mixin.address.client; + +import com.google.common.net.HostAndPort; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.client.network.ServerAddress; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Mixin(ServerAddress.class) +public abstract class MixinServerAddress { + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); + } + + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;(Lcom/google/common/net/HostAndPort;)V")) + private static HostAndPort injectViaMetadata(HostAndPort original, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; + } + + return HostAndPort.fromParts(parser.addAddressSuffix(original.getHost()), original.getPort()); + } +} diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/service/ProtocolAutoDetector.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/service/ProtocolAutoDetector.java index 2f47ecca..c1cd4eef 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/service/ProtocolAutoDetector.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/service/ProtocolAutoDetector.java @@ -17,18 +17,29 @@ */ package com.viaversion.fabric.mc1194.service; -import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1194.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.viaversion.fabric.common.AddressParser; +import com.viaversion.fabric.mc1194.ViaFabric; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.network.*; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.DecoderHandler; +import net.minecraft.network.NetworkSide; +import net.minecraft.network.NetworkState; +import net.minecraft.network.PacketEncoder; +import net.minecraft.network.SizePrepender; +import net.minecraft.network.SplitterHandler; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import net.minecraft.network.packet.c2s.query.QueryRequestC2SPacket; @@ -36,7 +47,6 @@ import net.minecraft.network.packet.s2c.query.QueryResponseS2CPacket; import net.minecraft.server.ServerMetadata; import net.minecraft.text.Text; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -130,7 +140,7 @@ public boolean isConnectionOpen() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json index a883164b..29dcba5d 100644 --- a/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json +++ b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json @@ -5,7 +5,8 @@ "mixins": [ ], "client": [ - "client.MixinAllowedAddressResolver" + "client.MixinAllowedAddressResolver", + "client.MixinServerAddress" ], "injectors": { "defaultRequire": 0 diff --git a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinAllowedAddressResolver.java index c0ebe58f..bc5de5e1 100644 --- a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinAllowedAddressResolver.java @@ -28,8 +28,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.Optional; @@ -40,22 +38,20 @@ public abstract class MixinAllowedAddressResolver { @Inject(method = "resolve", at = @At(value = "HEAD"), cancellable = true) private void resolveVF(ServerAddress address, CallbackInfoReturnable> cir) { - AddressParser viaAddr = new AddressParser().parse(address.getAddress()); - if (viaAddr.viaSuffix == null) { + AddressParser viaAddr = AddressParser.parse(address.getAddress()); + if (!viaAddr.hasViaMetadata()) { return; } - ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress, address.getPort()); + ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress(), address.getPort()); - cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr.getSuffixWithOptions()))); + cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr))); } @Unique - private Address viaFabric$addSuffix(Address it, String viaSuffix) { + private static Address viaFabric$addSuffix(Address it, AddressParser viaAddr) { try { - return Address.create(new InetSocketAddress( - InetAddress.getByAddress(it.getHostName() + "." + viaSuffix, - it.getInetSocketAddress().getAddress().getAddress()), it.getPort())); + return Address.create(viaAddr.addAddressSuffix(it.getInetSocketAddress())); } catch (UnknownHostException e) { throw new RuntimeException(e); } diff --git a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinServerAddress.java b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinServerAddress.java new file mode 100644 index 00000000..8238ec46 --- /dev/null +++ b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinServerAddress.java @@ -0,0 +1,49 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1201.mixin.address.client; + +import com.google.common.net.HostAndPort; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.client.network.ServerAddress; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Mixin(ServerAddress.class) +public abstract class MixinServerAddress { + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); + } + + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;(Lcom/google/common/net/HostAndPort;)V")) + private static HostAndPort injectViaMetadata(HostAndPort original, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; + } + + return HostAndPort.fromParts(parser.addAddressSuffix(original.getHost()), original.getPort()); + } +} diff --git a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/service/ProtocolAutoDetector.java b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/service/ProtocolAutoDetector.java index 57edbeee..25d1ec9b 100644 --- a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/service/ProtocolAutoDetector.java +++ b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/service/ProtocolAutoDetector.java @@ -17,18 +17,29 @@ */ package com.viaversion.fabric.mc1201.service; -import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1201.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.viaversion.fabric.common.AddressParser; +import com.viaversion.fabric.mc1201.ViaFabric; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.network.*; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.DecoderHandler; +import net.minecraft.network.NetworkSide; +import net.minecraft.network.NetworkState; +import net.minecraft.network.PacketEncoder; +import net.minecraft.network.SizePrepender; +import net.minecraft.network.SplitterHandler; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; import net.minecraft.network.packet.c2s.query.QueryRequestC2SPacket; @@ -36,7 +47,6 @@ import net.minecraft.network.packet.s2c.query.QueryResponseS2CPacket; import net.minecraft.server.ServerMetadata; import net.minecraft.text.Text; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -130,7 +140,7 @@ public boolean isConnectionOpen() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1201/src/main/resources/mixins.viafabric1201.address.json b/viafabric-mc1201/src/main/resources/mixins.viafabric1201.address.json index 044e77bf..51b7f44e 100644 --- a/viafabric-mc1201/src/main/resources/mixins.viafabric1201.address.json +++ b/viafabric-mc1201/src/main/resources/mixins.viafabric1201.address.json @@ -5,7 +5,8 @@ "mixins": [ ], "client": [ - "client.MixinAllowedAddressResolver" + "client.MixinAllowedAddressResolver", + "client.MixinServerAddress" ], "injectors": { "defaultRequire": 0 diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinAllowedAddressResolver.java index 19a78612..b3ed7296 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinAllowedAddressResolver.java @@ -28,8 +28,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.Optional; @@ -40,22 +38,20 @@ public abstract class MixinAllowedAddressResolver { @Inject(method = "resolve", at = @At(value = "HEAD"), cancellable = true) private void resolveVF(ServerAddress address, CallbackInfoReturnable> cir) { - AddressParser viaAddr = new AddressParser().parse(address.getAddress()); - if (viaAddr.viaSuffix == null) { + AddressParser viaAddr = AddressParser.parse(address.getAddress()); + if (!viaAddr.hasViaMetadata()) { return; } - ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress, address.getPort()); + ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress(), address.getPort()); - cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr.getSuffixWithOptions()))); + cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr))); } @Unique - private Address viaFabric$addSuffix(Address it, String viaSuffix) { + private static Address viaFabric$addSuffix(Address it, AddressParser viaAddr) { try { - return Address.create(new InetSocketAddress( - InetAddress.getByAddress(it.getHostName() + "." + viaSuffix, - it.getInetSocketAddress().getAddress().getAddress()), it.getPort())); + return Address.create(viaAddr.addAddressSuffix(it.getInetSocketAddress())); } catch (UnknownHostException e) { throw new RuntimeException(e); } diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinServerAddress.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinServerAddress.java new file mode 100644 index 00000000..b805b507 --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinServerAddress.java @@ -0,0 +1,49 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.mixin.address.client; + +import com.google.common.net.HostAndPort; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.client.network.ServerAddress; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Mixin(ServerAddress.class) +public abstract class MixinServerAddress { + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); + } + + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;(Lcom/google/common/net/HostAndPort;)V")) + private static HostAndPort injectViaMetadata(HostAndPort original, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; + } + + return HostAndPort.fromParts(parser.addAddressSuffix(original.getHost()), original.getPort()); + } +} diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/service/ProtocolAutoDetector.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/service/ProtocolAutoDetector.java index 5d51973f..396d47a6 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/service/ProtocolAutoDetector.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/service/ProtocolAutoDetector.java @@ -17,19 +17,26 @@ */ package com.viaversion.fabric.mc1204.service; -import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1204.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.viaversion.fabric.common.AddressParser; +import com.viaversion.fabric.mc1204.ViaFabric; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.SharedConstants; -import net.minecraft.network.*; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.NetworkSide; +import net.minecraft.network.NetworkState; import net.minecraft.network.handler.DecoderHandler; import net.minecraft.network.handler.PacketEncoder; import net.minecraft.network.handler.SizePrepender; @@ -42,7 +49,7 @@ import net.minecraft.network.packet.s2c.query.QueryResponseS2CPacket; import net.minecraft.server.ServerMetadata; import net.minecraft.text.Text; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; +import org.jetbrains.annotations.NotNull; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -51,7 +58,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import org.jetbrains.annotations.NotNull; @Environment(EnvType.CLIENT) public class ProtocolAutoDetector { @@ -149,7 +155,7 @@ public boolean isConnectionOpen() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json index ed1ac7a2..a9519d03 100644 --- a/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json +++ b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json @@ -5,7 +5,8 @@ "mixins": [ ], "client": [ - "client.MixinAllowedAddressResolver" + "client.MixinAllowedAddressResolver", + "client.MixinServerAddress" ], "injectors": { "defaultRequire": 0 diff --git a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinAllowedAddressResolver.java index 2b7927fb..59774f72 100644 --- a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinAllowedAddressResolver.java @@ -28,8 +28,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.Optional; @@ -40,22 +38,20 @@ public abstract class MixinAllowedAddressResolver { @Inject(method = "resolve", at = @At(value = "HEAD"), cancellable = true) private void resolveVF(ServerAddress address, CallbackInfoReturnable> cir) { - AddressParser viaAddr = new AddressParser().parse(address.getAddress()); - if (viaAddr.viaSuffix == null) { + AddressParser viaAddr = AddressParser.parse(address.getAddress()); + if (!viaAddr.hasViaMetadata()) { return; } - ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress, address.getPort()); + ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress(), address.getPort()); - cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr.getSuffixWithOptions()))); + cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr))); } @Unique - private Address viaFabric$addSuffix(Address it, String viaSuffix) { + private static Address viaFabric$addSuffix(Address it, AddressParser viaAddr) { try { - return Address.create(new InetSocketAddress( - InetAddress.getByAddress(it.getHostName() + "." + viaSuffix, - it.getInetSocketAddress().getAddress().getAddress()), it.getPort())); + return Address.create(viaAddr.addAddressSuffix(it.getInetSocketAddress())); } catch (UnknownHostException e) { throw new RuntimeException(e); } diff --git a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinServerAddress.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinServerAddress.java new file mode 100644 index 00000000..cf4fbb7c --- /dev/null +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinServerAddress.java @@ -0,0 +1,49 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1206.mixin.address.client; + +import com.google.common.net.HostAndPort; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.client.network.ServerAddress; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Mixin(ServerAddress.class) +public abstract class MixinServerAddress { + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); + } + + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;(Lcom/google/common/net/HostAndPort;)V")) + private static HostAndPort injectViaMetadata(HostAndPort original, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; + } + + return HostAndPort.fromParts(parser.addAddressSuffix(original.getHost()), original.getPort()); + } +} 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 index c004bbec..6096d5ad 100644 --- 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 @@ -17,20 +17,29 @@ */ package com.viaversion.fabric.mc1206.service; -import com.viaversion.fabric.common.AddressParser; -import com.viaversion.fabric.mc1206.ViaFabric; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; +import com.viaversion.fabric.common.AddressParser; +import com.viaversion.fabric.mc1206.ViaFabric; +import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.SharedConstants; -import net.minecraft.network.*; -import net.minecraft.network.handler.*; +import net.minecraft.network.ClientConnection; +import net.minecraft.network.NetworkSide; +import net.minecraft.network.handler.EncoderHandler; +import net.minecraft.network.handler.NetworkStateTransitions; +import net.minecraft.network.handler.SizePrepender; +import net.minecraft.network.handler.SplitterHandler; import net.minecraft.network.listener.ClientQueryPacketListener; import net.minecraft.network.packet.c2s.handshake.ConnectionIntent; import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; @@ -41,7 +50,7 @@ import net.minecraft.network.state.QueryStates; import net.minecraft.server.ServerMetadata; import net.minecraft.text.Text; -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; +import org.jetbrains.annotations.NotNull; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -50,7 +59,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import org.jetbrains.annotations.NotNull; @Environment(EnvType.CLIENT) public class ProtocolAutoDetector { @@ -144,7 +152,7 @@ public boolean isConnectionOpen() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json index 8b430911..df0b55cc 100644 --- a/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json +++ b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json @@ -5,7 +5,8 @@ "mixins": [ ], "client": [ - "client.MixinAllowedAddressResolver" + "client.MixinAllowedAddressResolver", + "client.MixinServerAddress" ], "injectors": { "defaultRequire": 0 diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinAllowedAddressResolver.java b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinAllowedAddressResolver.java index e53ee761..13f29afc 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinAllowedAddressResolver.java +++ b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinAllowedAddressResolver.java @@ -28,8 +28,6 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.Optional; @@ -40,22 +38,20 @@ public abstract class MixinAllowedAddressResolver { @Inject(method = "resolve", at = @At(value = "HEAD"), cancellable = true) private void resolveVF(ServerAddress address, CallbackInfoReturnable> cir) { - AddressParser viaAddr = new AddressParser().parse(address.getAddress()); - if (viaAddr.viaSuffix == null) { + AddressParser viaAddr = AddressParser.parse(address.getAddress()); + if (!viaAddr.hasViaMetadata()) { return; } - ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress, address.getPort()); + ServerAddress realAddress = new ServerAddress(viaAddr.serverAddress(), address.getPort()); - cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr.getSuffixWithOptions()))); + cir.setReturnValue(resolve(realAddress).map(it -> viaFabric$addSuffix(it, viaAddr))); } @Unique - private Address viaFabric$addSuffix(Address it, String viaSuffix) { + private static Address viaFabric$addSuffix(Address it, AddressParser viaAddr) { try { - return Address.create(new InetSocketAddress( - InetAddress.getByAddress(it.getHostName() + "." + viaSuffix, - it.getInetSocketAddress().getAddress().getAddress()), it.getPort())); + return Address.create(viaAddr.addAddressSuffix(it.getInetSocketAddress())); } catch (UnknownHostException e) { throw new RuntimeException(e); } diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinServerAddress.java b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinServerAddress.java new file mode 100644 index 00000000..ba57414a --- /dev/null +++ b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinServerAddress.java @@ -0,0 +1,49 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc121.mixin.address.client; + +import com.google.common.net.HostAndPort; +import com.llamalad7.mixinextras.sugar.Share; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.client.network.ServerAddress; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Mixin(ServerAddress.class) +public abstract class MixinServerAddress { + @ModifyVariable(method = "parse", at = @At("HEAD"), argsOnly = true) + private static String modifyAddress(String address, @Share("via") LocalRef via) { + AddressParser parser = AddressParser.parse(address); + via.set(parser); + + return parser.toAddress(); + } + + @ModifyArg(method = "parse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ServerAddress;(Lcom/google/common/net/HostAndPort;)V")) + private static HostAndPort injectViaMetadata(HostAndPort original, @Share("via") LocalRef via) { + final AddressParser parser = via.get(); + if (parser == null) { + return original; + } + + return HostAndPort.fromParts(parser.addAddressSuffix(original.getHost()), original.getPort()); + } +} diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/service/ProtocolAutoDetector.java b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/service/ProtocolAutoDetector.java index 717bcec0..69930a28 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/service/ProtocolAutoDetector.java +++ b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/service/ProtocolAutoDetector.java @@ -24,7 +24,11 @@ import com.viaversion.fabric.mc1211.ViaFabric; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.timeout.ReadTimeoutHandler; import net.fabricmc.api.EnvType; @@ -149,7 +153,7 @@ public boolean isConnectionOpen() { public static CompletableFuture detectVersion(InetSocketAddress address) { try { InetSocketAddress real = new InetSocketAddress(InetAddress.getByAddress - (new AddressParser().parse(address.getHostString()).serverAddress, + (AddressParser.parse(address.getHostString()).serverAddress(), address.getAddress().getAddress()), address.getPort()); return SERVER_VER.get(real); } catch (UnknownHostException | ExecutionException e) { diff --git a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json b/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json index 36e5195f..f86b344e 100644 --- a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json +++ b/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json @@ -5,7 +5,8 @@ "mixins": [ ], "client": [ - "client.MixinAllowedAddressResolver" + "client.MixinAllowedAddressResolver", + "client.MixinServerAddress" ], "injectors": { "defaultRequire": 0 From e3c3f8fe3e2e56afeb4e4f77a84448914e1851e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ampflower=20=F0=9F=8C=BA?= Date: Thu, 22 Aug 2024 21:35:04 -0700 Subject: [PATCH 2/4] Remove Via metadata from address in HandshakeC2SPacket --- .../client/MixinHandshakeC2SPacket.java | 37 ++++++++++++++++++ .../mixins.viafabric1144.address.json | 1 + .../client/MixinHandshakeC2SPacket.java | 37 ++++++++++++++++++ .../mixins.viafabric1152.address.json | 1 + .../client/MixinHandshakeC2SPacket.java | 37 ++++++++++++++++++ .../mixins.viafabric1165.address.json | 1 + .../client/MixinHandshakeC2SPacket.java | 37 ++++++++++++++++++ .../mixins.viafabric1171.address.json | 1 + .../client/MixinHandshakeC2SPacket.java | 37 ++++++++++++++++++ .../mixins.viafabric1182.address.json | 1 + .../client/MixinHandshakeC2SPacket.java | 37 ++++++++++++++++++ .../mixins.viafabric1194.address.json | 1 + .../client/MixinHandshakeC2SPacket.java | 37 ++++++++++++++++++ .../mixins.viafabric1201.address.json | 1 + .../MixinClientConnectionHandshake.java | 39 +++++++++++++++++++ .../mixins.viafabric1204.address.json | 1 + .../MixinClientConnectionHandshake.java | 39 +++++++++++++++++++ .../mixins.viafabric1206.address.json | 1 + .../MixinClientConnectionHandshake.java | 39 +++++++++++++++++++ .../mixins.viafabric1211.address.json | 1 + 20 files changed, 386 insertions(+) create mode 100644 viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinHandshakeC2SPacket.java create mode 100644 viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinHandshakeC2SPacket.java create mode 100644 viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinHandshakeC2SPacket.java create mode 100644 viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinHandshakeC2SPacket.java create mode 100644 viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinHandshakeC2SPacket.java create mode 100644 viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinHandshakeC2SPacket.java create mode 100644 viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinHandshakeC2SPacket.java create mode 100644 viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinClientConnectionHandshake.java create mode 100644 viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinClientConnectionHandshake.java create mode 100644 viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinClientConnectionHandshake.java diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinHandshakeC2SPacket.java new file mode 100644 index 00000000..2a4903e2 --- /dev/null +++ b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinHandshakeC2SPacket.java @@ -0,0 +1,37 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1144.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +/** + * Minimally invasive address sanitiser. + * + * @author Ampflower + **/ +@Mixin(HandshakeC2SPacket.class) +public class MixinHandshakeC2SPacket { + @ModifyVariable(method = "*", at = @At("LOAD"), argsOnly = true) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1144/src/main/resources/mixins.viafabric1144.address.json b/viafabric-mc1144/src/main/resources/mixins.viafabric1144.address.json index 8121604a..d25f9c79 100644 --- a/viafabric-mc1144/src/main/resources/mixins.viafabric1144.address.json +++ b/viafabric-mc1144/src/main/resources/mixins.viafabric1144.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinConnectScreenThread", + "client.MixinHandshakeC2SPacket", "client.MixinServerAddress", "client.MixinServerPinger" ], diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinHandshakeC2SPacket.java new file mode 100644 index 00000000..4fb3b42c --- /dev/null +++ b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinHandshakeC2SPacket.java @@ -0,0 +1,37 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1152.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +/** + * Minimally invasive address sanitiser. + * + * @author Ampflower + **/ +@Mixin(HandshakeC2SPacket.class) +public class MixinHandshakeC2SPacket { + @ModifyVariable(method = "*", at = @At("LOAD"), argsOnly = true) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1152/src/main/resources/mixins.viafabric1152.address.json b/viafabric-mc1152/src/main/resources/mixins.viafabric1152.address.json index c3124ef8..2e8263a5 100644 --- a/viafabric-mc1152/src/main/resources/mixins.viafabric1152.address.json +++ b/viafabric-mc1152/src/main/resources/mixins.viafabric1152.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinConnectScreenThread", + "client.MixinHandshakeC2SPacket", "client.MixinServerAddress", "client.MixinServerPinger" ], diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinHandshakeC2SPacket.java new file mode 100644 index 00000000..f553cc48 --- /dev/null +++ b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinHandshakeC2SPacket.java @@ -0,0 +1,37 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1165.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +/** + * Minimally invasive address sanitiser. + * + * @author Ampflower + **/ +@Mixin(HandshakeC2SPacket.class) +public class MixinHandshakeC2SPacket { + @ModifyVariable(method = "*", at = @At("LOAD"), argsOnly = true) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1165/src/main/resources/mixins.viafabric1165.address.json b/viafabric-mc1165/src/main/resources/mixins.viafabric1165.address.json index 8aa7c696..449b057c 100644 --- a/viafabric-mc1165/src/main/resources/mixins.viafabric1165.address.json +++ b/viafabric-mc1165/src/main/resources/mixins.viafabric1165.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinConnectScreenThread", + "client.MixinHandshakeC2SPacket", "client.MixinServerAddress", "client.MixinServerPinger" ], diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinHandshakeC2SPacket.java new file mode 100644 index 00000000..1f70d257 --- /dev/null +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinHandshakeC2SPacket.java @@ -0,0 +1,37 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1171.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +/** + * Minimally invasive address sanitiser. + * + * @author Ampflower + **/ +@Mixin(HandshakeC2SPacket.class) +public class MixinHandshakeC2SPacket { + @ModifyVariable(method = "*", at = @At("LOAD"), argsOnly = true) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json index f548e889..c44d9adc 100644 --- a/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json +++ b/viafabric-mc1171/src/main/resources/mixins.viafabric1171.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinAllowedAddressResolver", + "client.MixinHandshakeC2SPacket", "client.MixinServerAddress" ], "injectors": { diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinHandshakeC2SPacket.java new file mode 100644 index 00000000..eb341ecb --- /dev/null +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinHandshakeC2SPacket.java @@ -0,0 +1,37 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1182.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +/** + * Minimally invasive address sanitiser. + * + * @author Ampflower + **/ +@Mixin(HandshakeC2SPacket.class) +public class MixinHandshakeC2SPacket { + @ModifyVariable(method = "*", at = @At("LOAD"), argsOnly = true) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json index 9571e2f4..f8584d47 100644 --- a/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json +++ b/viafabric-mc1182/src/main/resources/mixins.viafabric1182.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinAllowedAddressResolver", + "client.MixinHandshakeC2SPacket", "client.MixinServerAddress" ], "injectors": { diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinHandshakeC2SPacket.java new file mode 100644 index 00000000..42882e34 --- /dev/null +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinHandshakeC2SPacket.java @@ -0,0 +1,37 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1194.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +/** + * Minimally invasive address sanitiser. + * + * @author Ampflower + **/ +@Mixin(HandshakeC2SPacket.class) +public class MixinHandshakeC2SPacket { + @ModifyVariable(method = "*", at = @At("LOAD"), argsOnly = true) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json index 29dcba5d..2b85e4af 100644 --- a/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json +++ b/viafabric-mc1194/src/main/resources/mixins.viafabric1194.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinAllowedAddressResolver", + "client.MixinHandshakeC2SPacket", "client.MixinServerAddress" ], "injectors": { diff --git a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinHandshakeC2SPacket.java new file mode 100644 index 00000000..9e783f57 --- /dev/null +++ b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinHandshakeC2SPacket.java @@ -0,0 +1,37 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1201.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.packet.c2s.handshake.HandshakeC2SPacket; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +/** + * Minimally invasive address sanitiser. + * + * @author Ampflower + **/ +@Mixin(HandshakeC2SPacket.class) +public class MixinHandshakeC2SPacket { + @ModifyVariable(method = "*", at = @At("LOAD"), argsOnly = true) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1201/src/main/resources/mixins.viafabric1201.address.json b/viafabric-mc1201/src/main/resources/mixins.viafabric1201.address.json index 51b7f44e..d99d579c 100644 --- a/viafabric-mc1201/src/main/resources/mixins.viafabric1201.address.json +++ b/viafabric-mc1201/src/main/resources/mixins.viafabric1201.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinAllowedAddressResolver", + "client.MixinHandshakeC2SPacket", "client.MixinServerAddress" ], "injectors": { diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinClientConnectionHandshake.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinClientConnectionHandshake.java new file mode 100644 index 00000000..338c9f53 --- /dev/null +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinClientConnectionHandshake.java @@ -0,0 +1,39 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1204.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.ClientConnection; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; + +/** + * Minimally invasive address sanitizer. + *

+ * Placed in ClientConnection to prevent sanitizing input from LAN clients. + * + * @author Ampflower + **/ +@Mixin(ClientConnection.class) +public class MixinClientConnectionHandshake { + @ModifyArg(method = "method_52900", at = @At(value = "INVOKE", target = "net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.(ILjava/lang/String;ILnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V")) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json index a9519d03..978999fc 100644 --- a/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json +++ b/viafabric-mc1204/src/main/resources/mixins.viafabric1204.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinAllowedAddressResolver", + "client.MixinClientConnectionHandshake", "client.MixinServerAddress" ], "injectors": { diff --git a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinClientConnectionHandshake.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinClientConnectionHandshake.java new file mode 100644 index 00000000..46f881ca --- /dev/null +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinClientConnectionHandshake.java @@ -0,0 +1,39 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc1206.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.ClientConnection; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; + +/** + * Minimally invasive address sanitizer. + *

+ * Placed in ClientConnection to prevent sanitizing input from LAN clients. + * + * @author Ampflower + **/ +@Mixin(ClientConnection.class) +public class MixinClientConnectionHandshake { + @ModifyArg(method = "method_52900", at = @At(value = "INVOKE", target = "net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.(ILjava/lang/String;ILnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V")) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json index df0b55cc..6806f6ab 100644 --- a/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json +++ b/viafabric-mc1206/src/main/resources/mixins.viafabric1206.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinAllowedAddressResolver", + "client.MixinClientConnectionHandshake", "client.MixinServerAddress" ], "injectors": { diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinClientConnectionHandshake.java b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinClientConnectionHandshake.java new file mode 100644 index 00000000..8910c695 --- /dev/null +++ b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinClientConnectionHandshake.java @@ -0,0 +1,39 @@ +/* + * This file is part of ViaFabric - https://github.com/ViaVersion/ViaFabric + * Copyright (C) 2018-2024 ViaVersion and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package com.viaversion.fabric.mc121.mixin.address.client; + +import com.viaversion.fabric.common.AddressParser; +import net.minecraft.network.ClientConnection; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; + +/** + * Minimally invasive address sanitizer. + *

+ * Placed in ClientConnection to prevent sanitizing input from LAN clients. + * + * @author Ampflower + **/ +@Mixin(ClientConnection.class) +public class MixinClientConnectionHandshake { + @ModifyArg(method = "method_52900", at = @At(value = "INVOKE", target = "net/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket.(ILjava/lang/String;ILnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V")) + private static String removeViaMetadataFromAddress(String address) { + return AddressParser.parse(address).toAddress(); + } +} diff --git a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json b/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json index f86b344e..e67df145 100644 --- a/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json +++ b/viafabric-mc1211/src/main/resources/mixins.viafabric1211.address.json @@ -6,6 +6,7 @@ ], "client": [ "client.MixinAllowedAddressResolver", + "client.MixinClientConnectionHandshake", "client.MixinServerAddress" ], "injectors": { From 7802b23bffafd6c373bdea03863a1a9cbfa0fb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ampflower=20=F0=9F=8C=BA?= Date: Fri, 23 Aug 2024 02:32:03 -0700 Subject: [PATCH 3/4] Omit author tags from javadocs --- .../java/com/viaversion/fabric/common/AddressParserTest.java | 2 -- .../mc1144/mixin/address/client/MixinHandshakeC2SPacket.java | 2 -- .../mc1152/mixin/address/client/MixinHandshakeC2SPacket.java | 2 -- .../mc1165/mixin/address/client/MixinHandshakeC2SPacket.java | 2 -- .../mc1171/mixin/address/client/MixinHandshakeC2SPacket.java | 2 -- .../mc1182/mixin/address/client/MixinHandshakeC2SPacket.java | 2 -- .../mc1194/mixin/address/client/MixinHandshakeC2SPacket.java | 2 -- .../mc1201/mixin/address/client/MixinHandshakeC2SPacket.java | 2 -- .../mixin/address/client/MixinClientConnectionHandshake.java | 2 -- .../mixin/address/client/MixinClientConnectionHandshake.java | 2 -- .../mixin/address/client/MixinClientConnectionHandshake.java | 2 -- 11 files changed, 22 deletions(-) diff --git a/src/test/java/com/viaversion/fabric/common/AddressParserTest.java b/src/test/java/com/viaversion/fabric/common/AddressParserTest.java index 3984c5ac..24f2ed09 100644 --- a/src/test/java/com/viaversion/fabric/common/AddressParserTest.java +++ b/src/test/java/com/viaversion/fabric/common/AddressParserTest.java @@ -38,8 +38,6 @@ *

* Test cases include seemingly malformed data that previous versions of ViaFabric * would accept as valid, and asserting that it would parse and treat it the same way. - * - * @author Ampflower **/ public class AddressParserTest { diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinHandshakeC2SPacket.java index 2a4903e2..02075e8b 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinHandshakeC2SPacket.java +++ b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/mixin/address/client/MixinHandshakeC2SPacket.java @@ -25,8 +25,6 @@ /** * Minimally invasive address sanitiser. - * - * @author Ampflower **/ @Mixin(HandshakeC2SPacket.class) public class MixinHandshakeC2SPacket { diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinHandshakeC2SPacket.java index 4fb3b42c..b70c4f0b 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinHandshakeC2SPacket.java +++ b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/mixin/address/client/MixinHandshakeC2SPacket.java @@ -25,8 +25,6 @@ /** * Minimally invasive address sanitiser. - * - * @author Ampflower **/ @Mixin(HandshakeC2SPacket.class) public class MixinHandshakeC2SPacket { diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinHandshakeC2SPacket.java index f553cc48..e8959e8e 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinHandshakeC2SPacket.java +++ b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/mixin/address/client/MixinHandshakeC2SPacket.java @@ -25,8 +25,6 @@ /** * Minimally invasive address sanitiser. - * - * @author Ampflower **/ @Mixin(HandshakeC2SPacket.class) public class MixinHandshakeC2SPacket { diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinHandshakeC2SPacket.java index 1f70d257..9cb8a733 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinHandshakeC2SPacket.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/mixin/address/client/MixinHandshakeC2SPacket.java @@ -25,8 +25,6 @@ /** * Minimally invasive address sanitiser. - * - * @author Ampflower **/ @Mixin(HandshakeC2SPacket.class) public class MixinHandshakeC2SPacket { diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinHandshakeC2SPacket.java index eb341ecb..091153fb 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinHandshakeC2SPacket.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/mixin/address/client/MixinHandshakeC2SPacket.java @@ -25,8 +25,6 @@ /** * Minimally invasive address sanitiser. - * - * @author Ampflower **/ @Mixin(HandshakeC2SPacket.class) public class MixinHandshakeC2SPacket { diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinHandshakeC2SPacket.java index 42882e34..9e0b2a43 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinHandshakeC2SPacket.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/mixin/address/client/MixinHandshakeC2SPacket.java @@ -25,8 +25,6 @@ /** * Minimally invasive address sanitiser. - * - * @author Ampflower **/ @Mixin(HandshakeC2SPacket.class) public class MixinHandshakeC2SPacket { diff --git a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinHandshakeC2SPacket.java b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinHandshakeC2SPacket.java index 9e783f57..e8d962d7 100644 --- a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinHandshakeC2SPacket.java +++ b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/mixin/address/client/MixinHandshakeC2SPacket.java @@ -25,8 +25,6 @@ /** * Minimally invasive address sanitiser. - * - * @author Ampflower **/ @Mixin(HandshakeC2SPacket.class) public class MixinHandshakeC2SPacket { diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinClientConnectionHandshake.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinClientConnectionHandshake.java index 338c9f53..c82a23f0 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinClientConnectionHandshake.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/mixin/address/client/MixinClientConnectionHandshake.java @@ -27,8 +27,6 @@ * Minimally invasive address sanitizer. *

* Placed in ClientConnection to prevent sanitizing input from LAN clients. - * - * @author Ampflower **/ @Mixin(ClientConnection.class) public class MixinClientConnectionHandshake { diff --git a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinClientConnectionHandshake.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinClientConnectionHandshake.java index 46f881ca..50f9e50a 100644 --- a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinClientConnectionHandshake.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/mixin/address/client/MixinClientConnectionHandshake.java @@ -27,8 +27,6 @@ * Minimally invasive address sanitizer. *

* Placed in ClientConnection to prevent sanitizing input from LAN clients. - * - * @author Ampflower **/ @Mixin(ClientConnection.class) public class MixinClientConnectionHandshake { diff --git a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinClientConnectionHandshake.java b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinClientConnectionHandshake.java index 8910c695..03c3968b 100644 --- a/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinClientConnectionHandshake.java +++ b/viafabric-mc1211/src/main/java/com/viaversion/fabric/mc1211/mixin/address/client/MixinClientConnectionHandshake.java @@ -27,8 +27,6 @@ * Minimally invasive address sanitizer. *

* Placed in ClientConnection to prevent sanitizing input from LAN clients. - * - * @author Ampflower **/ @Mixin(ClientConnection.class) public class MixinClientConnectionHandshake { From 370a7c354715fa39bc190184ff0d7fae0c5f1452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ampflower=20=F0=9F=8C=BA?= Date: Fri, 23 Aug 2024 12:37:17 -0700 Subject: [PATCH 4/4] Update README.md for new address parser syntax. --- README.md | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 10882545..68b71608 100644 --- a/README.md +++ b/README.md @@ -127,9 +127,22 @@ registry synchronization (fabric-registry-sync mod). ### How can I set the version for specific servers?: -- Append ._v(VERSION).viafabric. -- Examples: ``minigame.example.com._v1_8.viafabric``, ``native.example.com._v-1.viafabric`` - , ``auto.example.com._v-2.viafabric`` +#### Suffix Style + +- Append ``._v(VERSION).viafabric`` after the host, before any port. + - All dots (``.``) in a given version must be replaced with underscores (``_``). +- Examples: + - ``minigame.example.com._v1_8.viafabric`` + - ``native.example.com._v-1.viafabric`` + - ``auto.example.com._v-2.viafabric`` + +#### Prefix Style + +- Add ``viafabric.v(VERSION);`` before the address. +- Examples: + - ``viafabric.v1.8;minigame.example.com`` + - ``viafabric.v-1;native.example.com`` + - ``viafabric.v-2;auto.example.com`` ## ViaFabricPlus