- fixed duplication bug while right clicking stacks in the workbench (whooops)

- fixed config option of fully-break-modular tools, now the correct item is set and it can be repaired

Author: Smartin-b

CHANGELOG.md

@@ -2,4 +2,7 @@
 - fixed crash with Enchancement Mod
 - fixed duplicating throwing knifes when multishot
 - fixed sword sweeping on neoforge
-- strongly improved rendering performance 
+- strongly improved rendering performance 
+- fixed ht-treechop not working correctly in some module setups
+- fixed duplication bug while right clicking stacks in the workbench (whooops)
+- fixed config option of fully-break-modular tools, now the correct item is set and it can be repaired

armory

@@ -6,6 +6,7 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.Container;
+import net.minecraft.world.ContainerListener;
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Inventory;
@@ -214,9 +215,23 @@ public CraftingScreenHandler getScreenHandler() {
             @Override
             public void setChanged() {
                 super.setChanged();
-                CraftingScreenHandler.this.slotsChanged(this);
             }
         };
+        ((SimpleContainer)inventory).addListener(new ContainerListener() {
+            @Override
+            public void containerChanged(Container container) {
+                CraftingScreenHandler.this.slotsChanged(container);
+                if(notClient()){
+                    ItemStack block = blockEntity.getItem();
+                    ItemStack inv = inventory.getItem(0);
+                    if (!ItemStack.matches(block, inv)) {
+                        blockEntity.setItem(inventory.getItem(0));
+                        blockEntity.saveAndSync();
+                        updateBE();
+                    }
+                }
+            }
+        });
         if (blockEntity != null) {
             this.setItem(blockEntity.getItem());
         }
@@ -287,13 +302,6 @@ public boolean notClient() {
     public void broadcastChanges() {
         super.broadcastChanges();
         if (notClient()) {
-            ItemStack block = blockEntity.getItem();
-            ItemStack inv = inventory.getItem(0);
-            if (!ItemStack.isSameItem(block, inv)) {
-                blockEntity.setItem(inventory.getItem(0));
-                blockEntity.saveAndSync();
-                updateBE();
-            }
         }
         if (blockEntity == null && delegate.get(0) == 1) {
             short xsh = (short) delegate.get(1);

arsenal

@@ -2,10 +2,9 @@
 
 import com.redpxnda.nucleus.util.Color;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.item.*;
 import org.lwjgl.system.NonnullDefault;
+import smartin.miapi.config.MiapiConfig;
 import smartin.miapi.item.FakeItemManager;
 import smartin.miapi.item.modular.PlatformModularItemMethods;
 import smartin.miapi.item.modular.VisualModularItem;
@@ -16,9 +15,18 @@
 import java.util.List;
 
 @NonnullDefault
-public class BrokenModularVisualOnlyItem extends Item implements PlatformModularItemMethods, VisualModularItem {
+public class BrokenModularVisualOnlyItem extends TieredItem implements PlatformModularItemMethods, VisualModularItem {
     public BrokenModularVisualOnlyItem() {
-        super(new Properties().stacksTo(1).durability(1000));
+        super(new ModularToolMaterial(), new Properties().stacksTo(1).durability(1000));
+    }
+
+    @Override
+    public Tier getTier() {
+        ItemStack itemStack = FakeItemManager.getDefaultInstance(this);
+        if (MiapiConfig.getServerConfig().other.looseToolMaterial && itemStack != null) {
+            return ModularToolMaterial.forItemStack(itemStack);
+        }
+        return super.getTier();
     }
 
     @Override

common/libs/armory-local.jar

@@ -122,7 +122,7 @@ public abstract class MiapiItemStackMixin {
                 if (damage + current.getDamageValue() >= current.getMaxDamage()) {
                     for (EquipmentSlot slot : EquipmentSlot.values()) {
                         if (player.getItemBySlot(slot).equals(current)) {
-                            ItemStack broken = new ItemStack(RegistryInventory.visualOnlymodularItem);
+                            ItemStack broken = new ItemStack(RegistryInventory.brokenModualrItem);
                             ItemModule.getModules(current).writeToItem(broken);
                             broken.set(DataComponents.DAMAGE, current.get(DataComponents.DAMAGE));
                             broken.set(DataComponents.MAX_DAMAGE, current.get(DataComponents.MAX_DAMAGE));
@@ -144,7 +144,7 @@ public abstract class MiapiItemStackMixin {
         if (ModularItem.isModularItem(current) && current.isDamageableItem() && !MiapiConfig.getServerConfig().other.fullBreakModularItems) {
             if (entity != null && !entity.hasInfiniteMaterials()) {
                 if (amount + current.getDamageValue() >= current.getMaxDamage()) {
-                    ItemStack broken = new ItemStack(RegistryInventory.visualOnlymodularItem);
+                    ItemStack broken = new ItemStack(RegistryInventory.brokenModualrItem);
                     ItemModule.getModules(current).writeToItem(broken);
                     broken.set(DataComponents.DAMAGE, current.get(DataComponents.DAMAGE));
                     broken.set(DataComponents.MAX_DAMAGE, current.get(DataComponents.MAX_DAMAGE));

common/libs/arsenal-local.jar

@@ -18,11 +18,11 @@ public class AnvilMenuMixin {
             at = @At("TAIL")
     )
     public void miapi$preventFullBreak(CallbackInfo ci) {
-        ItemStack current =  (
+        ItemStack current = (
                 (ForgingScreenHandlerAccessor) this)
                 .getResultSlots()
                 .getItem(0);
-        if (VisualModularItem.isVisualModularItem(current) && current.isDamageableItem() && !MiapiConfig.getServerConfig().other.fullBreakModularItems) {
+        if (VisualModularItem.isVisualModularItem(current) && current.isDamageableItem() && !MiapiConfig.getServerConfig().other.fullBreakModularItems && false) {
             ((ForgingScreenHandlerAccessor) this)
                     .getResultSlots()
                     .setItem(

common/src/main/java/smartin/miapi/client/gui/crafting/CraftingScreenHandler.java

@@ -0,0 +1,25 @@
+package smartin.miapi.mixin.smithing;
+
+import net.minecraft.world.inventory.ResultContainer;
+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.ModifyVariable;
+import smartin.miapi.item.modular.VisualModularItem;
+import smartin.miapi.modules.properties.ItemIdProperty;
+
+@Mixin(ResultContainer.class)
+public class ResultContainerMixin {
+
+    @ModifyVariable(
+            method = "setItem"
+            , at = @At("HEAD"),
+            argsOnly = true)
+    private ItemStack modifyStackBeforeSet(ItemStack current) {
+        if (VisualModularItem.isVisualModularItem(current) && current.isDamageableItem() && current.getMaxDamage() > current.getDamageValue() + 2)
+        {
+            return ItemIdProperty.changeId(current);
+        }
+        return current;
+    }
+}

common/src/main/java/smartin/miapi/item/modular/items/BrokenModularVisualOnlyItem.java

@@ -8,12 +8,11 @@
 import smartin.miapi.Miapi;
 import smartin.miapi.blocks.ModularWorkBenchEntity;
 import smartin.miapi.craft.CraftAction;
+import smartin.miapi.datapack.ReloadEvents;
+import smartin.miapi.item.modular.VisualModularItem;
 import smartin.miapi.modules.ItemModule;
 import smartin.miapi.modules.ModuleInstance;
-import smartin.miapi.modules.properties.util.CodecProperty;
-import smartin.miapi.modules.properties.util.CraftingProperty;
-import smartin.miapi.modules.properties.util.EditorError;
-import smartin.miapi.modules.properties.util.MergeType;
+import smartin.miapi.modules.properties.util.*;
 import smartin.miapi.registries.RegistryInventory;
 
 import java.util.List;
@@ -85,4 +84,21 @@ public ItemStack preview(ItemStack old, ItemStack crafting, Player player, Modul
     public ResourceLocation merge(ResourceLocation left, ResourceLocation right, MergeType mergeType) {
         return right;
     }
+
+    public Optional<ResourceLocation> getData(ItemStack itemStack) {
+        if (itemStack == null) {
+            return Optional.empty();
+        }
+        if (!VisualModularItem.isVisualModularItem(itemStack)) {
+            return Optional.empty();
+        }
+        if (ReloadEvents.isInReload()) {
+            return Optional.empty();
+        }
+        ModuleInstance baseModule = ItemModule.getModules(itemStack);
+        if (baseModule == null || baseModule.module == ItemModule.empty) {
+            return Optional.empty();
+        }
+        return Optional.ofNullable(baseModule.getPropertyItemStack(this));
+    }
 }

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

@@ -4,12 +4,15 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 import smartin.miapi.Miapi;
+import smartin.miapi.datapack.ReloadEvents;
+import smartin.miapi.item.modular.VisualModularItem;
+import smartin.miapi.material.MaterialProperty;
 import smartin.miapi.material.base.IngredientController;
+import smartin.miapi.material.base.Material;
 import smartin.miapi.modules.ItemModule;
 import smartin.miapi.modules.ModuleInstance;
 import smartin.miapi.modules.cache.ModularItemCache;
-import smartin.miapi.material.base.Material;
-import smartin.miapi.material.MaterialProperty;
+import smartin.miapi.modules.properties.util.DoubleOperationResolvable;
 import smartin.miapi.modules.properties.util.DoubleProperty;
 
 import java.util.ArrayList;
@@ -80,4 +83,21 @@ private List<Material> getRepairMaterialsPrivate(ItemStack itemStack) {
         }
         return materials;
     }
+
+    public Optional<DoubleOperationResolvable> getData(ItemStack itemStack) {
+        if (itemStack == null) {
+            return Optional.empty();
+        }
+        if (!VisualModularItem.isVisualModularItem(itemStack)) {
+            return Optional.empty();
+        }
+        if (ReloadEvents.isInReload()) {
+            return Optional.empty();
+        }
+        ModuleInstance baseModule = ItemModule.getModules(itemStack);
+        if (baseModule == null || baseModule.module == ItemModule.empty) {
+            return Optional.empty();
+        }
+        return Optional.ofNullable(baseModule.getPropertyItemStack(this));
+    }
 }

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

@@ -4,6 +4,7 @@
 import ht.treechop.api.TreeChopAPI;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.AxeItem;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
@@ -12,30 +13,22 @@
 public class TreechopUtil {
     public static TreeChopAPI api = null;
 
-    public static void setTreechopApi(Object object){
+    public static void setTreechopApi(Object object) {
         api = (TreeChopAPI) object;
-        api.registerChoppingItemBehavior(RegistryInventory.modularAxe, new IChoppingItem() {
-            @Override
-            public boolean canChop(Player playerEntity, ItemStack itemStack, Level world, BlockPos blockPos, BlockState blockState) {
-                return true;
-            }
+        RegistryInventory.MODULAR_ITEMS.addCallback(item -> {
+            api.registerChoppingItemBehavior(item, new IChoppingItem() {
+                @Override
+                public boolean canChop(Player playerEntity, ItemStack itemStack, Level world, BlockPos blockPos, BlockState blockState) {
+                    return item instanceof AxeItem || TreechopProperty.property.getValue(itemStack).orElse(0.0).intValue() > 0;
+                }
 
-            @Override
-            public int getNumChops(ItemStack itemStack, BlockState blockState) {
-                return TreechopProperty.property.getValue(itemStack).orElse(0.0).intValue() + 1;
-            }
-        });
-
-        api.registerChoppingItemBehavior(RegistryInventory.modularMattock, new IChoppingItem() {
-            @Override
-            public boolean canChop(Player playerEntity, ItemStack itemStack, Level world, BlockPos blockPos, BlockState blockState) {
-                return true;
-            }
+                @Override
+                public int getNumChops(ItemStack itemStack, BlockState blockState) {
 
-            @Override
-            public int getNumChops(ItemStack itemStack, BlockState blockState) {
-                return TreechopProperty.property.getValue(itemStack).orElse(0.0).intValue() + 1;
-            }
+                    return TreechopProperty.property.getValue(itemStack).orElse(0.0).intValue() +
+                           (item instanceof AxeItem ? 1 : 0);
+                }
+            });
         });
     }
 }

common/src/main/java/smartin/miapi/mixin/smithing/ResultContainerMixin.java

@@ -56,6 +56,9 @@ public void execute(List<BlockPos> posList, Level world, ServerPlayer player, Bl
             int success = 0;
             do {
                 pos = reducedList.remove(0);
+                if (itemStack.getMaxDamage() - itemStack.getDamageValue() < 2) {
+                    return;
+                }
                 if (tryBreakBlock(player, pos)) {
                     success++;
                     if (!player.isCreative()) {