From 10fddd4c9ca107805ea1f0fe16c1c06ad94c7c50 Mon Sep 17 00:00:00 2001
From: object-Object <object@objectobject.ca>
Date: Sat, 22 Jun 2024 21:06:48 -0400
Subject: [PATCH] Revert non-Gradle-related changes

---
 Fabric/gradle.properties                  | 8 ++++----
 Fabric/src/main/resources/fabric.mod.json | 8 ++++----
 Forge/gradle.properties                   | 2 +-
 build.gradle                              | 6 ------
 gradle.properties                         | 3 +--
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Fabric/gradle.properties b/Fabric/gradle.properties
index 9459c5b32b..403ee97acd 100644
--- a/Fabric/gradle.properties
+++ b/Fabric/gradle.properties
@@ -1,9 +1,9 @@
-fabricVersion=0.92.2+1.20.1
-fabricLoaderVersion=0.15.11
-fabricLanguageKotlinVersion=1.10.9+kotlin.1.9.0
+fabricVersion=0.85.0+1.20.1
+fabricLoaderVersion=0.14.21
+fabricLanguageKotlinVersion=1.9.4+kotlin.1.8.21
 
 # These are all included
-cardinalComponentsVersion=5.2.2
+cardinalComponentsVersion=5.2.1
 serializationHooksVersion=0.4.99999
 #entityReachVersion=2.3.0
 
diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json
index 51947dd81c..4468af2380 100644
--- a/Fabric/src/main/resources/fabric.mod.json
+++ b/Fabric/src/main/resources/fabric.mod.json
@@ -51,10 +51,10 @@
     "fabricloader": ">=0.14",
     "fabric": ">=0.84",
     "fabric-language-kotlin": ">=1.9.4+kotlin.1.8.21",
-    "cardinal-components-base": "~5.2.2",
-    "cardinal-components-entity": "~5.2.2",
-    "cardinal-components-item": "~5.2.2",
-    "cardinal-components-block": "~5.2.2",
+    "cardinal-components-base": "~5.2.1",
+    "cardinal-components-entity": "~5.2.1",
+    "cardinal-components-item": "~5.2.1",
+    "cardinal-components-block": "~5.2.1",
     "paucal": ">=0.6.0-pre <0.7.0",
     "cloth-config": "11.1.*",
     "patchouli": ">=1.20.1-80"
diff --git a/Forge/gradle.properties b/Forge/gradle.properties
index 6ba5b71f61..57a5c0f489 100644
--- a/Forge/gradle.properties
+++ b/Forge/gradle.properties
@@ -1,4 +1,4 @@
-forgeVersion=47.2.0
+forgeVersion=47.1.47
 
 kotlinForForgeVersion=4.3.0
 
diff --git a/build.gradle b/build.gradle
index b1197f204e..091f594d38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,3 @@
-buildscript {
-    dependencies {
-        classpath 'com.google.code.gson:gson:2.10.1'
-    }
-}
-
 buildscript {
     repositories {
         mavenCentral()
diff --git a/gradle.properties b/gradle.properties
index e1ac2fb6c3..88d13e374a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,6 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-org.gradle.java.installations.fromEnv=JAVA_17_HOME
 
 modID=hexcasting
 modName=Hex Casting
@@ -10,7 +9,7 @@ modName=Hex Casting
 jetbrainsAnnotationsVersion=23.0.0
 
 minecraftVersion=1.20.1
-kotlinVersion=1.9.0
+kotlinVersion=1.7.20
 modVersion=0.11.1-7
 
 paucalVersion=0.6.0-pre-118