mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
[1.12] Replace ThrowableImpactEvent with a more generic version (#4040)
This commit is contained in:
1 parent
19b7347db9
commit
31655b3a7d
10 files changed
+222
-7
No files matched your search
@@ -111,7 +111,6 @@ import net.minecraftforge.event.DifficultyChangeEvent;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
import net.minecraftforge.event.ServerChatEvent;
|
||||
import net.minecraftforge.event.entity.EntityTravelToDimensionEvent;
|
||||
import net.minecraftforge.event.entity.ThrowableImpactEvent;
|
||||
import net.minecraftforge.event.entity.item.ItemTossEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingAttackEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
||||
@@ -1239,9 +1238,11 @@ public class ForgeHooks
|
||||
public static LootEntry deserializeJsonLootEntry(String type, JsonObject json, int weight, int quality, LootCondition[] conditions){ return null; }
|
||||
public static String getLootEntryType(LootEntry entry){ return null; } //Companion to above function
|
||||
|
||||
/** @deprecated use {@link ForgeEventFactory#onProjectileImpact(EntityThrowable, RayTraceResult)} */
|
||||
@Deprecated // TODO: remove (1.13)
|
||||
public static boolean onThrowableImpact(EntityThrowable throwable, RayTraceResult ray)
|
||||
{
|
||||
return MinecraftForge.EVENT_BUS.post(new ThrowableImpactEvent(throwable, ray));
|
||||
return ForgeEventFactory.onProjectileImpact(throwable, ray);
|
||||
}
|
||||
|
||||
public static boolean onCropsGrowPre(World worldIn, BlockPos pos, IBlockState state, boolean def)
|
||||
|
||||
@@ -36,6 +36,9 @@ import net.minecraft.entity.monster.EntityZombie;
|
||||
import net.minecraft.entity.passive.EntityAnimal;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayer.SleepResult;
|
||||
import net.minecraft.entity.projectile.EntityArrow;
|
||||
import net.minecraft.entity.projectile.EntityFireball;
|
||||
import net.minecraft.entity.projectile.EntityThrowable;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -81,6 +84,8 @@ import net.minecraftforge.event.entity.EntityEvent;
|
||||
import net.minecraftforge.event.entity.EntityMountEvent;
|
||||
import net.minecraftforge.event.entity.EntityStruckByLightningEvent;
|
||||
import net.minecraftforge.event.entity.PlaySoundAtEntityEvent;
|
||||
import net.minecraftforge.event.entity.ProjectileImpactEvent;
|
||||
import net.minecraftforge.event.entity.ThrowableImpactEvent;
|
||||
import net.minecraftforge.event.entity.item.ItemExpireEvent;
|
||||
import net.minecraftforge.event.entity.living.AnimalTameEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingDestroyBlockEvent;
|
||||
@@ -644,6 +649,28 @@ public class ForgeEventFactory
|
||||
return event.getCharge();
|
||||
}
|
||||
|
||||
public static boolean onProjectileImpact(Entity entity, RayTraceResult ray)
|
||||
{
|
||||
return MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent(entity, ray));
|
||||
}
|
||||
|
||||
public static boolean onProjectileImpact(EntityArrow arrow, RayTraceResult ray)
|
||||
{
|
||||
return MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent.Arrow(arrow, ray));
|
||||
}
|
||||
|
||||
public static boolean onProjectileImpact(EntityFireball fireball, RayTraceResult ray)
|
||||
{
|
||||
return MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent.Fireball(fireball, ray));
|
||||
}
|
||||
|
||||
public static boolean onProjectileImpact(EntityThrowable throwable, RayTraceResult ray)
|
||||
{
|
||||
boolean oldEvent = MinecraftForge.EVENT_BUS.post(new ThrowableImpactEvent(throwable, ray));
|
||||
boolean newEvent = MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent.Throwable(throwable, ray));
|
||||
return oldEvent || newEvent; // TODO: clean up when old event is removed
|
||||
}
|
||||
|
||||
public static boolean onReplaceBiomeBlocks(IChunkGenerator gen, int x, int z, ChunkPrimer primer, World world)
|
||||
{
|
||||
ChunkGeneratorEvent.ReplaceBiomeBlocks event = new ChunkGeneratorEvent.ReplaceBiomeBlocks(gen, x, z, primer, world);
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
/*
|
||||
* Minecraft Forge
|
||||
* Copyright (c) 2016.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation version 2.1
|
||||
* of the License.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
package net.minecraftforge.event.entity;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.projectile.EntityArrow;
|
||||
import net.minecraft.entity.projectile.EntityFireball;
|
||||
import net.minecraft.entity.projectile.EntityThrowable;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.ForgeEventFactory;
|
||||
import net.minecraftforge.fml.common.eventhandler.Cancelable;
|
||||
|
||||
/**
|
||||
* This event is fired when a projectile entity impacts something.
|
||||
* This event is fired via {@link ForgeEventFactory#onProjectileImpact(Entity, RayTraceResult)}
|
||||
* Subclasses of this event exist for more specific types of projectile.
|
||||
* This event is fired for all vanilla projectiles by Forge,
|
||||
* custom projectiles should fire this event and check the result in a similar fashion.
|
||||
* This event is cancelable. When canceled, the impact will not be processed.
|
||||
* Killing or other handling of the entity after event cancellation is up to the modder.
|
||||
* This event is fired on the {@link MinecraftForge#EVENT_BUS}.
|
||||
*/
|
||||
@Cancelable
|
||||
public class ProjectileImpactEvent extends EntityEvent
|
||||
{
|
||||
private final RayTraceResult ray;
|
||||
|
||||
public ProjectileImpactEvent(Entity entity, RayTraceResult ray)
|
||||
{
|
||||
super(entity);
|
||||
this.ray = ray;
|
||||
}
|
||||
|
||||
public RayTraceResult getRayTraceResult()
|
||||
{
|
||||
return ray;
|
||||
}
|
||||
|
||||
@Cancelable
|
||||
public static class Arrow extends ProjectileImpactEvent
|
||||
{
|
||||
private final EntityArrow arrow;
|
||||
|
||||
public Arrow(EntityArrow arrow, RayTraceResult ray)
|
||||
{
|
||||
super(arrow, ray);
|
||||
this.arrow = arrow;
|
||||
}
|
||||
|
||||
public EntityArrow getArrow()
|
||||
{
|
||||
return arrow;
|
||||
}
|
||||
}
|
||||
|
||||
@Cancelable
|
||||
public static class Fireball extends ProjectileImpactEvent
|
||||
{
|
||||
private final EntityFireball fireball;
|
||||
|
||||
public Fireball(EntityFireball fireball, RayTraceResult ray)
|
||||
{
|
||||
super(fireball, ray);
|
||||
this.fireball = fireball;
|
||||
}
|
||||
|
||||
public EntityFireball getFireball()
|
||||
{
|
||||
return fireball;
|
||||
}
|
||||
}
|
||||
|
||||
@Cancelable
|
||||
public static class Throwable extends ProjectileImpactEvent
|
||||
{
|
||||
private final EntityThrowable throwable;
|
||||
|
||||
public Throwable(EntityThrowable throwable, RayTraceResult ray)
|
||||
{
|
||||
super(throwable, ray);
|
||||
this.throwable = throwable;
|
||||
}
|
||||
|
||||
public EntityThrowable getThrowable()
|
||||
{
|
||||
return throwable;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,10 @@ import net.minecraftforge.fml.common.eventhandler.Cancelable;
|
||||
* This event is cancelable. When canceled, {@link EntityThrowable#onImpact} will not be called.
|
||||
* Killing or other handling of the entity after event cancellation is up to the modder.
|
||||
* This event is fired on the {@link net.minecraftforge.common.MinecraftForge#EVENT_BUS}.
|
||||
*
|
||||
* @deprecated use {@link ProjectileImpactEvent.Throwable}
|
||||
*/
|
||||
@Deprecated // TODO: remove (1.13)
|
||||
@Cancelable
|
||||
public class ThrowableImpactEvent extends EntityEvent
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user