Full Imports and Code Format Optimization

This commit is contained in:
Kam committed 2025-03-12 20:12:01 -04:00
1 parent 250edf099c
commit 6815f579a7
1192 files changed
+60344 -62167

No files matched your search

@@ -23,86 +23,54 @@ import java.util.Vector;
public class PlayerQuestController {
public static boolean hasActiveQuests(EntityPlayer player){
PlayerQuestData data = PlayerData.get(player).questData;
return !data.activeQuests.isEmpty();
}
public static boolean isQuestActive(EntityPlayer player, int quest){
PlayerQuestData data = PlayerData.get(player).questData;
return data.activeQuests.containsKey(quest);
}
public static boolean isQuestFinished(EntityPlayer player, int questid){
PlayerQuestData data = PlayerData.get(player).questData;
return data.finishedQuests.containsKey(questid);
}
public static void addActiveQuest(QuestData questData, EntityPlayer player) {
PlayerData playerData = PlayerData.get(player);
PlayerQuestData data = playerData.questData;
if(canQuestBeAccepted(questData.quest, player)){
if (EventHooks.onQuestStarted(player, questData.quest)) {
return;
}
data.activeQuests.put(questData.quest.id,questData);
if (questData.sendAlerts) {
AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "quest.newquest", questData.quest.title);
ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "quest.newquest", ": ", questData.quest.title);
}
playerData.updateClient = true;
} else {
long timeUntilRepeat = questData.quest.getTimeUntilRepeat(player);
if (timeUntilRepeat > 0 && questData.quest.getIsRepeatable() && questData.quest.repeat != EnumQuestRepeat.NONE && questData.quest.repeat != EnumQuestRepeat.REPEATABLE) {
String timeString = NoppesUtilServer.millisToTime(timeUntilRepeat);
String message = "You have " + timeString + " left until you can repeat this quest.";
player.addChatMessage(new ChatComponentTranslation(NoppesStringUtils.formatText(message,player)));
}
}
}
public static void setQuestFinished(Quest quest, EntityPlayer player){
PlayerData playerdata = PlayerData.get(player);
PlayerQuestData data = playerdata.questData;
QuestData questData = data.activeQuests.get(quest.id);
data.activeQuests.remove(quest.id);
setQuestFinishedUtil(player, quest, data);
if(quest.repeat != EnumQuestRepeat.NONE && quest.type == EnumQuestType.Dialog){
QuestDialog questdialog = (QuestDialog) quest.questInterface;
for(int dialog : questdialog.dialogs.values()){
playerdata.dialogData.dialogsRead.remove(dialog);
}
}
if (questData != null && questData.sendAlerts) {
AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "quest.completed", questData.quest.title);
ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "quest.completed", ": ", questData.quest.title);
}
playerdata.updateClient = true;
}
public static void setQuestFinishedUtil(EntityPlayer player, Quest quest, PlayerQuestData questData){
long completeTime;
if(quest.repeat == EnumQuestRepeat.RLDAILY || quest.repeat == EnumQuestRepeat.RLWEEKLY || quest.repeat == EnumQuestRepeat.RLCUSTOM){
completeTime = System.currentTimeMillis();
questData.finishedQuests.put(quest.id, completeTime);
} else {
completeTime = player.worldObj.getTotalWorldTime();
questData.finishedQuests.put(quest.id, completeTime);
}
if(ConfigMain.ProfilesEnabled && quest.profileOptions.enableOptions && quest.profileOptions.completeControl == EnumProfileSync.Shared)
ProfileController.Instance.shareQuestCompletion(player, quest.id, completeTime);
public static boolean hasActiveQuests(EntityPlayer player) {
PlayerQuestData data = PlayerData.get(player).questData;
return !data.activeQuests.isEmpty();
}
public static void setQuestPartyFinished(Quest quest, EntityPlayer player, QuestData questData ){
public static boolean isQuestActive(EntityPlayer player, int quest) {
PlayerQuestData data = PlayerData.get(player).questData;
return data.activeQuests.containsKey(quest);
}
public static boolean isQuestFinished(EntityPlayer player, int questid) {
PlayerQuestData data = PlayerData.get(player).questData;
return data.finishedQuests.containsKey(questid);
}
public static void addActiveQuest(QuestData questData, EntityPlayer player) {
PlayerData playerData = PlayerData.get(player);
PlayerQuestData data = playerData.questData;
if (canQuestBeAccepted(questData.quest, player)) {
if (EventHooks.onQuestStarted(player, questData.quest)) {
return;
}
data.activeQuests.put(questData.quest.id, questData);
if (questData.sendAlerts) {
AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "quest.newquest", questData.quest.title);
ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "quest.newquest", ": ", questData.quest.title);
}
playerData.updateClient = true;
} else {
long timeUntilRepeat = questData.quest.getTimeUntilRepeat(player);
if (timeUntilRepeat > 0 && questData.quest.getIsRepeatable() && questData.quest.repeat != EnumQuestRepeat.NONE && questData.quest.repeat != EnumQuestRepeat.REPEATABLE) {
String timeString = NoppesUtilServer.millisToTime(timeUntilRepeat);
String message = "You have " + timeString + " left until you can repeat this quest.";
player.addChatMessage(new ChatComponentTranslation(NoppesStringUtils.formatText(message, player)));
}
}
}
public static void setQuestFinished(Quest quest, EntityPlayer player) {
PlayerData playerdata = PlayerData.get(player);
PlayerQuestData data = playerdata.questData;
QuestData questData = data.activeQuests.get(quest.id);
data.activeQuests.remove(quest.id);
setQuestFinishedUtil(player, quest, data);
if(quest.repeat != EnumQuestRepeat.NONE && quest.type == EnumQuestType.Dialog){
if (quest.repeat != EnumQuestRepeat.NONE && quest.type == EnumQuestType.Dialog) {
QuestDialog questdialog = (QuestDialog) quest.questInterface;
for(int dialog : questdialog.dialogs.values()){
for (int dialog : questdialog.dialogs.values()) {
playerdata.dialogData.dialogsRead.remove(dialog);
}
}
@@ -113,48 +81,77 @@ public class PlayerQuestController {
playerdata.updateClient = true;
}
public static boolean canQuestBeAccepted(Quest quest, EntityPlayer player){
if(quest == null)
return false;
public static void setQuestFinishedUtil(EntityPlayer player, Quest quest, PlayerQuestData questData) {
long completeTime;
if (quest.repeat == EnumQuestRepeat.RLDAILY || quest.repeat == EnumQuestRepeat.RLWEEKLY || quest.repeat == EnumQuestRepeat.RLCUSTOM) {
completeTime = System.currentTimeMillis();
questData.finishedQuests.put(quest.id, completeTime);
} else {
completeTime = player.worldObj.getTotalWorldTime();
questData.finishedQuests.put(quest.id, completeTime);
}
PlayerData playerData = PlayerData.get(player);
if(playerData == null)
if (ConfigMain.ProfilesEnabled && quest.profileOptions.enableOptions && quest.profileOptions.completeControl == EnumProfileSync.Shared)
ProfileController.Instance.shareQuestCompletion(player, quest.id, completeTime);
}
public static void setQuestPartyFinished(Quest quest, EntityPlayer player, QuestData questData) {
PlayerData playerdata = PlayerData.get(player);
PlayerQuestData data = playerdata.questData;
data.activeQuests.remove(quest.id);
setQuestFinishedUtil(player, quest, data);
if (quest.repeat != EnumQuestRepeat.NONE && quest.type == EnumQuestType.Dialog) {
QuestDialog questdialog = (QuestDialog) quest.questInterface;
for (int dialog : questdialog.dialogs.values()) {
playerdata.dialogData.dialogsRead.remove(dialog);
}
}
if (questData != null && questData.sendAlerts) {
AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "quest.completed", questData.quest.title);
ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "quest.completed", ": ", questData.quest.title);
}
playerdata.updateClient = true;
}
public static boolean canQuestBeAccepted(Quest quest, EntityPlayer player) {
if (quest == null)
return false;
PlayerQuestData data = playerData.questData;
if(data.activeQuests.containsKey(quest.id))
return false;
PlayerData playerData = PlayerData.get(player);
if (playerData == null)
return false;
if(!data.finishedQuests.containsKey(quest.id) || quest.repeat == EnumQuestRepeat.REPEATABLE)
return true;
if(quest.repeat == EnumQuestRepeat.NONE)
return false;
PlayerQuestData data = playerData.questData;
if (data.activeQuests.containsKey(quest.id))
return false;
long questTime = data.finishedQuests.get(quest.id);
if (!data.finishedQuests.containsKey(quest.id) || quest.repeat == EnumQuestRepeat.REPEATABLE)
return true;
if (quest.repeat == EnumQuestRepeat.NONE)
return false;
if(quest.repeat == EnumQuestRepeat.MCDAILY){
return player.worldObj.getTotalWorldTime() - questTime >= 24000;
}
else if(quest.repeat == EnumQuestRepeat.MCWEEKLY){
return player.worldObj.getTotalWorldTime() - questTime >= 168000;
}
else if(quest.repeat == EnumQuestRepeat.RLDAILY){
return System.currentTimeMillis() - questTime >= 86400000;
}
else if(quest.repeat == EnumQuestRepeat.RLWEEKLY){
return System.currentTimeMillis() - questTime >= 604800000;
}
return false;
}
public static Vector<Quest> getActiveQuests(EntityPlayer player)
{
Vector<Quest> quests = new Vector<Quest>();
PlayerQuestData data = PlayerData.get(player).questData;
for(QuestData questdata: data.activeQuests.values()){
if(questdata.quest == null)
continue;
quests.add(questdata.quest);
}
return quests;
}
long questTime = data.finishedQuests.get(quest.id);
if (quest.repeat == EnumQuestRepeat.MCDAILY) {
return player.worldObj.getTotalWorldTime() - questTime >= 24000;
} else if (quest.repeat == EnumQuestRepeat.MCWEEKLY) {
return player.worldObj.getTotalWorldTime() - questTime >= 168000;
} else if (quest.repeat == EnumQuestRepeat.RLDAILY) {
return System.currentTimeMillis() - questTime >= 86400000;
} else if (quest.repeat == EnumQuestRepeat.RLWEEKLY) {
return System.currentTimeMillis() - questTime >= 604800000;
}
return false;
}
public static Vector<Quest> getActiveQuests(EntityPlayer player) {
Vector<Quest> quests = new Vector<Quest>();
PlayerQuestData data = PlayerData.get(player).questData;
for (QuestData questdata : data.activeQuests.values()) {
if (questdata.quest == null)
continue;
quests.add(questdata.quest);
}
return quests;
}
}