diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2024-09-10 16:00:53 +0200 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2024-09-10 16:00:53 +0200 |
| commit | b86c79591b87d6fc5f9ee91e1dd7ff9ff48fa63f (patch) | |
| tree | 4bcefb87414c453122f9c58aafdbb0e2c25d8e36 /src/main | |
| parent | d2493f9525c01f549d924ac7ccd5ec3fbf530286 (diff) | |
| parent | ce8c235c34aa7a7291377bd2b8c5b40e86d56bae (diff) | |
| download | skyhanni-b86c79591b87d6fc5f9ee91e1dd7ff9ff48fa63f.tar.gz skyhanni-b86c79591b87d6fc5f9ee91e1dd7ff9ff48fa63f.tar.bz2 skyhanni-b86c79591b87d6fc5f9ee91e1dd7ff9ff48fa63f.zip | |
Merge remote-tracking branch 'origin/beta' into beta
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt | 6 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt index b6c1c81d0..afe5694b1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt @@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.data.model.findShortestPathAsGraphWithDistance import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.GuiRenderEvent +import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.IslandChangeEvent import at.hannibal2.skyhanni.events.ItemClickEvent @@ -196,6 +197,11 @@ object TunnelsMaps { } @SubscribeEvent + fun onInventoryClose(event: InventoryCloseEvent) { + clickTranslate = mapOf() + } + + @SubscribeEvent fun onRenderItemTooltip(event: LorenzToolTipEvent) { if (!isEnabled()) return clickTranslate[event.slot.slotIndex]?.let { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt index bef3b469e..081af4ea9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt @@ -16,6 +16,7 @@ import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.NumberUtil.formatLong import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.RenderUtils.highlight +import net.minecraft.client.player.inventory.ContainerLocalMenu import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.awt.Color @@ -109,6 +110,7 @@ object AuctionHousePriceComparison { if (!isEnabled()) return val diff = slotPriceMap[event.slot.slotIndex] ?: return + if (event.slot.inventory !is ContainerLocalMenu) return event.toolTip.add("") if (diff >= 0) { |