Bump to 1.20.5

1 files changed, 3 insertions, 1 deletions

diff --git a/src/main/java/moe/nea/firmament/mixins/custommodels/TestForFirmamentOverridePredicatesPatch.java b/src/main/java/moe/nea/firmament/mixins/custommodels/TestForFirmamentOverridePredicatesPatch.java
index 4db9fc0..740fbc7 100644
--- a/src/main/java/moe/nea/firmament/mixins/custommodels/TestForFirmamentOverridePredicatesPatch.java
+++ b/src/main/java/moe/nea/firmament/mixins/custommodels/TestForFirmamentOverridePredicatesPatch.java
@@ -9,6 +9,7 @@ package moe.nea.firmament.mixins.custommodels;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.sugar.Local;
 import moe.nea.firmament.features.texturepack.BakedOverrideData;
+import moe.nea.firmament.features.texturepack.CustomSkyBlockTextures;
 import moe.nea.firmament.features.texturepack.FirmamentModelPredicate;
 import moe.nea.firmament.features.texturepack.ModelOverrideData;
 import net.minecraft.client.render.model.json.ModelOverride;
@@ -38,11 +39,12 @@ public class TestForFirmamentOverridePredicatesPatch {
     @ModifyExpressionValue(method = "apply", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/model/json/ModelOverrideList$BakedOverride;test([F)Z"))
     public boolean testFirmamentOverrides(boolean originalValue,
                                           @Local ModelOverrideList.BakedOverride bakedOverride,
-                                          @Local ItemStack stack) {
+                                          @Local(argsOnly = true) ItemStack stack) {
         if (!originalValue) return false;
         var overrideData = (BakedOverrideData) bakedOverride;
         var overrides = overrideData.getFirmamentOverrides();
         if (overrides == null) return true;
+        if (!CustomSkyBlockTextures.TConfig.INSTANCE.getEnableModelOverrides()) return false;
         for (FirmamentModelPredicate firmamentOverride : overrides) {
             if (!firmamentOverride.test(stack))
                 return false;