From 95c0aa1e981ad89d328e8e142a1f0ce7baa96cdc Mon Sep 17 00:00:00 2001
From: Cyborgmas <cyborgmas18@gmail.com>
Date: Mon, 23 Aug 2021 13:52:17 -0400
Subject: [PATCH] Minor resource pack related fixes (#7884)

---
 mdk/src/main/resources/pack.mcmeta                            | 3 +--
 .../minecraftforge/fmllegacy/packs/ModFileResourcePack.java   | 4 ++--
 .../minecraftforge/fmllegacy/packs/ResourcePackLoader.java    | 2 +-
 src/main/resources/pack.mcmeta                                | 2 +-
 src/test/resources/pack.mcmeta                                | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/mdk/src/main/resources/pack.mcmeta b/mdk/src/main/resources/pack.mcmeta
index c79a3626c9..9a208763dd 100644
--- a/mdk/src/main/resources/pack.mcmeta
+++ b/mdk/src/main/resources/pack.mcmeta
@@ -1,7 +1,6 @@
 {
     "pack": {
         "description": "examplemod resources",
-        "pack_format": 6,
-        "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods."
+        "pack_format": 7
     }
 }
diff --git a/src/main/java/net/minecraftforge/fmllegacy/packs/ModFileResourcePack.java b/src/main/java/net/minecraftforge/fmllegacy/packs/ModFileResourcePack.java
index 23482ce84a..dd79352875 100644
--- a/src/main/java/net/minecraftforge/fmllegacy/packs/ModFileResourcePack.java
+++ b/src/main/java/net/minecraftforge/fmllegacy/packs/ModFileResourcePack.java
@@ -20,12 +20,12 @@
 package net.minecraftforge.fmllegacy.packs;
 
 import net.minecraft.server.packs.AbstractPackResources;
-import net.minecraft.server.packs.ResourcePackFileNotFoundException;
 import net.minecraft.server.packs.repository.Pack;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.resources.ResourceLocation;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -66,7 +66,7 @@ public class ModFileResourcePack extends AbstractPackResources
     {
         final Path path = modFile.findResource(name);
         if(!Files.exists(path))
-            throw new ResourcePackFileNotFoundException(modFile.getFilePath().toFile(), name);
+            throw new FileNotFoundException("Can't find resource " + name + " at " + modFile.getFilePath().toString());
         return Files.newInputStream(path, StandardOpenOption.READ);
     }
 
diff --git a/src/main/java/net/minecraftforge/fmllegacy/packs/ResourcePackLoader.java b/src/main/java/net/minecraftforge/fmllegacy/packs/ResourcePackLoader.java
index 25684ad1c8..0f01e62064 100644
--- a/src/main/java/net/minecraftforge/fmllegacy/packs/ResourcePackLoader.java
+++ b/src/main/java/net/minecraftforge/fmllegacy/packs/ResourcePackLoader.java
@@ -61,7 +61,7 @@ public class ResourcePackLoader {
     }
 
     public static List<String> getPackNames() {
-        return ModList.get().applyForEachModFile(mf->"mod:"+mf.getModInfos().get(0).getModId()).collect(Collectors.toList());
+        return ModList.get().applyForEachModFile(mf->"mod:"+mf.getModInfos().get(0).getModId()).filter(n->!n.equals("mod:minecraft")).collect(Collectors.toList());
     }
 
     public static <V> Comparator<Map.Entry<String,V>> getSorter() {
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
index f9c8a4975c..0f2303f560 100644
--- a/src/main/resources/pack.mcmeta
+++ b/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
    "pack": {
-      "pack_format": 6,
+      "pack_format": 7,
       "description": "Forge resource pack"
    }
 }
diff --git a/src/test/resources/pack.mcmeta b/src/test/resources/pack.mcmeta
index b46b1a9d20..3f41e9bf86 100644
--- a/src/test/resources/pack.mcmeta
+++ b/src/test/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
    "pack": {
-      "pack_format": 6,
+      "pack_format": 7,
       "description": "Forge tests resource pack"
    }
 }