diff --git a/src/main/java/org/polyfrost/glintcolorizer/mixin/RenderItemMixin_GlintCustomizer.java b/src/main/java/org/polyfrost/glintcolorizer/mixin/RenderItemMixin_GlintCustomizer.java index 3b2d110..7bdf639 100644 --- a/src/main/java/org/polyfrost/glintcolorizer/mixin/RenderItemMixin_GlintCustomizer.java +++ b/src/main/java/org/polyfrost/glintcolorizer/mixin/RenderItemMixin_GlintCustomizer.java @@ -29,7 +29,7 @@ public class RenderItemMixin_GlintCustomizer { ) private void glintColorizer$push(IBakedModel model, CallbackInfo ci) { if (!RenderItemHook.INSTANCE.isPotionGlintEnabled()) { return; } - if (!glintColorizer$shouldApplyMatrix()) { return; } + if (glintColorizer$shouldApplyMatrix()) { return; } GlStateManager.pushMatrix(); } @@ -245,10 +245,10 @@ public class RenderItemMixin_GlintCustomizer { @Unique private boolean glintColorizer$shouldApplyMatrix() { - return GlintConfig.INSTANCE.getPotionGlintSize() && - RenderItemHook.INSTANCE.isRenderingInGUI() && - RenderItemHook.INSTANCE.isPotionItem() && - (GlintConfig.INSTANCE.getPotionGlintForeground() || GlintConfig.INSTANCE.getPotionGlintBackground()); + return !GlintConfig.INSTANCE.getPotionGlintSize() || + !RenderItemHook.INSTANCE.isRenderingInGUI() || + !RenderItemHook.INSTANCE.isPotionItem() || + (!GlintConfig.INSTANCE.getPotionGlintForeground() && !GlintConfig.INSTANCE.getPotionGlintBackground()); } /** diff --git a/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintConfig.kt b/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintConfig.kt index 0cb3d09..a57772b 100644 --- a/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintConfig.kt +++ b/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintConfig.kt @@ -189,11 +189,6 @@ object GlintConfig : Config( ) var potionGlintForeground = false - @ColorEntry( - category = "Shiny Pots" - ) - var shinyPots = GlintEffectOptions() - @Checkbox( name = "Custom Shiny Effect Color", category = "Shiny Pots", @@ -201,6 +196,11 @@ object GlintConfig : Config( ) var potionGlintBackground = false + @ColorEntry( + category = "Shiny Pots" + ) + var shinyPots = GlintEffectOptions() + @Switch( name = "Potion Color Based Glint", category = "Shiny Pots", @@ -210,10 +210,6 @@ object GlintConfig : Config( init { initialize() - -// addDependency("potionGlintType", "potionGlint") -// addDependency("strokeOne", "individualStrokes") -// addDependency("strokeTwo", "individualStrokes") } } \ No newline at end of file diff --git a/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintEffectOptions.kt b/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintEffectOptions.kt index fa772b3..c35fa86 100644 --- a/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintEffectOptions.kt +++ b/src/main/kotlin/org/polyfrost/glintcolorizer/config/GlintEffectOptions.kt @@ -7,7 +7,7 @@ import cc.polyfrost.oneconfig.config.core.OneColor class GlintEffectOptions { @Button( - name = "Reset Held Glint Colors", + name = "Reset Glint Colors", subcategory = "Configuration", text = "Reset", description = "Resets ALL custom glint colors."