Fix mixin issues with forgified fabric (lambda moment)

Author: JustRed23

patches/minecraft/net/minecraft/world/entity/LivingEntity.java.patch

@@ -742,7 +742,7 @@
 
        boolean flag = this.lastHurtByPlayerTime > 0;
        if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
-@@ -1349,15 +_,80 @@
+@@ -1349,15 +_,76 @@
        }
 
        this.dropEquipment();
@@ -767,7 +767,9 @@
 +         if (handlePlayerDeath$swap) s.level().getGameRules().getRule(GameRules.RULE_KEEPINVENTORY).set(handlePlayerDeath$originalKeepInv, s.getServer());
 +         if (handlePlayerDeath$cbKeepInv) {
 +            if (!drops.isEmpty()) dropAllDeathLoot$dropsCopy.addAll(drops); //Plugins can still add items
-+            dropAllDeathLoot$dropsCopy.forEach(e -> s.getInventory().add(e.getItem()));
++            for (ItemEntity itemEntity : dropAllDeathLoot$dropsCopy) {
++               s.getInventory().add(itemEntity.getItem());
++            }
 +         }
 +      }
 +      //Ketting end
@@ -781,13 +783,7 @@
 +   private boolean handlePlayerDeath$swap;
 +   protected org.bukkit.event.entity.PlayerDeathEvent handlePlayerDeath$event;
 +   private void handlePlayerDeath(ServerPlayer cast, Collection<ItemEntity> drops) {
-+      List<org.bukkit.inventory.ItemStack> bukkitDrops = io.izzel.tools.collection.XmapList.create((List<ItemEntity>) drops, org.bukkit.inventory.ItemStack.class,
-+                (ItemEntity e) -> org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack.asCraftMirror(e.getItem()),
-+                itemStack -> {
-+                    ItemEntity itemEntity = new ItemEntity(cast.level(), cast.getX(), cast.getY(), cast.getZ(), org.bukkit.craftbukkit.v1_20_R1.inventory.CraftItemStack.asNMSCopy(itemStack));
-+                    itemEntity.setDefaultPickUpDelay();
-+                    return itemEntity;
-+                });
++      List<org.bukkit.inventory.ItemStack> bukkitDrops = org.kettingpowered.ketting.craftbukkit.EventConverter.createXmapList(drops, cast);
 +
 +      handlePlayerDeath$originalKeepInv = cast.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY);
 +

src/main/java/org/kettingpowered/ketting/craftbukkit/EventConverter.java

@@ -18,20 +18,24 @@
 
 public class EventConverter {
 
+    public static List<ItemStack> createXmapList(Collection<ItemEntity> drops, LivingEntity entity) {
+        return XmapList.create((List<ItemEntity>) drops, ItemStack.class,
+                (ItemEntity e) -> CraftItemStack.asCraftMirror(e.getItem()),
+                itemStack -> {
+                    ItemEntity itemEntity = new ItemEntity(entity.level(), entity.getX(), entity.getY(), entity.getZ(), CraftItemStack.asNMSCopy(itemStack));
+                    itemEntity.setDefaultPickUpDelay();
+                    return itemEntity;
+                });
+    }
+
     public static LivingDropsEvent callLivingDropsEvent(LivingEntity entity, DamageSource source, Collection<ItemEntity> drops, int lootingLevel, boolean recentlyHit) {
         LivingDropsEvent event = new LivingDropsEvent(entity, source, drops, lootingLevel, recentlyHit);
         if (entity instanceof ServerPlayer) return event;
 
         if (!(drops instanceof ArrayList))
             drops = new ArrayList<>(drops);
 
-        List<ItemStack> bukkitDrops = XmapList.create((List<ItemEntity>) drops, ItemStack.class,
-                (ItemEntity e) -> CraftItemStack.asCraftMirror(e.getItem()),
-                itemStack -> {
-                    ItemEntity itemEntity = new ItemEntity(entity.level(), entity.getX(), entity.getY(), entity.getZ(), CraftItemStack.asNMSCopy(itemStack));
-                    itemEntity.setDefaultPickUpDelay();
-                    return itemEntity;
-                });
+        List<ItemStack> bukkitDrops = createXmapList(drops, entity);
 
         CraftLivingEntity craftLivingEntity = ((CraftLivingEntity) entity.getBukkitEntity());
         EntityDeathEvent bukkitEvent = new EntityDeathEvent(craftLivingEntity, bukkitDrops, entity.getExpReward());