From 1751de2f2dd02bd6e6f6e31f7a7bde79f0f0a864 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 30 Oct 2023 21:06:01 -0400 Subject: [PATCH] Add Party System Framework --- src/api | 2 +- .../noppes/npcs/controllers/data/Party.java | 112 ++++++++++++++++++ .../noppes/npcs/controllers/data/Quest.java | 28 +++++ 3 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 src/main/java/noppes/npcs/controllers/data/Party.java diff --git a/src/api b/src/api index f1c4b87a0..fbc7ae91e 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit f1c4b87a08154d8ba32a511f300b6049b9c68953 +Subproject commit fbc7ae91e7f8ff01e764d3a2750ac8169283ea2b diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java new file mode 100644 index 000000000..da60113de --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -0,0 +1,112 @@ +package noppes.npcs.controllers.data; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.api.handler.IPlayerQuestData; +import noppes.npcs.api.handler.data.IQuest; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.QuestController; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.Collection; +import java.util.UUID; + +public class Party { + + private UUID partyLeader; + + private Collection partyMembers; + private int currentQuestID = -1; + + public UUID getPartyLeader() { + return partyLeader; + } + + public void setPartyLeader(UUID partyLeader) { + this.partyLeader = partyLeader; + } + + public int getCurrentQuestID() { + return currentQuestID; + } + + public void setCurrentQuestID(int currentQuestID) { + this.currentQuestID = currentQuestID; + } + + public void addPlayer(EntityPlayer player) { + partyMembers.add(player.getUniqueID()); + } + + public void addPlayer(UUID player) { + partyMembers.add(player); + } + + public boolean removePlayer(String playerName) { + UUID uuid = getUUID(playerName); + if (uuid == null){ + return false; + } + return partyMembers.remove(uuid); + } + + public boolean removePlayer(UUID player) { + return partyMembers.remove(player); + } + + public boolean hasPlayer(UUID player) { + return partyMembers.contains(player); + } + + // To Be Called DURING Invite, Leave, Quest Switch, Leader Switch, etc. + public static boolean validateQuest(int questID, Collection players){ + IQuest quest = QuestController.Instance.get(questID); + if(quest == null){ + return false; + } + + boolean everyoneNeedsQuest = quest.getPartyRequirements() == 1; + if(everyoneNeedsQuest){ + // TODO: Get EntityPlayer from WORLD using UUID Collection + +// for(EntityPlayer player: players){ +// if(player != null){ +// PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); +// if(playerData != null){ +// IPlayerQuestData questData = playerData.getQuestData(); +// if(questData != null){ +// if(!questData.hasActiveQuest(questID)){ +// return false; +// } +// } else{ +// return false; +// } +// } +// } +// } + return true; + } + else { + // Check if Party Leader has Quest + return true; + } + } + + public static UUID getUUID(String name) { + UUID uuid = null; + try { + BufferedReader in = new BufferedReader(new InputStreamReader(new URL("https://api.mojang.com/users/profiles/minecraft/" + name).openStream())); + String uuidString; + uuidString = (((JsonObject)new JsonParser().parse(in)).get("id")).toString().replaceAll("\"", ""); + uuidString = uuidString.replaceAll("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5"); + in.close(); + + uuid = UUID.fromString(uuidString); + } catch (Exception ignored) {} + return uuid; + } + +} diff --git a/src/main/java/noppes/npcs/controllers/data/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java index 1f17b8a87..f277a6221 100644 --- a/src/main/java/noppes/npcs/controllers/data/Quest.java +++ b/src/main/java/noppes/npcs/controllers/data/Quest.java @@ -35,6 +35,10 @@ public class Quest implements ICompatibilty, IQuest { public String nextQuestTitle = ""; public PlayerMail mail = new PlayerMail(); public String command = ""; + + public boolean allowParty = false; + public byte partyRequirements = 0; // 0 - Only Party Leaders, 1 - Everyone + public byte rewardControl = 0; // 0 - Only Party Leaders, 1 - Everyone public QuestInterface questInterface = new QuestItem(); @@ -273,4 +277,28 @@ public class Quest implements ICompatibilty, IQuest { public IQuestInterface getQuestInterface(){ return this.questInterface; } + + public boolean isAllowParty() { + return allowParty; + } + + public void setAllowParty(boolean allowParty) { + this.allowParty = allowParty; + } + + public byte getPartyRequirements() { + return partyRequirements; + } + + public void setPartyRequirements(byte partyRequirements) { + this.partyRequirements = partyRequirements; + } + + public byte getRewardControl() { + return rewardControl; + } + + public void setRewardControl(byte rewardControl) { + this.rewardControl = rewardControl; + } }