- fixes enchanting bugs

Author: Smartin-b

CHANGELOG.md

@@ -1,2 +1,3 @@
-## v2.0.2 (1.21)
-- fixed forge server crash
+## v2.0.3 (1.21)
+- improved stat preview more
+- fixed bugs related enchanting and to twin blades enchanting

common/src/main/java/smartin/miapi/mixin/EnchantmentMixin.java

@@ -1,11 +1,16 @@
 package smartin.miapi.mixin;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import net.minecraft.core.Holder;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import smartin.miapi.item.modular.ModularItem;
+import smartin.miapi.modules.ItemModule;
+import smartin.miapi.modules.ModuleInstance;
+import smartin.miapi.modules.properties.enchanment.AllowedEnchantments;
 
 @Mixin(Enchantment.class)
 public abstract class EnchantmentMixin {
@@ -23,7 +28,13 @@ public abstract class EnchantmentMixin {
     private boolean miapi$adjustSupportedItem(boolean original, ItemStack itemStack) {
         if (ModularItem.isModularItem(itemStack)) {
             Enchantment enchantment = (Enchantment) (Object) (this);
-            //return AllowedEnchantments.isAllowed(itemStack, enchantment, original);
+            ModuleInstance moduleInstance = ItemModule.getModules(itemStack);
+            if (moduleInstance != null && moduleInstance.registryAccess != null) {
+                Holder<Enchantment> holder = moduleInstance.registryAccess.registry(Registries.ENCHANTMENT).get().wrapAsHolder(enchantment);
+                if(holder!=null){
+                    return AllowedEnchantments.isAllowed(itemStack, holder, original);
+                }
+            }
         }
         return original;
     }
@@ -32,7 +43,13 @@ public abstract class EnchantmentMixin {
     private boolean miapi$adjustcanEnchant(boolean original, ItemStack itemStack) {
         if (ModularItem.isModularItem(itemStack)) {
             Enchantment enchantment = (Enchantment) (Object) (this);
-            //return AllowedEnchantments.isAllowed(itemStack, enchantment, original);
+            ModuleInstance moduleInstance = ItemModule.getModules(itemStack);
+            if (moduleInstance != null && moduleInstance.registryAccess != null) {
+                Holder<Enchantment> holder = moduleInstance.registryAccess.registry(Registries.ENCHANTMENT).get().wrapAsHolder(enchantment);
+                if(holder!=null){
+                    return AllowedEnchantments.isAllowed(itemStack, holder, original);
+                }
+            }
         }
         return original;
     }

common/src/main/resources/data/c/tags/items/swords.json

@@ -13,6 +13,7 @@
         "miapi:modular_longsword",
         "miapi:modular_trident",
         "miapi:modular_scythe",
-        "miapi:modular_sickle"
+        "miapi:modular_sickle",
+        "miapi:twin_blade"
     ]
 }

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel=false
 minecraft_version=1.21
 
 archives_base_name=Truly-Modular-miapi
-mod_version=2.0.2
+mod_version=2.0.3
 maven_group=smartin
 mod_id=miapi
 credits=KawataroTB, Nytifx, Ace, Beniven, Repeat, RPGLordLight and others