From 0a96dd618acba15269627c7eae8a2291fb2dc84a Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Sun, 14 Sep 2025 19:46:52 +0200 Subject: snapshot --- src/main/kotlin/features/items/BlockZapperOverlay.kt | 15 +++------------ src/main/kotlin/features/items/BonemerangOverlay.kt | 16 +++------------- src/main/kotlin/features/items/EtherwarpOverlay.kt | 10 +++------- 3 files changed, 9 insertions(+), 32 deletions(-) (limited to 'src/main/kotlin/features/items') diff --git a/src/main/kotlin/features/items/BlockZapperOverlay.kt b/src/main/kotlin/features/items/BlockZapperOverlay.kt index ad96b8e..a853012 100644 --- a/src/main/kotlin/features/items/BlockZapperOverlay.kt +++ b/src/main/kotlin/features/items/BlockZapperOverlay.kt @@ -9,19 +9,17 @@ import net.minecraft.util.hit.BlockHitResult import net.minecraft.util.hit.HitResult import net.minecraft.util.math.BlockPos import moe.nea.firmament.annotations.Subscribe -import moe.nea.firmament.events.ClientStartedEvent import moe.nea.firmament.events.WorldKeyboardEvent import moe.nea.firmament.events.WorldRenderLastEvent -import moe.nea.firmament.features.FirmamentFeature -import moe.nea.firmament.util.data.ManagedConfig import moe.nea.firmament.util.MC import moe.nea.firmament.util.data.Config +import moe.nea.firmament.util.data.ManagedConfig import moe.nea.firmament.util.render.RenderInWorldContext import moe.nea.firmament.util.skyBlockId import moe.nea.firmament.util.skyblock.SkyBlockItems -object BlockZapperOverlay : FirmamentFeature { - override val identifier: String +object BlockZapperOverlay { + val identifier: String get() = "block-zapper-overlay" @Config @@ -31,13 +29,6 @@ object BlockZapperOverlay : FirmamentFeature { var undoKey by keyBindingWithDefaultUnbound("undo-key") } - @Subscribe - fun onInit(event: ClientStartedEvent) { - } - - override val config: ManagedConfig - get() = TConfig - val bannedZapper: List = listOf( Blocks.WHEAT, Blocks.CARROTS, diff --git a/src/main/kotlin/features/items/BonemerangOverlay.kt b/src/main/kotlin/features/items/BonemerangOverlay.kt index 80019c0..1310154 100644 --- a/src/main/kotlin/features/items/BonemerangOverlay.kt +++ b/src/main/kotlin/features/items/BonemerangOverlay.kt @@ -1,7 +1,6 @@ package moe.nea.firmament.features.items import me.shedaniel.math.Color -import moe.nea.jarvis.api.Point import org.joml.Vector2i import net.minecraft.entity.LivingEntity import net.minecraft.entity.decoration.ArmorStandEntity @@ -9,20 +8,18 @@ import net.minecraft.entity.player.PlayerEntity import net.minecraft.util.Formatting import net.minecraft.util.math.Box import moe.nea.firmament.annotations.Subscribe -import moe.nea.firmament.events.ClientStartedEvent import moe.nea.firmament.events.EntityRenderTintEvent import moe.nea.firmament.events.HudRenderEvent -import moe.nea.firmament.features.FirmamentFeature -import moe.nea.firmament.util.data.ManagedConfig import moe.nea.firmament.util.MC import moe.nea.firmament.util.data.Config +import moe.nea.firmament.util.data.ManagedConfig import moe.nea.firmament.util.render.TintedOverlayTexture import moe.nea.firmament.util.skyBlockId import moe.nea.firmament.util.skyblock.SkyBlockItems import moe.nea.firmament.util.tr -object BonemerangOverlay : FirmamentFeature { - override val identifier: String +object BonemerangOverlay { + val identifier: String get() = "bonemerang-overlay" @Config @@ -32,13 +29,6 @@ object BonemerangOverlay : FirmamentFeature { var highlightHitEntities by toggle("highlight-hit-entities") { false } } - @Subscribe - fun onInit(event: ClientStartedEvent) { - } - - override val config: ManagedConfig - get() = TConfig - fun getEntities(): MutableSet { val entities = mutableSetOf() val camera = MC.camera as? PlayerEntity ?: return entities diff --git a/src/main/kotlin/features/items/EtherwarpOverlay.kt b/src/main/kotlin/features/items/EtherwarpOverlay.kt index 640c8f5..ba712b3 100644 --- a/src/main/kotlin/features/items/EtherwarpOverlay.kt +++ b/src/main/kotlin/features/items/EtherwarpOverlay.kt @@ -13,19 +13,18 @@ import net.minecraft.util.math.Vec3d import net.minecraft.world.BlockView import moe.nea.firmament.annotations.Subscribe import moe.nea.firmament.events.WorldRenderLastEvent -import moe.nea.firmament.features.FirmamentFeature -import moe.nea.firmament.util.data.ManagedConfig import moe.nea.firmament.util.MC import moe.nea.firmament.util.SBData import moe.nea.firmament.util.data.Config +import moe.nea.firmament.util.data.ManagedConfig import moe.nea.firmament.util.extraAttributes import moe.nea.firmament.util.render.RenderInWorldContext import moe.nea.firmament.util.skyBlockId import moe.nea.firmament.util.skyblock.SkyBlockItems import moe.nea.firmament.util.tr -object EtherwarpOverlay : FirmamentFeature { - override val identifier: String +object EtherwarpOverlay { + val identifier: String get() = "etherwarp-overlay" @Config @@ -41,9 +40,6 @@ object EtherwarpOverlay : FirmamentFeature { var failureText by toggle("failure-text") { false } } - override val config: ManagedConfig - get() = TConfig - enum class EtherwarpResult(val label: Text?, val color: () -> ChromaColour) { SUCCESS(null, TConfig::cubeColour), INTERACTION_BLOCKED( -- cgit