From 662bea324ca1f6248fcf19b4dd096b9371287557 Mon Sep 17 00:00:00 2001
From: PersonTheCat <professionallyperson@gmail.com>
Date: Tue, 4 Jun 2024 09:40:42 -0500
Subject: [PATCH 1/3] Update Framework version

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 86dfb3e7..d4947d21 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,7 @@ mod_issues=https://github.com/MrCrayfish/Configured/issues
 mod_license=GNU Lesser General Public License v3.0
 
 # Dependency options
-framework_version=0.8.8
+framework_version=0.8.13
 jei_version=17.3.0.48
 catalogue_version=1.10.1
 

From ebf8976fc854e200623ee4da66d463d09adb68f4 Mon Sep 17 00:00:00 2001
From: PersonTheCat <professionallyperson@gmail.com>
Date: Tue, 4 Jun 2024 09:41:38 -0500
Subject: [PATCH 2/3] Tolerate unconfigured builds

---
 .../src/main/groovy/multiloader-common.gradle | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle
index 9d0c6f4e..40799440 100644
--- a/buildSrc/src/main/groovy/multiloader-common.gradle
+++ b/buildSrc/src/main/groovy/multiloader-common.gradle
@@ -41,25 +41,29 @@ repositories {
             includeGroupAndSubgroups("com.terraformersmc")
         }
     }
-    exclusiveContent {
-        forRepository {
-            maven {
-                name = "MrCrayfish (GitHub)"
-                url = "https://maven.pkg.github.com/MrCrayfish/Maven"
-                credentials {
-                    username = findProperty("gpr.user") ?: System.getenv("GPR_USER")
-                    password = findProperty("gpr.key") ?: System.getenv("GPR_KEY")
+    if (findProperty("gpr.user") ?: System.getenv("GPR_USER")) {
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = "MrCrayfish (GitHub)"
+                    url = "https://maven.pkg.github.com/MrCrayfish/Maven"
+                    credentials {
+                        username = findProperty("gpr.user") ?: System.getenv("GPR_USER")
+                        password = findProperty("gpr.key") ?: System.getenv("GPR_KEY")
+                    }
                 }
             }
-        }
-        filter {
-            includeGroupAndSubgroups("com.mrcrayfish")
+            filter {
+                includeGroupAndSubgroups("com.mrcrayfish")
+            }
         }
     }
-    if (!System.getenv("CI")) {
+    if (System.getenv("LOCAL_MAVEN") && !System.getenv("CI")) {
         maven {
-            url "file://" + System.getenv("LOCAL_MAVEN")
+            url "file://${System.getenv("LOCAL_MAVEN")}"
         }
+    } else {
+        mavenLocal()
     }
     maven {
         name = 'BlameJared'

From ec187d880bb1d9175f601930d2223fe4e8d6f333 Mon Sep 17 00:00:00 2001
From: PersonTheCat <professionallyperson@gmail.com>
Date: Tue, 4 Jun 2024 12:20:16 -0500
Subject: [PATCH 3/3] Fix crash parsing list entries

---
 .../client/screen/list/ListType.java          | 20 ++++++++++++++++++-
 gradle.properties                             |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/mrcrayfish/configured/client/screen/list/ListType.java b/common/src/main/java/com/mrcrayfish/configured/client/screen/list/ListType.java
index ae2a711f..30bbab6b 100644
--- a/common/src/main/java/com/mrcrayfish/configured/client/screen/list/ListType.java
+++ b/common/src/main/java/com/mrcrayfish/configured/client/screen/list/ListType.java
@@ -1,5 +1,6 @@
 package com.mrcrayfish.configured.client.screen.list;
 
+import com.mrcrayfish.configured.Constants;
 import net.minecraft.network.chat.Component;
 
 import java.util.function.Function;
@@ -13,7 +14,7 @@ public class ListType<T> implements IListType<T>
     public ListType(Function<T, String> stringParser, Function<String, T> valueParser, String hintKey)
     {
         this.stringParser = stringParser;
-        this.valueParser = valueParser;
+        this.valueParser = new ErrorSuppressingParserWrapper<>(valueParser);
         this.hintKey = hintKey;
     }
 
@@ -34,4 +35,21 @@ public Component getHint()
     {
         return Component.translatable(this.hintKey);
     }
+
+    private record ErrorSuppressingParserWrapper<T>(Function<String, T> wrapped) implements Function<String, T>
+    {
+        @Override
+        public T apply(String s)
+        {
+            try
+            {
+                return this.wrapped.apply(s);
+            }
+            catch(RuntimeException e)
+            {
+                Constants.LOG.debug(String.format("Suppressing error parsing value: %s", s), e);
+                return null;
+            }
+        }
+    }
 }
diff --git a/gradle.properties b/gradle.properties
index d4947d21..21e49330 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ fabric_version=0.97.8+1.20.6
 fabric_loader_version=0.15.10
 
 # NeoForge
-neoforge_version=20.6.48-beta
+neoforge_version=20.6.99-beta
 neoforge_version_range=[20.6,)
 neoforge_loader_version_range=[2,)