From f8c0b8feb07458cea99f6b8a5f951c6610d50731 Mon Sep 17 00:00:00 2001 From: Woder <17339354+wode490390@users.noreply.github.com> Date: Thu, 11 Jul 2024 21:37:42 +0800 Subject: [PATCH] Add support for RTX --- src/main/java/cn/nukkit/entity/data/Skin.java | 2 +- .../cn/nukkit/resourcepacks/AbstractResourcePack.java | 9 +++++++++ src/main/java/cn/nukkit/resourcepacks/ResourcePack.java | 3 +++ .../java/cn/nukkit/resourcepacks/ZippedResourcePack.java | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/cn/nukkit/entity/data/Skin.java b/src/main/java/cn/nukkit/entity/data/Skin.java index 70774e57b9e..dfe3d4e6d70 100644 --- a/src/main/java/cn/nukkit/entity/data/Skin.java +++ b/src/main/java/cn/nukkit/entity/data/Skin.java @@ -483,7 +483,7 @@ public static SerializedImage parseBufferedImage(BufferedImage image) { } private static String convertLegacyGeometryName(String geometryName) { - return "{\"geometry\" : {\"default\" : \"" + geometryName + "\"}}"; + return "{\"geometry\":{\"default\":\"" + geometryName + "\"}}"; } @Override diff --git a/src/main/java/cn/nukkit/resourcepacks/AbstractResourcePack.java b/src/main/java/cn/nukkit/resourcepacks/AbstractResourcePack.java index c2f29e7f51a..3050c7fac6e 100644 --- a/src/main/java/cn/nukkit/resourcepacks/AbstractResourcePack.java +++ b/src/main/java/cn/nukkit/resourcepacks/AbstractResourcePack.java @@ -2,6 +2,9 @@ import lombok.ToString; +import java.util.ArrayList; +import java.util.List; + @ToString public abstract class AbstractResourcePack implements ResourcePack { protected PackManifest manifest; @@ -9,6 +12,7 @@ public abstract class AbstractResourcePack implements ResourcePack { protected String id; protected String version; protected String type; + protected final List capabilities = new ArrayList<>(); @Override public String getPackName() { @@ -30,6 +34,11 @@ public String getPackType() { return type; } + @Override + public List getCapabilities() { + return capabilities; + } + @Override public String getEncryptionKey() { return ""; diff --git a/src/main/java/cn/nukkit/resourcepacks/ResourcePack.java b/src/main/java/cn/nukkit/resourcepacks/ResourcePack.java index 47a169601ef..c05c5292ee0 100644 --- a/src/main/java/cn/nukkit/resourcepacks/ResourcePack.java +++ b/src/main/java/cn/nukkit/resourcepacks/ResourcePack.java @@ -1,6 +1,7 @@ package cn.nukkit.resourcepacks; import javax.annotation.Nullable; +import java.util.List; public interface ResourcePack { String getPackName(); @@ -11,6 +12,8 @@ public interface ResourcePack { String getPackType(); + List getCapabilities(); + int getPackSize(); byte[] getSha256(); diff --git a/src/main/java/cn/nukkit/resourcepacks/ZippedResourcePack.java b/src/main/java/cn/nukkit/resourcepacks/ZippedResourcePack.java index 9dbc552e32c..131ab4d1121 100644 --- a/src/main/java/cn/nukkit/resourcepacks/ZippedResourcePack.java +++ b/src/main/java/cn/nukkit/resourcepacks/ZippedResourcePack.java @@ -70,6 +70,7 @@ public ZippedResourcePack(File file, boolean encrypt) throws IOException { .findFirst() .map(Module::getType) .orElse("resources"); + capabilities.addAll(manifest.getCapabilities()); String encryptionKey; if (RESOURCE_PACK_ENCRYPTION && encrypt) {