From 0a5ef64d6ea96fe85d7c62107081ced649e6a3e9 Mon Sep 17 00:00:00 2001 From: Max Becker Date: Thu, 17 Nov 2016 00:04:05 +0100 Subject: [PATCH] Added event to allow modification of player visibility to mobs/AI (#3382) --- .../net/minecraft/world/World.java.patch | 9 ++++++ .../net/minecraftforge/common/ForgeHooks.java | 11 ++++++- .../event/entity/player/PlayerEvent.java | 32 +++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/world/World.java.patch b/patches/minecraft/net/minecraft/world/World.java.patch index ac3bbc4536..143a29d01b 100644 --- a/patches/minecraft/net/minecraft/world/World.java.patch +++ b/patches/minecraft/net/minecraft/world/World.java.patch @@ -706,6 +706,15 @@ } public boolean func_175640_z(BlockPos p_175640_1_) +@@ -3185,7 +3376,7 @@ + { + d2 *= ((Double)Objects.firstNonNull(p_184150_11_.apply(entityplayer1), Double.valueOf(1.0D))).doubleValue(); + } +- ++ d2 = net.minecraftforge.common.ForgeHooks.getPlayerVisibilityDistance(entityplayer1, d2, p_184150_7_); + if ((p_184150_9_ < 0.0D || Math.abs(entityplayer1.field_70163_u - p_184150_3_) < p_184150_9_ * p_184150_9_) && (p_184150_7_ < 0.0D || d1 < d2 * d2) && (d0 == -1.0D || d1 < d0)) + { + d0 = d1; @@ -3247,7 +3438,7 @@ public long func_72905_C() diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index edd1b6f5d5..b0f66637b3 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -115,6 +115,7 @@ import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent; import net.minecraftforge.event.entity.living.LootingLevelEvent; import net.minecraftforge.event.entity.player.AnvilRepairEvent; import net.minecraftforge.event.entity.player.AttackEntityEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.NoteBlockEvent; @@ -540,6 +541,14 @@ public class ForgeHooks return event.getLootingLevel(); } + public static double getPlayerVisibilityDistance(EntityPlayer player, double xzDistance, double maxXZDistance) + { + PlayerEvent.Visibility event = new PlayerEvent.Visibility(player); + MinecraftForge.EVENT_BUS.post(event); + double value = event.getVisibilityModifier() * xzDistance; + return value >= maxXZDistance ? maxXZDistance : value; + } + public static boolean isLivingOnLadder(IBlockState state, World world, BlockPos pos, EntityLivingBase entity) { boolean isSpectator = (entity instanceof EntityPlayer && ((EntityPlayer)entity).isSpectator()); @@ -1163,7 +1172,7 @@ public class ForgeHooks { return MinecraftForge.EVENT_BUS.post(new ThrowableImpactEvent(throwable, ray)); } - + public static boolean onCropsGrowPre(World worldIn, BlockPos pos, IBlockState state, boolean def) { BlockEvent ev = new BlockEvent.CropGrowEvent.Pre(worldIn,pos,state); diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java index 62895def22..ab036f3251 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java @@ -351,4 +351,36 @@ public class PlayerEvent extends LivingEvent return playerUUID; } } + + /** + * Fired when the world checks if a player is near enough to be attacked by an entity. + * The resulting visibility modifier is multiplied by the one calculated by Minecraft (based on sneaking and more) and used to calculate the radius a player has to be in (targetDistance*modifier). + * This can also be used to increase the visibility of a player, if it was decreased by Minecraft or other mods. But the resulting value cannot be higher than the standard target distance. + */ + public static class Visibility extends PlayerEvent + { + + private double visibilityModifier = 1D; + + public Visibility(EntityPlayer player) + { + super(player); + } + + /** + * @param mod Is multiplied with the current modifier + */ + public void modifyVisibility(double mod) + { + visibilityModifier *= mod; + } + + /** + * @return The current modifier + */ + public double getVisibilityModifier() + { + return visibilityModifier; + } + } }