From bdfb65646744ed050205f86e3df19a239a3ba610 Mon Sep 17 00:00:00 2001 From: SHsuperCM Date: Fri, 15 Oct 2021 12:27:22 +0300 Subject: Global Properties' useGlint --- .../fabric/citresewn/mixin/citenchantment/ItemStackMixin.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/shcm/shsupercm/fabric') diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/citenchantment/ItemStackMixin.java b/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/citenchantment/ItemStackMixin.java index 4834a76..033bf8e 100644 --- a/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/citenchantment/ItemStackMixin.java +++ b/src/main/java/shcm/shsupercm/fabric/citresewn/mixin/citenchantment/ItemStackMixin.java @@ -5,6 +5,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import shcm.shsupercm.fabric.citresewn.CITResewn; import shcm.shsupercm.fabric.citresewn.config.CITResewnConfig; import shcm.shsupercm.fabric.citresewn.pack.cits.CITEnchantment; @@ -29,7 +30,7 @@ public class ItemStackMixin implements CITEnchantment.Cached { @Inject(method = "hasGlint", cancellable = true, at = @At("HEAD")) private void disableDefaultGlint(CallbackInfoReturnable cir) { - if (CITEnchantment.shouldApply && CITEnchantment.appliedContext != null && !CITEnchantment.appliedContext.get(0).useGlint) + if (CITResewn.INSTANCE.activeCITs != null && ((!CITResewn.INSTANCE.activeCITs.effectiveGlobalProperties.useGlint) || (CITEnchantment.appliedContext != null && CITEnchantment.shouldApply && !CITEnchantment.appliedContext.get(0).useGlint))) cir.setReturnValue(false); } } -- cgit