- merge lang fixes

Author: Smartin-b

COMPAT.md

@@ -10,6 +10,8 @@ That being said, Better Combat also sadly has a bug with NBT based compatibility
 
 ## Other Mod Info
 - **[Better Paragliders](https://modrinth.com/mod/better-paragliders)** stamina system should work with MIAPI tools.
+- **[MineColonies](https://www.curseforge.com/minecraft/mc-mods/minecolonies)** NPCs should detect tools and armor correctly.
+- most other mods should just work as well. - if issues are found please report them
 
 ## Generated Material Info
 Truly Modular attempts to make any mods' tool materials compatible.

common/src/main/java/smartin/miapi/entity/ItemProjectileEntity.java

@@ -320,6 +320,11 @@ protected boolean tryPickup(PlayerEntity player) {
                 if (hasLoyalty && getOwner() != null && !isOwner(player)) {
                     return false;
                 }
+                if (slotId == -2 && player.getOffHandStack().isEmpty()) {
+                    player.getInventory().offHand.set(0, this.asItemStack());
+                    player.getInventory().markDirty();
+                    return true;
+                }
                 if (slotId >= 0 && player.getInventory().getStack(slotId).isEmpty()) {
                     return player.getInventory().insertStack(slotId, this.asItemStack());
                 } else {

common/src/main/java/smartin/miapi/modules/abilities/BoomerangThrowingAbility.java

@@ -79,7 +79,11 @@ public void onStoppedUsingAfter(ItemStack stack, World world, LivingEntity user,
                     boomerangEntity.setBowItem(ItemStack.EMPTY);
                     boomerangEntity.setPierceLevel((byte) (int) AttributeProperty.getActualValue(stack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_PIERCING));
                     boomerangEntity.setSpeedDamage(true);
-                    boomerangEntity.setPreferredSlot(playerEntity.getInventory().selectedSlot);
+                    if (user.getActiveHand() == Hand.OFF_HAND) {
+                        boomerangEntity.setPreferredSlot(-2);
+                    } else {
+                        boomerangEntity.setPreferredSlot(playerEntity.getInventory().selectedSlot);
+                    }
                     boomerangEntity.thrownStack = stack;
                     world.spawnEntity(boomerangEntity);
                     world.playSoundFromEntity(null, user, SoundEvents.ITEM_TRIDENT_THROW, SoundCategory.PLAYERS, 1.0f, 1.0f);

common/src/main/java/smartin/miapi/modules/abilities/ThrowingAbility.java

@@ -91,7 +91,11 @@ public void onStoppedUsingAfter(ItemStack stack, World world, LivingEntity user,
                     projectileEntity.setBowItem(ItemStack.EMPTY);
                     projectileEntity.setPierceLevel((byte) (int) AttributeProperty.getActualValue(stack, EquipmentSlot.MAINHAND, AttributeRegistry.PROJECTILE_PIERCING));
                     projectileEntity.setSpeedDamage(true);
-                    projectileEntity.setPreferredSlot(playerEntity.getInventory().selectedSlot);
+                    if (user.getActiveHand() == Hand.OFF_HAND) {
+                        projectileEntity.setPreferredSlot(-2);
+                    } else {
+                        projectileEntity.setPreferredSlot(playerEntity.getInventory().selectedSlot);
+                    }
                     projectileEntity.thrownStack = stack;
                     world.spawnEntity(projectileEntity);
                     world.playSoundFromEntity(null, user, SoundEvents.ITEM_TRIDENT_THROW, SoundCategory.PLAYERS, 1.0f, 1.0f);