From c809b8de08b18371590f8d5a92d75f072cda2e58 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Fri, 7 May 2021 20:56:00 +0800 Subject: [PATCH] Bump tools to 1.1, fix entity drop adding (#258) --- arclight-common/build.gradle | 2 +- .../common/mod/server/event/EntityEventDispatcher.java | 7 ++++--- arclight-forge-1.16/build.gradle | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arclight-common/build.gradle b/arclight-common/build.gradle index 4ae25315..f7ac10ec 100644 --- a/arclight-common/build.gradle +++ b/arclight-common/build.gradle @@ -60,7 +60,7 @@ dependencies { implementation 'net.md-5:bungeecord-chat:1.16-R0.4' implementation 'mysql:mysql-connector-java:5.1.49' implementation 'org.yaml:snakeyaml:1.27' - implementation 'io.izzel:tools:1.0.+' + implementation 'io.izzel:tools:1.1.+' implementation project(':arclight-api') implementation project(':i18n-config') } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityEventDispatcher.java b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityEventDispatcher.java index 2f7d79b2..61f87566 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityEventDispatcher.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mod/server/event/EntityEventDispatcher.java @@ -1,7 +1,7 @@ package io.izzel.arclight.common.mod.server.event; -import com.google.common.collect.Lists; import io.izzel.arclight.common.mod.util.ArclightCaptures; +import io.izzel.tools.collection.XmapList; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.ServerPlayerEntity; @@ -33,8 +33,9 @@ public class EntityEventDispatcher { if (!(drops instanceof ArrayList)) { drops = new ArrayList<>(drops); } - List itemStackList = Lists.transform((List) drops, - (ItemEntity entity) -> CraftItemStack.asCraftMirror(entity.getItem())); + List itemStackList = XmapList.create((List) drops, ItemStack.class, + (ItemEntity entity) -> CraftItemStack.asCraftMirror(entity.getItem()), + itemStack -> new ItemEntity(livingEntity.world, livingEntity.getPosX(), livingEntity.getPosY(), livingEntity.getPosZ(), CraftItemStack.asNMSCopy(itemStack))); ArclightEventFactory.callEntityDeathEvent(livingEntity, itemStackList); if (drops.isEmpty()) { event.setCanceled(true); diff --git a/arclight-forge-1.16/build.gradle b/arclight-forge-1.16/build.gradle index 423ae17b..8a1af2bc 100644 --- a/arclight-forge-1.16/build.gradle +++ b/arclight-forge-1.16/build.gradle @@ -75,7 +75,7 @@ dependencies { embed 'net.md-5:bungeecord-chat:1.16-R0.4@jar' embed "org.spigotmc:spigot-api:$minecraftVersion-R0.1-SNAPSHOT@jar" embed 'com.github.ArclightTeam:mixin-tools:1.0.0@jar' - embed 'io.izzel:tools:1.0.+' + embed 'io.izzel:tools:1.1.+' annotationProcessor 'org.spongepowered:mixin:0.8.2:processor' annotationProcessor 'com.github.ArclightTeam:mixin-tools:1.0.0' }