From bec885e6785acc4bf33824a14a04ec78a30c0a45 Mon Sep 17 00:00:00 2001
From: Juuz <6596629+Juuxel@users.noreply.github.com>
Date: Sun, 7 Nov 2021 16:45:38 +0200
Subject: [PATCH] fabric: Fix #221 by using Jankson-Fabric again

---
 fabric/build.gradle.kts                   | 6 +-----
 fabric/src/main/resources/fabric.mod.json | 1 +
 gradle.properties                         | 3 ++-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
index dbb6cc78a..ee64678bf 100644
--- a/fabric/build.gradle.kts
+++ b/fabric/build.gradle.kts
@@ -67,7 +67,7 @@ dependencies {
     modImplementation("net.fabricmc.fabric-api:fabric-api:${rootProject.property("fabric-api")}")
     modApi("net.fabricmc:fabric-language-kotlin:${rootProject.property("fabric-kotlin")}")
 
-    bundle("blue.endless:jankson:${rootProject.property("jankson")}")
+    include(modImplementation("io.github.cottonmc:Jankson-Fabric:${rootProject.property("jankson-fabric")}")!!)
     include(modImplementation("io.github.cottonmc:LibGui:${rootProject.property("libgui")}")!!)
     include(modImplementation("io.github.cottonmc:LibCD:${rootProject.property("libcd")}")!!)
 
@@ -93,8 +93,4 @@ tasks {
             expand("version" to project.version)
         }
     }
-
-    shadowJar {
-        relocate("blue.endless.jankson", "juuxel.adorn.relocated.jankson")
-    }
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index 476fa6806..addf62772 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -45,6 +45,7 @@
 
     "fabric": ">=0.41.0",
 
+    "jankson": "^3.0.1",
     "libgui": "^4.1.3",
     "libcd": ["^2.0.0", "^3.0.3"]
   },
diff --git a/gradle.properties b/gradle.properties
index f211cefc6..9dfeef765 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ kotlin.code.style = official
 kotlin.stdlib.default.dependency = false
 
 # Adorn
-mod-version = 2.3.0
+mod-version = 2.3.1
 
 # Minecraft
 minecraft-version = 1.17.1
@@ -27,3 +27,4 @@ libgui = 4.1.3+1.17.1
 modmenu = 2.0.2
 libcd = 3.0.3+1.16.3
 dashloader = 2.0-pre2
+jankson-fabric = 3.0.1+j1.2.0