From 92eb9221de6c53d22f9c10075a7156e9368a067b Mon Sep 17 00:00:00 2001
From: Luke Bemish <lukebemish@lukebemish.dev>
Date: Thu, 21 Dec 2023 13:21:38 +0000
Subject: [PATCH] Begin 1.20.4 update

---
 gradle/libs.versions.toml                     | 22 +++++++++----------
 .../impl/neoforge/ResourceDegrouperImpl.java  | 12 ++--------
 version.properties                            |  2 +-
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d2ba4c4b..c12b87d8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,28 +1,28 @@
 [versions]
-minecraft = "1.20.2"
-parchment_minecraft = "1.20.1"
-parchment_mappings = "2023.08.20"
+minecraft = "1.20.4"
+parchment_minecraft = "1.20.2"
+parchment_mappings = "2023.12.10"
 
-neoforge = "20.2.59-beta"
+neoforge = "20.4.48-beta"
 
 fabric_loader = "0.14.24"
-fabric_api = "0.90.4+1.20.2"
+fabric_api = "0.91.3+1.20.4"
 
 mdg_plugin = "1.4.3"
 mdg_dsl = "1.5.1"
 autoservice = "1.1.1"
 
-architectury_loom = "1.4.367"
+architectury_loom = "1.4.373"
 quilt_licenser = "2.0.1"
 
-jetbrains_annotations = "24.0.1"
+jetbrains_annotations = "24.1.0"
 jspecify = "0.3.0"
 
-minotaur = "2.8.3"
+minotaur = "2.8.7"
 
-owolib = "0.11.0+1.20"
+owolib = "0.11.4+1.20.2"
 
-managedversioning = "1.2.2"
+managedversioning = "1.2.3"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
@@ -46,4 +46,4 @@ mdg_plugin = { id = "org.groovymc.modsdotgroovy", version.ref = "mdg_plugin" }
 architectury_loom = { id = "dev.architectury.loom", version.ref = "architectury_loom" }
 quilt_licenser = { id = "org.quiltmc.gradle.licenser", version.ref = "quilt_licenser" }
 minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }
-curseforgegradle = {id = "net.darkhax.curseforgegradle", version = "1.1.16"}
+curseforgegradle = {id = "net.darkhax.curseforgegradle", version = "1.1.18"}
diff --git a/neoforge/src/main/java/dev/lukebemish/dynamicassetgenerator/impl/neoforge/ResourceDegrouperImpl.java b/neoforge/src/main/java/dev/lukebemish/dynamicassetgenerator/impl/neoforge/ResourceDegrouperImpl.java
index 091cfded..fe2c6f55 100644
--- a/neoforge/src/main/java/dev/lukebemish/dynamicassetgenerator/impl/neoforge/ResourceDegrouperImpl.java
+++ b/neoforge/src/main/java/dev/lukebemish/dynamicassetgenerator/impl/neoforge/ResourceDegrouperImpl.java
@@ -8,21 +8,13 @@
 import com.google.auto.service.AutoService;
 import dev.lukebemish.dynamicassetgenerator.impl.platform.services.ResourceDegrouper;
 import net.minecraft.server.packs.PackResources;
-import net.neoforged.neoforge.resource.DelegatingPackResources;
 
 import java.util.stream.Stream;
 
 @AutoService(ResourceDegrouper.class)
 public class ResourceDegrouperImpl implements ResourceDegrouper {
     public Stream<PackResources> unpackPacks(Stream<PackResources> packs) {
-        return packs.flatMap(pack -> {
-            if (pack instanceof DelegatingPackResources delegatingPackResources) {
-                var children = delegatingPackResources.getChildren();
-                if (children != null) {
-                    return Stream.concat(Stream.of(pack), unpackPacks(children.stream()));
-                }
-            }
-            return Stream.of(pack);
-        });
+        // On modern neoforge, no flattening is needed!
+        return packs;
     }
 }
diff --git a/version.properties b/version.properties
index 78b9e9a1..42ba350d 100644
--- a/version.properties
+++ b/version.properties
@@ -1 +1 @@
-version=5.0.0
+version=5.1.0