From f254d68ec41236789e14a67dcf173b18941c0a93 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Mon, 2 Sep 2024 05:27:12 +0300 Subject: [PATCH] fade armor toggle button when not hovered --- build.gradle.kts | 2 +- gradle.properties | 2 +- .../ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index cbbf1cda4..d0fd77931 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -170,7 +170,7 @@ dependencies { val condensed_creative_version: String by project compileOnly("top.theillusivec4.curios:curios-neoforge:${curios_version}+${curios_mc_version}") - compileOnly("curse.maven:cosmetic-armor-reworked-237307:$cosmetic_armor_reworked_id") + implementation("curse.maven:cosmetic-armor-reworked-237307:$cosmetic_armor_reworked_id") compileOnly("mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}") compileOnly("mezz.jei:jei-${jei_mc_version}-neoforge-api:${jei_version}") diff --git a/gradle.properties b/gradle.properties index ad7ba78dd..5b10ad29b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,7 +24,7 @@ kommons_version=3.1.2 jei_version=19.14.1.139 jupiter_version=5.9.2 curios_version=9.0.5 -cosmetic_armor_reworked_id=5427303 +cosmetic_armor_reworked_id=5610814 ad_astra_id=4594155 botarium_id=4594094 resourceful_lib_id=4598948 diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt index afe5f56e3..a89d186e8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt @@ -16,6 +16,7 @@ import net.minecraft.world.inventory.Slot import net.minecraft.world.item.ItemStack import net.neoforged.fml.ModList import net.neoforged.neoforge.network.PacketDistributor +import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.mc.otm.client.render.MGUIGraphics import ru.dbotthepony.mc.otm.client.minecraft import ru.dbotthepony.mc.otm.client.render.sprites.MatterySprite @@ -179,10 +180,11 @@ class CosmeticToggleButton( override fun innerRender(graphics: MGUIGraphics, mouseX: Float, mouseY: Float, partialTick: Float) { val inv = ModObjects.invMan.getCosArmorInventoryClient(minecraft.player?.uuid ?: throw ConcurrentModificationException()) + val color = if (isHovered) RGBAColor.WHITE else RGBAColor.HALF_TRANSPARENT if (inv.isSkinArmor(index)) { - BUTTON_ACTIVE.render(graphics, width = width, height = height) + BUTTON_ACTIVE.render(graphics, width = width, height = height, color = color) } else { - BUTTON_INACTIVE.render(graphics, width = width, height = height) + BUTTON_INACTIVE.render(graphics, width = width, height = height, color = color) } }