diff --git a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java index cb86cff15..c2d62a229 100644 --- a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java +++ b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java @@ -226,7 +226,7 @@ public abstract class AbstractCommandHelper extends CommandHelper { list.add(data); } else { for (EntityPlayer player : players) { - list.add(PlayerDataController.Instance.getPlayerData(player)); + list.add(PlayerData.get(player)); } } diff --git a/src/main/java/kamkeel/npcs/command/QuestCommand.java b/src/main/java/kamkeel/npcs/command/QuestCommand.java index 5382a203d..0a6cb5edf 100644 --- a/src/main/java/kamkeel/npcs/command/QuestCommand.java +++ b/src/main/java/kamkeel/npcs/command/QuestCommand.java @@ -214,7 +214,7 @@ public class QuestCommand extends CommandKamkeelBase { return; } - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); if (data == null) { sendError(sender, "No PlayerData found for:" + player); return; diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java b/src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java index bbbfcc066..41e4da887 100644 --- a/src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandHelpProfile.java @@ -3,7 +3,6 @@ package kamkeel.npcs.command.profile; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.CustomNpcsPermissions; import java.lang.reflect.Method; diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/PlayerAttributeMap.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/PlayerAttributeMap.java index 6889c5c10..8eec9414b 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/PlayerAttributeMap.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/PlayerAttributeMap.java @@ -1,8 +1,5 @@ package kamkeel.npcs.controllers.data.attribute; -import noppes.npcs.api.handler.data.ICustomAttribute; - -import java.util.Collection; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/ProfileSlotRequirement.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/ProfileSlotRequirement.java index eb76f8015..0621ad096 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/ProfileSlotRequirement.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/ProfileSlotRequirement.java @@ -3,7 +3,6 @@ package kamkeel.npcs.controllers.data.attribute.requirement.types; import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.data.PlayerData; public class ProfileSlotRequirement implements IRequirementChecker { diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java index a1b17ab94..b74c69db7 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java @@ -6,8 +6,6 @@ import com.google.gson.JsonParser; import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.controllers.QuestController; -import noppes.npcs.controllers.data.PlayerData; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerAttributeTracker.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerAttributeTracker.java index 58c3f4f62..5a10af4e5 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerAttributeTracker.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerAttributeTracker.java @@ -4,8 +4,6 @@ import kamkeel.npcs.CustomAttributes; import kamkeel.npcs.controllers.AttributeController; import kamkeel.npcs.controllers.data.attribute.AttributeDefinition; import kamkeel.npcs.controllers.data.attribute.PlayerAttribute; -import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.handler.data.ICustomAttribute; import kamkeel.npcs.controllers.data.attribute.PlayerAttributeMap; import kamkeel.npcs.controllers.data.attribute.requirement.RequirementCheckerRegistry; import kamkeel.npcs.util.AttributeAttackUtil; @@ -16,6 +14,8 @@ import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.handler.data.ICustomAttribute; import noppes.npcs.api.handler.data.IPlayerAttributes; import java.util.HashMap; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java b/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java index 8e5eff27d..9549e2e36 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerFactionData; @@ -56,7 +55,7 @@ public class CheckPlayerValue extends AbstractPacket { Type type = Type.values()[in.readInt()]; switch (type) { case Faction: - PlayerFactionData data = PlayerDataController.Instance.getPlayerData(playerMP).factionData; + PlayerFactionData data = PlayerData.get(playerMP).factionData; GuiDataPacket.sendGuiData(playerMP, data.getPlayerGuiData()); break; case QuestLog: @@ -66,8 +65,8 @@ public class CheckPlayerValue extends AbstractPacket { NoppesUtilPlayer.sendTrackedQuest(playerMP); break; case CheckQuestCompletion: - PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP); - PlayerQuestData questData = PlayerDataController.Instance.getPlayerData(playerMP).questData; + PlayerData playerData = PlayerData.get(playerMP); + PlayerQuestData questData = PlayerData.get(playerMP).questData; Party playerParty = playerData.getPlayerParty(); if (playerParty != null) PartyController.Instance().checkQuestCompletion(playerParty, null); diff --git a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java index 82062485f..eb5e12d97 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java @@ -17,6 +17,7 @@ import noppes.npcs.constants.EnumGuiType; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.controllers.data.PlayerMailData; import noppes.npcs.controllers.data.QuestData; @@ -97,7 +98,7 @@ public class MailActionPacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; EntityPlayerMP playerMP = (EntityPlayerMP) player; - PlayerMailData data = PlayerDataController.Instance.getPlayerData(playerMP).mailData; + PlayerMailData data = PlayerData.get(playerMP).mailData; if (type == Action.GET) { GuiDataPacket.sendGuiData(playerMP, data.saveNBTData(new NBTTagCompound())); diff --git a/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java index b03a80fd3..258c29a59 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java @@ -8,7 +8,7 @@ import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumPlayerPacket; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; import java.io.IOException; @@ -44,6 +44,6 @@ public class ScreenSizePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { int width = in.readInt(), height = in.readInt(); - PlayerDataController.Instance.getPlayerData(player).screenSize.setSize(width, height); + PlayerData.get(player).screenSize.setSize(width, height); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenInform.java b/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenInform.java index 3aa839d51..cf6bc4988 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenInform.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenInform.java @@ -8,7 +8,6 @@ import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumRequestPacket; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerData; import java.io.IOException; @@ -44,7 +43,7 @@ public final class IsGuiOpenInform extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - PlayerData playerdata = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerdata = PlayerData.get(player); boolean isGUIOpen = in.readBoolean(); playerdata.setGUIOpen(isGUIOpen); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java index 72501a9bb..3a8abd9c0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/CloneSavePacket.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcsPermissions; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.controllers.data.PlayerData; @@ -70,7 +69,7 @@ public final class CloneSavePacket extends AbstractPacket { if (!PacketUtil.verifyItemPacket(packetName, player, EnumItemPacketType.CLONER)) return; - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); if (data.cloned == null) return; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java index be9bf04ba..8a0c3ee75 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java @@ -9,7 +9,6 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerData; import java.io.IOException; @@ -46,7 +45,7 @@ public final class PartyAcceptInvitePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); String uuidString = ByteBufUtils.readString(in); if (uuidString != null) { UUID uuid = UUID.fromString(uuidString); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java index e22f8f349..2fdc81257 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerData; import java.io.IOException; @@ -42,7 +41,7 @@ public final class PartyDisbandPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData.partyUUID != null) { PartyController.Instance().disbandParty(playerData.partyUUID); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java index bc8c5733b..30dbd1fa2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java @@ -9,7 +9,6 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerData; import java.io.IOException; @@ -46,7 +45,7 @@ public final class PartyIgnoreInvitePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); String uuidString = ByteBufUtils.readString(in); if (uuidString != null) { UUID uuid = UUID.fromString(uuidString); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java index db5c4e090..2b7def180 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java @@ -16,7 +16,6 @@ import net.minecraft.nbt.NBTTagString; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.Quest; @@ -71,7 +70,7 @@ public final class PartyInfoPacket extends AbstractPacket { } public static void sendPartyData(EntityPlayerMP player) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData.partyUUID != null) { Party party = PartyController.Instance().getParty(playerData.partyUUID); NBTTagCompound compound = party.writeToNBT(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java index 1ae14a308..b4292d5ad 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java @@ -17,7 +17,6 @@ import noppes.npcs.EventHooks; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.NpcAPI; @@ -60,8 +59,8 @@ public final class PartyInvitePacket extends AbstractPacket { public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { EntityPlayer invitedPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in)); if (invitedPlayer != null) { - PlayerData senderData = PlayerDataController.Instance.getPlayerData(player); - PlayerData invitedData = PlayerDataController.Instance.getPlayerData(invitedPlayer); + PlayerData senderData = PlayerData.get(player); + PlayerData invitedData = PlayerData.get(invitedPlayer); if (senderData.partyUUID != null && invitedData.partyUUID == null) { Party party = PartyController.Instance().getParty(senderData.partyUUID); if (!party.getIsLocked()) { @@ -77,7 +76,7 @@ public final class PartyInvitePacket extends AbstractPacket { } public static void sendInviteData(EntityPlayerMP player) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData.partyUUID == null) { NBTTagCompound compound = new NBTTagCompound(); NBTTagList list = new NBTTagList(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java index 0a0d3b97c..a5a51cc0a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java @@ -61,7 +61,7 @@ public final class PartyKickPacket extends AbstractPacket { PlayerData playerData = null; UUID playerUUID = null; if (kickPlayer != null) { - playerData = PlayerDataController.Instance.getPlayerData(player); + playerData = PlayerData.get(player); } else { String uuid = PlayerDataController.Instance.getPlayerUUIDFromName(kickPlayerName); if (!uuid.isEmpty()) { diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java index 1a55d008a..7b1fc7a69 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java @@ -14,7 +14,6 @@ import noppes.npcs.EventHooks; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.NpcAPI; @@ -57,7 +56,7 @@ public final class PartyLeavePacket extends AbstractPacket { public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { EntityPlayer leavingPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in)); if (leavingPlayer != null) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData.partyUUID != null) { Party party = PartyController.Instance().getParty(playerData.partyUUID); boolean successful = party.removePlayer(leavingPlayer); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java index 7248b6f27..f4f0987fd 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java @@ -11,7 +11,6 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; @@ -48,7 +47,7 @@ public final class PartySavePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData.partyUUID != null) { Party party = PartyController.Instance().getParty(playerData.partyUUID); party.readClientNBT(ByteBufUtils.readNBT(in)); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java index 2d90068c8..006d6dfcc 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java @@ -11,7 +11,6 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; @@ -48,7 +47,7 @@ public final class PartySetLeaderPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData.partyUUID != null) { Party party = PartyController.Instance().getParty(playerData.partyUUID); if (!party.getIsLocked()) { diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java index 932b852c2..b4c598b1e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java @@ -10,7 +10,6 @@ import kamkeel.npcs.network.enums.EnumRequestPacket; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.EventHooks; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; @@ -51,7 +50,7 @@ public final class PartySetQuestPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData.partyUUID != null) { Party party = PartyController.Instance().getParty(playerData.partyUUID); if (party != null) { diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index 6c37dd14a..50aea56b8 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -34,8 +34,8 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptSound; -import noppes.npcs.scripted.event.player.DialogEvent; import noppes.npcs.scripted.event.PartyEvent; +import noppes.npcs.scripted.event.player.DialogEvent; import noppes.npcs.scripted.event.player.QuestEvent; import java.io.IOException; @@ -81,7 +81,7 @@ public class NoppesUtilPlayer { public static void transport(EntityPlayerMP player, EntityNPCInterface npc, String location) { TransportLocation loc = TransportController.getInstance().getTransport(location); - PlayerTransportData playerdata = PlayerDataController.Instance.getPlayerData(player).transportData; + PlayerTransportData playerdata = PlayerData.get(player).transportData; if (loc == null || !loc.isDefault() && !playerdata.transports.contains(loc.id)) return; @@ -295,7 +295,7 @@ public class NoppesUtilPlayer { } public static void updateQuestLogData(ByteBuf buffer, EntityPlayerMP player) throws IOException { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); NBTTagCompound compound = ByteBufUtils.readNBT(buffer); HashMap questAlerts = NBTTags.getStringStringMap(compound.getTagList("Alerts", 10)); @@ -316,13 +316,13 @@ public class NoppesUtilPlayer { } public static void clearTrackQuest(EntityPlayerMP player) throws IOException { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); playerData.questData.untrackQuest(); } public static void updatePartyQuestLogData(ByteBuf buffer, EntityPlayerMP player) throws IOException { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); String trackedQuestString = ByteBufUtils.readString(buffer); Quest trackedQuest = getQuestFromStringKey(trackedQuestString); if (trackedQuest != null) { @@ -362,7 +362,7 @@ public class NoppesUtilPlayer { } public static void sendTrackedQuestData(EntityPlayerMP player) { - Quest trackedQuest = (Quest) PlayerDataController.Instance.getPlayerData(player).questData.getTrackedQuest(); + Quest trackedQuest = (Quest) PlayerData.get(player).questData.getTrackedQuest(); if (trackedQuest != null) { NBTTagCompound compound = new NBTTagCompound(); compound.setTag("Quest", trackedQuest.writeToNBT(new NBTTagCompound())); @@ -383,7 +383,7 @@ public class NoppesUtilPlayer { } public static void sendPartyTrackedQuestData(EntityPlayerMP player, Party party) { - Quest trackedQuest = (Quest) PlayerDataController.Instance.getPlayerData(player).questData.getTrackedQuest(); + Quest trackedQuest = (Quest) PlayerData.get(player).questData.getTrackedQuest(); if (trackedQuest != null) { NBTTagCompound compound = new NBTTagCompound(); compound.setTag("Quest", trackedQuest.writeToNBT(new NBTTagCompound())); @@ -424,7 +424,7 @@ public class NoppesUtilPlayer { if (player == null) return false; - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); PlayerQuestData questData = playerData.questData; QuestData data = questData.activeQuests.get(questId); @@ -535,7 +535,7 @@ public class NoppesUtilPlayer { if (player == null) continue; - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData == null) continue; @@ -634,7 +634,7 @@ public class NoppesUtilPlayer { if (player == null) continue; - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData == null) continue; diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 3a22e9ace..108b66821 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -80,14 +80,14 @@ public class NoppesUtilServer { } public static void setEditingNpc(EntityPlayer player, EntityNPCInterface npc) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); data.editingNpc = npc; if (npc != null) PacketHandler.Instance.sendToPlayer(new EditNpcPacket(npc.getEntityId()), (EntityPlayerMP) player); } public static EntityNPCInterface getEditingNpc(EntityPlayer player) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); return data.editingNpc; } @@ -219,7 +219,7 @@ public class NoppesUtilServer { } if (dialog.mail.isValid()) PlayerDataController.Instance.addPlayerMessage(player.getCommandSenderName(), dialog.mail); - PlayerDialogData data = PlayerDataController.Instance.getPlayerData(player).dialogData; + PlayerDialogData data = PlayerData.get(player).dialogData; if (!data.dialogsRead.contains(dialog.id) && dialog.id >= 0) { data.dialogsRead.add(dialog.id); playerdata.updateClient = true; @@ -356,7 +356,7 @@ public class NoppesUtilServer { list.add(loc.name); } } - PlayerTransportData playerdata = PlayerDataController.Instance.getPlayerData(player).transportData; + PlayerTransportData playerdata = PlayerData.get(player).transportData; for (int i : playerdata.transports) { TransportLocation loc = TransportController.getInstance().getTransport(i); if (loc != null && location.category.locations.containsKey(loc.id)) { @@ -528,7 +528,7 @@ public class NoppesUtilServer { if (pl == null) playerdata = PlayerDataController.Instance.getDataFromUsername(name); else - playerdata = PlayerDataController.Instance.getPlayerData(pl); + playerdata = PlayerData.get(pl); if (type == EnumPlayerData.Players) { String fileType = ".json"; @@ -951,7 +951,7 @@ public class NoppesUtilServer { } public static void isGUIOpen(ByteBuf buffer, EntityPlayer player) throws IOException { - PlayerData playerdata = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerdata = PlayerData.get(player); boolean isGUIOpen = buffer.readBoolean(); playerdata.setGUIOpen(isGUIOpen); } @@ -993,7 +993,7 @@ public class NoppesUtilServer { if (pl == null) playerdata = PlayerDataController.Instance.getDataFromUsername(playerName); else - playerdata = PlayerDataController.Instance.getPlayerData(pl); + playerdata = PlayerData.get(pl); // Assemble quest maps: Map questActiveMap = new HashMap<>(); @@ -1097,7 +1097,7 @@ public class NoppesUtilServer { if (pl == null) playerdata = PlayerDataController.Instance.getDataFromUsername(playerName); else - playerdata = PlayerDataController.Instance.getPlayerData(pl); + playerdata = PlayerData.get(pl); if (enumPlayerData == EnumPlayerData.Quest) { // Quest removal playerdata.questData.activeQuests.remove(value); @@ -1145,7 +1145,7 @@ public class NoppesUtilServer { if (pl == null) playerdata = PlayerDataController.Instance.getDataFromUsername(playerName); else - playerdata = PlayerDataController.Instance.getPlayerData(pl); + playerdata = PlayerData.get(pl); if (enumPlayerData == EnumPlayerData.Magic) { // Quest removal playerdata.magicData.readToNBT(compound); diff --git a/src/main/java/noppes/npcs/QuestLogData.java b/src/main/java/noppes/npcs/QuestLogData.java index ad41ccd0b..50eec29c9 100644 --- a/src/main/java/noppes/npcs/QuestLogData.java +++ b/src/main/java/noppes/npcs/QuestLogData.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.constants.EnumQuestCompletion; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; @@ -60,7 +59,7 @@ public class QuestLogData { } public void setData(EntityPlayer player) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); for (Quest quest : PlayerQuestController.getActiveQuests(player)) { String category = quest.category.title; @@ -99,7 +98,7 @@ public class QuestLogData { } public void setTrackedQuestKey(EntityPlayer player) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); Party party = playerData.getPlayerParty(); if (party != null && party.getQuest() != null) { diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java index a3cbcc490..7f0e5aa21 100644 --- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java @@ -136,7 +136,7 @@ public class ScriptItemEventHandler { if (PlayerDataController.Instance != null) { if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR) { - PlayerData handler = PlayerDataController.Instance.getPlayerData(event.entityPlayer); + PlayerData handler = PlayerData.get(event.entityPlayer); if (handler == null) return; @@ -155,7 +155,7 @@ public class ScriptItemEventHandler { } catch (Exception e) { } } else if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { - PlayerData handler = PlayerDataController.Instance.getPlayerData(event.entityPlayer); + PlayerData handler = PlayerData.get(event.entityPlayer); if (handler == null) return; diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 1efff2088..c62bdfe0e 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -69,7 +69,7 @@ public class ScriptPlayerEventHandler { } if (PlayerDataController.Instance != null) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData.updateClient) { SyncController.syncPlayerData((EntityPlayerMP) player, true); @@ -92,11 +92,11 @@ public class ScriptPlayerEventHandler { Party party = playerData.getPlayerParty(); boolean trackingPartyQuest = playerData.questData.getTrackedQuest() != null && party != null && party.getQuest() != null && party.getQuest().getId() == playerData.questData.getTrackedQuest().getId(); if (playerData.questData.getTrackedQuest() != null && !playerData.questData.activeQuests.containsKey(playerData.questData.getTrackedQuest().getId()) && !trackingPartyQuest) { - PlayerDataController.Instance.getPlayerData(player).questData.untrackQuest(); + PlayerData.get(player).questData.untrackQuest(); } - if (player.ticksExisted % 20 == 0 && !PlayerDataController.Instance.getPlayerData(player).skinOverlays.overlayList.isEmpty()) { - PlayerDataController.Instance.getPlayerData(player).skinOverlays.updateClient(); + if (player.ticksExisted % 20 == 0 && !PlayerData.get(player).skinOverlays.overlayList.isEmpty()) { + PlayerData.get(player).skinOverlays.updateClient(); } if (player.ticksExisted % (TrackedQuestUpdateFrequency * 20) == 0) { @@ -263,7 +263,7 @@ public class ScriptPlayerEventHandler { return; if (!event.player.worldObj.isRemote && !(event.player instanceof FakePlayer)) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(event.player); + PlayerData playerData = PlayerData.get(event.player); PlayerQuestData questData = playerData.questData; QuestItem.pickedUp = event.pickedUp.getEntityItem(); @@ -545,7 +545,7 @@ public class ScriptPlayerEventHandler { IPlayer scriptPlayer = (IPlayer) NpcAPI.Instance().getIEntity(event.player); EventHooks.onPlayerLogin(handler, scriptPlayer); - PlayerData playerData = PlayerDataController.Instance.getPlayerData(event.player); + PlayerData playerData = PlayerData.get(event.player); Quest quest = (Quest) playerData.questData.getTrackedQuest(); if (quest != null) { Party party = playerData.getPlayerParty(); @@ -556,7 +556,7 @@ public class ScriptPlayerEventHandler { } } - PlayerDataController.Instance.getPlayerData(event.player).skinOverlays.updateClient(); + PlayerData.get(event.player).skinOverlays.updateClient(); } } diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 5a8c05874..f8333cc2b 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -47,7 +47,6 @@ import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; @@ -102,7 +101,7 @@ public class ServerEventsHandler { NBTTagCompound compound = new NBTTagCompound(); if (!event.target.writeToNBTOptional(compound)) return; - PlayerData data = PlayerDataController.Instance.getPlayerData(event.entityPlayer); + PlayerData data = PlayerData.get(event.entityPlayer); ServerCloneController.Instance.cleanTags(compound); PacketHandler.Instance.sendToPlayer(new ClonerPacket(compound), (EntityPlayerMP) event.entityPlayer); data.cloned = compound; @@ -152,8 +151,8 @@ public class ServerEventsHandler { // Check for Friendly Fire if (ConfigMain.PartyFriendlyFireEnabled) { EntityPlayer sourcePlayer = (EntityPlayer) event.source.getEntity(); - PlayerData playerData = PlayerDataController.Instance.getPlayerData(sourcePlayer); - PlayerData targetData = PlayerDataController.Instance.getPlayerData((EntityPlayer) event.entityLiving); + PlayerData playerData = PlayerData.get(sourcePlayer); + PlayerData targetData = PlayerData.get((EntityPlayer) event.entityLiving); if (playerData.partyUUID != null && playerData.partyUUID.equals(targetData.partyUUID)) { Party party = PartyController.Instance().getParty(playerData.partyUUID); if (party != null && !party.friendlyFire()) @@ -270,7 +269,7 @@ public class ServerEventsHandler { } } if (event.entityLiving instanceof EntityPlayer) { - PlayerData data = PlayerDataController.Instance.getPlayerData((EntityPlayer) event.entityLiving); + PlayerData data = PlayerData.get((EntityPlayer) event.entityLiving); data.save(); } } @@ -447,7 +446,7 @@ public class ServerEventsHandler { @SubscribeEvent public void world(PlayerEvent.SaveToFile event) { - PlayerData data = PlayerDataController.Instance.getPlayerData((EntityPlayer) event.entity); + PlayerData data = PlayerData.get((EntityPlayer) event.entity); data.save(); } @@ -455,7 +454,7 @@ public class ServerEventsHandler { public void world(EntityJoinWorldEvent event) { if (event.world.isRemote || !(event.entity instanceof EntityPlayer)) return; - PlayerData data = PlayerDataController.Instance.getPlayerData((EntityPlayer) event.entity); + PlayerData data = PlayerData.get((EntityPlayer) event.entity); data.updateCompanion(event.world); } diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index 6f05146a8..c73874df5 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.world.WorldServer; import noppes.npcs.client.AnalyticsTracking; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerData; import java.net.InetAddress; @@ -47,7 +46,7 @@ public class ServerTickHandler { } AnalyticsTracking.sendData(event.player, "join", serverName); - PlayerData playerData = PlayerDataController.Instance.getPlayerData(event.player); + PlayerData playerData = PlayerData.get(event.player); if (playerData != null) { playerData.onLogin(); } @@ -59,7 +58,7 @@ public class ServerTickHandler { @SubscribeEvent public void playerLogout(PlayerEvent.PlayerLoggedOutEvent event) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(event.player); + PlayerData playerData = PlayerData.get(event.player); if (playerData != null) { playerData.onLogout(); } diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java index d9d85f89b..20f2326ff 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java @@ -8,7 +8,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.*; import noppes.npcs.quests.QuestLocation; @@ -43,7 +42,7 @@ public class TileWaypoint extends TileEntity { if (toCheck.isEmpty()) return; for (EntityPlayer player : toCheck) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); PlayerQuestData questData = playerData.questData; Party party = playerData.getPlayerParty(); Quest partyQuest = null; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java b/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java index 95559b42a..d28977979 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java @@ -1,7 +1,6 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiTextField; import noppes.npcs.client.gui.util.*; import noppes.npcs.scripted.ScriptParticle; diff --git a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java index 41658a41f..c5f64dbc2 100644 --- a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java +++ b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java @@ -1,22 +1,16 @@ package noppes.npcs.client.gui.item; -import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.player.item.MagicCyclesPacket; -import kamkeel.npcs.network.packets.request.magic.MagicGetAllPacket; -import kamkeel.npcs.network.packets.request.magic.MagicGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.GuiMagicCycleMap; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumScrollData; -import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicCycle; -import org.lwjgl.opengl.GL11; import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Vector; public class GuiNpcMagicBook extends GuiNPCInterface implements ICustomScrollListener, IScrollData, IGuiData { diff --git a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java index ca4c98a14..eb9dbb62e 100644 --- a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java @@ -13,7 +13,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IChatComponent; import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomNpcs; -import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.api.handler.data.IDialogImage; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.NoppesUtil; @@ -23,7 +22,6 @@ import noppes.npcs.client.gui.player.GuiDialogImage; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.IGuiClose; import noppes.npcs.constants.EnumOptionType; -import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogImage; import noppes.npcs.controllers.data.DialogOption; diff --git a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java index 483409f69..7d89fd8e9 100644 --- a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java +++ b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java @@ -29,7 +29,6 @@ import noppes.npcs.client.gui.util.GuiTexturedButton; import noppes.npcs.client.gui.util.IGuiClose; import noppes.npcs.config.ConfigExperimental; import noppes.npcs.controllers.FactionController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; @@ -180,7 +179,7 @@ public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { GL11.glScalef(1 / 1.5f, 1 / 1.5f, 1); drawTextBlock(takeQuestString, (width - textBlockWidth) / 2, height - textPartHeight + 23 + 3 + gap, textBlockWidth,-1); - Map activeQuests = PlayerDataController.Instance.getPlayerData(this.player).questData.activeQuests; + Map activeQuests = PlayerData.get(this.player).questData.activeQuests; boolean hadQuest = activeQuests.containsKey(quest.id); activeQuests.put(quest.id,new QuestData(quest)); StringBuilder objectiveString = new StringBuilder(); diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java index dfb1b2900..5e99de749 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java @@ -10,12 +10,10 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; import noppes.npcs.NoppesStringUtils; -import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.global.GuiNPCManageLinked; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.LinkedItem; import noppes.npcs.controllers.data.LinkedItemScript; diff --git a/src/main/java/noppes/npcs/config/ConfigExperimental.java b/src/main/java/noppes/npcs/config/ConfigExperimental.java index c7a4a29ac..da2fd0019 100644 --- a/src/main/java/noppes/npcs/config/ConfigExperimental.java +++ b/src/main/java/noppes/npcs/config/ConfigExperimental.java @@ -3,8 +3,6 @@ package noppes.npcs.config; import cpw.mods.fml.common.FMLLog; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import noppes.npcs.CustomNpcs; -import noppes.npcs.config.legacy.LegacyConfig; import org.apache.logging.log4j.Level; import java.io.File; diff --git a/src/main/java/noppes/npcs/containers/ContainerMail.java b/src/main/java/noppes/npcs/containers/ContainerMail.java index ff7e7b087..8cc88e23a 100644 --- a/src/main/java/noppes/npcs/containers/ContainerMail.java +++ b/src/main/java/noppes/npcs/containers/ContainerMail.java @@ -3,7 +3,7 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.controllers.data.PlayerMailData; @@ -76,7 +76,7 @@ public class ContainerMail extends ContainerNpcInterface { public void onContainerClosed(EntityPlayer player) { super.onContainerClosed(player); if (!canEdit && !player.worldObj.isRemote) { - PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData; + PlayerMailData data = PlayerData.get(player).mailData; Iterator it = data.playermail.iterator(); while (it.hasNext()) { PlayerMail mail = it.next(); diff --git a/src/main/java/noppes/npcs/controllers/PartyController.java b/src/main/java/noppes/npcs/controllers/PartyController.java index dfb71eb91..36fbb78fb 100644 --- a/src/main/java/noppes/npcs/controllers/PartyController.java +++ b/src/main/java/noppes/npcs/controllers/PartyController.java @@ -60,7 +60,7 @@ public class PartyController implements IPartyHandler { return null; EntityPlayer entityPlayer = (EntityPlayer) player.getMCEntity(); - PlayerData playerData = PlayerDataController.Instance.getPlayerData(entityPlayer); + PlayerData playerData = PlayerData.get(entityPlayer); if (playerData.partyUUID != null) return getParty(playerData.partyUUID); @@ -80,7 +80,7 @@ public class PartyController implements IPartyHandler { return; EntityPlayer entityPlayer = (EntityPlayer) player.getMCEntity(); - PlayerData playerData = PlayerDataController.Instance.getPlayerData(entityPlayer); + PlayerData playerData = PlayerData.get(entityPlayer); if (playerData.partyUUID != null) disbandParty(playerData.partyUUID); @@ -100,7 +100,7 @@ public class PartyController implements IPartyHandler { EntityPlayer player = NoppesUtilServer.getPlayer(uuid); PlayerData playerData; if (player != null) { - playerData = PlayerDataController.Instance.getPlayerData(player); + playerData = PlayerData.get(player); } else { playerData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); } @@ -172,7 +172,7 @@ public class PartyController implements IPartyHandler { for (String name : party.getPlayerNames()) { EntityPlayer playerMP = NoppesUtilServer.getPlayerByName(name); if (playerMP != null) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP); + PlayerData playerData = PlayerData.get(playerMP); if (playerData != null) { PartyDataPacket.sendPartyData((EntityPlayerMP) playerMP, compound); } @@ -203,7 +203,7 @@ public class PartyController implements IPartyHandler { for (String name : party.getPlayerNames()) { EntityPlayer playerMP = NoppesUtilServer.getPlayerByName(name); if (playerMP != null) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP); + PlayerData playerData = PlayerData.get(playerMP); if (playerData != null) { PartyDataPacket.sendPartyData((EntityPlayerMP) playerMP, compound); } @@ -251,7 +251,7 @@ public class PartyController implements IPartyHandler { for (String name : party.getPlayerNames()) { EntityPlayer playerMP = NoppesUtilServer.getPlayerByName(name); if (playerMP != null) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP); + PlayerData playerData = PlayerData.get(playerMP); if (playerData != null) { if (playerData.questData.getTrackedQuest() != null && questData.quest.getId() == playerData.questData.getTrackedQuest().getId()) { NoppesUtilPlayer.sendPartyTrackedQuestData((EntityPlayerMP) playerMP, party); diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index ca113e13a..37b36f0de 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -266,7 +266,7 @@ public class PlayerDataController { public PlayerBankData getBankData(EntityPlayer player, int bankId) { Bank bank = BankController.getInstance().getBank(bankId); - PlayerBankData data = getPlayerData(player).bankData; + PlayerBankData data = PlayerData.get(player).bankData; if (!data.hasBank(bank.id)) { data.loadNew(bank.id); } @@ -278,7 +278,7 @@ public class PlayerDataController { List list = MinecraftServer.getServer().getConfigurationManager().playerEntityList; for (Object o : list) { if (o instanceof EntityPlayer) { - playerDataList.add(this.getPlayerData((EntityPlayer) o)); + playerDataList.add(PlayerData.get((EntityPlayer) o)); } } return playerDataList; @@ -347,7 +347,7 @@ public class PlayerDataController { } } } else - data = PlayerDataController.Instance.getPlayerData(player); + data = PlayerData.get(player); return data; } @@ -370,7 +370,7 @@ public class PlayerDataController { list.add(data); } else { for (EntityPlayer player : players) { - list.add(PlayerDataController.Instance.getPlayerData(player)); + list.add(PlayerData.get(player)); } } @@ -383,7 +383,7 @@ public class PlayerDataController { } public boolean hasMail(EntityPlayer player) { - return getPlayerData(player).mailData.hasMail(); + return PlayerData.get(player).mailData.hasMail(); } public void readNBT(NBTTagCompound compound) { diff --git a/src/main/java/noppes/npcs/controllers/data/AnimationData.java b/src/main/java/noppes/npcs/controllers/data/AnimationData.java index 681a403b1..43fe42016 100644 --- a/src/main/java/noppes/npcs/controllers/data/AnimationData.java +++ b/src/main/java/noppes/npcs/controllers/data/AnimationData.java @@ -17,7 +17,6 @@ import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.handler.data.IAnimation; import noppes.npcs.api.handler.data.IAnimationData; import noppes.npcs.constants.EnumAnimationPart; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; @@ -117,7 +116,7 @@ public class AnimationData implements IAnimationData { entities.removeIf(player -> Arrays.stream(excludedPlayers).anyMatch(exp -> player == exp)); for (EntityPlayer player : entities) { - AnimationData animationData = PlayerDataController.Instance.getPlayerData(player).animationData; + AnimationData animationData = PlayerData.get(player).animationData; NBTTagCompound animationNBT = this.animation != null ? this.animation.writeToNBT() : null; animationData.viewAnimation(this.animation, this, animationNBT); } diff --git a/src/main/java/noppes/npcs/controllers/data/Faction.java b/src/main/java/noppes/npcs/controllers/data/Faction.java index d8d38ca1e..1a9b83aef 100644 --- a/src/main/java/noppes/npcs/controllers/data/Faction.java +++ b/src/main/java/noppes/npcs/controllers/data/Faction.java @@ -8,7 +8,6 @@ import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.IPlayerFactionData; import noppes.npcs.api.handler.data.IFaction; import noppes.npcs.controllers.FactionController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -80,17 +79,17 @@ public class Faction implements IFaction { } public boolean isFriendlyToPlayer(EntityPlayer player) { - PlayerFactionData data = PlayerDataController.Instance.getPlayerData(player).factionData; + PlayerFactionData data = PlayerData.get(player).factionData; return data.getFactionPoints(id) >= friendlyPoints; } public boolean isAggressiveToPlayer(EntityPlayer player) { - PlayerFactionData data = PlayerDataController.Instance.getPlayerData(player).factionData; + PlayerFactionData data = PlayerData.get(player).factionData; return data.getFactionPoints(id) < neutralPoints; } public boolean isNeutralToPlayer(EntityPlayer player) { - PlayerFactionData data = PlayerDataController.Instance.getPlayerData(player).factionData; + PlayerFactionData data = PlayerData.get(player).factionData; int points = data.getFactionPoints(id); return points >= neutralPoints && points < friendlyPoints; } diff --git a/src/main/java/noppes/npcs/controllers/data/FactionOptions.java b/src/main/java/noppes/npcs/controllers/data/FactionOptions.java index e80537f07..6f41b7f7b 100644 --- a/src/main/java/noppes/npcs/controllers/data/FactionOptions.java +++ b/src/main/java/noppes/npcs/controllers/data/FactionOptions.java @@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.controllers.FactionController; -import noppes.npcs.controllers.PlayerDataController; public class FactionOptions { @@ -48,7 +47,7 @@ public class FactionOptions { if (factionId < 0 && faction2Id < 0) return; - PlayerFactionData data = PlayerDataController.Instance.getPlayerData(player).factionData; + PlayerFactionData data = PlayerData.get(player).factionData; if (factionId >= 0 && factionPoints > 0) addPoints(player, data, factionId, decreaseFactionPoints, factionPoints); if (faction2Id >= 0 && faction2Points > 0) diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index fc347d8ee..df826bb9e 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -118,7 +118,7 @@ public class Party implements IParty { return false; } - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); playerData.partyUUID = this.partyUUID; partyMembers.put(player.getUniqueID(), player.getCommandSenderName()); @@ -140,7 +140,7 @@ public class Party implements IParty { } } - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); playerData.partyUUID = null; return true; @@ -314,7 +314,7 @@ public class Party implements IParty { } private boolean isValidLeaderQuest(EntityPlayer leader, int questID) { - IPlayerQuestData questData = PlayerDataController.Instance.getPlayerData(leader).getQuestData(); + IPlayerQuestData questData = PlayerData.get(leader).getQuestData(); return questData != null && questData.hasActiveQuest(questID); } @@ -323,7 +323,7 @@ public class Party implements IParty { for (UUID playerUUID : partyMembers.keySet()) { EntityPlayer player = PlayerDataController.getPlayerFromUUID(playerUUID); if (player != null) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData != null) { IPlayerQuestData questData = playerData.getQuestData(); if (questData != null) { diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java index dbbd5437e..995e5d85f 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java @@ -16,7 +16,6 @@ import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.PlayerQuestController; import noppes.npcs.controllers.QuestController; import noppes.npcs.entity.EntityNPCInterface; @@ -104,7 +103,7 @@ public class PlayerQuestData implements IPlayerQuestData { } public QuestData getQuestCompletion(EntityPlayer player, EntityNPCInterface npc) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); for (QuestData data : activeQuests.values()) { Quest quest = data.quest; if (quest != null && quest.completion == EnumQuestCompletion.Npc && quest.completerNpc.equals(npc.getCommandSenderName()) && quest.questInterface.isCompleted(playerData)) { @@ -115,7 +114,7 @@ public class PlayerQuestData implements IPlayerQuestData { } public Party getPartyQuestCompletion(EntityPlayer player, EntityNPCInterface npc) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); if (playerData != null) { Party party = playerData.getPlayerParty(); if (party != null) { diff --git a/src/main/java/noppes/npcs/controllers/data/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java index 5d7b11533..02f3e3f87 100644 --- a/src/main/java/noppes/npcs/controllers/data/Quest.java +++ b/src/main/java/noppes/npcs/controllers/data/Quest.java @@ -17,7 +17,6 @@ import noppes.npcs.constants.EnumProfileSync; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; import noppes.npcs.constants.EnumQuestType; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.QuestController; import noppes.npcs.quests.*; import noppes.npcs.scripted.CustomNPCsException; @@ -173,7 +172,7 @@ public class Quest implements ICompatibilty, IQuest { } return timeRemaining; } - IPlayerQuestData questData = PlayerDataController.Instance.getPlayerData(player).getQuestData(); + IPlayerQuestData questData = PlayerData.get(player).getQuestData(); return getTimeUntilRepeatQuestData(player, questData); } diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 7c350bf99..5d7f34034 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -70,7 +70,6 @@ import noppes.npcs.constants.*; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.LinkedNpcController.LinkedData; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.*; import noppes.npcs.entity.data.DataTimers; import noppes.npcs.roles.*; @@ -446,7 +445,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti addInteract(player); Dialog dialog = getDialog(player); - PlayerQuestData playerdata = PlayerDataController.Instance.getPlayerData(player).questData; + PlayerQuestData playerdata = PlayerData.get(player).questData; QuestData data = playerdata.getQuestCompletion(player, this); Party partyCompleted = playerdata.getPartyQuestCompletion(player, this); if (partyCompleted != null) { diff --git a/src/main/java/noppes/npcs/entity/EntityProjectile.java b/src/main/java/noppes/npcs/entity/EntityProjectile.java index 648448040..37e903890 100644 --- a/src/main/java/noppes/npcs/entity/EntityProjectile.java +++ b/src/main/java/noppes/npcs/entity/EntityProjectile.java @@ -3,11 +3,9 @@ package noppes.npcs.entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.addon.DBCAddon; -import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.packets.data.script.ScriptedParticlePacket; import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -35,7 +33,6 @@ import noppes.npcs.api.IPos; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IProjectile; -import noppes.npcs.client.fx.CustomFX; import noppes.npcs.constants.EnumParticleType; import noppes.npcs.constants.EnumPotionType; import noppes.npcs.controllers.ScriptContainer; diff --git a/src/main/java/noppes/npcs/items/ItemNpcTool.java b/src/main/java/noppes/npcs/items/ItemNpcTool.java index a54de9fa3..39431e908 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcTool.java +++ b/src/main/java/noppes/npcs/items/ItemNpcTool.java @@ -25,7 +25,6 @@ import noppes.npcs.blocks.BlockWallBanner; import noppes.npcs.blocks.tiles.TileBanner; import noppes.npcs.blocks.tiles.TileChair; import noppes.npcs.blocks.tiles.TileColorable; -import noppes.npcs.client.NoppesUtil; import noppes.npcs.constants.EnumGuiType; import java.util.List; diff --git a/src/main/java/noppes/npcs/items/ItemSoulstoneEmpty.java b/src/main/java/noppes/npcs/items/ItemSoulstoneEmpty.java index 82d0359a6..7bc7f70b7 100644 --- a/src/main/java/noppes/npcs/items/ItemSoulstoneEmpty.java +++ b/src/main/java/noppes/npcs/items/ItemSoulstoneEmpty.java @@ -15,7 +15,6 @@ import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilServer; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; @@ -83,7 +82,7 @@ public class ItemSoulstoneEmpty extends Item { int p = npc.advanced.minFactionPointsToSoulStone; if (p == -1 && npc.getFaction().isFriendlyToPlayer(player)) return true; else if (p != -1) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); return data.factionData.getFactionPoints(npc.getFaction().getId()) >= p; } } diff --git a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java index abca79104..94bb6072f 100644 --- a/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java +++ b/src/main/java/noppes/npcs/items/ItemSoulstoneFilled.java @@ -16,7 +16,6 @@ import net.minecraft.world.World; import noppes.npcs.LogWriter; import noppes.npcs.config.ConfigDebug; import noppes.npcs.constants.EnumRoleType; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleCompanion; @@ -93,7 +92,7 @@ public class ItemSoulstoneFilled extends Item { npc.advanced.soulStonePlayerName = sourceName; npc.advanced.soulStoneInit = true; if (npc.advanced.role == EnumRoleType.Companion && player != null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); if (data.hasCompanion()) return false; ((RoleCompanion) npc.roleInterface).setOwner(player); diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index 554348a99..ea6bf3e73 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -53,7 +53,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { if (dialog == null) continue; String title = dialog.title; - if (PlayerDataController.Instance.getPlayerData(player).dialogData.dialogsRead.contains(dialogId)) + if (PlayerData.get(player).dialogData.dialogsRead.contains(dialogId)) title += " (read)"; else title += " (unread)"; @@ -119,7 +119,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer player = NoppesUtilServer.getPlayer(uuid); PlayerData playerData; if (player != null) { - playerData = PlayerDataController.Instance.getPlayerData(player); + playerData = PlayerData.get(player); } else { playerData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); } @@ -153,7 +153,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer leader = NoppesUtilServer.getPlayer(party.getLeaderUUID()); PlayerData playerData; if (leader != null) { - playerData = PlayerDataController.Instance.getPlayerData(leader); + playerData = PlayerData.get(leader); } else { playerData = PlayerDataController.Instance.getPlayerDataCache(party.getLeaderUUID().toString()); } @@ -181,7 +181,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer player = NoppesUtilServer.getPlayer(uuid); PlayerData sharedData; if (player != null) { - sharedData = PlayerDataController.Instance.getPlayerData(player); + sharedData = PlayerData.get(player); } else { sharedData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); } @@ -224,7 +224,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer individual = NoppesUtilServer.getPlayer(uuid); PlayerData individualData; if (individual != null) { - individualData = PlayerDataController.Instance.getPlayerData(individual); + individualData = PlayerData.get(individual); } else { individualData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); } @@ -242,7 +242,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer leaderPlayer = NoppesUtilServer.getPlayer(party.getLeaderUUID()); PlayerData leaderData; if (leaderPlayer != null) { - leaderData = PlayerDataController.Instance.getPlayerData(leaderPlayer); + leaderData = PlayerData.get(leaderPlayer); } else { leaderData = PlayerDataController.Instance.getPlayerDataCache(party.getLeaderUUID().toString()); } @@ -262,7 +262,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer player = NoppesUtilServer.getPlayer(uuid); PlayerData playerData; if (player != null) { - playerData = PlayerDataController.Instance.getPlayerData(player); + playerData = PlayerData.get(player); } else { playerData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); } @@ -309,7 +309,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { public void setProgress(int progress) { if (progress >= 0 && progress <= 1) { if (player != null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); boolean completed = data.dialogData.dialogsRead.contains(this.dialog.id); if (progress == 0 && completed) { data.dialogData.dialogsRead.remove(this.dialog.id); @@ -331,7 +331,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer leaderPlayer = NoppesUtilServer.getPlayer(party.getLeaderUUID()); PlayerData leaderData; if (leaderPlayer != null) { - leaderData = PlayerDataController.Instance.getPlayerData(leaderPlayer); + leaderData = PlayerData.get(leaderPlayer); } else { leaderData = PlayerDataController.Instance.getPlayerDataCache(party.getLeaderUUID().toString()); } @@ -356,7 +356,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer individual = NoppesUtilServer.getPlayer(uuid); PlayerData individualData; if (individual != null) { - individualData = PlayerDataController.Instance.getPlayerData(individual); + individualData = PlayerData.get(individual); } else { individualData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); } @@ -388,7 +388,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { if (progress >= 0 && progress <= 1) { EntityPlayer foundplayer = NoppesUtilServer.getPlayerByName(playerName); if (foundplayer != null && party == null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(foundplayer); + PlayerData data = PlayerData.get(foundplayer); boolean completed = data.dialogData.dialogsRead.contains(this.dialog.id); if (progress == 0 && completed) { data.dialogData.dialogsRead.remove(this.dialog.id); @@ -410,7 +410,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer leaderPlayer = NoppesUtilServer.getPlayer(party.getLeaderUUID()); PlayerData leaderData; if (leaderPlayer != null) { - leaderData = PlayerDataController.Instance.getPlayerData(leaderPlayer); + leaderData = PlayerData.get(leaderPlayer); } else { leaderData = PlayerDataController.Instance.getPlayerDataCache(party.getLeaderUUID().toString()); } @@ -431,7 +431,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { leaderData.save(); } } else { - PlayerData individualData = PlayerDataController.Instance.getPlayerData(foundplayer); + PlayerData individualData = PlayerData.get(foundplayer); if (individualData != null) { boolean completed = individualData.dialogData.dialogsRead.contains(this.dialog.id); if (progress == 0 && completed) { @@ -460,7 +460,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { public boolean isCompleted() { if (player != null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); return data.dialogData.dialogsRead.contains(this.dialog.id); } else if (party != null) { if (party.getObjectiveRequirement() != null) { @@ -469,7 +469,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer leaderPlayer = NoppesUtilServer.getPlayer(party.getLeaderUUID()); PlayerData leaderData; if (leaderPlayer != null) { - leaderData = PlayerDataController.Instance.getPlayerData(leaderPlayer); + leaderData = PlayerData.get(leaderPlayer); } else { leaderData = PlayerDataController.Instance.getPlayerDataCache(party.getLeaderUUID().toString()); } @@ -482,7 +482,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer individual = NoppesUtilServer.getPlayer(uuid); PlayerData individualData; if (individual != null) { - individualData = PlayerDataController.Instance.getPlayerData(individual); + individualData = PlayerData.get(individual); } else { individualData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); } @@ -514,7 +514,7 @@ public class QuestDialog extends QuestInterface implements IQuestDialog { EntityPlayer individual = NoppesUtilServer.getPlayer(uuid); PlayerData individualData; if (individual != null) { - individualData = PlayerDataController.Instance.getPlayerData(individual); + individualData = PlayerData.get(individual); } else { individualData = PlayerDataController.Instance.getPlayerDataCache(uuid.toString()); } diff --git a/src/main/java/noppes/npcs/quests/QuestInterface.java b/src/main/java/noppes/npcs/quests/QuestInterface.java index 14e52d2a0..4c5672a40 100644 --- a/src/main/java/noppes/npcs/quests/QuestInterface.java +++ b/src/main/java/noppes/npcs/quests/QuestInterface.java @@ -5,7 +5,6 @@ import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.api.handler.data.IQuestInterface; import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.constants.EnumPartyObjectives; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerQuestData; @@ -22,10 +21,10 @@ public abstract class QuestInterface implements IQuestInterface { public abstract boolean isCompleted(PlayerData player); public void handleComplete(EntityPlayer player) { - PlayerQuestData questData = PlayerDataController.Instance.getPlayerData(player).questData; + PlayerQuestData questData = PlayerData.get(player).questData; if (questData != null && questData.getTrackedQuest() != null) { - if (this.questId == PlayerDataController.Instance.getPlayerData(player).questData.getTrackedQuest().getId()) { - PlayerDataController.Instance.getPlayerData(player).questData.untrackQuest(); + if (this.questId == PlayerData.get(player).questData.getTrackedQuest().getId()) { + PlayerData.get(player).questData.untrackQuest(); } } } diff --git a/src/main/java/noppes/npcs/quests/QuestKill.java b/src/main/java/noppes/npcs/quests/QuestKill.java index 9a271bb68..70f283938 100644 --- a/src/main/java/noppes/npcs/quests/QuestKill.java +++ b/src/main/java/noppes/npcs/quests/QuestKill.java @@ -9,7 +9,6 @@ import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerQuestData; @@ -81,7 +80,7 @@ public class QuestKill extends QuestInterface implements IQuestKill { @Override public Vector getQuestLogStatus(EntityPlayer player) { Vector vec = new Vector(); - PlayerQuestData playerdata = PlayerDataController.Instance.getPlayerData(player).questData; + PlayerQuestData playerdata = PlayerData.get(player).questData; QuestData data = playerdata.activeQuests.get(questId); if (data == null) return vec; @@ -265,7 +264,7 @@ public class QuestKill extends QuestInterface implements IQuestKill { public int getProgress() { if (player != null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); PlayerQuestData playerdata = data.questData; QuestData questdata = (QuestData) playerdata.activeQuests.get(this.parent.questId); if (questdata != null) { @@ -299,7 +298,7 @@ public class QuestKill extends QuestInterface implements IQuestKill { public void setProgress(int progress) { if (progress >= 0 && progress <= this.amount) { if (player != null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); PlayerQuestData playerdata = data.questData; QuestData questdata = (QuestData) playerdata.activeQuests.get(this.parent.questId); if (questdata != null) { @@ -347,7 +346,7 @@ public class QuestKill extends QuestInterface implements IQuestKill { if (progress >= 0 && progress <= this.amount) { EntityPlayer foundplayer = NoppesUtilServer.getPlayerByName(playerName); if (foundplayer != null && party == null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(foundplayer); + PlayerData data = PlayerData.get(foundplayer); PlayerQuestData playerdata = data.questData; QuestData questdata = (QuestData) playerdata.activeQuests.get(this.parent.questId); if (questdata != null) { diff --git a/src/main/java/noppes/npcs/quests/QuestLocation.java b/src/main/java/noppes/npcs/quests/QuestLocation.java index c5b8be0ed..ed23af743 100644 --- a/src/main/java/noppes/npcs/quests/QuestLocation.java +++ b/src/main/java/noppes/npcs/quests/QuestLocation.java @@ -10,7 +10,6 @@ import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerQuestData; @@ -57,7 +56,7 @@ public class QuestLocation extends QuestInterface implements IQuestLocation { @Override public Vector getQuestLogStatus(EntityPlayer player) { Vector vec = new Vector(); - PlayerQuestData playerdata = PlayerDataController.Instance.getPlayerData(player).questData; + PlayerQuestData playerdata = PlayerData.get(player).questData; QuestData data = playerdata.activeQuests.get(questId); if (data == null) return vec; @@ -341,7 +340,7 @@ public class QuestLocation extends QuestInterface implements IQuestLocation { public void setProgress(int progress) { if (progress >= 0 && progress <= 1) { if (player != null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); QuestData questData = (QuestData) data.questData.activeQuests.get(this.parent.questId); boolean completed = questData.extraData.getBoolean(this.nbtName); if ((!completed || progress != 1) && (completed || progress != 0)) { @@ -377,7 +376,7 @@ public class QuestLocation extends QuestInterface implements IQuestLocation { if (progress >= 0 && progress <= 1) { EntityPlayer foundplayer = NoppesUtilServer.getPlayerByName(playerName); if (foundplayer != null && party == null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(foundplayer); + PlayerData data = PlayerData.get(foundplayer); QuestData questData = (QuestData) data.questData.activeQuests.get(this.parent.questId); boolean completed = questData.extraData.getBoolean(this.nbtName); if ((!completed || progress != 1) && (completed || progress != 0)) { @@ -417,7 +416,7 @@ public class QuestLocation extends QuestInterface implements IQuestLocation { public boolean isCompleted() { QuestData questData = null; if (player != null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); PlayerQuestData playerQuestData = data.questData; if (playerQuestData != null) { questData = playerQuestData.activeQuests.get(this.parent.questId); diff --git a/src/main/java/noppes/npcs/quests/QuestManual.java b/src/main/java/noppes/npcs/quests/QuestManual.java index ba0ee2b20..80a59709e 100644 --- a/src/main/java/noppes/npcs/quests/QuestManual.java +++ b/src/main/java/noppes/npcs/quests/QuestManual.java @@ -8,7 +8,6 @@ import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerQuestData; @@ -58,7 +57,7 @@ public class QuestManual extends QuestInterface { @Override public Vector getQuestLogStatus(EntityPlayer player) { Vector vec = new Vector(); - PlayerData playerdata = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerdata = PlayerData.get(player); if (playerdata == null) return vec; @@ -216,7 +215,7 @@ public class QuestManual extends QuestInterface { @Override public int getProgress() { if (player != null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); PlayerQuestData playerdata = data.questData; QuestData questdata = (QuestData) playerdata.activeQuests.get(questId); if (questdata != null) { @@ -251,7 +250,7 @@ public class QuestManual extends QuestInterface { public void setProgress(int progress) { if (progress >= 0 && progress <= this.amount) { if (player != null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); PlayerQuestData playerdata = data.questData; QuestData questdata = (QuestData) playerdata.activeQuests.get(questId); if (questdata != null) { @@ -296,7 +295,7 @@ public class QuestManual extends QuestInterface { if (progress >= 0 && progress <= this.amount) { EntityPlayer foundplayer = NoppesUtilServer.getPlayerByName(playerName); if (foundplayer != null && party == null) { - PlayerData data = PlayerDataController.Instance.getPlayerData(foundplayer); + PlayerData data = PlayerData.get(foundplayer); PlayerQuestData playerdata = data.questData; QuestData questdata = (QuestData) playerdata.activeQuests.get(questId); if (questdata != null) { diff --git a/src/main/java/noppes/npcs/roles/JobItemGiver.java b/src/main/java/noppes/npcs/roles/JobItemGiver.java index b899e6570..7b674803e 100644 --- a/src/main/java/noppes/npcs/roles/JobItemGiver.java +++ b/src/main/java/noppes/npcs/roles/JobItemGiver.java @@ -8,9 +8,9 @@ import net.minecraft.nbt.NBTTagList; import noppes.npcs.NBTTags; import noppes.npcs.NpcMiscInventory; import noppes.npcs.controllers.GlobalDataController; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerItemGiverData; import noppes.npcs.entity.EntityNPCInterface; @@ -98,7 +98,7 @@ public class JobItemGiver extends JobInterface { } public boolean giveItems(EntityPlayer player) { - PlayerItemGiverData data = PlayerDataController.Instance.getPlayerData(player).itemgiverData; + PlayerItemGiverData data = PlayerData.get(player).itemgiverData; if (!canPlayerInteract(data)) { return false; } diff --git a/src/main/java/noppes/npcs/roles/RoleCompanion.java b/src/main/java/noppes/npcs/roles/RoleCompanion.java index 0ca34ba6b..39209c238 100644 --- a/src/main/java/noppes/npcs/roles/RoleCompanion.java +++ b/src/main/java/noppes/npcs/roles/RoleCompanion.java @@ -18,7 +18,6 @@ import net.minecraft.util.Vec3; import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; import noppes.npcs.constants.*; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; @@ -69,7 +68,7 @@ public class RoleCompanion extends RoleInterface { npc.isDead = true; } else if (prev != owner && owner != null) { ownerName = owner.getDisplayName(); - PlayerData data = PlayerDataController.Instance.getPlayerData(owner); + PlayerData data = PlayerData.get(owner); if (data.companionID != companionID) { npc.isDead = true; } @@ -515,7 +514,7 @@ public class RoleCompanion extends RoleInterface { public void setSelfsuficient(boolean bo) { if (owner == null || jobInterface != null && bo == jobInterface.isSelfSufficient()) return; - PlayerData data = PlayerDataController.Instance.getPlayerData(owner); + PlayerData data = PlayerData.get(owner); if (!bo && data.hasCompanion()) return; data.setCompanion(bo ? null : npc); diff --git a/src/main/java/noppes/npcs/roles/RoleTransporter.java b/src/main/java/noppes/npcs/roles/RoleTransporter.java index 40d16d294..519715b9f 100644 --- a/src/main/java/noppes/npcs/roles/RoleTransporter.java +++ b/src/main/java/noppes/npcs/roles/RoleTransporter.java @@ -6,8 +6,8 @@ import net.minecraft.util.ChatComponentTranslation; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.handler.data.ITransportLocation; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.controllers.data.PlayerTransportData; import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; @@ -82,7 +82,7 @@ public class RoleTransporter extends RoleInterface { } public void unlock(EntityPlayer player, ITransportLocation loc) { - PlayerTransportData data = PlayerDataController.Instance.getPlayerData(player).transportData; + PlayerTransportData data = PlayerData.get(player).transportData; if (data.transports.contains(transportId)) return; data.transports.add(transportId); diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 80f3b6f3d..c7187d9aa 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -200,7 +200,7 @@ public class ScriptPlayer extends ScriptLivingBase } public boolean hasReadDialog(int id) { - PlayerDialogData data = PlayerDataController.Instance.getPlayerData(player).dialogData; + PlayerDialogData data = PlayerData.get(player).dialogData; return data.dialogsRead.contains(id); } @@ -253,12 +253,12 @@ public class ScriptPlayer extends ScriptLivingBase } public boolean hasFinishedQuest(int id) { - PlayerQuestData data = PlayerDataController.Instance.getPlayerData(player).questData; + PlayerQuestData data = PlayerData.get(player).questData; return data.finishedQuests.containsKey(id); } public boolean hasActiveQuest(int id) { - PlayerQuestData data = PlayerDataController.Instance.getPlayerData(player).questData; + PlayerQuestData data = PlayerData.get(player).questData; return data.activeQuests.containsKey(id); } @@ -271,7 +271,7 @@ public class ScriptPlayer extends ScriptLivingBase Quest quest = QuestController.Instance.quests.get(id); if (quest == null) return; - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); if (data.questData.activeQuests.containsKey(id)) return; QuestData questdata = new QuestData(quest); @@ -305,7 +305,7 @@ public class ScriptPlayer extends ScriptLivingBase Quest quest = QuestController.Instance.quests.get(id); if (quest == null) return; - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); data.questData.activeQuests.remove(id); data.updateClient = true; } @@ -340,7 +340,7 @@ public class ScriptPlayer extends ScriptLivingBase * @param points The points to increase. Use negative values to decrease */ public void addFactionPoints(int faction, int points) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); data.factionData.increasePoints(faction, points, player); } @@ -349,7 +349,7 @@ public class ScriptPlayer extends ScriptLivingBase * @param points The new point value for this faction */ public void setFactionPoints(int faction, int points) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); data.factionData.increasePoints(faction, points - getFactionPoints(faction), player); } @@ -358,7 +358,7 @@ public class ScriptPlayer extends ScriptLivingBase * @return points */ public int getFactionPoints(int faction) { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); return data.factionData.getFactionPoints(faction); } @@ -718,18 +718,18 @@ public class ScriptPlayer extends ScriptLivingBase } public ITimers getTimers() { - return PlayerDataController.Instance.getPlayerData(player).timers; + return PlayerData.get(player).timers; } @Override public IScreenSize getScreenSize() { - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); return data.getScreenSize(); } public void updatePlayerInventory() { ((EntityPlayerMP) this.entity).inventoryContainer.detectAndSendChanges(); - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + PlayerData playerData = PlayerData.get(player); PlayerQuestData questData = playerData.questData; Party playerParty = playerData.getPlayerParty(); if (playerParty != null) @@ -741,7 +741,7 @@ public class ScriptPlayer extends ScriptLivingBase @Deprecated public boolean checkGUIOpen() { NoppesUtilPlayer.isGUIOpen(player); - PlayerData data = PlayerDataController.Instance.getPlayerData(player); + PlayerData data = PlayerData.get(player); return data.getGUIOpen(); } @@ -756,7 +756,7 @@ public class ScriptPlayer extends ScriptLivingBase public PlayerData getData() { if (this.data == null) { - this.data = PlayerDataController.Instance.getPlayerData(player); + this.data = PlayerData.get(player); } return this.data;