diff options
| -rw-r--r-- | src/main/kotlin/skytils/skytilsmod/core/Config.kt | 7 | ||||
| -rw-r--r-- | src/main/kotlin/skytils/skytilsmod/features/impl/misc/SlayerFeatures.kt | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/main/kotlin/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/skytils/skytilsmod/core/Config.kt index b83e0c57..55c510c3 100644 --- a/src/main/kotlin/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/skytils/skytilsmod/core/Config.kt @@ -1725,6 +1725,13 @@ object Config : Vigilant(File("./config/skytils/config.toml"), "Skytils", sortin var yangGlyphPing = false @Property( + PropertyType.SWITCH, name = "Yang Glyph Ping on Land", + description = "Changes the Yang Glyph ping to ping on land rather than on throw.", + category = "Slayer", subcategory = "Voidgloom Seraph" + ) + var yangGlyphPingOnLand = false + + @Property( PropertyType.SWITCH, name = "Highlight Yang Glyph", description = "Highlights the Yang Glyph block.", category = "Slayer", subcategory = "Voidgloom Seraph" diff --git a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/SlayerFeatures.kt b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/SlayerFeatures.kt index 46f2a6d1..1d5136f2 100644 --- a/src/main/kotlin/skytils/skytilsmod/features/impl/misc/SlayerFeatures.kt +++ b/src/main/kotlin/skytils/skytilsmod/features/impl/misc/SlayerFeatures.kt @@ -259,14 +259,14 @@ class SlayerFeatures { if (packet is S1CPacketEntityMetadata) { if (packet.entityId == slayerEntity?.entityId && slayerEntity is EntityEnderman) { (slayerEntity as EntityEnderman).apply { - if (Skytils.config.yangGlyphPing && heldBlockState?.block == Blocks.beacon && ((packet.func_149376_c() + if (heldBlockState?.block == Blocks.beacon && ((packet.func_149376_c() .find { it.dataValueId == 16 } ?: return@apply).`object` as Short).toInt().and(65535) .and(4095) == 0 ) { lastYangGlyphSwitch = System.currentTimeMillis() lastYangGlyphSwitchTicks = 0 thrownBoundingBox = entityBoundingBox - createTitle("§cYang Glyph!", 30) + if (Skytils.config.yangGlyphPing && !Skytils.config.yangGlyphPingOnLand) createTitle("§cYang Glyph!", 30) } } } @@ -329,10 +329,12 @@ class SlayerFeatures { printDevMessage("Beacon entity near beacon block!", "slayer", "seraph", "seraphGlyph") yangGlyph = event.pos yangGlyphEntity = null + if (Skytils.config.yangGlyphPing && Skytils.config.yangGlyphPingOnLand) createTitle("§cYang Glyph!", 30) } } if (Skytils.config.experimentalYangGlyphDetection && yangGlyph == null && slayerEntity != null) { if (lastYangGlyphSwitchTicks in 0..5 && slayerEntity!!.getDistanceSq(event.pos) <= 5 * 5) { + if (Skytils.config.yangGlyphPing && Skytils.config.yangGlyphPingOnLand) createTitle("§cYang Glyph!", 30) printDevMessage( "Beacon was close to slayer, $lastYangGlyphSwitchTicks", "slayer", "seraph", "seraphGlyph" ) |