aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSychic <47618543+Sychic@users.noreply.github.com>2021-10-16 01:52:08 -0400
committerSychic <47618543+Sychic@users.noreply.github.com>2021-10-16 01:52:08 -0400
commit5bbc5e49cffae08f40e1419d9b83924a89124f58 (patch)
tree235df659bb1d7516f648fed99a555dda146671ef
parentd64361cbc01c61f4d7e412f7074601e3cfffe43f (diff)
downloadSkytilsMod-5bbc5e49cffae08f40e1419d9b83924a89124f58.tar.gz
SkytilsMod-5bbc5e49cffae08f40e1419d9b83924a89124f58.tar.bz2
SkytilsMod-5bbc5e49cffae08f40e1419d9b83924a89124f58.zip
Fix cyclic mixin on item outline rarity
-rw-r--r--src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RenderItemHook.kt2
-rw-r--r--src/main/kotlin/skytils/skytilsmod/utils/RenderUtil.kt2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RenderItemHook.kt b/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RenderItemHook.kt
index 12024033..4b267b21 100644
--- a/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RenderItemHook.kt
+++ b/src/main/kotlin/skytils/skytilsmod/mixins/hooks/renderer/RenderItemHook.kt
@@ -44,6 +44,8 @@ fun renderRarity(stack: ItemStack, x: Int, y: Int, ci: CallbackInfo) {
if (Utils.inSkyblock && Skytils.config.showItemRarity) {
if (mc.currentScreen != null) {
if (isStorageMenuActive || isTradeWindowActive || isCustomAHActive) {
+ // TODO Fix items not rendering in neu storage overlay
+ if (stack.hasTagCompound() && stack.tagCompound.getBoolean("ignoreForRarity")) return
renderRarity(stack, x, y)
}
}
diff --git a/src/main/kotlin/skytils/skytilsmod/utils/RenderUtil.kt b/src/main/kotlin/skytils/skytilsmod/utils/RenderUtil.kt
index 596dbf12..56443eaa 100644
--- a/src/main/kotlin/skytils/skytilsmod/utils/RenderUtil.kt
+++ b/src/main/kotlin/skytils/skytilsmod/utils/RenderUtil.kt
@@ -565,7 +565,7 @@ object RenderUtil {
0.0
)
GlStateManager.scale(scale, scale, 0.0)
- renderItem(ItemUtil.removeEnchants(itemStack.copy()), 0, 0)
+ renderItem(ItemUtil.removeEnchants(itemStack.copy().also { it.tagCompound.setBoolean("ignoreForRarity", true) }), 0, 0)
GlStateManager.scale(1 / scale, 1 / scale, 0.0)
GL11.glColorMask(true, true, true, false)