From 961865b8a0ea8edf0128a2d7db1095a1d36a55e8 Mon Sep 17 00:00:00 2001
From: P3pp3rF1y <p3pp3rf1y@gmail.com>
Date: Sun, 7 Apr 2024 11:19:28 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fix=20upgrade=20error=20m?=
 =?UTF-8?q?essage=20to=20not=20incorrectly=20show=20with=20additional=20sh?=
 =?UTF-8?q?ift=20clicks=20into=20inventory=20until=20this=20is=20reopen=20?=
 =?UTF-8?q?or=20upgrade=20is=20put/removed=20from=20upgrade=20slot=20witho?=
 =?UTF-8?q?ut=20error=20displaying?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties                                   |  2 +-
 .../common/gui/StorageContainerMenuBase.java        | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 70bc8842..3b5545c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.daemon=false
 
 mod_id=sophisticatedcore
 mod_group_id=sophisticatedcore
-mod_version=0.6.17
+mod_version=0.6.18
 sonar_project_key=sophisticatedcore:SophisticatedCore
 github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedCore
 
diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedcore/common/gui/StorageContainerMenuBase.java b/src/main/java/net/p3pp3rf1y/sophisticatedcore/common/gui/StorageContainerMenuBase.java
index 74e8b8e8..68596ffb 100644
--- a/src/main/java/net/p3pp3rf1y/sophisticatedcore/common/gui/StorageContainerMenuBase.java
+++ b/src/main/java/net/p3pp3rf1y/sophisticatedcore/common/gui/StorageContainerMenuBase.java
@@ -149,12 +149,16 @@ public int getColumnsTaken() {
 
 	public Optional<UpgradeSlotChangeResult> getErrorUpgradeSlotChangeResult() {
 		if (errorUpgradeSlotChangeResult != null && player.level().getGameTime() >= errorResultExpirationTime) {
-			errorResultExpirationTime = 0;
-			errorUpgradeSlotChangeResult = null;
+			clearErrorUpgradeSlotChangeResult();
 		}
 		return Optional.ofNullable(errorUpgradeSlotChangeResult);
 	}
 
+	private void clearErrorUpgradeSlotChangeResult() {
+		errorResultExpirationTime = 0;
+		errorUpgradeSlotChangeResult = null;
+	}
+
 	protected void sendStorageSettingsToClient() {
 		//noop by default
 	}
@@ -677,6 +681,11 @@ private boolean shouldShiftClickIntoOpenTabFirst() {
 	}
 
 	private boolean mergeStackToUpgradeSlots(Slot sourceSlot, ItemStack slotStack) {
+		if (!(slotStack.getItem() instanceof IUpgradeItem<?>)) {
+			return false;
+		}
+
+		clearErrorUpgradeSlotChangeResult();
 		tryingToMergeUpgrade = true;
 		boolean result = !upgradeSlots.isEmpty() && moveItemStackTo(sourceSlot, slotStack, getInventorySlotsSize(), getInventorySlotsSize() + getNumberOfUpgradeSlots(), false);
 		tryingToMergeUpgrade = false;