Merge pull request #232 from P3pp3rF1y/1.20.x-dev

fix: 🐛 Fix upgrade error message to not incorrectly show with additio…
P3pp3rF1y · Apr 7, 2024 · e39b477 · e39b477
2 parents f2ce207 + 961865b
commit e39b477
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git 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
@@ -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;