upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 10:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch' into patch

Browse Source
This commit is contained in:
Luis C.M committed 2023-05-11 18:29:49 -05:00
2 parents 241120c32a 9ff341bd17
commit f5bae9099d
10 files changed
+49 -34
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/kamkeel/QuestCommand.java
+9 -3
View File
@@ -5,8 +5,10 @@ import java.util.List;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.server.MinecraftServer;
import noppes.npcs.Server;
import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.constants.EnumQuestRepeat;
import noppes.npcs.controllers.DialogController;
import noppes.npcs.controllers.PlayerDataController;
import noppes.npcs.controllers.QuestController;
@@ -57,7 +59,7 @@ public class QuestCommand extends CommandKamkeelBase {
QuestData questdata = new QuestData(quest);
playerdata.questData.activeQuests.put(questid, questdata);
playerdata.savePlayerDataOnFile();
if(playerdata.player != null){
if(playerdata.player != null && questdata.sendAlerts){
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.newquest", quest.title);
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.CHAT, "quest.newquest", ": ", quest.title);
}
@@ -95,8 +97,12 @@ public class QuestCommand extends CommandKamkeelBase {
if(playerdata.questData.activeQuests.containsKey(questid)){
playerdata.questData.activeQuests.remove(questid);
}
playerdata.questData.finishedQuests.put(questid, System.currentTimeMillis());
if(quest.repeat == EnumQuestRepeat.RLDAILY || quest.repeat == EnumQuestRepeat.RLWEEKLY)
playerdata.questData.finishedQuests.put(quest.id, System.currentTimeMillis());
else
playerdata.questData.finishedQuests.put(quest.id, sender.getEntityWorld().getTotalWorldTime());
playerdata.savePlayerDataOnFile();
if(playerdata.player != null){
Server.sendData((EntityPlayerMP)playerdata.player, EnumPacketClient.MESSAGE, "quest.completed", quest.title);
src/main/java/noppes/npcs/CustomNpcs.java
+1 -1
View File
@@ -35,7 +35,7 @@ import java.util.ArrayList;
import java.util.Set;
import java.util.UUID;
@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.8.1")
@Mod(modid = "customnpcs", name = "CustomNpcs", version = "1.8.2-beta")
public class CustomNpcs {
@SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy")
src/main/java/noppes/npcs/NoppesUtilServer.java
+7 -21
View File
@@ -799,35 +799,21 @@ public class NoppesUtilServer {
long minutes = seconds / 60;
long hours = minutes / 60;
long days = hours / 24;
long months = days / 30;
long years = months / 12;
months = months % 12;
days = days % 30;
hours = hours % 24;
minutes = minutes % 60;
seconds = seconds % 60;
seconds %= 60;
minutes %= 60;
hours %= 24;
StringBuilder sb = new StringBuilder();
if (years > 0) {
sb.append(years + " year(s) ");
}
if (months > 0) {
sb.append(months + " month(s) ");
}
if (days > 0) {
sb.append(days + " day(s) ");
sb.append(days).append(" day").append(days == 1 ? "" : "s").append(", ");
}
if (hours > 0) {
sb.append(hours + " hour(s) ");
sb.append(hours).append(" hour").append(hours == 1 ? "" : "s").append(", ");
}
if (minutes > 0) {
sb.append(minutes + " minute(s) ");
sb.append(minutes).append(" minute").append(minutes == 1 ? "" : "s").append(", ");
}
if (seconds > 0) {
sb.append(seconds + " second(s)");
}
sb.append(seconds).append(" second").append(seconds == 1 ? "" : "s");
return sb.toString();
}
}
src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java
+9 -1
View File
@@ -72,7 +72,15 @@ public class GuiRecipes extends GuiNPCInterface
}
List<IRecipe> list = new ArrayList<IRecipe>();
for(IRecipe recipe : RecipeController.instance.anvilRecipes.values()){
// System.out.println(recipe.getRecipeOutput().getDisplayName());
if(recipe.getRecipeOutput() == null)
continue;
if(recipe.getRecipeOutput().getDisplayName() == null)
continue;
if(recipe.getRecipeOutput().getDisplayName().trim().equals(""))
continue;
if(recipe.getRecipeOutput().getDisplayName().toLowerCase().contains(search.toLowerCase()))
list.add(recipe);
}
src/main/java/noppes/npcs/controllers/PlayerQuestController.java
+7
View File
@@ -60,17 +60,24 @@ public class PlayerQuestController {
public static void setQuestFinished(Quest quest, EntityPlayer player){
PlayerData playerdata = PlayerDataController.instance.getPlayerData(player);
PlayerQuestData data = playerdata.questData;
QuestData questData = data.activeQuests.get(quest.id);
data.activeQuests.remove(quest.id);
if(quest.repeat == EnumQuestRepeat.RLDAILY || quest.repeat == EnumQuestRepeat.RLWEEKLY)
data.finishedQuests.put(quest.id, System.currentTimeMillis());
else
data.finishedQuests.put(quest.id,player.worldObj.getTotalWorldTime());
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.sendAlerts) {
Server.sendData((EntityPlayerMP) player, EnumPacketClient.MESSAGE, "quest.completed", questData.quest.title);
Server.sendData((EntityPlayerMP) player, EnumPacketClient.CHAT, "quest.completed", ": ", questData.quest.title);
}
}
public static boolean canQuestBeAccepted(Quest quest, EntityPlayer player){
if(quest == null)
src/main/java/noppes/npcs/controllers/ServerCloneController.java
-2
View File
@@ -254,8 +254,6 @@ public class ServerCloneController implements ICloneHandler {
nbttagcompound.removeTag("MovingPathNew");
nbttagcompound.removeTag("Pos");
nbttagcompound.removeTag("Riding");
nbttagcompound.removeTag("UUIDMost");
nbttagcompound.removeTag("UUIDLeast");
if(!nbttagcompound.hasKey("ModRev"))
nbttagcompound.setInteger("ModRev", 1);
src/main/java/noppes/npcs/controllers/data/PlayerQuestData.java
+6 -1
View File
@@ -11,6 +11,7 @@ import noppes.npcs.api.handler.IPlayerQuestData;
import noppes.npcs.api.handler.data.IQuest;
import noppes.npcs.constants.EnumPacketClient;
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;
@@ -164,7 +165,11 @@ public class PlayerQuestData implements IPlayerQuestData {
Quest quest = QuestController.instance.quests.get(id);
if (quest == null)
return;
finishedQuests.put(id, System.currentTimeMillis());
if(quest.repeat == EnumQuestRepeat.RLDAILY || quest.repeat == EnumQuestRepeat.RLWEEKLY)
finishedQuests.put(quest.id, System.currentTimeMillis());
else
finishedQuests.put(quest.id, parent.player.worldObj.getTotalWorldTime());
}
public void stopQuest(int id) {
src/main/java/noppes/npcs/controllers/data/Quest.java
+3 -3
View File
@@ -148,11 +148,11 @@ public class Quest implements ICompatibilty, IQuest {
switch (repeat) {
case MCDAILY:
return Math.max(0, questTime + 24000 - player.worldObj.getTotalWorldTime());
return Math.max(0, (questTime + 24000 - player.worldObj.getTotalWorldTime()) * 50);
case MCWEEKLY:
return Math.max(0, questTime + 168000 - player.worldObj.getTotalWorldTime());
return Math.max(0, (questTime + 168000 - player.worldObj.getTotalWorldTime()) * 50);
case RLDAILY:
return Math.max(0, questTime + 86400000 - System.currentTimeMillis());
return Math.max(0, questTime + 86400000 - System.currentTimeMillis());
case RLWEEKLY:
return Math.max(0, questTime + 604800000 - System.currentTimeMillis());
}
src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
+6 -1
View File
@@ -27,6 +27,7 @@ import noppes.npcs.api.item.IItemStack;
import noppes.npcs.api.overlay.ICustomOverlay;
import noppes.npcs.config.ConfigScript;
import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.constants.EnumQuestRepeat;
import noppes.npcs.constants.EnumQuestType;
import noppes.npcs.containers.ContainerCustomGui;
import noppes.npcs.controllers.*;
@@ -270,7 +271,11 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
if (quest == null)
return;
PlayerData data = PlayerDataController.instance.getPlayerData(player);
data.questData.finishedQuests.put(id, System.currentTimeMillis());
if(quest.repeat == EnumQuestRepeat.RLDAILY || quest.repeat == EnumQuestRepeat.RLWEEKLY)
data.questData.finishedQuests.put(quest.id, System.currentTimeMillis());
else
data.questData.finishedQuests.put(quest.id, player.worldObj.getTotalWorldTime());
}
/**