Add mod menu support for config and implement #3 as a toggleable option

build.gradle.kts

@@ -20,6 +20,7 @@ group = mavenGroup
 repositories {
     mavenCentral()
     maven("https://maven.shedaniel.me/")
+    maven("https://maven.terraformersmc.com/releases/")
 }
 dependencies {
     val minecraftVersion: String by project
@@ -33,11 +34,11 @@ dependencies {
     val fabricKotlinVersion: String by project
     modImplementation("net.fabricmc:fabric-language-kotlin:$fabricKotlinVersion")
     val clothConfigVersion: String by project
-    modApi("me.shedaniel.cloth:cloth-config-fabric:$clothConfigVersion") {
-        exclude("net.fabricmc.fabric-api")
-    }
+    modApi("me.shedaniel.cloth:cloth-config-fabric:$clothConfigVersion")
+    val modMenuVersion: String by project
+    modApi("com.terraformersmc:modmenu:$modMenuVersion")
 
-    modImplementation("blue.endless:jankson:1.2.1")
+    modImplementation("blue.endless:jankson:1.2.2")
 }
 tasks {
     val javaVersion = JavaVersion.VERSION_17

gradle.properties

@@ -16,4 +16,5 @@ archivesBaseName = waxednotwaxed
 systemProp.kotlinVersion = 1.6.10
 fabricKotlinVersion = 1.8.7+kotlin.1.7.22
 
-clothConfigVersion = 11.0.99
+clothConfigVersion = 11.0.99
+modMenuVersion = 7.0.1

src/main/kotlin/me/iru/waxednotwaxed/WaxedNotWaxed.kt

@@ -1,9 +1,9 @@
 package me.iru.waxednotwaxed
 
+import me.iru.waxednotwaxed.config.WaxedNotWaxedConfig
 import me.iru.waxednotwaxed.events.EndClientTickHandler
 import me.iru.waxednotwaxed.events.HudRenderHandler
 import me.shedaniel.autoconfig.AutoConfig
-import me.shedaniel.autoconfig.ConfigHolder
 import me.shedaniel.autoconfig.annotation.Config
 import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer
 import net.fabricmc.api.ClientModInitializer
@@ -14,24 +14,21 @@ import net.minecraft.client.option.KeyBinding
 import net.minecraft.client.util.InputUtil
 import org.lwjgl.glfw.GLFW
 
-
 object WaxedNotWaxed : ClientModInitializer {
 
     var keyBinding: KeyBinding? = null
-    var config: ConfigHolder<ToggleConfig>? = null
-    var toggledCached: Boolean = false
+    lateinit var config: WaxedNotWaxedConfig
 
     override fun onInitializeClient() {
         AutoConfig.register(
-            ToggleConfig::class.java
-        ) { definition: Config?, configClass: Class<ToggleConfig?>? ->
+            WaxedNotWaxedConfig::class.java
+        ) { definition: Config?, configClass: Class<WaxedNotWaxedConfig?>? ->
             JanksonConfigSerializer(
                 definition,
                 configClass
             )
         }
-        this.config = AutoConfig.getConfigHolder(ToggleConfig::class.java)
-        this.toggledCached = this.config!!.get().toggled
+        this.config = AutoConfig.getConfigHolder(WaxedNotWaxedConfig::class.java).get()
 
         this.keyBinding = KeyBindingHelper.registerKeyBinding(
             KeyBinding(

src/main/kotlin/me/iru/waxednotwaxed/config/ModMenuIntegration.kt

@@ -0,0 +1,16 @@
+package me.iru.waxednotwaxed.config
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory
+import com.terraformersmc.modmenu.api.ModMenuApi
+import me.shedaniel.autoconfig.AutoConfig
+import net.minecraft.client.gui.screen.Screen
+
+class ModMenuIntegration: ModMenuApi {
+    override fun getModConfigScreenFactory(): ConfigScreenFactory<*> {
+        return ConfigScreenFactory { parent: Screen? ->
+            AutoConfig.getConfigScreen(
+                WaxedNotWaxedConfig::class.java, parent
+            ).get()
+        }
+    }
+}

src/main/kotlin/me/iru/waxednotwaxed/config/WaxedNotWaxedConfig.kt

@@ -0,0 +1,15 @@
+package me.iru.waxednotwaxed.config
+
+import me.shedaniel.autoconfig.AutoConfig
+import me.shedaniel.autoconfig.ConfigData
+import me.shedaniel.autoconfig.annotation.Config
+
+@Config(name = "waxednotwaxed")
+class WaxedNotWaxedConfig : ConfigData {
+    var enabled: Boolean = false
+    var onlyShowWhenHoldingAxe: Boolean = false
+
+    fun save() {
+        AutoConfig.getConfigHolder(this::class.java).save()
+    }
+}

src/main/kotlin/me/iru/waxednotwaxed/events/EndClientTickHandler.kt

@@ -9,10 +9,9 @@ import net.minecraft.sound.SoundEvents
 fun EndClientTickHandler(): ClientTickEvents.EndTick {
     return ClientTickEvents.EndTick {
         while(WaxedNotWaxed.keyBinding!!.wasPressed()) {
-            val newValue = !WaxedNotWaxed.toggledCached
-            WaxedNotWaxed.toggledCached = newValue
-            WaxedNotWaxed.config!!.config.toggled = newValue
-            WaxedNotWaxed.config!!.save()
+            val newValue = !WaxedNotWaxed.config.enabled
+            WaxedNotWaxed.config.enabled = newValue
+            WaxedNotWaxed.config.save()
             val mc = MinecraftClient.getInstance()
             val p = mc.player!!
             mc.world!!.playSound(p, p.blockPos, SoundEvents.UI_BUTTON_CLICK.value(), SoundCategory.MASTER, 0.1f, 1f)

src/main/kotlin/me/iru/waxednotwaxed/events/HudRenderHandler.kt

@@ -8,12 +8,16 @@ import net.minecraft.block.OxidizableSlabBlock
 import net.minecraft.block.OxidizableStairsBlock
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawContext
+import net.minecraft.item.AxeItem
 import net.minecraft.util.Identifier
 
 class HudRenderHandler : HudRenderCallback {
 
     override fun onHudRender(drawContext: DrawContext?, tickDelta: Float) {
-        if(drawContext == null || !WaxedNotWaxed.toggledCached) return
+        if(drawContext == null ||
+            !WaxedNotWaxed.config.enabled ||
+            (WaxedNotWaxed.config.onlyShowWhenHoldingAxe && MinecraftClient.getInstance().player!!.mainHandStack.item !is AxeItem)
+        ) return
         val lookingAt = Utils.getBlockAtCrosshair() ?: return
         if (lookingAt.name.toString().lowercase().contains("waxed")) render(drawContext, true)
         else if(lookingAt is OxidizableBlock || lookingAt is OxidizableSlabBlock || lookingAt is OxidizableStairsBlock) {

src/main/resources/assets/waxednotwaxed/lang/en_us.json

@@ -1,4 +1,7 @@
 {
+  "text.autoconfig.waxednotwaxed.title": "Waxed Not Waxed Config",
+  "text.autoconfig.waxednotwaxed.option.enabled": "Enabled",
+  "text.autoconfig.waxednotwaxed.option.onlyShowWhenHoldingAxe": "Only show when holding an axe",
   "key.waxednotwaxed.toggle": "Toggle Indicator",
   "category.waxednotwaxed.keybindcategory": "Waxed Not Waxed"
 }

src/main/resources/fabric.mod.json

@@ -21,6 +21,9 @@
         "adapter": "kotlin",
         "value": "me.iru.waxednotwaxed.WaxedNotWaxed"
       }
+    ],
+    "modmenu": [
+      "me.iru.waxednotwaxed.config.ModMenuIntegration"
     ]
   },
   "depends": {
@@ -29,5 +32,12 @@
     "fabric-language-kotlin": ">=1.8.7+kotlin.1.7.22",
     "minecraft": ">=1.20",
     "java": ">=17"
+  },
+  "custom": {
+    "modmenu": {
+      "links": {
+        "modmenu.discord": "https://discord.gg/jrebrmDD5X"
+      }
+    }
   }
 }