From 2e576d1763a5e7e915577e7841e130001e7feb9a Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 15:29:46 -0500 Subject: [PATCH 01/12] [CHERRYPICK EVERYWHERE EXCEPT IDO] FILE RENAME Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../{AbstrackStackSize.kt => AbstractStackSize.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/{AbstrackStackSize.kt => AbstractStackSize.kt} (100%) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstrackStackSize.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt similarity index 100% rename from src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstrackStackSize.kt rename to src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt From 3909212c12f192dab8fc1b5e8971787758b8c8c7 Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 17:43:48 -0500 Subject: [PATCH 02/12] cherrypick everywhere: LOC reduction Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../features/inventory/itemdisplayoverlay/AbstractStackSize.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt index beeb6e09b49a..aecd4226a565 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt @@ -4,9 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod import net.minecraft.item.ItemStack abstract class AbstractStackSize { - val configItemStackSize get() = SkyHanniMod.feature.inventory - abstract fun getStackTip(item: ItemStack): String } From 47f6f5f5aa0c7ef8a11363c15bc3681e18c9260c Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:11:56 -0500 Subject: [PATCH 03/12] yknow, sometimes i ask myself how people have the patience for doing this Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../inventory/itemdisplayoverlay/AbstractStackSize.kt | 6 ++++++ .../itemdisplayoverlay/ItemDisplayOverlayFeatures.kt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt index aecd4226a565..3c06d2d8d83f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/AbstractStackSize.kt @@ -1,10 +1,16 @@ package at.hannibal2.skyhanni.features.inventory.itemdisplayoverlay import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.RenderItemTipEvent import net.minecraft.item.ItemStack +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent abstract class AbstractStackSize { val configItemStackSize get() = SkyHanniMod.feature.inventory + @SubscribeEvent + open fun onRenderItemTip(event: RenderItemTipEvent) { + event.stackTip = getStackTip(event.stack) + } abstract fun getStackTip(item: ItemStack): String } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/ItemDisplayOverlayFeatures.kt index 5daafc2f44e1..c4f6683c3946 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/ItemDisplayOverlayFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/ItemDisplayOverlayFeatures.kt @@ -125,8 +125,8 @@ object ItemDisplayOverlayFeatures : AbstractStackSize() { ) @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { - event.stackTip = getStackTip(event.stack) + override fun onRenderItemTip(event: RenderItemTipEvent) { + super.onRenderItemTip(event) } override fun getStackTip(item: ItemStack): String { From e344dffefada3e4179584819d15417298740841c Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:12:26 -0500 Subject: [PATCH 04/12] and then i realize there's a thing called orange juice Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../itemdisplayoverlay/menu/MenuItemDisplayOverlayAbiphone.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayAbiphone.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayAbiphone.kt index a5b29aab480d..4a56e69b314b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayAbiphone.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayAbiphone.kt @@ -23,8 +23,8 @@ class MenuItemDisplayOverlayAbiphone : AbstractMenuStackSize() { private val tilerSortAbiphoneOnlyLoreLinePattern = ((".*(?§.)*▶.?(?[\\w ]+).*").toPattern()) @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { - event.stackTip = getStackTip(event.stack) + override fun onRenderItemTip(event: RenderItemTipEvent) { + super.onRenderItemTip(event) } override fun getStackTip(item: ItemStack): String { From 55a858131c0734243986d38dfa454e0229300d79 Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:12:38 -0500 Subject: [PATCH 05/12] now i wanna drink some Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../itemdisplayoverlay/menu/MenuItemDisplayOverlayBingo.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayBingo.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayBingo.kt index 345c43325fb0..461cb82e1a28 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayBingo.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayBingo.kt @@ -20,8 +20,8 @@ class MenuItemDisplayOverlayBingo : AbstractMenuStackSize() { private val communityPersonalGoalLoreLinePattern = (("(§.)*(?Community|Personal) Goal").toPattern()) @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { - event.stackTip = getStackTip(event.stack) + override fun onRenderItemTip(event: RenderItemTipEvent) { + super.onRenderItemTip(event) } override fun getStackTip(item: ItemStack): String { From 35ef90e3f2f7ab26ff164f4542b1a6767c445ccc Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:13:12 -0500 Subject: [PATCH 06/12] oh god i just realized this is gonna make no sense in the cherrypicked branches Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../itemdisplayoverlay/menu/MenuItemDisplayOverlayCombat.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayCombat.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayCombat.kt index 28e2479eb200..7fd1392311b8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayCombat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayCombat.kt @@ -22,8 +22,8 @@ class MenuItemDisplayOverlayCombat : AbstractMenuStackSize() { private val unlockedSlayerRecipesLoreLinePattern = ((".*(§.)*Unlocked: (§.)*(?[\\w]+) recipes.*").toPattern()) @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { - event.stackTip = getStackTip(event.stack) + override fun onRenderItemTip(event: RenderItemTipEvent) { + super.onRenderItemTip(event) } override fun getStackTip(item: ItemStack): String { From 7fce3f2e5bf35ed10aceadc70b711e7773e64a74 Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:13:52 -0500 Subject: [PATCH 07/12] farming Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../itemdisplayoverlay/menu/MenuItemDisplayOverlayFarming.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayFarming.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayFarming.kt index 456e25b9d725..1345b64b190c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayFarming.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayFarming.kt @@ -20,8 +20,8 @@ class MenuItemDisplayOverlayFarming : AbstractMenuStackSize() { private val visitorMilestonePercentProgressLoreLinePattern = (("(§.)*Progress to Tier (?[\\w]+):.* (§.)*(?[0-9]+)(\\.[0-9]*)?(§.)?%").toPattern()) @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { - event.stackTip = getStackTip(event.stack) + override fun onRenderItemTip(event: RenderItemTipEvent) { + super.onRenderItemTip(event) } override fun getStackTip(item: ItemStack): String { From d280a2b48c7e6f96b3291402b6ea4ca1011038f2 Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:14:20 -0500 Subject: [PATCH 08/12] mining Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../itemdisplayoverlay/menu/MenuItemDisplayOverlayMining.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayMining.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayMining.kt index e07cf664857a..c8806e22583f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayMining.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayMining.kt @@ -31,8 +31,8 @@ class MenuItemDisplayOverlayMining : AbstractMenuStackSize() { private val crystalNotFoundLoreLinePattern = ((".* §c✖ Not Found").toPattern()) @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { - event.stackTip = getStackTip(event.stack) + override fun onRenderItemTip(event: RenderItemTipEvent) { + super.onRenderItemTip(event) } override fun getStackTip(item: ItemStack): String { From d70efd838c5761f29df1947fd102acd4f09d1a1f Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:14:39 -0500 Subject: [PATCH 09/12] general Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayer.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayer.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayer.kt index 5a1ce36cbe2b..c5083b4563ea 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayer.kt @@ -56,8 +56,8 @@ class MenuItemDisplayOverlayPlayer : AbstractMenuStackSize() { ) @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { - event.stackTip = getStackTip(event.stack) + override fun onRenderItemTip(event: RenderItemTipEvent) { + super.onRenderItemTip(event) } override fun getStackTip(item: ItemStack): String { From 100737c6d093ffea89b32251a1a7e3c99f335fe9 Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:14:55 -0500 Subject: [PATCH 10/12] advanced Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../menu/MenuItemDisplayOverlayPlayerAdvanced.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayerAdvanced.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayerAdvanced.kt index 0321740fb3e4..95db0097f772 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayerAdvanced.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayerAdvanced.kt @@ -97,7 +97,7 @@ class MenuItemDisplayOverlayPlayerAdvanced : AbstractMenuStackSize() { } @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { + override fun onRenderItemTip(event: RenderItemTipEvent) { isDepositCoinsItemNamePattern.matchMatcher(event.stack.cleanName()) { return } /* so apparently i have to make a whole separate event for the bank balance display. @@ -116,7 +116,7 @@ class MenuItemDisplayOverlayPlayerAdvanced : AbstractMenuStackSize() { - ery */ - event.stackTip = getStackTip(event.stack) + super.onRenderItemTip(event) } From b5fea8d4ba2681a5d737959cc2e1268e6710a782 Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:15:46 -0500 Subject: [PATCH 11/12] fifteen fps livestream on discord gg gaming tryhard Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../menu/MenuItemDisplayOverlayPlayerTryhard.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayerTryhard.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayerTryhard.kt index 768a110ca2c3..616cbad67d4a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayerTryhard.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlayPlayerTryhard.kt @@ -53,8 +53,8 @@ class MenuItemDisplayOverlayPlayerTryhard : AbstractMenuStackSize() { private val achievementPointsLoreLinePattern = (("(§.)*Points: (§.)*([\\w,]+)(§.)*\\/(§.)*([\\w,]+) (§.)*\\((?[\\w]+)%(§.)*\\)").toPattern()) @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { - event.stackTip = getStackTip(event.stack) + override fun onRenderItemTip(event: RenderItemTipEvent) { + super.onRenderItemTip(event) } override fun getStackTip(item: ItemStack): String { From 92d86b80f9f2352e0260858de4781ebfb7b45703 Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Fri, 8 Dec 2023 18:16:03 -0500 Subject: [PATCH 12/12] level Signed-off-by: Erymanthus[#5074] | (u/)RayDeeUx <51521765+RayDeeUx@users.noreply.github.com> --- .../menu/MenuItemDisplayOverlaySBLeveling.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlaySBLeveling.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlaySBLeveling.kt index 85fbe50f18c2..ff370d07d4e7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlaySBLeveling.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/itemdisplayoverlay/menu/MenuItemDisplayOverlaySBLeveling.kt @@ -22,8 +22,8 @@ class MenuItemDisplayOverlaySBLeveling : AbstractMenuStackSize() { private val emblemsUnlockedLorePattern = (("(§.)?(?[\\d]+) Unlocked").toPattern()) @SubscribeEvent - fun onRenderItemTip(event: RenderItemTipEvent) { - event.stackTip = getStackTip(event.stack) + override fun onRenderItemTip(event: RenderItemTipEvent) { + super.onRenderItemTip(event) } override fun getStackTip(item: ItemStack): String {