keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Add AnimalTameEvent for handling animal taming (#3763)

Browse source
This commit is contained in:
Ben Staddon 2017-04-08 00:47:28 +01:00 committed by LexManos
parent f22874d3be
commit 901df8345c
6 changed files with 120 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
patches/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java.patch Normal file
View file

@ -0,0 +1,11 @@
--- ../src-base/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
+++ ../src-work/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java
@@ -70,7 +70,7 @@
int i = this.field_111180_a.func_110252_cg();
int j = this.field_111180_a.func_190676_dC();
- if (j > 0 && this.field_111180_a.func_70681_au().nextInt(j) < i)
+ if (j > 0 && this.field_111180_a.func_70681_au().nextInt(j) < i && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(field_111180_a, (EntityPlayer)entity))
{
this.field_111180_a.func_110263_g((EntityPlayer)entity);
return;

9
patches/minecraft/net/minecraft/entity/passive/EntityOcelot.java.patch
View file

@ -1,5 +1,14 @@
--- ../src-base/minecraft/net/minecraft/entity/passive/EntityOcelot.java
+++ ../src-work/minecraft/net/minecraft/entity/passive/EntityOcelot.java
@@ -208,7 +208,7 @@
if (!this.field_70170_p.field_72995_K)
{
- if (this.field_70146_Z.nextInt(3) == 0)
+ if (this.field_70146_Z.nextInt(3) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, p_184645_1_))
{
this.func_70903_f(true);
this.func_70912_b(1 + this.field_70170_p.field_73012_v.nextInt(3));
@@ -299,7 +299,7 @@
IBlockState iblockstate = this.field_70170_p.func_180495_p(blockpos.func_177977_b());
Block block = iblockstate.func_177230_c();

11
patches/minecraft/net/minecraft/entity/passive/EntityWolf.java.patch Normal file
View file

@ -0,0 +1,11 @@
--- ../src-base/minecraft/net/minecraft/entity/passive/EntityWolf.java
+++ ../src-work/minecraft/net/minecraft/entity/passive/EntityWolf.java
@@ -423,7 +423,7 @@
if (!this.field_70170_p.field_72995_K)
{
- if (this.field_70146_Z.nextInt(3) == 0)
+ if (this.field_70146_Z.nextInt(3) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, p_184645_1_))
{
this.func_70903_f(true);
this.field_70699_by.func_75499_g();

7
src/main/java/net/minecraftforge/event/ForgeEventFactory.java
View file

@ -35,6 +35,7 @@ import net.minecraft.entity.EnumCreatureType;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.item.EntityItem;
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.init.Blocks;
@ -80,6 +81,7 @@ import net.minecraftforge.event.entity.EntityMountEvent;
import net.minecraftforge.event.entity.EntityStruckByLightningEvent;
import net.minecraftforge.event.entity.PlaySoundAtEntityEvent;
import net.minecraftforge.event.entity.item.ItemExpireEvent;
import net.minecraftforge.event.entity.living.AnimalTameEvent;
import net.minecraftforge.event.entity.living.LivingDestroyBlockEvent;
import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent;
import net.minecraftforge.event.entity.living.LivingExperienceDropEvent;
@ -460,6 +462,11 @@ public class ForgeEventFactory
return true;
}
public static boolean onAnimalTame(EntityAnimal animal, EntityPlayer tamer)
{
return MinecraftForge.EVENT_BUS.post(new AnimalTameEvent(animal, tamer));
}
public static SleepResult onPlayerSleepInBed(EntityPlayer player, BlockPos pos)
{
PlayerSleepInBedEvent event = new PlayerSleepInBedEvent(player, pos);

57
src/main/java/net/minecraftforge/event/entity/living/AnimalTameEvent.java Normal file
View file

@ -0,0 +1,57 @@
/*
* 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.living;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.fml.common.eventhandler.Cancelable;
/**
* This event is fired when an {@link EntityAnimal} is tamed. <br>
* It is fired via {@link ForgeEventFactory#onAnimalTame(EntityAnimal, EntityPlayer)}.
* Forge fires this event for applicable vanilla animals, mods need to fire it themselves.
* This event is {@link Cancelable}. If canceled, taming the animal will fail.
* This event is fired on the {@link MinecraftForge#EVENT_BUS}.
*/
@Cancelable
public class AnimalTameEvent extends LivingEvent
{
private final EntityAnimal animal;
private final EntityPlayer tamer;
public AnimalTameEvent(EntityAnimal animal, EntityPlayer tamer)
{
super(animal);
this.animal = animal;
this.tamer = tamer;
}
public EntityAnimal getAnimal()
{
return animal;
}
public EntityPlayer getTamer()
{
return tamer;
}
}

25
src/test/java/net/minecraftforge/test/AnimalTameEventTest.java Normal file
View file

@ -0,0 +1,25 @@
package net.minecraftforge.test;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraftforge.event.entity.living.AnimalTameEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = AnimalTameEventTest.MOD_ID, name = "AnimalTameEvent test mod", version = "1.0")
@Mod.EventBusSubscriber
public class AnimalTameEventTest
{
static final String MOD_ID = "animal_tame_event_test";
static final boolean ENABLED = false;
@SubscribeEvent
public static void onAnimalTame(AnimalTameEvent event)
{
if (!ENABLED) return;
if (event.getAnimal() instanceof EntityWolf)
{
event.setCanceled(true);
}
}
}