mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-20 22:42:19 +00:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
20b2cdae0a
18 files changed
+139
-17
No files matched your search
@@ -45,6 +45,7 @@ import noppes.npcs.api.handler.data.IFramePart;
|
||||
import noppes.npcs.api.handler.data.ISound;
|
||||
import noppes.npcs.api.item.IItemStack;
|
||||
import noppes.npcs.api.overlay.ICustomOverlay;
|
||||
import noppes.npcs.compat.PixelmonHelper;
|
||||
import noppes.npcs.config.ConfigScript;
|
||||
import noppes.npcs.constants.EnumAnimationPart;
|
||||
import noppes.npcs.containers.ContainerNpcInterface;
|
||||
|
||||
@@ -4,7 +4,7 @@ import net.minecraft.entity.passive.EntityTameable;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.api.IPixelmonPlayerData;
|
||||
import noppes.npcs.controllers.PixelmonHelper;
|
||||
import noppes.npcs.compat.PixelmonHelper;
|
||||
import noppes.npcs.scripted.entity.ScriptPixelmon;
|
||||
|
||||
public class ScriptPixelmonPlayerData implements IPixelmonPlayerData {
|
||||
|
||||
@@ -372,6 +372,15 @@ public class ScriptDBCPlayer<T extends EntityPlayerMP> extends ScriptPlayer<T> i
|
||||
return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcBdy");
|
||||
}
|
||||
|
||||
public void setHP(int hp){
|
||||
setBody(hp);
|
||||
}
|
||||
public int getHP()
|
||||
{
|
||||
return getBody();
|
||||
}
|
||||
|
||||
|
||||
public void setStamina(int stamina){
|
||||
player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcStamina",stamina);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package noppes.npcs.scripted.entity;
|
||||
import net.minecraft.entity.passive.EntityTameable;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.api.entity.IPixelmon;
|
||||
import noppes.npcs.controllers.PixelmonHelper;
|
||||
import noppes.npcs.compat.PixelmonHelper;
|
||||
import noppes.npcs.util.ValueUtil;
|
||||
|
||||
public class ScriptPixelmon<T extends EntityTameable> extends ScriptAnimal<T> implements IPixelmon {
|
||||
|
||||
@@ -25,6 +25,7 @@ import noppes.npcs.api.handler.data.IQuest;
|
||||
import noppes.npcs.api.handler.data.ISound;
|
||||
import noppes.npcs.api.item.IItemStack;
|
||||
import noppes.npcs.api.overlay.ICustomOverlay;
|
||||
import noppes.npcs.compat.PixelmonHelper;
|
||||
import noppes.npcs.config.ConfigScript;
|
||||
import noppes.npcs.constants.EnumPacketClient;
|
||||
import noppes.npcs.constants.EnumQuestRepeat;
|
||||
|
||||
Reference in new issue
Block a user