From ccb58d0804fcc8bf62d3fb7f1f00ca01d396fc98 Mon Sep 17 00:00:00 2001
From: NotRyken <notryken@gmail.com>
Date: Sun, 4 Aug 2024 08:11:47 +0800
Subject: [PATCH] Backport to mc1.20.6

---
 .../screen/ConfigScreenProvider.java          |  5 +---
 gradle.properties                             | 30 +++++++++----------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/common/src/main/java/dev/terminalmc/clientsort/screen/ConfigScreenProvider.java b/common/src/main/java/dev/terminalmc/clientsort/screen/ConfigScreenProvider.java
index 4e77f74..e862fde 100644
--- a/common/src/main/java/dev/terminalmc/clientsort/screen/ConfigScreenProvider.java
+++ b/common/src/main/java/dev/terminalmc/clientsort/screen/ConfigScreenProvider.java
@@ -11,7 +11,7 @@
 import net.minecraft.client.gui.components.MultiLineTextWidget;
 import net.minecraft.client.gui.screens.ConfirmLinkScreen;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.screens.options.OptionsSubScreen;
+import net.minecraft.client.gui.screens.OptionsSubScreen;
 import net.minecraft.network.chat.CommonComponents;
 
 import static dev.terminalmc.clientsort.util.mod.Localization.localized;
@@ -65,8 +65,5 @@ public void init() {
                     .build();
             addRenderableWidget(exitButton);
         }
-
-        @Override
-        protected void addOptions() {}
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 8803392..6a37b8e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,33 +21,33 @@ java_versions_fabric=>=21
 java_versions_neoforge=[21,)
 
 # Minecraft
-minecraft_version=1.21
-minecraft_versions_fabric=>1.20.6 <1.22
-minecraft_versions_neoforge=(1.20.6, 1.22)
+minecraft_version=1.20.6
+minecraft_versions_fabric=>1.20.4 <1.21
+minecraft_versions_neoforge=(1.20.4, 1.21)
 
 # Fabric https://fabricmc.net/develop/
 fabric_loader_version=0.15.11
 fabric_loader_versions=>=0.15.0
-fabric_api_version=0.100.3+1.21
+fabric_api_version=0.100.8+1.20.6
 fabric_api_versions=*
 
 # NeoForge https://projects.neoforged.net/neoforged/neoforge
 neoforge_loader_versions=[1,)
-neoforge_version=21.0.21-beta
-neoforge_versions=(20.6, 22)
+neoforge_version=20.6.119
+neoforge_versions=(20.4, 21)
 
 # Cloth Config https://modrinth.com/mod/9s6osm5g/versions
-clothconfig_version=15.0.127
-clothconfig_versions_fabric=>14
-clothconfig_versions_neoforge=(14,)
+clothconfig_version=14.0.126
+clothconfig_versions_fabric=>13
+clothconfig_versions_neoforge=(13,)
 
 # ModMenu https://modrinth.com/mod/mOgUt4GM/versions
-modmenu_version=11.0.1
-modmenu_versions=>10
+modmenu_version=10.0.0
+modmenu_versions=>9
 
 # EMI https://modrinth.com/mod/fRiHVvU7/versions
-emi_version_fabric=1.1.8+1.21+fabric
-emi_version_neoforge=1.1.8+1.21+neoforge
+emi_version_fabric=1.1.10+1.20.6+fabric
+emi_version_neoforge=1.1.10+1.20.6+neoforge
 
 # Links
 homepage_url=https://modrinth.com/mod/K0AkAin6
@@ -65,12 +65,12 @@ curseforge_id=1049891
 release_type=beta
 # Fabric
 release_mod_loaders_fabric=fabric,quilt
-release_game_versions_fabric=1.21
+release_game_versions_fabric=1.20.6
 release_required_dep_ids_fabric_mr=P7dR8mSH,mOgUt4GM,9s6osm5g
 release_required_dep_ids_fabric_cf=fabric-api,modmenu,cloth-config
 # NeoForge
 release_mod_loaders_neoforge=neoforge
-release_game_versions_neoforge=1.21
+release_game_versions_neoforge=1.20.6
 release_required_dep_ids_neoforge_mr=9s6osm5g
 release_required_dep_ids_neoforge_cf=cloth-config