diff options
author | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-09-07 14:47:45 -0400 |
---|---|---|
committer | My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> | 2021-09-07 14:48:16 -0400 |
commit | ae5cc372ccbc371e3285fb9968e48d7a5a13ce24 (patch) | |
tree | 7f95baf20a309edc6f3939dea57415d1767e1ac9 | |
parent | d8920ff76ea1328c517fca638fd5d81422a5a132 (diff) | |
download | SkytilsMod-ae5cc372ccbc371e3285fb9968e48d7a5a13ce24.tar.gz SkytilsMod-ae5cc372ccbc371e3285fb9968e48d7a5a13ce24.tar.bz2 SkytilsMod-ae5cc372ccbc371e3285fb9968e48d7a5a13ce24.zip |
oops
3 files changed, 4 insertions, 5 deletions
diff --git a/src/main/kotlin/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/skytils/skytilsmod/core/Config.kt index 341100b3..f98bc783 100644 --- a/src/main/kotlin/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/skytils/skytilsmod/core/Config.kt @@ -97,13 +97,12 @@ object Config : Vigilant(File("./config/skytils/config.toml"), "Skytils", sortin ) var overrideReparty = true - @Property( type = PropertyType.SWITCH, name = "Chat Tabs", description = "Creates various tabs to organize chat.", category = "General", subcategory = "Hypixel" ) - var chatTabs = true + var chatTabs = false @Property( type = PropertyType.SWITCH, name = "Guild Leave Confirmation", diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/ItemFeatures.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/ItemFeatures.kt index 1318ecbd..9d17f385 100644 --- a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/ItemFeatures.kt +++ b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/ItemFeatures.kt @@ -365,7 +365,7 @@ class ItemFeatures { @SubscribeEvent fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.Post) { val item = event.stack ?: return - if (!Utils.inSkyblock || item.stackSize != 1 || item.tagCompound.hasKey("SkytilsNoItemOverlay")) return + if (!Utils.inSkyblock || item.stackSize != 1 || item.tagCompound?.hasKey("SkytilsNoItemOverlay") == true) return var stackTip = "" val extraAttributes = getExtraAttributes(item) if (extraAttributes != null) { @@ -552,7 +552,7 @@ class ItemFeatures { class SoulflowGuiElement : GuiElement("Soulflow Display", FloatPair(0.65f, 0.85f)) { override fun render() { if (Utils.inSkyblock) { - for (i in Skytils.mc.thePlayer.inventory.mainInventory) { + for (i in mc.thePlayer.inventory.mainInventory) { if (i == null) continue if (!i.displayName.containsAny("Soulflow Pile", "Soulflow Battery", "Soulflow Supercell")) continue for (str in getItemLore(i)) { diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/MinionFeatures.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/MinionFeatures.kt index 747d4898..142af12c 100644 --- a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/MinionFeatures.kt +++ b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/MinionFeatures.kt @@ -114,7 +114,7 @@ class MinionFeatures { @SubscribeEvent fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.Post) { val item = event.stack ?: return - if (!Utils.inSkyblock || item.stackSize != 1 || item.tagCompound.hasKey("SkytilsNoItemOverlay")) return + if (!Utils.inSkyblock || item.stackSize != 1 || item.tagCompound?.hasKey("SkytilsNoItemOverlay") == true) return val extraAttributes = getExtraAttributes(item) if (Skytils.config.showMinionTier && extraAttributes != null && extraAttributes.hasKey("generator_tier")) { val s = extraAttributes.getInteger("generator_tier").toString() |