Add support for custom AOTV preview color

3 files changed, 21 insertions, 7 deletions

diff --git a/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt b/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt
index 7447595..3536890 100644
--- a/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt
+++ b/src/main/kotlin/com/dulkirfabric/config/DulkirConfig.kt
@@ -138,6 +138,16 @@ class DulkirConfig {
             entryBuilder.mkToggle(Text.literal("Hide Held Item Tooltips"), configOptions::hideHeldItemTooltip,
                 tooltip = Text.literal("This is for the pesky overlay that pops up on switching items"))
         )
+        general.addEntry(
+            entryBuilder.mkToggle(Text.literal("Etherwarp Preview"), configOptions::showEtherwarpPreview,
+                tooltip = Text.literal("Highlights the targeted block when shifting with a aotv."))
+        )
+        general.addEntry(
+            entryBuilder.startAlphaColorField(Text.literal("Etherwarp Preview Color"), configOptions.etherwarpPreviewColor)
+                .setDefaultValue(0x99FFFFFF.toInt())
+                .setSaveConsumer { newValue -> configOptions.etherwarpPreviewColor = newValue }
+                .build()
+        )
 
         val shortcuts = builder.getOrCreateCategory(Text.literal("Shortcuts"))
         shortcuts.addEntry(
@@ -270,8 +280,8 @@ class DulkirConfig {
         var statusEffectHidden: Boolean = false,
         var inactiveEffigyDisplay: Boolean = false,
         var disableExplosionParticles: Boolean = false,
-        var hideArmorOverlay: Boolean = false,
-        var hideHungerOverlay: Boolean = false,
+        var hideArmorOverlay: Boolean = true,
+        var hideHungerOverlay: Boolean = true,
         var animationPreset: AnimationPreset = AnimationPreset(),
         var duraCooldown: Boolean = false,
         var alarmTimeout: Int = 300,
@@ -283,7 +293,9 @@ class DulkirConfig {
         val positions: MutableMap<String, HudElement.Positioning> = mutableMapOf(),
         var hudifyActionBar: Boolean = true,
         var showEHP: Boolean = false,
-        var hideHeldItemTooltip: Boolean = false
+        var hideHeldItemTooltip: Boolean = false,
+        var showEtherwarpPreview: Boolean = true,
+        var etherwarpPreviewColor: Int = 0x99FFFFFF.toInt()
     )
 
     @Serializable
diff --git a/src/main/kotlin/com/dulkirfabric/features/AotvHighlight.kt b/src/main/kotlin/com/dulkirfabric/features/AotvHighlight.kt
index b56c82a..283886f 100644
--- a/src/main/kotlin/com/dulkirfabric/features/AotvHighlight.kt
+++ b/src/main/kotlin/com/dulkirfabric/features/AotvHighlight.kt
@@ -1,6 +1,7 @@
 package com.dulkirfabric.features
 
 import com.dulkirfabric.DulkirModFabric.mc
+import com.dulkirfabric.config.DulkirConfig
 import com.dulkirfabric.events.ClientTickEvent
 import com.dulkirfabric.events.LongUpdateEvent
 import com.dulkirfabric.events.WorldRenderLastEvent
@@ -38,6 +39,7 @@ object AotvHighlight {
 
     @EventHandler
     fun onWorldRenderLast(event: WorldRenderLastEvent) {
+        if (!DulkirConfig.configOptions.showEtherwarpPreview) return
         // check that holding aotv
         if (heldItemID != "ASPECT_OF_THE_VOID") return
         val handle = MinecraftClient.getInstance().window.handle
@@ -52,7 +54,7 @@ object AotvHighlight {
 
         // if found display box
         WorldRenderUtils.drawBox(event.context, pos.x.toDouble(), pos.y.toDouble(), pos.z.toDouble(), 1.0, 1.0, 1.0,
-            Color(255, 1, 1, 255), false)
+            Color(DulkirConfig.configOptions.etherwarpPreviewColor, true), false)
     }
 
     private fun raycast(entity: Entity, maxDistance: Double, tickDelta: Float): HitResult {
diff --git a/src/main/kotlin/com/dulkirfabric/features/RenderTest.kt b/src/main/kotlin/com/dulkirfabric/features/RenderTest.kt
index 179ad3d..1f00b53 100644
--- a/src/main/kotlin/com/dulkirfabric/features/RenderTest.kt
+++ b/src/main/kotlin/com/dulkirfabric/features/RenderTest.kt
@@ -19,12 +19,12 @@ object RenderTest {
             Vec3d(-183.5, 79.0, -465.5)
         )
 
-        WorldRenderUtils.drawBox(event.context, 16.0, 119.0, -6.0, 2.0, 2.0, 2.0, Color(0, 200, 200, 150), false)
+        WorldRenderUtils.drawBox(event.context, 16.0, 119.0, -6.0, 2.0, 2.0, 2.0, Color(0, 200, 200, 100), false)
     }
 
     @EventHandler
     fun onLoadEnt(event: EntityLoadEvent) {
-        if (event.entity !is GlowingEntityInterface) return
-        event.entity.setDulkirEntityGlow(true, Color(0, 0, 255, 255))
+        //if (event.entity !is GlowingEntityInterface) return
+        //event.entity.setDulkirEntityGlow(true, Color(0, 0, 255, 255))
     }
 }
\ No newline at end of file