- fixed enchantment transformers on forge

Author: Smartin-b

CHANGELOG.md

@@ -5,4 +5,5 @@
 - improved armor compatibility
 - fixed heavy attack not multiplying damage
 - actually enabled NBT Property
-- fixed crash with minecolonies
+- fixed crash with minecolonies
+- fixed enchantment transformers

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

@@ -18,7 +18,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import smartin.miapi.events.MiapiEvents;
-import smartin.miapi.item.FakeEnchantment;
 import smartin.miapi.item.modular.ModularItem;
 import smartin.miapi.modules.properties.ChannelingProperty;
 import smartin.miapi.modules.properties.EnchantAbilityProperty;
@@ -131,17 +130,6 @@ public class EnchantmentHelperMixin {
         return original;
     }
 
-    @ModifyReturnValue(
-            method = "getLevel(Lnet/minecraft/enchantment/Enchantment;Lnet/minecraft/item/ItemStack;)I",
-            at = @At("RETURN")
-    )
-    private static int miapi$modifyPossibleEntries(int original, Enchantment enchantment, ItemStack stack) {
-        if (stack.getItem() instanceof ModularItem) {
-            return FakeEnchantment.getFakeLevel(enchantment, stack, original);
-        }
-        return original;
-    }
-
     private static List<EnchantmentLevelEntry> getLevels(int power, ItemStack stack, boolean treasureAllowed) {
         ArrayList<EnchantmentLevelEntry> list = Lists.newArrayList();
         if (stack.getItem() instanceof ModularItem) {
@@ -158,12 +146,4 @@ private static List<EnchantmentLevelEntry> getLevels(int power, ItemStack stack,
         }
         return list;
     }
-
-    @Inject(
-            method = "forEachEnchantment(Lnet/minecraft/enchantment/EnchantmentHelper$Consumer;Lnet/minecraft/item/ItemStack;)V",
-            at = @At("TAIL"),
-            cancellable = true)
-    private static void miapi$addFakeEnchants(EnchantmentHelper.Consumer consumer, ItemStack stack, CallbackInfo ci) {
-        FakeEnchantment.addEnchantments(consumer, stack);
-    }
 }

fabric/src/main/java/smartin/miapi/fabric/mixin/EnchantmentHelperMixin.java

@@ -0,0 +1,35 @@
+package smartin.miapi.fabric.mixin;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.item.ItemStack;
+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.CallbackInfo;
+import smartin.miapi.item.FakeEnchantment;
+import smartin.miapi.item.modular.ModularItem;
+
+@Mixin(value = EnchantmentHelper.class, priority = 700)
+public class EnchantmentHelperMixin {
+
+    @ModifyReturnValue(
+            method = "getLevel(Lnet/minecraft/enchantment/Enchantment;Lnet/minecraft/item/ItemStack;)I",
+            at = @At("RETURN")
+    )
+    private static int miapi$modifyPossibleEntries(int original, Enchantment enchantment, ItemStack stack) {
+        if (stack.getItem() instanceof ModularItem) {
+            return FakeEnchantment.getFakeLevel(enchantment, stack, original);
+        }
+        return original;
+    }
+
+    @Inject(
+            method = "forEachEnchantment(Lnet/minecraft/enchantment/EnchantmentHelper$Consumer;Lnet/minecraft/item/ItemStack;)V",
+            at = @At("TAIL"),
+            cancellable = true)
+    private static void miapi$addFakeEnchants(EnchantmentHelper.Consumer consumer, ItemStack stack, CallbackInfo ci) {
+        FakeEnchantment.addEnchantments(consumer, stack);
+    }
+}

fabric/src/main/resources/miapi.mixins.json

@@ -5,7 +5,8 @@
     "compatibilityLevel": "JAVA_17",
     "mixins": [
         "LivingEntityMixin",
-        "PlatformModularItemMethodsMixin"
+        "PlatformModularItemMethodsMixin",
+        "EnchantmentHelperMixin"
     ],
     "client": [
         "EntityMixin",

forge/build.gradle

@@ -49,6 +49,7 @@ dependencies {
     // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
 
+    forgeRuntimeLibrary("com.ezylang:EvalEx:${rootProject.eval_ex_version}")
     forgeRuntimeLibrary(include("com.ezylang:EvalEx:${rootProject.eval_ex_version}"))
     modApi("top.theillusivec4.caelus:caelus-forge:${rootProject.forge_caelus_version}")
 

forge/src/main/java/smartin/miapi/forge/TrulyModularForge.java

@@ -6,6 +6,7 @@
 import dev.architectury.registry.ReloadListenerRegistry;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
@@ -63,6 +64,7 @@ public TrulyModularForge() {
                 Miapi.LOGGER.info("couldnt load quark compat",e);
             }
         }
+        EnchantmentHelper helper;
         bus.register(new ModEvents());
         MinecraftForge.EVENT_BUS.register(new ServerEvents());
         Miapi.init();

forge/src/main/java/smartin/miapi/forge/mixin/item/ModularItemMixin.java

@@ -2,6 +2,8 @@
 
 import com.google.common.collect.Multimap;
 import net.minecraft.block.BlockState;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.attribute.EntityAttribute;
@@ -10,8 +12,12 @@
 import net.minecraftforge.common.ToolAction;
 import org.spongepowered.asm.mixin.Mixin;
 import smartin.miapi.forge.compat.ModularItemInject;
+import smartin.miapi.item.FakeEnchantment;
 import smartin.miapi.item.modular.items.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Mixin(
         value = {
                 ExampleModularItem.class,
@@ -63,6 +69,16 @@ public int getEnchantmentValue(ItemStack stack) {
         return getEnchantmentValueModular(stack);
     }
 
+    public int getEnchantmentLevel(ItemStack stack, Enchantment enchantment) {
+        return FakeEnchantment.getFakeLevel(enchantment, stack, EnchantmentHelper.getTagEnchantmentLevel(enchantment, stack));
+    }
+
+    public Map<Enchantment, Integer> getAllEnchantments(ItemStack stack) {
+        Map<Enchantment, Integer> enchants = new HashMap<>(EnchantmentHelper.fromNbt(stack.getEnchantments()));
+        FakeEnchantment.addEnchantments((enchants::put), stack);
+        return enchants;
+    }
+
     public Multimap<EntityAttribute, EntityAttributeModifier> getAttributeModifiers(EquipmentSlot slot, ItemStack stack) {
         return getAttributeModifiersModular(slot, stack);
     }