From cf91d8638f5c39812ccfd3ce5bb828ca7b2fbddc Mon Sep 17 00:00:00 2001 From: luisc Date: Mon, 13 Dec 2021 18:33:20 -0600 Subject: [PATCH] Fixed getDBCPlayer not returning a DBC Player instance. --- .../npcs/scripted/entity/ScriptDBCPlayer.java | 76 +++++++++---------- .../npcs/scripted/entity/ScriptPlayer.java | 6 +- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java index e796ba16e..503811418 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java @@ -16,27 +16,27 @@ public class ScriptDBCPlayer extends ScriptPlayer{ switch (stat) { case "str": case "strength": - player.getEntityData().setInteger("jrmcStrI", value); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcStrI", value); break; case "dex": case "dexterity": - player.getEntityData().setInteger("jrmcDexI", value); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcDexI", value); break; case "con": case "constitution": - player.getEntityData().setInteger("jrmcCnsI", value); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcCnsI", value); break; case "wil": case "willpower": - player.getEntityData().setInteger("jrmcWilI", value); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcWilI", value); break; case "mnd": case "mind": - player.getEntityData().setInteger("jrmcIntI", value); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcIntI", value); break; case "spi": case "spirit": - player.getEntityData().setInteger("jrmcCncI", value); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcCncI", value); break; } } @@ -46,22 +46,22 @@ public class ScriptDBCPlayer extends ScriptPlayer{ switch (stat) { case "str": case "strength": - return player.getEntityData().getInteger("jrmcStrI"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcStrI"); case "dex": case "dexterity": - return player.getEntityData().getInteger("jrmcDexI"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcDexI"); case "con": case "constitution": - return player.getEntityData().getInteger("jrmcCnsI"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcCnsI"); case "wil": case "willpower": - return player.getEntityData().getInteger("jrmcWilI"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcWilI"); case "mnd": case "mind": - return player.getEntityData().getInteger("jrmcIntI"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcIntI"); case "spi": case "spirit": - return player.getEntityData().getInteger("jrmcCncI"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcCncI"); } throw new CustomNPCsException("Invalid stat name: " + stat + "\nValid stat names are:" + @@ -69,89 +69,89 @@ public class ScriptDBCPlayer extends ScriptPlayer{ } public void setRelease(byte release){ - player.getEntityData().setByte("jrmcRelease",release); + player.getEntityData().getCompoundTag("PlayerPersisted").setByte("jrmcRelease",release); } public byte getRelease(){ - return player.getEntityData().getByte("jrmcRelease"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcRelease"); } public void setBody(int body){ - player.getEntityData().setInteger("jrmcBdy",body); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcBdy",body); } public int getBody(){ - return player.getEntityData().getInteger("jrmcBdy"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcBdy"); } public void setStamina(int stamina){ - player.getEntityData().setInteger("jrmcStamina",stamina); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcStamina",stamina); } public int getStamina(){ - return player.getEntityData().getInteger("jrmcStamina"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcStamina"); } public void setKi(int ki){ - player.getEntityData().setInteger("jrmcEnrgy",ki); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcEnrgy",ki); } public int getKi(){ - return player.getEntityData().getInteger("jrmcEnrgy"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcEnrgy"); } public void setTP(int tp){ - player.getEntityData().setInteger("jrmcTpint",tp); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcTpint",tp); } public int getTP(){ - return player.getEntityData().getInteger("jrmcTpint"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcTpint"); } public void setGravity(float gravity){ - player.getEntityData().setFloat("jrmcGravForce",gravity); + player.getEntityData().getCompoundTag("PlayerPersisted").setFloat("jrmcGravForce",gravity); } public float getGravity(){ - return player.getEntityData().getFloat("jrmcGravForce"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getFloat("jrmcGravForce"); } public void setForm(byte form){ - player.getEntityData().setByte("jrmcState",form); + player.getEntityData().getCompoundTag("PlayerPersisted").setByte("jrmcState",form); } public byte getForm(){ - return player.getEntityData().getByte("jrmcState"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcState"); } public void setForm2(byte form2){ - player.getEntityData().setByte("jrmcState2",form2); + player.getEntityData().getCompoundTag("PlayerPersisted").setByte("jrmcState2",form2); } public byte getForm2(){ - return player.getEntityData().getByte("jrmcState2"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcState2"); } public void setPowerPoints(int points){ - player.getEntityData().setInteger("jrmcArcRsrv",points); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcArcRsrv",points); } public int getPowerPoints(){ - return player.getEntityData().getInteger("jrmcArcRsrv"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcArcRsrv"); } public void setAuraColor(int color){ - player.getEntityData().setInteger("jrmcAuraColor",color); + player.getEntityData().getCompoundTag("PlayerPersisted").setInteger("jrmcAuraColor",color); } public int getAuraColor(){ - return player.getEntityData().getInteger("jrmcAuraColor"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcAuraColor"); } public byte getDBCClass(){ - return player.getEntityData().getByte("jrmcClass"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcClass"); } public int getRace(){ - return player.getEntityData().getByte("jrmcRace"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcRace"); } public int getPowerType(){ - return player.getEntityData().getByte("jrmcPwrtyp"); + return player.getEntityData().getCompoundTag("PlayerPersisted").getByte("jrmcPwrtyp"); } public int getKillCount(String type){ type = type.toLowerCase().trim(); - int evilKills = player.getEntityData().getInteger("jrmcKillCountEvil"); - int goodKills = player.getEntityData().getInteger("jrmcKillCountGood"); - int neutKills = player.getEntityData().getInteger("jrmcKillCountNeut"); + int evilKills = player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcKillCountEvil"); + int goodKills = player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcKillCountGood"); + int neutKills = player.getEntityData().getCompoundTag("PlayerPersisted").getInteger("jrmcKillCountNeut"); switch (type) { case "evil": diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 345446be3..4d5787a7d 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -4,8 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.stats.Achievement; import net.minecraft.stats.StatBase; import net.minecraft.stats.StatList; @@ -391,14 +389,14 @@ public class ScriptPlayer extends ScriptLivingBase } public ScriptDBCPlayer getDBCPlayer() { - Set keySet = player.getEntityData().func_150296_c(); + Set keySet = player.getEntityData().getCompoundTag("PlayerPersisted").func_150296_c(); Iterator iterator = keySet.iterator(); while (iterator.hasNext()) { String s = (String)iterator.next(); if(s.contains("jrmc")) - return new ScriptDBCPlayer<>(this.player); + return new ScriptDBCPlayer(this.player); } return null; }