From d41b3b7a7e5f821b4662ca219cfb058b1bba37a7 Mon Sep 17 00:00:00 2001 From: "Luis C.M" Date: Tue, 3 May 2022 11:26:04 -0500 Subject: [PATCH] ScriptEntity: -Added setInvisible, setSneaking, setSprinting, and getUniqueID() functions. ScriptLivingBase: -Added getLookVec() function ScriptPlayer: -Added stopUsingItem(), clearItemInUse(), playSound(name,volume,pitch), mountEntity(entity), dropOneItem(shouldDropStack), canHarvestBlock(block), interactWith(entity) functions --- .../npcs/scripted/entity/ScriptEntity.java | 16 +++++++++ .../scripted/entity/ScriptLivingBase.java | 4 +++ .../npcs/scripted/entity/ScriptPlayer.java | 34 ++++++++++++++++--- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java index ca7d500b2..67d2fe5ad 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java @@ -627,6 +627,22 @@ public class ScriptEntity implements IEntity { entity.hurtResistantTime = ticks; }; + public void setInvisible(boolean invisible){ + entity.setInvisible(invisible); + } + + public void setSneaking(boolean sneaking){ + entity.setSneaking(sneaking); + } + + public void setSprinting(boolean sprinting){ + entity.setSprinting(sprinting); + } + + public String getUniqueID(){ + return entity.getUniqueID().toString(); + } + public boolean hasCollided() { return entity.isCollided; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java index eb1cbed0e..0220ddfc6 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java @@ -117,6 +117,10 @@ public class ScriptLivingBase extends ScriptEntity/effect command diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 7ed874a37..67f77db16 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -1,5 +1,6 @@ package noppes.npcs.scripted.entity; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -17,10 +18,7 @@ import noppes.npcs.constants.EnumQuestType; import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.controllers.*; import noppes.npcs.entity.EntityDialogNpc; -import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.ScriptItemStack; -import noppes.npcs.scripted.ScriptPixelmonPlayerData; +import noppes.npcs.scripted.*; import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.scripted.event.FactionEvent; import noppes.npcs.scripted.gui.ScriptGui; @@ -364,6 +362,34 @@ public class ScriptPlayer extends ScriptLivingBase public void swingHand(){ NoppesUtilPlayer.swingPlayerArm(player); } + + public void stopUsingItem(){ + player.stopUsingItem(); + } + + public void clearItemInUse(){ + player.clearItemInUse(); + } + + public void playSound(String name, float volume, float pitch){ + player.playSound(name, volume, pitch); + } + + public void mountEntity(Entity ridingEntity){ + player.mountEntity(ridingEntity); + } + + public ScriptEntity dropOneItem(boolean dropStack){ + return new ScriptEntity(player.dropOneItem(dropStack)); + } + + public boolean canHarvestBlock(ScriptBlock block){ + return player.canHarvestBlock(block.getMCBlock()); + } + + public boolean interactWith(ScriptEntity entity){ + return player.interactWith(entity.getMCEntity()); + } /** * @param achievement The achievement id. For a complete list see http://minecraft.gamepedia.com/Achievements