Skip to content

Commit

Permalink
fix: wrong locraw mode for Kuudra
Browse files Browse the repository at this point in the history
  • Loading branch information
My-Name-Is-Jeff committed Jan 18, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
1 parent b9596a1 commit 0e50d48
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
}
}
3 changes: 1 addition & 2 deletions src/main/kotlin/gg/skytils/skytilsmod/utils/SBInfo.kt
Original file line number Diff line number Diff line change
@@ -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)", "");

0 comments on commit 0e50d48

Please sign in to comment.