From 7e714334e92088c6d42a7d941365bed161bbfc82 Mon Sep 17 00:00:00 2001
From: Dragon-Seeker <timekeeperguild@gmail.com>
Date: Mon, 1 Jan 2024 16:11:42 -0600
Subject: [PATCH] Update dependency versions

---
 build.gradle                                  | 20 +------------------
 gradle.properties                             |  8 ++++----
 .../recipe/CountedIngredient.java             |  4 ++--
 src/main/resources/fabric.mod.json            |  6 +++---
 4 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/build.gradle b/build.gradle
index 233ddc3..078e2f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,25 +35,7 @@ dependencies {
     modCompileOnly ("me.shedaniel.cloth:basic-math:0.6.1")
 
     modLocalRuntime ("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}")
-
-//    modCompileOnly ("me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}") {
-//        exclude(module: "cloth-config-fabric")
-//    }
-//    modCompileOnly ("me.shedaniel.cloth:basic-math:0.6.1")
-//    modCompileOnly ("dev.architectury:architectury-fabric:11.0.8")
-//
-//    modLocalRuntime ("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}") {
-//        exclude(module: "cloth-config-fabric")
-//        exclude(module: "architectury-fabric")
-//    }
-//    modLocalRuntime ("me.shedaniel.cloth:cloth-config-fabric:13.0.114") {
-//        exclude(module: "fabric-api")
-//        exclude(module: "architectury-fabric")
-//    }
-
-    //modLocalRuntime ("dev.architectury:architectury-fabric:11.0.8") { exclude(module: "fabric-api") }
-
-    //modLocalRuntime "dev.architectury:architectury-fabric:${project.arch_version}"
+    modLocalRuntime ("dev.architectury:architectury-fabric:11.0.9") { exclude(module: "fabric-api") }
 
     modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
 
diff --git a/gradle.properties b/gradle.properties
index bf452d7..423881b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,10 +2,10 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_base_version=1.20
+minecraft_base_version=1.20.4
 minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.2
-loader_version=0.15.1
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.3
 # Mod Properties
 mod_version=2.1.2
 maven_group=io.wispforest
@@ -17,6 +17,6 @@ rei_version=14.0.688
 # https://www.curseforge.com/minecraft/mc-mods/modmenu/files
 modmenu_version=9.0.0
 # https://maven.wispforest.io/io/wispforest/owo-lib
-owo_version=0.12.0-pre.5.1+1.20.3
+owo_version=0.12.0+1.20.3
 # https://maven.terraformersmc.com/releases/dev/emi/emi
 emi_version=1.0.29+1.20.4
diff --git a/src/main/java/wraith/alloyforgery/recipe/CountedIngredient.java b/src/main/java/wraith/alloyforgery/recipe/CountedIngredient.java
index 6512440..6042f95 100644
--- a/src/main/java/wraith/alloyforgery/recipe/CountedIngredient.java
+++ b/src/main/java/wraith/alloyforgery/recipe/CountedIngredient.java
@@ -15,11 +15,11 @@ public record CountedIngredient(Ingredient ingredient, int count) {
         var object = element.<Map<String, EdmElement<?>>>cast();
 
         return new CountedIngredient(
-                EndecUtils.INGREDIENT.decode(new EdmDeserializer(element)),
+                EndecUtils.INGREDIENT.decode(EdmDeserializer.of(element)),
                 object.containsKey("count") ? object.get("count").<Number>cast().intValue() : 1
         );
     }, countedIngredient -> {
-        var element = (EdmElement<Map<String, EdmElement<?>>>) EndecUtils.INGREDIENT.encodeFully(EdmSerializer::new, countedIngredient.ingredient());
+        var element = (EdmElement<Map<String, EdmElement<?>>>) EndecUtils.INGREDIENT.encodeFully(EdmSerializer::of, countedIngredient.ingredient());
 
         var count = countedIngredient.count();
 
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 2dcdde2..a8f9563 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -46,15 +46,15 @@
   "depends": {
     "fabricloader": ">=0.10",
     "fabric": "*",
-    "minecraft": ">=1.20",
-    "owo": ">=0.11.0"
+    "minecraft": ">=1.20.3",
+    "owo": ">=0.12.0"
   },
   "suggests": {
     "craft-this-from-that": "*",
     "mythicmetals": "*"
   },
   "recommends": {
-    "roughlyenoughitems": ">=12.0.0"
+    "roughlyenoughitems": ">=14.0.0"
   },
   "custom": {
     "modmenu": {