From 1ac0b3b0a3432b97fa2b043e7681efc4bfb91a02 Mon Sep 17 00:00:00 2001
From: "Luis C.M" <42545778+c0508383@users.noreply.github.com>
Date: Mon, 26 Dec 2022 01:13:28 -0600
Subject: [PATCH] Added more functions to IPlayer, IEntityLiving,
 IEntityLivingBase, and IAnimal.

---
 .../npcs/scripted/entity/ScriptAnimal.java    | 10 +++++++-
 .../npcs/scripted/entity/ScriptLiving.java    |  4 ++++
 .../scripted/entity/ScriptLivingBase.java     | 24 +++++++++++++++++--
 .../npcs/scripted/entity/ScriptPlayer.java    |  8 +++++++
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java b/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java
index 51583fd4e..be157e261 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptAnimal.java
@@ -2,6 +2,7 @@ package noppes.npcs.scripted.entity;
 
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.player.EntityPlayer;
+import noppes.npcs.scripted.NpcAPI;
 import noppes.npcs.scripted.constants.EntityType;
 import noppes.npcs.api.entity.IAnimal;
 import noppes.npcs.api.entity.IPlayer;
@@ -35,6 +36,14 @@ public class ScriptAnimal<T extends EntityAnimal> extends ScriptLiving<T> implem
 		return this.entity.interact((EntityPlayer) player.getMCEntity());
 	}
 
+	public void setFollowPlayer(IPlayer player) {
+		this.entity.func_146082_f((EntityPlayer) player.getMCEntity());
+	}
+
+	public IPlayer followingPlayer() {
+		return (IPlayer) NpcAPI.Instance().getIEntity(this.entity.func_146083_cb());
+	}
+
 	public boolean isInLove() {
 		return this.entity.isInLove();
 	}
@@ -47,7 +56,6 @@ public class ScriptAnimal<T extends EntityAnimal> extends ScriptLiving<T> implem
 		return this.entity.canMateWith((EntityAnimal) animal.getMCEntity());
 	}
 
-	@Override
 	public boolean typeOf(int type){
 		return type == EntityType.ANIMAL || super.typeOf(type);
 	}
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java
index 475c41fb9..8d7408847 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLiving.java
@@ -147,4 +147,8 @@ public class ScriptLiving<T extends EntityLiving> extends ScriptLivingBase<T> im
 	public void setLeashedTo(IEntity entity, boolean sendPacket) {
 		this.entity.setLeashedToEntity(entity.getMCEntity(), sendPacket);
 	}
+
+	public boolean canBeSteered() {
+		return this.entity.canBeSteered();
+	}
 }
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
index 0f3bd4c00..0fa698348 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
@@ -9,7 +9,6 @@ import net.minecraft.util.EntityDamageSource;
 import net.minecraft.util.Vec3;
 import noppes.npcs.api.IDamageSource;
 import noppes.npcs.scripted.NpcAPI;
-import noppes.npcs.scripted.ScriptDamageSource;
 import noppes.npcs.scripted.constants.EntityType;
 import noppes.npcs.api.IBlock;
 import noppes.npcs.api.IPos;
@@ -117,7 +116,28 @@ public class ScriptLivingBase<T extends EntityLivingBase> extends ScriptEntity<T
 	public IEntityLivingBase getAttackTarget(){
 		return (IEntityLivingBase)NpcAPI.Instance().getIEntity(entity.getAITarget());
 	}
-	
+
+	public int getAttackTargetTime() {
+		return this.entity.func_142015_aE();
+	}
+
+	public void setLastAttacker(IEntity p_130011_1_) {
+		this.entity.setLastAttacker(p_130011_1_.getMCEntity());
+	}
+
+	public IEntity getLastAttacker() {
+		return NpcAPI.Instance().getIEntity(this.entity.getLastAttacker());
+	}
+
+	public int getLastAttackerTime()
+	{
+		return this.entity.getLastAttackerTime();
+	}
+
+	public boolean canBreatheUnderwater() {
+		return this.entity.canBreatheUnderwater();
+	}
+
 	@Override
 	public int getType(){
 		return EntityType.LIVING;
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
index 7a43b0d1f..5a6bbebdf 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
@@ -780,4 +780,12 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
 
 		return (IQuest[])quests.toArray(new IQuest[quests.size()]);
 	}
+
+	public void setConqueredEnd(boolean conqueredEnd) {
+		this.player.playerConqueredTheEnd = conqueredEnd;
+	}
+
+	public boolean conqueredEnd() {
+		return this.player.playerConqueredTheEnd;
+	}
 }