Merge remote-tracking branch 'upstream/master'

Author: Skullians

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

@@ -87,8 +87,9 @@ public static TextureAtlases fromAtlasesFolder(ResourcePackFile folder) {
                             String sprite = (String) sourceJson.getOrDefault("sprite", resource);
                             textureAtlasSource = new TextureAtlasSingleSource(resource, sprite);
                         } else if (sourceType.equals(TextureAtlasSourceType.FILTER)) {
-                            Pattern namespace = Pattern.compile((String) sourceJson.get("namespace"));
-                            Pattern path = Pattern.compile((String) sourceJson.get("path"));
+                            JSONObject patternJson = (JSONObject) sourceJson.get("pattern");
+                            Pattern namespace = Pattern.compile((String) patternJson.get("namespace"));
+                            Pattern path = Pattern.compile((String) patternJson.get("path"));
                             textureAtlasSource = new TextureAtlasFilterSource(namespace, path);
                         } else if (sourceType.equals(TextureAtlasSourceType.UNSTITCH)) {
                             String resource = (String) sourceJson.get("resource");

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

@@ -45,7 +45,7 @@ public class TextureResource {
     private final String resourceKey;
     @Getter
     private final ResourcePackFile file;
-    private final  boolean isTexture;
+    private final boolean isTexture;
     private Reference<BufferedImage> texture;
     @Getter
     private final UnaryOperator<BufferedImage> imageTransformFunction;