diff --git a/build.gradle b/build.gradle index 3252362..8b55859 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,7 @@ subprojects { // versionName = project.version + " devbuild for " + project.minecraft_version versionType = "alpha" // This is the default -- can also be `beta` or `alpha` // uploadFile = remapShadowJar // With Loom, this MUST be set to `remapJar` instead of `jar`! - gameVersions = ["1.17", "1.17.1", "1.18", "1.18.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6"] + gameVersions = ["1.17", "1.17.1", "1.18", "1.18.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21"] // loaders = ["fabric"] changelog = com.ishland.buildscript.ParseGItHubActionChangelog.getChangelog() } diff --git a/common/src/main/resources/raknetify-channel-mappings.json b/common/src/main/resources/raknetify-channel-mappings.json index 409a453..0cfcf9d 100644 --- a/common/src/main/resources/raknetify-channel-mappings.json +++ b/common/src/main/resources/raknetify-channel-mappings.json @@ -1993,183 +1993,7 @@ "57": 2 } }, - "1073741953": { - "s2c": { - "0": -2147483648, - "1": 2, - "2": 2, - "3": 1, - "4": 2, - "5": -1, - "6": 1, - "7": 7, - "8": 7, - "9": 7, - "10": 7, - "11": 1, - "12": 1, - "13": 7, - "14": 1, - "15": 1, - "16": 1, - "17": 3, - "18": 3, - "19": 3, - "20": 3, - "21": 1, - "22": 1, - "23": 3, - "24": 2, - "25": 1, - "26": -1, - "27": 1, - "28": 2, - "29": 2, - "30": 7, - "31": 2, - "32": 3, - "33": 2, - "34": 3, - "35": -1, - "36": 7, - "37": 7, - "38": 4, - "39": 7, - "40": 2, - "41": 4, - "42": 3, - "43": 2, - "44": 2, - "45": 2, - "46": 2, - "47": 3, - "48": 3, - "49": 7, - "50": -1, - "51": 3, - "52": 2, - "53": 1, - "54": 2, - "55": 2, - "56": 1, - "57": 1, - "58": 1, - "59": 1, - "60": 1, - "61": 3, - "62": 2, - "63": 2, - "64": -1, - "65": 3, - "66": 2, - "67": 7, - "68": -1, - "69": 1, - "70": 1, - "71": 3, - "72": 3, - "73": 3, - "74": 3, - "75": 3, - "76": 2, - "77": 3, - "78": 7, - "79": 7, - "80": 2, - "81": 1, - "82": 2, - "83": 2, - "84": 2, - "85": 2, - "86": 1, - "87": 1, - "88": 1, - "89": 2, - "90": 1, - "91": 1, - "92": 7, - "93": 1, - "94": 1, - "95": 1, - "96": 1, - "97": 4, - "98": 4, - "99": 4, - "100": 1, - "101": 1, - "102": 3, - "103": 2, - "104": 2, - "105": 1, - "106": 2, - "107": 2, - "108": 2, - "109": 1, - "110": 1, - "111": 1, - "112": 1, - "113": 1, - "114": 1, - "115": 1, - "116": 1 - }, - "c2s": { - "0": 3, - "1": 3, - "2": 1, - "3": 1, - "4": 1, - "5": 1, - "6": 1, - "7": 3, - "8": 1, - "9": 1, - "10": 1, - "11": 1, - "12": 3, - "13": 3, - "14": 3, - "15": 3, - "16": 2, - "17": 7, - "18": -1, - "19": 1, - "20": 2, - "21": 2, - "22": 2, - "23": 2, - "24": 2, - "25": 2, - "26": 3, - "27": 3, - "28": 3, - "29": 1, - "30": 1, - "31": 1, - "32": -1, - "33": 3, - "34": 3, - "35": 3, - "36": -1, - "37": -1, - "38": 3, - "39": 3, - "40": 3, - "41": 3, - "42": 3, - "43": 3, - "44": 3, - "45": 3, - "46": 7, - "47": 2, - "48": 3, - "49": 2, - "50": 2, - "51": 1, - "52": 2 - } - }, - "1073742027": { + "767": { "s2c": { "0": -2147483648, "1": 2, @@ -2293,8 +2117,8 @@ "119": 1, "120": 1, "121": 2, - "122": 7, - "123": 7 + "122": -1, + "123": -1 }, "c2s": { "0": 3, @@ -2356,6 +2180,182 @@ "56": 2, "57": 2 } + }, + "1073741953": { + "s2c": { + "0": -2147483648, + "1": 2, + "2": 2, + "3": 1, + "4": 2, + "5": -1, + "6": 1, + "7": 7, + "8": 7, + "9": 7, + "10": 7, + "11": 1, + "12": 1, + "13": 7, + "14": 1, + "15": 1, + "16": 1, + "17": 3, + "18": 3, + "19": 3, + "20": 3, + "21": 1, + "22": 1, + "23": 3, + "24": 2, + "25": 1, + "26": -1, + "27": 1, + "28": 2, + "29": 2, + "30": 7, + "31": 2, + "32": 3, + "33": 2, + "34": 3, + "35": -1, + "36": 7, + "37": 7, + "38": 4, + "39": 7, + "40": 2, + "41": 4, + "42": 3, + "43": 2, + "44": 2, + "45": 2, + "46": 2, + "47": 3, + "48": 3, + "49": 7, + "50": -1, + "51": 3, + "52": 2, + "53": 1, + "54": 2, + "55": 2, + "56": 1, + "57": 1, + "58": 1, + "59": 1, + "60": 1, + "61": 3, + "62": 2, + "63": 2, + "64": -1, + "65": 3, + "66": 2, + "67": 7, + "68": -1, + "69": 1, + "70": 1, + "71": 3, + "72": 3, + "73": 3, + "74": 3, + "75": 3, + "76": 2, + "77": 3, + "78": 7, + "79": 7, + "80": 2, + "81": 1, + "82": 2, + "83": 2, + "84": 2, + "85": 2, + "86": 1, + "87": 1, + "88": 1, + "89": 2, + "90": 1, + "91": 1, + "92": 7, + "93": 1, + "94": 1, + "95": 1, + "96": 1, + "97": 4, + "98": 4, + "99": 4, + "100": 1, + "101": 1, + "102": 3, + "103": 2, + "104": 2, + "105": 1, + "106": 2, + "107": 2, + "108": 2, + "109": 1, + "110": 1, + "111": 1, + "112": 1, + "113": 1, + "114": 1, + "115": 1, + "116": 1 + }, + "c2s": { + "0": 3, + "1": 3, + "2": 1, + "3": 1, + "4": 1, + "5": 1, + "6": 1, + "7": 3, + "8": 1, + "9": 1, + "10": 1, + "11": 1, + "12": 3, + "13": 3, + "14": 3, + "15": 3, + "16": 2, + "17": 7, + "18": -1, + "19": 1, + "20": 2, + "21": 2, + "22": 2, + "23": 2, + "24": 2, + "25": 2, + "26": 3, + "27": 3, + "28": 3, + "29": 1, + "30": 1, + "31": 1, + "32": -1, + "33": 3, + "34": 3, + "35": 3, + "36": -1, + "37": -1, + "38": 3, + "39": 3, + "40": 3, + "41": 3, + "42": 3, + "43": 3, + "44": 3, + "45": 3, + "46": 7, + "47": 2, + "48": 3, + "49": 2, + "50": 2, + "51": 1, + "52": 2 + } } } } \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index 0e254b5..3538aa4 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -119,6 +119,7 @@ if (System.getenv("CURSEFORGE_TOKEN")) { addGameVersion "1.20.4" addGameVersion "1.20.5" addGameVersion "1.20.6" + addGameVersion "1.21" addGameVersion "Fabric" addGameVersion "Java 17" addGameVersion "Java 18" diff --git a/fabric/src/main/java/com/ishland/raknetify/fabric/common/connection/RakNetMultiChannel.java b/fabric/src/main/java/com/ishland/raknetify/fabric/common/connection/RakNetMultiChannel.java index bb1e8db..9238e95 100644 --- a/fabric/src/main/java/com/ishland/raknetify/fabric/common/connection/RakNetMultiChannel.java +++ b/fabric/src/main/java/com/ishland/raknetify/fabric/common/connection/RakNetMultiChannel.java @@ -82,6 +82,9 @@ private static Set> createClassSet(String[] classNames) { "net/minecraft/class_2935", // QueryPingC2SPacket "net/minecraft/class_2923", // PingResultS2CPacket + + "net/minecraft/class_9814", // CustomReportDetailsS2CPacket + "net/minecraft/class_9815", // ServerLinksS2CPacket }); private static final Set> channel0 = createClassSet(new String[]{ diff --git a/genMappings.sh b/genMappings.sh index 28bcde6..b3402c3 100755 --- a/genMappings.sh +++ b/genMappings.sh @@ -5,7 +5,7 @@ installer_version=1.0.1 #declare -a vers if [[ -z "$@" ]]; then - vers="1.17 1.17.1 1.18.1 1.18.2 1.19 1.19.2 1.19.3 1.19.4 23w13a_or_b 1.20.1 1.20.2 1.20.4 1.20.6 1.21-rc1" + vers="1.17 1.17.1 1.18.1 1.18.2 1.19 1.19.2 1.19.3 1.19.4 23w13a_or_b 1.20.1 1.20.2 1.20.4 1.20.6 1.21" else vers=$@ fi diff --git a/gradle.properties b/gradle.properties index 5927799..167b225 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,8 +6,8 @@ org.gradle.parallel=true # check these on https://fabricmc.net/develop # # Also don't forget to gen mappings in genMappings.sh -minecraft_version=1.21-rc1 -yarn_mappings=1.21-rc1+build.1 +minecraft_version=1.21 +yarn_mappings=1.21+build.1 loader_version=0.15.11 # Mod Properties