Skip to content

Commit 7f29ac8

Browse files
committed
Fixed parsing filter texture atlases
1 parent e3b38d8 commit 7f29ac8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

common/src/main/java/com/loohp/interactivechatdiscordsrvaddon/resources/TextureAtlases.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@ public static TextureAtlases fromAtlasesFolder(ResourcePackFile folder) {
8585
String sprite = (String) sourceJson.getOrDefault("sprite", resource);
8686
textureAtlasSource = new TextureAtlasSingleSource(resource, sprite);
8787
} else if (sourceType.equals(TextureAtlasSourceType.FILTER)) {
88-
Pattern namespace = Pattern.compile((String) sourceJson.get("namespace"));
89-
Pattern path = Pattern.compile((String) sourceJson.get("path"));
88+
JSONObject patternJson = (JSONObject) sourceJson.get("pattern");
89+
Pattern namespace = Pattern.compile((String) patternJson.get("namespace"));
90+
Pattern path = Pattern.compile((String) patternJson.get("path"));
9091
textureAtlasSource = new TextureAtlasFilterSource(namespace, path);
9192
} else if (sourceType.equals(TextureAtlasSourceType.UNSTITCH)) {
9293
String resource = (String) sourceJson.get("resource");

common/src/main/java/com/loohp/interactivechatdiscordsrvaddon/resources/textures/TextureResource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class TextureResource {
4141
private final ITextureManager manager;
4242
private final String resourceKey;
4343
private final ResourcePackFile file;
44-
private final boolean isTexture;
44+
private final boolean isTexture;
4545
private Reference<BufferedImage> texture;
4646
private final UnaryOperator<BufferedImage> imageTransformFunction;
4747

0 commit comments

Comments
 (0)