diff --git a/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch b/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch index 640d38fc61..7fceb1007e 100644 --- a/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch +++ b/patches/minecraft/net/minecraft/entity/LivingEntity.java.patch @@ -71,6 +71,15 @@ this.func_82142_c(this.func_70644_a(Effects.field_76441_p)); } +@@ -747,7 +752,7 @@ + d0 *= 0.5D; + } + } +- ++ d0 = net.minecraftforge.common.ForgeHooks.getEntityVisibilityMultiplier(this, p_213340_1_, d0); + return d0; + } + @@ -782,7 +787,9 @@ boolean flag; diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index d231ac97b6..b0d3dc9eb4 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -147,6 +147,7 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.event.entity.living.LivingDamageEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.living.LivingFallEvent; @@ -394,6 +395,11 @@ public class ForgeHooks return event.getLootingLevel(); } + /** + * TODO 1.17 remove + * Unused + */ + @Deprecated public static double getPlayerVisibilityDistance(PlayerEntity player, double xzDistance, double maxXZDistance) { PlayerEvent.Visibility event = new PlayerEvent.Visibility(player); @@ -402,6 +408,12 @@ public class ForgeHooks return value >= maxXZDistance ? maxXZDistance : value; } + public static double getEntityVisibilityMultiplier(LivingEntity entity, Entity lookingEntity, double originalMultiplier){ + LivingEvent.LivingVisibilityEvent event = new LivingEvent.LivingVisibilityEvent(entity, lookingEntity, originalMultiplier); + MinecraftForge.EVENT_BUS.post(event); + return Math.max(0,event.getVisibilityModifier()); + } + public static boolean isLivingOnLadder(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull LivingEntity entity) { boolean isSpectator = (entity instanceof PlayerEntity && ((PlayerEntity)entity).isSpectator()); diff --git a/src/main/java/net/minecraftforge/event/entity/living/LivingEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingEvent.java index b13203df4b..cd5bf74381 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/LivingEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/LivingEvent.java @@ -19,12 +19,15 @@ package net.minecraftforge.event.entity.living; +import net.minecraft.entity.Entity; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraft.entity.LivingEntity; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityEvent; +import javax.annotation.Nullable; + /** * LivingEvent is fired whenever an event involving Living entities occurs.
* If a method utilizes this {@link net.minecraftforge.eventbus.api.Event} as its parameter, the method will @@ -84,4 +87,43 @@ public class LivingEvent extends EntityEvent { public LivingJumpEvent(LivingEntity e){ super(e); } } + + public static class LivingVisibilityEvent extends LivingEvent + { + private double visibilityModifier; + @Nullable + private final Entity lookingEntity; + + public LivingVisibilityEvent(LivingEntity livingEntity, @Nullable Entity lookingEntity, double originalMultiplier) + { + super(livingEntity); + this.visibilityModifier = originalMultiplier; + this.lookingEntity = lookingEntity; + } + + /** + * @param mod Is multiplied with the current modifier + */ + public void modifyVisibility(double mod) + { + visibilityModifier *= mod; + } + + /** + * @return The current modifier + */ + public double getVisibilityModifier() + { + return visibilityModifier; + } + + /** + * @return The entity trying to see this LivingEntity, if available + */ + @Nullable + public Entity getLookingEntity() + { + return lookingEntity; + } + } } 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 5c6f897462..726f7e5972 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java @@ -361,10 +361,12 @@ public class PlayerEvent extends LivingEvent } /** + * TODO 1.17 remove, unused * 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. */ + @Deprecated public static class Visibility extends PlayerEvent {