From 6663f23e13c863f60793bdaa678c16c7f5d9eea3 Mon Sep 17 00:00:00 2001 From: AwesomeSyd239 Date: Fri, 16 Jul 2021 20:41:51 -0600 Subject: [PATCH] Add Fishing bobber projectile impact event (#7842) --- .../projectile/FishingBobberEntity.java.patch | 9 ++++ .../event/ForgeEventFactory.java | 6 +++ .../event/entity/ProjectileImpactEvent.java | 21 +++++++++ .../debug/entity/FishingBobberEventTest.java | 44 +++++++++++++++++++ src/test/resources/META-INF/mods.toml | 3 +- 5 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 src/test/java/net/minecraftforge/debug/entity/FishingBobberEventTest.java diff --git a/patches/minecraft/net/minecraft/entity/projectile/FishingBobberEntity.java.patch b/patches/minecraft/net/minecraft/entity/projectile/FishingBobberEntity.java.patch index c0c365f054..a8bd1667fa 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/FishingBobberEntity.java.patch +++ b/patches/minecraft/net/minecraft/entity/projectile/FishingBobberEntity.java.patch @@ -1,5 +1,14 @@ --- a/net/minecraft/entity/projectile/FishingBobberEntity.java +++ b/net/minecraft/entity/projectile/FishingBobberEntity.java +@@ -245,7 +_,7 @@ + + private void func_190624_r() { + RayTraceResult raytraceresult = ProjectileHelper.func_234618_a_(this, this::func_230298_a_); +- this.func_70227_a(raytraceresult); ++ if (raytraceresult.func_216346_c() == RayTraceResult.Type.MISS || !net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, raytraceresult)) this.func_70227_a(raytraceresult); + } + + protected boolean func_230298_a_(Entity p_230298_1_) { @@ -300,7 +_,7 @@ double d1 = (double)((float)MathHelper.func_76128_c(this.func_226278_cu_()) + 1.0F); double d2 = this.func_226281_cx_() + (double)(f2 * (float)this.field_146038_az * 0.1F); diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index 119271f7dd..a06092d22d 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -53,6 +53,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.entity.projectile.AbstractArrowEntity; import net.minecraft.entity.projectile.DamagingProjectileEntity; import net.minecraft.entity.projectile.FireworkRocketEntity; +import net.minecraft.entity.projectile.FishingBobberEntity; import net.minecraft.entity.projectile.ThrowableEntity; import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; @@ -667,6 +668,11 @@ public class ForgeEventFactory return MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent.FireworkRocket(fireworkRocket, ray)); } + public static boolean onProjectileImpact(FishingBobberEntity fishingBobber, RayTraceResult ray) + { + return MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent.FishingBobber(fishingBobber, ray)); + } + public static LootTable loadLootTable(ResourceLocation name, LootTable table, LootTableManager lootTableManager) { LootTableLoadEvent event = new LootTableLoadEvent(name, table, lootTableManager); diff --git a/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java b/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java index 1b5ef81d4d..d254a1a8f1 100644 --- a/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java @@ -23,6 +23,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.AbstractArrowEntity; import net.minecraft.entity.projectile.DamagingProjectileEntity; import net.minecraft.entity.projectile.FireworkRocketEntity; +import net.minecraft.entity.projectile.FishingBobberEntity; import net.minecraft.entity.projectile.ThrowableEntity; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.common.MinecraftForge; @@ -125,4 +126,24 @@ public class ProjectileImpactEvent extends EntityEvent return fireworkRocket; } } + + /** + * Event is cancellable, causes bobber to ignore the current hit and continue on its journey. + */ + @Cancelable + public static class FishingBobber extends ProjectileImpactEvent + { + private final FishingBobberEntity fishingBobber; + + public FishingBobber(FishingBobberEntity fishingBobber, RayTraceResult ray) + { + super(fishingBobber, ray); + this.fishingBobber = fishingBobber; + } + + public FishingBobberEntity getFishingBobber() + { + return fishingBobber; + } + } } diff --git a/src/test/java/net/minecraftforge/debug/entity/FishingBobberEventTest.java b/src/test/java/net/minecraftforge/debug/entity/FishingBobberEventTest.java new file mode 100644 index 0000000000..411d91fada --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/entity/FishingBobberEventTest.java @@ -0,0 +1,44 @@ +package net.minecraftforge.debug.entity; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.FishingBobberEntity; +import net.minecraft.util.math.EntityRayTraceResult; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.ProjectileImpactEvent; +import net.minecraftforge.fml.common.Mod; + +@Mod("fishing_bobber_event_test") +public class FishingBobberEventTest +{ + public static final boolean ENABLE = true; + + public FishingBobberEventTest() + { + if (ENABLE) + { + MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.addListener(FishingBobberEventTest::handleImpact); + } + } + + public static void handleImpact(ProjectileImpactEvent.FishingBobber event) + { + FishingBobberEntity bob = event.getFishingBobber(); + RayTraceResult trace = event.getRayTraceResult(); + if (trace.getType() == RayTraceResult.Type.ENTITY) + { + Vector3d vector3d = bob.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D).normalize().scale(0.6); + if (vector3d.lengthSqr() > 0.0D) + { + Entity entity = ((EntityRayTraceResult) trace).getEntity(); + if (entity instanceof LivingEntity) + { + ((LivingEntity) entity).push(vector3d.x, 0.3D, vector3d.z); + } + } + } + } +} \ No newline at end of file diff --git a/src/test/resources/META-INF/mods.toml b/src/test/resources/META-INF/mods.toml index f615f14230..d7c960dbb9 100644 --- a/src/test/resources/META-INF/mods.toml +++ b/src/test/resources/META-INF/mods.toml @@ -124,6 +124,8 @@ license="LGPL v2.1" modId="entity_teleport_event_test" [[mods]] modId="text_linear_filtering_test" +[[mods]] + modId="fishing_bobber_event_test" [[mods]] modId="custom_respawn_test" [[mods]] @@ -132,4 +134,3 @@ license="LGPL v2.1" modId="dimension_settings_test" [[mods]] modId="player_attack_knockback_test" -