From 7724dde567d0fcabcf5bc669103091d0a3d9b097 Mon Sep 17 00:00:00 2001
From: sebseb7 <sebgreenbus@gmail.com>
Date: Mon, 8 Jan 2024 19:12:11 +0100
Subject: [PATCH] 2b2t fix

---
 build.gradle                                           |  6 +++++-
 gradle.properties                                      | 10 ++++++----
 .../sebseb7/autotrade/event/KeybindCallbacks.java      |  9 ++-------
 src/main/resources/fabric.mod.json                     |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1fa1a5c..b3dca40 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,11 @@ processResources {
 	inputs.property "mod_version", project.mod_version
 
 	filesMatching("fabric.mod.json") {
-		expand "mod_version": project.mod_version
+		expand([
+				"mod_version"          : project.version,
+				"minecraft_version_min": project.property("minecraft_version_min"),
+				"malilib_version"   : project.property("malilib_version")
+		])
 	}
 }
 
diff --git a/gradle.properties b/gradle.properties
index 9b0acfc..610c4fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,12 +7,14 @@ mod_name = AutoTrade
 author = sebseb7
 mod_file_name = autotrade-fabric
 
-mod_version = 0.0.7
+mod_version = 0.0.8
 
 malilib_version = 0.18.0
-
+minecraft_version_min = 1.20.3
 minecraft_version_out = 1.20.4
+
 minecraft_version = 1.20.4
-mappings_version = 1.20.4+build.1
-fabric_loader_version = 0.15.1
+
+mappings_version = 1.20.4+build.3
+fabric_loader_version = 0.15.3
 mod_menu_version = 9.0.0
diff --git a/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java b/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java
index 18562f0..f2a8b41 100644
--- a/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java
+++ b/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java
@@ -17,7 +17,6 @@ import java.util.HashMap;
 import java.util.Vector;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.ingame.MerchantScreen;
 import net.minecraft.client.gui.screen.ingame.ShulkerBoxScreen;
 import net.minecraft.entity.Entity;
@@ -212,11 +211,11 @@ public class KeybindCallbacks implements IHotkeyCallback, IClientTickHandler {
 		}
 
 		if (GuiUtils.getCurrentScreen() instanceof MerchantScreen) {
+			MerchantScreen screen = (MerchantScreen) GuiUtils.getCurrentScreen();
 			if (state == false) {
 				String sellItemStr = Configs.Generic.SELL_ITEM.getStringValue();
 				String buyItemStr = Configs.Generic.BUY_ITEM.getStringValue();
 				state = true;
-				MerchantScreen screen = (MerchantScreen) GuiUtils.getCurrentScreen();
 				MerchantScreenHandler handler = screen.getScreenHandler();
 				TradeOfferList offers = handler.getRecipes();
 				for (int i = 0; i < offers.size(); i++) {
@@ -255,8 +254,8 @@ public class KeybindCallbacks implements IHotkeyCallback, IClientTickHandler {
 						}
 					}
 				}
-				screen.close();
 			}
+			screen.close();
 			return;
 		}
 
@@ -285,10 +284,6 @@ public class KeybindCallbacks implements IHotkeyCallback, IClientTickHandler {
 			}
 		}
 
-		if (GuiUtils.getCurrentScreen() instanceof HandledScreen) {
-			return;
-		}
-
 		boolean found = false;
 
 		Vector<Entity> newVillagersInRange = new Vector<Entity>(villagersInRange);
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 16d9dea..3837adc 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -30,7 +30,7 @@
 	],
 
 	"depends": {
-		"minecraft": ">=1.20.3",
-		"malilib": ">=0.18.0"
+		"minecraft": ">=${minecraft_version_min}",
+		"malilib": ">=${malilib_version}"
 	}
 }