Enchantment logic improvments

Author: ZsoltMolnarrr

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.4.6
+
+- Enchantment that require matching attributes can now be configured to disable this requirement
+- Fix unsafe check in enchantment logic
+- Update translations
+
 # 1.4.5
 
 - Update translations

common/src/main/java/net/spell_power/SpellPowerMod.java

@@ -56,11 +56,15 @@ public static void registerAttributes() {
         }
 
         EnchantmentEvents.ALLOW_ENCHANTING.register((enchantment, target, enchantingContext) -> {
-            if (enchantment.isIn(SpellPowerTags.Enchantments.REQUIRES_MATCHING_ATTRIBUTE))  {
+            if (SpellPowerMod.attributesConfig.value.enchantments_require_matching_attribute &&
+                    enchantment.isIn(SpellPowerTags.Enchantments.REQUIRES_MATCHING_ATTRIBUTE))  {
                 // System.out.println("Spell Power - School Filtering check: " + enchantment);
                 var enchantmentAttributes = enchantment.value().effects().get(EnchantmentEffectComponentTypes.ATTRIBUTES);
                 if (enchantmentAttributes != null && !enchantmentAttributes.isEmpty()) {
                     var itemAttributes = target.getComponents().get(DataComponentTypes.ATTRIBUTE_MODIFIERS);
+                    if (itemAttributes == null) {
+                        return TriState.FALSE;
+                    }
                     if (itemAttributes.modifiers().isEmpty()) {
                         itemAttributes = target.getItem().getAttributeModifiers();
                     }

common/src/main/java/net/spell_power/config/AttributesConfig.java

@@ -15,7 +15,7 @@ public enum AttributeScope {
     public double base_spell_critical_damage_percentage = 50;
     public EffectConfig spell_power_effect = new EffectConfig(0.1F);
     public Map<String, EffectConfig> secondary_effects;
-
+    public boolean enchantments_require_matching_attribute = true;
 
     public DamageCurve resistance_curve = DamageCurve.HYPERBOLIC;
     public float resistance_multiplier = 1F;

gradle.properties

@@ -15,7 +15,7 @@ neoforge_version = 21.1.201
 # Mod
 maven_group=net.spell_power
 archives_name=spell_power
-mod_version=1.4.5
+mod_version=1.4.6
 minecraft_compat_version=1.21
 
 # Dependencies