From 0e50d48854765bf7bf809ca6be521164162c5c33 Mon Sep 17 00:00:00 2001 From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> Date: Thu, 18 Jan 2024 00:51:09 -0500 Subject: [PATCH] fix: wrong locraw mode for Kuudra --- .../gg/skytils/skytilsmod/features/impl/misc/KuudraFeatures.kt | 2 +- .../gg/skytils/skytilsmod/features/impl/misc/RandomStuff.kt | 3 ++- src/main/kotlin/gg/skytils/skytilsmod/utils/SBInfo.kt | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/KuudraFeatures.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/KuudraFeatures.kt index 8a70a3ab5..47fa6f72a 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/KuudraFeatures.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/KuudraFeatures.kt @@ -29,7 +29,7 @@ import org.lwjgl.input.Keyboard object KuudraFeatures { @SubscribeEvent fun onCheckRender(event: CheckRenderEntityEvent<*>) { - if (event.entity !is EntityArmorStand || SBInfo.mode == SkyblockIsland.Instanced.mode) return + if (event.entity !is EntityArmorStand || SBInfo.mode == SkyblockIsland.KuudraHollow.mode) return if (Skytils.config.kuudraHideNonNametags && !Keyboard.isKeyDown(Keyboard.KEY_LMENU)) { if (!event.entity.isInvisible && !event.entity.hasCustomName()) { event.isCanceled = true diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/RandomStuff.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/RandomStuff.kt index 7bb5a67ff..fb3579df5 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/RandomStuff.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/misc/RandomStuff.kt @@ -23,6 +23,7 @@ import gg.skytils.skytilsmod.events.impl.CheckRenderEntityEvent import gg.skytils.skytilsmod.events.impl.PacketEvent import gg.skytils.skytilsmod.features.impl.dungeons.DungeonTimer import gg.skytils.skytilsmod.utils.SBInfo +import gg.skytils.skytilsmod.utils.SkyblockIsland import gg.skytils.skytilsmod.utils.Utils import net.minecraft.entity.item.EntityArmorStand import net.minecraft.item.ItemBlock @@ -33,7 +34,7 @@ object RandomStuff { @SubscribeEvent fun onPacket(event: PacketEvent.ReceiveEvent) { if (!Skytils.config.randomStuff || !Utils.inSkyblock) return - if (event.packet is S0EPacketSpawnObject && event.packet.type == 70 && ((DungeonTimer.phase1ClearTime != -1L && DungeonTimer.bossClearTime == -1L) || SBInfo.mode == "instanced")) { + if (event.packet is S0EPacketSpawnObject && event.packet.type == 70 && ((DungeonTimer.phase1ClearTime != -1L && DungeonTimer.bossClearTime == -1L) || SBInfo.mode == SkyblockIsland.KuudraHollow.mode)) { event.isCanceled = true } } diff --git a/src/main/kotlin/gg/skytils/skytilsmod/utils/SBInfo.kt b/src/main/kotlin/gg/skytils/skytilsmod/utils/SBInfo.kt index 7f5cb9c25..5f6250d38 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/utils/SBInfo.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/utils/SBInfo.kt @@ -26,7 +26,6 @@ import gg.skytils.skytilsmod.events.impl.SendChatMessageEvent import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.SerializationException -import kotlinx.serialization.decodeFromString import kotlinx.serialization.descriptors.* import kotlinx.serialization.encoding.* import net.minecraft.client.gui.inventory.GuiChest @@ -184,7 +183,7 @@ enum class SkyblockIsland(val displayName: String, val mode: String) { Hub("Hub", "hub"), DarkAuction("Dark Auction", "dark_auction"), JerryWorkshop("Jerry's Workshop", "winter"), - Instanced("Instanced", "instanced"), + KuudraHollow("Kuudra's Hollow", "kuudra"), TheRift("The Rift", "rift"), Unknown("(Unknown)", "");