Add 1.16_combat-6 support

This commit is contained in:
SKBotNL committed 2025-10-09 23:44:41 +02:00
1 parent 9072350ac8
commit 09022689d0
3 files changed
+16 -6

No files matched your search

+1 -1
View File
@@ -11,7 +11,7 @@ plugins {
alias(libs.plugins.eclipseApt) apply false
}
group = "org.spongepowered"
group = "nl.skbotnl.sponge"
version = "0.2.1-SNAPSHOT"
@@ -34,14 +34,11 @@ import org.spongepowered.gradle.vanilla.resolver.HashAlgorithm;
import org.spongepowered.gradle.vanilla.resolver.ResolutionResult;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
@@ -102,6 +99,18 @@ final class DownloaderBasedVersionManifestRepository implements VersionManifestR
@Override
public CompletableFuture<ResolutionResult<VersionDescriptor.Full>> fullVersion(final String versionId) {
if (versionId.equals("1.16_combat-6")) {
try (InputStreamReader reader = new InputStreamReader(
Objects.requireNonNull(getClass().getClassLoader().getResourceAsStream("1_16_combat-6.json")))) {
return CompletableFuture.completedFuture(
ResolutionResult.result(
GsonUtils.GSON.fromJson(reader, VersionDescriptor.Full.class), true
)
);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
return this.resolvedVersions.computeIfAbsent(versionId, version -> this.manifest().thenCompose(manifest -> {
final VersionDescriptor.@Nullable Reference option = manifest.findDescriptor(version).orElse(null);
if (option == null) {
@@ -0,0 +1 @@
{"arguments": {"game": ["--username", "${auth_player_name}", "--version", "${version_name}", "--gameDir", "${game_directory}", "--assetsDir", "${assets_root}", "--assetIndex", "${assets_index_name}", "--uuid", "${auth_uuid}", "--accessToken", "${auth_access_token}", "--userType", "${user_type}", "--versionType", "${version_type}", {"rules": [{"action": "allow", "features": {"is_demo_user": true}}], "value": "--demo"}, {"rules": [{"action": "allow", "features": {"has_custom_resolution": true}}], "value": ["--width", "${resolution_width}", "--height", "${resolution_height}"]}], "jvm": [{"rules": [{"action": "allow", "os": {"name": "osx"}}], "value": ["-XstartOnFirstThread"]}, {"rules": [{"action": "allow", "os": {"name": "windows"}}], "value": "-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump"}, {"rules": [{"action": "allow", "os": {"name": "windows", "version": "^10\\."}}], "value": ["-Dos.name=Windows 10", "-Dos.version=10.0"]}, {"rules": [{"action": "allow", "os": {"arch": "x86"}}], "value": "-Xss1M"}, "-Djava.library.path=${natives_directory}", "-Dminecraft.launcher.brand=${launcher_name}", "-Dminecraft.launcher.version=${launcher_version}", "-cp", "${classpath}"]}, "assetIndex": {"id": "1.16", "sha1": "bdb68de96a44ec1e9ed6d9cfcd2ee973be618c3a", "size": 295417, "totalSize": 329202599, "url": "https://launchermeta.mojang.com/v1/packages/bdb68de96a44ec1e9ed6d9cfcd2ee973be618c3a/1.16.json"}, "assets": "1.16", "downloads": {"client": {"sha1": "177472ace3ff5d98fbd63b4bcd5bbef5b035a018", "size": 17523426, "url": "https://launcher.mojang.com/v1/objects/177472ace3ff5d98fbd63b4bcd5bbef5b035a018/client.jar"}, "client_mappings": {"sha1": "5ea38a7b8d58837c97214f2a46e5e12151d51f83", "size": 5729201, "url": "https://launcher.mojang.com/v1/objects/5ea38a7b8d58837c97214f2a46e5e12151d51f83/client.txt"}, "server": {"sha1": "b707c44ac1503ad179fde86c78d41aa4d0cc78a5", "size": 37945325, "url": "https://launcher.mojang.com/v1/objects/b707c44ac1503ad179fde86c78d41aa4d0cc78a5/server.jar"}, "server_mappings": {"sha1": "d89f9e0eb8fbe6f2c91e749e8b59391cd0dd96d4", "size": 4397606, "url": "https://launcher.mojang.com/v1/objects/d89f9e0eb8fbe6f2c91e749e8b59391cd0dd96d4/server.txt"}}, "id": "1.16_combat-6", "libraries": [{"downloads": {"artifact": {"path": "com/mojang/patchy/1.1/patchy-1.1.jar", "sha1": "aef610b34a1be37fa851825f12372b78424d8903", "size": 15817, "url": "https://libraries.minecraft.net/com/mojang/patchy/1.1/patchy-1.1.jar"}}, "name": "com.mojang:patchy:1.1"}, {"downloads": {"artifact": {"path": "oshi-project/oshi-core/1.1/oshi-core-1.1.jar", "sha1": "9ddf7b048a8d701be231c0f4f95fd986198fd2d8", "size": 30973, "url": "https://libraries.minecraft.net/oshi-project/oshi-core/1.1/oshi-core-1.1.jar"}}, "name": "oshi-project:oshi-core:1.1"}, {"downloads": {"artifact": {"path": "net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar", "sha1": "cb208278274bf12ebdb56c61bd7407e6f774d65a", "size": 1091208, "url": "https://libraries.minecraft.net/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar"}}, "name": "net.java.dev.jna:jna:4.4.0"}, {"downloads": {"artifact": {"path": "net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar", "sha1": "e3f70017be8100d3d6923f50b3d2ee17714e9c13", "size": 913436, "url": "https://libraries.minecraft.net/net/java/dev/jna/platform/3.4.0/platform-3.4.0.jar"}}, "name": "net.java.dev.jna:platform:3.4.0"}, {"downloads": {"artifact": {"path": "com/ibm/icu/icu4j/66.1/icu4j-66.1.jar", "sha1": "72c7519b6d91f7a1f993bd44a99fe95d67211b27", "size": 12935630, "url": "https://libraries.minecraft.net/com/ibm/icu/icu4j/66.1/icu4j-66.1.jar"}}, "name": "com.ibm.icu:icu4j:66.1"}, {"downloads": {"artifact": {"path": "com/mojang/javabridge/1.0.22/javabridge-1.0.22.jar", "sha1": "6aa6453aa99a52a5cd91749da1af6ab70e082ab3", "size": 5111, "url": "https://libraries.minecraft.net/com/mojang/javabridge/1.0.22/javabridge-1.0.22.jar"}}, "name": "com.mojang:javabridge:1.0.22"}, {"downloads": {"artifact": {"path": "net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar", "sha1": "cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a", "size": 78175, "url": "https://libraries.minecraft.net/net/sf/jopt-simple/jopt-simple/5.0.3/jopt-simple-5.0.3.jar"}}, "name": "net.sf.jopt-simple:jopt-simple:5.0.3"}, {"downloads": {"artifact": {"path": "io/netty/netty-all/4.1.25.Final/netty-all-4.1.25.Final.jar", "sha1": "d0626cd3108294d1d58c05859add27b4ef21f83b", "size": 3823147, "url": "https://libraries.minecraft.net/io/netty/netty-all/4.1.25.Final/netty-all-4.1.25.Final.jar"}}, "name": "io.netty:netty-all:4.1.25.Final"}, {"downloads": {"artifact": {"path": "com/google/guava/guava/21.0/guava-21.0.jar", "sha1": "3a3d111be1be1b745edfa7d91678a12d7ed38709", "size": 2521113, "url": "https://libraries.minecraft.net/com/google/guava/guava/21.0/guava-21.0.jar"}}, "name": "com.google.guava:guava:21.0"}, {"downloads": {"artifact": {"path": "org/apache/commons/commons-lang3/3.5/commons-lang3-3.5.jar", "sha1": "6c6c702c89bfff3cd9e80b04d668c5e190d588c6", "sizeLine truncated