- fix cache and registry lookup and enchant bugs

Author: Smartin-b

CHANGELOG.md

@@ -1,5 +1,2 @@
-## v2.0.6 (1.21)
-- fixed tool miss-identification on neoforge
-- fixed bug where fake enchants could become permanent (whoops)
-- fixed vein mining max being not set correctly
-- fixed bug where we expected the item name to be added to the lore list
+## v2.0.7 (1.21)
+- fixes to armor rendering on forge

common/src/main/java/smartin/miapi/Miapi.java

@@ -48,7 +48,7 @@
 import smartin.miapi.material.MaterialCommand;
 import smartin.miapi.material.MaterialIcons;
 import smartin.miapi.material.generated.GeneratedMaterialManager;
-import smartin.miapi.mixin.ItemStackAccessor;
+import smartin.miapi.mixin.item.ItemStackAccessor;
 import smartin.miapi.modules.ItemModule;
 import smartin.miapi.modules.MiapiPermissions;
 import smartin.miapi.modules.ModuleDataPropertiesManager;
@@ -223,7 +223,7 @@ public static void init() {
                 Miapi.server.getPlayerList().getPlayers().forEach(p -> {
                     p.getInventory().setChanged();
                     CompoundTag tag = new CompoundTag();
-                    if(p.save(tag)){
+                    if (p.save(tag)) {
                         p.load(tag);
                     }
                 });

common/src/main/java/smartin/miapi/client/atlas/MaterialAtlasManager.java

@@ -9,8 +9,8 @@
 import net.minecraft.client.resources.TextureAtlasHolder;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
-import smartin.miapi.mixin.TextureAtlasAccessor;
-import smartin.miapi.mixin.TextureAtlasHolderAccessor;
+import smartin.miapi.mixin.client.TextureAtlasAccessor;
+import smartin.miapi.mixin.client.TextureAtlasHolderAccessor;
 
 import java.util.ArrayList;
 import java.util.List;

common/src/main/java/smartin/miapi/craft/CraftAction.java

@@ -4,6 +4,7 @@
 import com.mojang.datafixers.util.Pair;
 import com.mojang.serialization.JsonOps;
 import net.minecraft.client.Minecraft;
+import net.minecraft.nbt.NbtOps;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.RegistryOps;
 import net.minecraft.resources.ResourceLocation;
@@ -335,12 +336,27 @@ public ItemStack getPreview() {
                 });
                 return old;
             }
+            if (player != null && player.level() != null) {
+                parsingInstance.registryAccess = player.level().registryAccess();
+            }
             parsingInstance = parsingInstance.getSubModule(slotLocation.get(i));
         }
         for (CraftingEvent eventHandler : events) {
             craftingStack.set(eventHandler.onPreview(old, craftingStack.get(), parsingInstance));
         }
+        ItemModule.getModules(craftingStack.get()).clearCaches();
         linkedInventory.setChanged();
+        try {
+            if (this.player != null && this.player.level() != null) {
+                ModuleInstance moduleInstance = ItemModule.getModules(craftingStack.get());
+                var ops = RegistryOps.create(NbtOps.INSTANCE, this.player.level().registryAccess());
+                ItemStack stack = craftingStack.get();
+                ModuleInstance.CODEC.decode(ops, ModuleInstance.CODEC.encodeStart(ops, moduleInstance).result().get()).result().get().getFirst().writeToItem(stack);
+                return stack;
+            }
+        } catch (RuntimeException suppressed) {
+
+        }
         return craftingStack.get();
     }
 

common/src/main/java/smartin/miapi/item/modular/items/bows/ModularCrossbow.java

@@ -29,7 +29,7 @@
 import smartin.miapi.item.FakeItemstackReferenceProvider;
 import smartin.miapi.item.modular.ModularItem;
 import smartin.miapi.item.modular.PlatformModularItemMethods;
-import smartin.miapi.mixin.CrossbowItemAccessor;
+import smartin.miapi.mixin.item.CrossbowItemAccessor;
 import smartin.miapi.modules.properties.DisplayNameProperty;
 import smartin.miapi.modules.properties.LoreProperty;
 import smartin.miapi.modules.properties.RepairPriority;

common/src/main/java/smartin/miapi/loot/LootHelper.java

@@ -11,7 +11,7 @@
 import net.minecraft.world.level.storage.loot.parameters.LootContextParam;
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
 import smartin.miapi.Miapi;
-import smartin.miapi.mixin.LootTableAccessor;
+import smartin.miapi.mixin.loot.LootTableAccessor;
 
 import java.util.List;
 import java.util.Optional;

common/src/main/java/smartin/miapi/material/generated/SmithingRecipeUtil.java

@@ -12,7 +12,7 @@
 import smartin.miapi.item.MaterialSmithingRecipe;
 import smartin.miapi.material.MaterialProperty;
 import smartin.miapi.material.base.Material;
-import smartin.miapi.mixin.SmithingTransformRecipeAccessor;
+import smartin.miapi.mixin.smithing.SmithingTransformRecipeAccessor;
 
 import java.util.ArrayList;
 import java.util.Arrays;

common/src/main/java/smartin/miapi/mixin/KeyMappingAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/client/KeyMappingAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.client;
 
 import net.minecraft.client.KeyMapping;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/smartin/miapi/mixin/MinecraftAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/client/MinecraftAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.client;
 
 import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/smartin/miapi/mixin/TextureAtlasAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/client/TextureAtlasAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.client;
 
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;

common/src/main/java/smartin/miapi/mixin/TextureAtlasHolderAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/client/TextureAtlasHolderAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.client;
 
 import net.minecraft.client.renderer.texture.TextureAtlas;
 import net.minecraft.client.resources.TextureAtlasHolder;

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

@@ -0,0 +1,15 @@
+package smartin.miapi.mixin.enchant;
+
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(EnchantmentHelper.class)
+public class EnchantmentHelperMixin {
+/*
+    @Inject(method = {"getComponentType(Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/core/component/DataComponentType;"}, at = @At("RETURN"))
+    private static void afterModifyEnchantments(ItemStack context, CallbackInfoReturnable<DataComponentType<ItemEnchantments>> cir) {
+        ((ItemEnchantmentsAccessor) cir.getReturnValue()).setOwnerStack(context);
+    }
+
+ */
+}

common/src/main/java/smartin/miapi/mixin/EnchantmentMixin.java renamed to common/src/main/java/smartin/miapi/mixin/enchant/EnchantmentMixin.java

@@ -1,19 +1,17 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.enchant;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import net.fabricmc.api.EnvType;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.enchantment.Enchantment;
-import org.apache.commons.lang3.mutable.MutableFloat;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import smartin.miapi.Environment;
+import smartin.miapi.MixinContextFlags;
 import smartin.miapi.item.modular.ModularItem;
 import smartin.miapi.modules.ItemModule;
 import smartin.miapi.modules.ModuleInstance;
@@ -33,6 +31,10 @@ public abstract class EnchantmentMixin {
 
     @ModifyReturnValue(method = "isSupportedItem", at = @At(value = "RETURN"))
     private boolean miapi$adjustSupportedItem(boolean original, ItemStack itemStack) {
+        if (MixinContextFlags.CALLED_FROM_MUTABLE.get()) {
+            return original;
+        }
+
         if (ModularItem.isModularItem(itemStack)) {
             Enchantment enchantment = (Enchantment) (Object) (this);
             ModuleInstance moduleInstance = ItemModule.getModules(itemStack);
@@ -57,6 +59,9 @@ public Holder<Enchantment> getClient(Enchantment enchantment){
 
     @ModifyReturnValue(method = "canEnchant(Lnet/minecraft/world/item/ItemStack;)Z", at = @At(value = "RETURN"))
     private boolean miapi$adjustcanEnchant(boolean original, ItemStack itemStack) {
+        if (MixinContextFlags.CALLED_FROM_MUTABLE.get()) {
+            return original;
+        }
         if (ModularItem.isModularItem(itemStack)) {
             Enchantment enchantment = (Enchantment) (Object) (this);
             ModuleInstance moduleInstance = ItemModule.getModules(itemStack);

common/src/main/java/smartin/miapi/mixin/EnchantmentMutableMixin.java renamed to common/src/main/java/smartin/miapi/mixin/enchant/EnchantmentMutableMixin.java

@@ -1,10 +1,13 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.enchant;
 
+import net.minecraft.core.Holder;
+import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.ItemEnchantments;
 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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import smartin.miapi.MixinContextFlags;
 
 @Mixin(ItemEnchantments.Mutable.class)
@@ -18,4 +21,14 @@ private void onModifyEnchantments(CallbackInfo ci) {
     private void afterModifyEnchantments(CallbackInfo ci) {
         MixinContextFlags.CALLED_FROM_MUTABLE.set(false);
     }
+
+    @Inject(method = {"getLevel"}, at = @At("HEAD"))
+    private void onModifyEnchantments(Holder<Enchantment> enchantment, CallbackInfoReturnable<Integer> cir) {
+        MixinContextFlags.CALLED_FROM_MUTABLE.set(true);
+    }
+
+    @Inject(method = {"getLevel"}, at = @At("RETURN"))
+    private void afterModifyEnchantments(Holder<Enchantment> enchantment, CallbackInfoReturnable<Integer> cir) {
+        MixinContextFlags.CALLED_FROM_MUTABLE.set(false);
+    }
 }

common/src/main/java/smartin/miapi/mixin/ItemEnchantmentsMixin.java renamed to common/src/main/java/smartin/miapi/mixin/enchant/ItemEnchantmentsMixin.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.enchant;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
@@ -7,23 +7,37 @@
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.ItemEnchantments;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import smartin.miapi.MixinContextFlags;
 import smartin.miapi.item.modular.ModularItem;
 import smartin.miapi.modules.properties.enchanment.FakeEnchantmentManager;
+import smartin.miapi.modules.properties.enchanment.ItemEnchantmentsAccessor;
 
 import java.util.Set;
 
 @Mixin(ItemEnchantments.class)
-public abstract class ItemEnchantmentsMixin {
+public abstract class ItemEnchantmentsMixin implements ItemEnchantmentsAccessor {
+
+    @Unique
+    ItemStack ownerStack;
+
+    @Override
+    public ItemStack getOwnerStack() {
+        return ownerStack;
+    }
+    @Override
+    public void setOwnerStack(ItemStack itemStack){
+        this.ownerStack = itemStack;
+    }
 
     @ModifyReturnValue(method = "entrySet()Ljava/util/Set;", at = @At("RETURN"))
     public Set<Object2IntMap.Entry<Holder<Enchantment>>> miapi$adjustFakeEnchants(Set<Object2IntMap.Entry<Holder<Enchantment>>> original) {
         if (MixinContextFlags.CALLED_FROM_MUTABLE.get()) {
             return original;
         }
         ItemEnchantments itemEnchantments = (ItemEnchantments) (Object) this;
-        ItemStack itemStack = FakeEnchantmentManager.lookupMap.get(itemEnchantments);
+        ItemStack itemStack = getOwnerStack();
         if (itemStack != null && ModularItem.isModularItem(itemStack)) {
             //TODO:this might not work
             return FakeEnchantmentManager.adjustEnchantments(original, itemStack);
@@ -37,7 +51,7 @@ public abstract class ItemEnchantmentsMixin {
             return original;
         }
         ItemEnchantments itemEnchantments = (ItemEnchantments) (Object) this;
-        ItemStack itemStack = FakeEnchantmentManager.lookupMap.get(itemEnchantments);
+        ItemStack itemStack = getOwnerStack();
         if (itemStack != null && ModularItem.isModularItem(itemStack)) {
             //TODO:this might not work
             return FakeEnchantmentManager.adjustLevel(enchantment, original, itemStack);

common/src/main/java/smartin/miapi/mixin/enchant/MiapiEnchantItemstackMixin.java

@@ -0,0 +1,21 @@
+package smartin.miapi.mixin.enchant;
+
+import net.minecraft.core.component.DataComponentMap;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.world.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.CallbackInfoReturnable;
+import smartin.miapi.modules.properties.enchanment.ItemEnchantmentsAccessor;
+
+@Mixin(ItemStack.class)
+public class MiapiEnchantItemstackMixin {
+
+    @Inject(method = {"Lnet/minecraft/world/item/ItemStack;getComponents()Lnet/minecraft/core/component/DataComponentMap;"}, at = @At("RETURN"))
+    private void afterModifyEnchantments(CallbackInfoReturnable<DataComponentMap> cir) {
+        if (cir.getReturnValue().has(DataComponents.ENCHANTMENTS)) {
+            ((ItemEnchantmentsAccessor) cir.getReturnValue().get(DataComponents.ENCHANTMENTS)).setOwnerStack((ItemStack) (Object) this);
+        }
+    }
+}

common/src/main/java/smartin/miapi/mixin/AxeItemAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/item/AxeItemAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.item;
 
 import net.minecraft.world.item.AxeItem;
 import net.minecraft.world.level.block.Block;

common/src/main/java/smartin/miapi/mixin/ChorusFruitMixin.java renamed to common/src/main/java/smartin/miapi/mixin/item/ChorusFruitMixin.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.item;
 
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ChorusFruitItem;

common/src/main/java/smartin/miapi/mixin/CrossbowItemAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/item/CrossbowItemAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.item;
 
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.CrossbowItem;

common/src/main/java/smartin/miapi/mixin/HoeItemAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/item/HoeItemAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.item;
 
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.world.item.HoeItem;

common/src/main/java/smartin/miapi/mixin/ItemStackAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/item/ItemStackAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.item;
 
 import com.mojang.serialization.Codec;
 import net.minecraft.world.item.ItemStack;

common/src/main/java/smartin/miapi/mixin/MiapiItemStackMixin.java renamed to common/src/main/java/smartin/miapi/mixin/item/MiapiItemStackMixin.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.item;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import net.minecraft.core.component.DataComponentType;

common/src/main/java/smartin/miapi/mixin/ShovelItemAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/item/ShovelItemAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.item;
 
 import net.minecraft.world.item.ShovelItem;
 import net.minecraft.world.level.block.Block;

common/src/main/java/smartin/miapi/mixin/ThrowablePotionItemAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/item/ThrowablePotionItemAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.item;
 
 import net.minecraft.world.entity.projectile.ThrownPotion;
 import net.minecraft.world.phys.HitResult;

common/src/main/java/smartin/miapi/mixin/LootContextAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/loot/LootContextAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.loot;
 
 import net.minecraft.world.level.storage.loot.LootContext;
 import net.minecraft.world.level.storage.loot.LootParams;

common/src/main/java/smartin/miapi/mixin/LootContextTypesAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/loot/LootContextTypesAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.loot;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;

common/src/main/java/smartin/miapi/mixin/LootParamsAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/loot/LootParamsAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.loot;
 
 import net.minecraft.world.level.storage.loot.LootParams;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParam;

common/src/main/java/smartin/miapi/mixin/LootPoolMixin.java renamed to common/src/main/java/smartin/miapi/mixin/loot/LootPoolMixin.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.loot;
 
 import net.minecraft.world.level.storage.loot.LootPool;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/smartin/miapi/mixin/LootTableAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/loot/LootTableAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.loot;
 
 import net.minecraft.world.level.storage.loot.LootPool;
 import net.minecraft.world.level.storage.loot.LootTable;

common/src/main/java/smartin/miapi/mixin/LootTableMixin.java renamed to common/src/main/java/smartin/miapi/mixin/loot/LootTableMixin.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.loot;
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.core.registries.Registries;

common/src/main/java/smartin/miapi/mixin/AnvilMenuMixin.java renamed to common/src/main/java/smartin/miapi/mixin/smithing/AnvilMenuMixin.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.smithing;
 
 import net.minecraft.world.inventory.AnvilMenu;
 import net.minecraft.world.item.ItemStack;

common/src/main/java/smartin/miapi/mixin/ForgingScreenHandlerAccessor.java renamed to common/src/main/java/smartin/miapi/mixin/smithing/ForgingScreenHandlerAccessor.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.smithing;
 
 import net.minecraft.world.Container;
 import net.minecraft.world.inventory.ItemCombinerMenu;

common/src/main/java/smartin/miapi/mixin/ItemCombinerMenuMixin.java renamed to common/src/main/java/smartin/miapi/mixin/smithing/ItemCombinerMenuMixin.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.smithing;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.ItemCombinerMenu;

common/src/main/java/smartin/miapi/mixin/SmithingMenuMixin.java renamed to common/src/main/java/smartin/miapi/mixin/smithing/SmithingMenuMixin.java

@@ -1,4 +1,4 @@
-package smartin.miapi.mixin;
+package smartin.miapi.mixin.smithing;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.SmithingMenu;