Merge remote-tracking branch 'origin/1.16.5-forge' into 1.17.1-forge

Author: Goldenfield192

src/main/java/cam72cam/mod/resource/BuiltinPack.java

@@ -22,6 +22,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -256,7 +258,7 @@ && handleRedirect(ident, entry.getKey(), entry.getValue()).canLoad()) {
         }
 
         @Override
-        public Collection<ResourceLocation> getResources(PackType type, String pathIn, String namespace, int maxDepth, Predicate<String> filter) {
+        public Collection<ResourceLocation> getResources(PackType type, String namespace, String pathIn, int maxDepth, Predicate<String> filter) {
             //TODO list all redirect/conditional resources, may need new parameters in API?
             List<ResourceLocation> result = new ArrayList<>();
             final String folder = pathIn + "/"; // Ensure folders
@@ -359,7 +361,12 @@ public InternalDataPack() {
         @Override
         public InputStream getResource(String resourcePath) throws IOException {
             if("pack.mcmeta".equals(resourcePath)) {
-                return new ByteArrayInputStream("{}".getBytes());
+                return new ByteArrayInputStream(("{\n" +
+                                                 "  \"pack\": {\n" +
+                                                 "    \"description\": \"UMC Generated Data\",\n" +
+                                                 "    \"pack_format\": 7\n" +
+                                                 "  }\n" +
+                                                 "}").getBytes(StandardCharsets.UTF_8));
             }
 
             return new ByteArrayInputStream(data.get(nameToLocation(resourcePath).internal));
@@ -371,7 +378,7 @@ public boolean hasResource(String resourcePath) {
         }
 
         @Override
-        public Collection<ResourceLocation> getResources(PackType type, String pathIn, String namespace, int maxDepth, Predicate<String> filter) {
+        public Collection<ResourceLocation> getResources(PackType type, String namespace, String pathIn, int maxDepth, Predicate<String> filter) {
             List<ResourceLocation> result = new ArrayList<>();
             final String folder = pathIn + "/"; // Ensure folders
             data.keySet().forEach((k) -> {