From 4a949172c09d090f4c834c18107432d8fc2f8dd6 Mon Sep 17 00:00:00 2001
From: tibs <git@tibinonest.me>
Date: Wed, 13 Apr 2022 19:04:49 -0400
Subject: [PATCH] Housekeeping

- Unify mixin configs
- Update dependencies
- Require Minecraft 1.18.2
---
 build.gradle                                          |  2 +-
 gradle.properties                                     |  4 ++--
 .../cauldron-dyeing.compat.sodium.mixins.json         | 11 -----------
 src/main/resources/cauldron-dyeing.mixins.json        |  3 ++-
 src/main/resources/fabric.mod.json                    |  5 ++---
 5 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/resources/cauldron-dyeing.compat.sodium.mixins.json

diff --git a/build.gradle b/build.gradle
index 42d23c0..bc371c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ var apiModules = [
         "fabric-api-base",
         "fabric-networking-api-v1",
         "fabric-object-builder-api-v1",
-        "fabric-registry-sync-v0",
+        "fabric-registry-sync-v0"
 ]
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index 7008e62..4321cff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
 minecraft_version=1.18.2
-quilt_mappings=21
+quilt_mappings=22
 yarn_mappings=2
 loader_version=0.13.3
-fabric_version=0.48.0+1.18.2
+fabric_version=0.50.0+1.18.2
 
 # Mod Properties
 mod_version=1.0.2
diff --git a/src/main/resources/cauldron-dyeing.compat.sodium.mixins.json b/src/main/resources/cauldron-dyeing.compat.sodium.mixins.json
deleted file mode 100644
index 597c520..0000000
--- a/src/main/resources/cauldron-dyeing.compat.sodium.mixins.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "package": "me.tibinonest.mods.cauldron_dyeing.mixin.sodium",
-  "required": false,
-  "compatibilityLevel": "JAVA_17",
-  "client": [
-    "SodiumBlockRendererMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
diff --git a/src/main/resources/cauldron-dyeing.mixins.json b/src/main/resources/cauldron-dyeing.mixins.json
index d35b626..2165738 100644
--- a/src/main/resources/cauldron-dyeing.mixins.json
+++ b/src/main/resources/cauldron-dyeing.mixins.json
@@ -8,7 +8,8 @@
     "LeveledCauldronBlockMixin"
   ],
   "client": [
-    "BiomeColorsMixin"
+    "BiomeColorsMixin",
+    "sodium.SodiumBlockRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 4a9b8ef..6ff963e 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -20,11 +20,10 @@
     ]
   },
   "mixins": [
-    "cauldron-dyeing.mixins.json",
-    "cauldron-dyeing.compat.sodium.mixins.json"
+    "cauldron-dyeing.mixins.json"
   ],
   "depends": {
-    "minecraft": ">=1.18",
+    "minecraft": ">=1.18.2",
     "fabricloader": ">=0.12.0",
     "fabric-object-builder-api-v1": ">=0.1"
   }