Fix #2399 (#2440)

Author: LShiftLess

src/main/java/twilightforest/entity/projectile/IceArrow.java

@@ -5,6 +5,7 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
@@ -24,6 +25,10 @@ public IceArrow(Level world, @Nullable LivingEntity shooter, ItemStack stack, It
 		super(TFEntities.ICE_ARROW.get(), world, shooter, stack, weapon);
 	}
 
+	public IceArrow(AbstractArrow parentArrow, ItemStack stack, ItemStack weapon) {
+		super(TFEntities.ICE_ARROW.get(), parentArrow, stack, weapon);
+	}
+
 	@Override
 	public void tick() {
 		super.tick();

src/main/java/twilightforest/entity/projectile/SeekerArrow.java

@@ -6,6 +6,7 @@
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.*;
 import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.AABB;
@@ -35,6 +36,11 @@ public SeekerArrow(Level world, LivingEntity shooter, ItemStack stack, ItemStack
 		this.setBaseDamage(1.0D);
 	}
 
+	public SeekerArrow(AbstractArrow parentArrow, ItemStack stack, ItemStack weapon) {
+		super(TFEntities.SEEKER_ARROW.get(), parentArrow, stack, weapon);
+		this.setBaseDamage(1.0D);
+	}
+
 	@Override
 	protected void defineSynchedData(SynchedEntityData.Builder builder) {
 		super.defineSynchedData(builder);

src/main/java/twilightforest/entity/projectile/TFArrow.java

@@ -11,8 +11,12 @@
 
 public abstract class TFArrow extends AbstractArrow implements ITFProjectile {
 
+	@Nullable
+	protected final AbstractArrow parentArrow;
+
 	public TFArrow(EntityType<? extends TFArrow> type, Level level) {
 		super(type, level);
+		this.parentArrow = null;
 	}
 
 	public TFArrow(EntityType<? extends TFArrow> type, Level level, @Nullable LivingEntity shooter, ItemStack stack, ItemStack weapon) {
@@ -21,10 +25,29 @@ public TFArrow(EntityType<? extends TFArrow> type, Level level, @Nullable Living
 		if (shooter != null) {
 			this.setPos(shooter.getX(), shooter.getEyeY() - 0.1D, shooter.getZ());
 		}
+		this.parentArrow = null;
+	}
+
+	public TFArrow(EntityType<? extends TFArrow> type, AbstractArrow parentArrow, ItemStack stack, ItemStack weapon) {
+		super(type, (LivingEntity) parentArrow.getOwner(), parentArrow.level(), stack, weapon);
+		var shooter = (LivingEntity) parentArrow.getOwner();
+		this.setOwner(shooter);
+		if (shooter != null) {
+			this.setPos(shooter.getX(), shooter.getEyeY() - 0.1D, shooter.getZ());
+		}
+		this.parentArrow = parentArrow;
 	}
 
 	@Override
 	protected ItemStack getDefaultPickupItem() {
 		return new ItemStack(Items.ARROW);
 	}
+
+	@Override
+	public void doPostHurtEffects(LivingEntity target) {
+		if (this.parentArrow != null) {
+			this.parentArrow.doPostHurtEffects(target);
+		}
+		super.doPostHurtEffects(target);
+	}
 }

src/main/java/twilightforest/item/IceBowItem.java

@@ -14,6 +14,6 @@ public IceBowItem(Properties properties) {
 
 	@Override
 	public AbstractArrow customArrow(AbstractArrow arrow, ItemStack projectileStack, ItemStack weaponStack) {
-		return new IceArrow(arrow.level(), (LivingEntity) arrow.getOwner(), projectileStack.copyWithCount(1), weaponStack);
+		return new IceArrow(arrow, projectileStack.copyWithCount(1), weaponStack);
 	}
 }

src/main/java/twilightforest/item/SeekerBowItem.java

@@ -14,6 +14,6 @@ public SeekerBowItem(Properties properties) {
 
 	@Override
 	public AbstractArrow customArrow(AbstractArrow arrow, ItemStack projectileStack, ItemStack weaponStack) {
-		return new SeekerArrow(arrow.level(), (LivingEntity) arrow.getOwner(), projectileStack.copyWithCount(1), weaponStack);
+		return new SeekerArrow(arrow, projectileStack.copyWithCount(1), weaponStack);
 	}
 }

src/main/resources/META-INF/accesstransformer.cfg

@@ -254,4 +254,9 @@ public net.minecraft.client.data.models.ModelProvider$SimpleModelCollector <init
 public net.minecraft.world.item.BlockItem updateBlockEntityComponents(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)V
 
 public net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer renderArmorPiece(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/EquipmentSlot;ILnet/minecraft/client/model/HumanoidModel;)V
-public net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer getArmorModel(Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/client/model/HumanoidModel;
+public net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer getArmorModel(Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/client/model/HumanoidModel;
+
+# TFArrow (add the effects of the original arrow to target entity)
+public net.minecraft.world.entity.projectile.AbstractArrow doPostHurtEffects(Lnet/minecraft/world/entity/LivingEntity;)V
+public net.minecraft.world.entity.projectile.Arrow doPostHurtEffects(Lnet/minecraft/world/entity/LivingEntity;)V
+public net.minecraft.world.entity.projectile.SpectralArrow doPostHurtEffects(Lnet/minecraft/world/entity/LivingEntity;)V