Merge remote-tracking branch 'origin/1.18.2-forge' into 1.19.4-forge

Author: Goldenfield192

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

@@ -27,6 +27,8 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -274,7 +276,7 @@ && handleRedirect(ident, entry.getKey(), entry.getValue()).canLoad()) {
         }
 
         @Override
-        public void listResources(PackType type, String pathIn, String namespace, PackResources.ResourceOutput output) {
+        public void listResources(PackType type, String namespace, String pathIn, PackResources.ResourceOutput output) {
             //TODO list all redirect/conditional resources, may need new parameters in API?
             final String folder = pathIn + "/"; // Ensure folders
             DIRECT_RESOURCES.forEach((k, v) -> {
@@ -375,7 +377,12 @@ public IoSupplier<InputStream> getResource(PackType type, ResourceLocation loc)
 
         private 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\": 12\n" +
+                                                 "  }\n" +
+                                                 "}").getBytes(StandardCharsets.UTF_8));
             }
 
             return new ByteArrayInputStream(data.get(nameToLocation(resourcePath).internal));
@@ -386,7 +393,7 @@ private boolean hasResource(String resourcePath) {
         }
 
         @Override
-        public void listResources(PackType type, String pathIn, String namespace, PackResources.ResourceOutput output) {
+        public void listResources(PackType type, String namespace, String pathIn, PackResources.ResourceOutput output) {
             List<ResourceLocation> result = new ArrayList<>();
             final String folder = pathIn + "/"; // Ensure folders
             data.keySet().forEach((k) -> {