mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-21 11:32:20 +00:00
Merge remote-tracking branch 'origin/dev' into animation-events
# Conflicts: # src/api # src/main/java/noppes/npcs/controllers/data/AnimationData.java
This commit is contained in:
commit
d055d434df
377 files changed
+2385
-1098
No files matched your search
@@ -108,7 +108,11 @@ public class PlayerQuestController {
|
||||
if(quest == null)
|
||||
return false;
|
||||
|
||||
PlayerQuestData data = PlayerDataController.Instance.getPlayerData(player).questData;
|
||||
PlayerData playerData = PlayerData.get(player);
|
||||
if(playerData == null)
|
||||
return false;
|
||||
|
||||
PlayerQuestData data = playerData.questData;
|
||||
if(data.activeQuests.containsKey(quest.id))
|
||||
return false;
|
||||
|
||||
|
||||
@@ -339,14 +339,19 @@ public class ServerCloneController implements ICloneHandler {
|
||||
}
|
||||
}
|
||||
|
||||
public void set(int tab, String name, IEntity entity) {
|
||||
public boolean has(int tab, String name) {
|
||||
NBTTagCompound compound = this.getCloneData((ICommandSender)null, name, tab);
|
||||
return compound != null;
|
||||
}
|
||||
|
||||
|
||||
public void set(int tab, String name, IEntity entity) {
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
if (!entity.getMCEntity().isEntityAlive()) {
|
||||
if (!entity.getMCEntity().writeMountToNBT(compound))
|
||||
throw new CustomNPCsException("Cannot save dead entities", new Object[0]);
|
||||
} else {
|
||||
this.cleanTags(compound);
|
||||
this.saveClone(tab, name, compound);
|
||||
}
|
||||
|
||||
this.cleanTags(compound);
|
||||
this.saveClone(tab, name, compound);
|
||||
}
|
||||
|
||||
public void remove(int tab, String name) {
|
||||
|
||||
@@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import noppes.npcs.NoppesUtilServer;
|
||||
import noppes.npcs.Server;
|
||||
import noppes.npcs.constants.EnumPacketClient;
|
||||
import noppes.npcs.constants.SyncType;
|
||||
@@ -23,7 +24,7 @@ public class SyncController {
|
||||
NBTTagCompound factioNBT = new NBTTagCompound();
|
||||
faction.writeNBT(factioNBT);
|
||||
list.appendTag(factioNBT);
|
||||
if(list.tagCount() > 20){
|
||||
if(list.tagCount() > 10){
|
||||
compound = new NBTTagCompound();
|
||||
compound.setTag("Data", list);
|
||||
Server.sendData(player, EnumPacketClient.SYNC_ADD, SyncType.FACTION, compound);
|
||||
@@ -43,7 +44,7 @@ public class SyncController {
|
||||
for(int questID : category.quests.keySet()){
|
||||
Quest quest = category.quests.get(questID);
|
||||
questList.appendTag(quest.writeToNBT(new NBTTagCompound()));
|
||||
if(questList.tagCount() > 50){
|
||||
if(questList.tagCount() > 40){
|
||||
questCompound = new NBTTagCompound();
|
||||
questCompound.setTag("Data", questList);
|
||||
questCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
|
||||
@@ -67,7 +68,7 @@ public class SyncController {
|
||||
for(int dialogID : category.dialogs.keySet()){
|
||||
Dialog dialog = category.dialogs.get(dialogID);
|
||||
dialogList.appendTag(dialog.writeToNBT(new NBTTagCompound()));
|
||||
if(dialogList.tagCount() > 50){
|
||||
if(dialogList.tagCount() > 40){
|
||||
dialogCompound = new NBTTagCompound();
|
||||
dialogCompound.setTag("Data", dialogList);
|
||||
dialogCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
|
||||
@@ -84,8 +85,9 @@ public class SyncController {
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
PlayerData data = PlayerData.get(player);
|
||||
if(data != null)
|
||||
Server.sendData(player, EnumPacketClient.SYNC_END, SyncType.PLAYER_DATA, data.getNBT());
|
||||
if(data != null){
|
||||
NoppesUtilServer.sendPlayerDataCompound(player, data.getSyncNBTFull(), false);
|
||||
}
|
||||
}
|
||||
|
||||
public static void syncAllDialogs() {
|
||||
@@ -95,7 +97,7 @@ public class SyncController {
|
||||
for(int dialogID : category.dialogs.keySet()){
|
||||
Dialog dialog = category.dialogs.get(dialogID);
|
||||
dialogList.appendTag(dialog.writeToNBT(new NBTTagCompound()));
|
||||
if(dialogList.tagCount() > 50){
|
||||
if(dialogList.tagCount() > 40){
|
||||
dialogCompound = new NBTTagCompound();
|
||||
dialogCompound.setTag("Data", dialogList);
|
||||
dialogCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
|
||||
@@ -118,7 +120,7 @@ public class SyncController {
|
||||
for(int questID : category.quests.keySet()){
|
||||
Quest quest = category.quests.get(questID);
|
||||
questList.appendTag(quest.writeToNBT(new NBTTagCompound()));
|
||||
if(questList.tagCount() > 50){
|
||||
if(questList.tagCount() > 40){
|
||||
questCompound = new NBTTagCompound();
|
||||
questCompound.setTag("Data", questList);
|
||||
questCompound.setTag("CatNBT", category.writeSmallNBT(new NBTTagCompound()));
|
||||
@@ -140,7 +142,7 @@ public class SyncController {
|
||||
for(int questID : questCategory.quests.keySet()){
|
||||
Quest quest = questCategory.quests.get(questID);
|
||||
questList.appendTag(quest.writeToNBT(new NBTTagCompound()));
|
||||
if(questList.tagCount() > 50){
|
||||
if(questList.tagCount() > 40){
|
||||
questCompound = new NBTTagCompound();
|
||||
questCompound.setTag("Data", questList);
|
||||
questCompound.setTag("CatNBT", questCategory.writeSmallNBT(new NBTTagCompound()));
|
||||
@@ -160,7 +162,7 @@ public class SyncController {
|
||||
for(int questID : dialogCategory.dialogs.keySet()){
|
||||
Dialog dialog = dialogCategory.dialogs.get(questID);
|
||||
dialogList.appendTag(dialog.writeToNBT(new NBTTagCompound()));
|
||||
if(dialogList.tagCount() > 50){
|
||||
if(dialogList.tagCount() > 40){
|
||||
dialogCompound = new NBTTagCompound();
|
||||
dialogCompound.setTag("Data", dialogList);
|
||||
dialogCompound.setTag("CatNBT", dialogCategory.writeSmallNBT(new NBTTagCompound()));
|
||||
|
||||
@@ -85,6 +85,9 @@ public class AnimationData implements IAnimationData {
|
||||
EntityLivingBase sendingEntity = parent instanceof PlayerData ? ((PlayerData) parent).player : parent instanceof DataDisplay ? ((DataDisplay) parent).npc : null;
|
||||
float range = parent instanceof PlayerData ? 160 : 60;
|
||||
if (sendingEntity != null) {
|
||||
if(sendingEntity.dimension != sendingEntity.worldObj.provider.dimensionId)
|
||||
sendingEntity.dimension = sendingEntity.worldObj.provider.dimensionId;
|
||||
|
||||
boolean prevIsClientAnimating = this.isClientAnimating && this.currentClientAnimation.currentFrame() != null;
|
||||
this.isClientAnimating = this.allowAnimation && this.animation != null;
|
||||
if (prevIsClientAnimating && (!this.isClientAnimating || this.animation != this.currentClientAnimation)) {
|
||||
|
||||
@@ -10,6 +10,7 @@ import noppes.npcs.api.handler.data.IAvailability;
|
||||
import noppes.npcs.constants.*;
|
||||
import noppes.npcs.controllers.FactionController;
|
||||
import noppes.npcs.controllers.PlayerQuestController;
|
||||
import noppes.npcs.controllers.QuestController;
|
||||
import noppes.npcs.scripted.CustomNPCsException;
|
||||
|
||||
public class Availability implements ICompatibilty, IAvailability {
|
||||
@@ -230,6 +231,13 @@ public class Availability implements ICompatibilty, IAvailability {
|
||||
return true;
|
||||
else if(en == EnumAvailabilityQuest.NotActive && !PlayerQuestController.isQuestActive(player, id))
|
||||
return true;
|
||||
else if(en == EnumAvailabilityQuest.Acceptable || en == EnumAvailabilityQuest.NotAcceptable){
|
||||
Quest quest = QuestController.Instance.quests.get(id);
|
||||
if(quest == null)
|
||||
return true;
|
||||
boolean result = PlayerQuestController.canQuestBeAccepted(quest, player);
|
||||
return (result && en == EnumAvailabilityQuest.Acceptable) || (!result && en == EnumAvailabilityQuest.NotAcceptable);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@Override
|
||||
|
||||
@@ -117,35 +117,35 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
|
||||
}
|
||||
isGUIOpen = data.getBoolean("isGUIOpen");
|
||||
}
|
||||
public NBTTagCompound getNBT() {
|
||||
if(player != null){
|
||||
playername = player.getCommandSenderName();
|
||||
uuid = player.getPersistentID().toString();
|
||||
}
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
dialogData.saveNBTData(compound);
|
||||
bankData.saveNBTData(compound);
|
||||
questData.saveNBTData(compound);
|
||||
transportData.saveNBTData(compound);
|
||||
factionData.saveNBTData(compound);
|
||||
itemgiverData.saveNBTData(compound);
|
||||
mailData.saveNBTData(compound);
|
||||
timers.writeToNBT(compound);
|
||||
skinOverlays.writeToNBT(compound);
|
||||
animationData.writeToNBT(compound);
|
||||
public NBTTagCompound getNBT() {
|
||||
if(player != null){
|
||||
playername = player.getCommandSenderName();
|
||||
uuid = player.getPersistentID().toString();
|
||||
}
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
dialogData.saveNBTData(compound);
|
||||
bankData.saveNBTData(compound);
|
||||
questData.saveNBTData(compound);
|
||||
transportData.saveNBTData(compound);
|
||||
factionData.saveNBTData(compound);
|
||||
itemgiverData.saveNBTData(compound);
|
||||
mailData.saveNBTData(compound);
|
||||
timers.writeToNBT(compound);
|
||||
skinOverlays.writeToNBT(compound);
|
||||
animationData.writeToNBT(compound);
|
||||
|
||||
compound.setString("PlayerName", playername);
|
||||
compound.setString("UUID", uuid);
|
||||
compound.setInteger("PlayerCompanionId", companionID);
|
||||
compound.setBoolean("isGUIOpen",isGUIOpen);
|
||||
compound.setString("PlayerName", playername);
|
||||
compound.setString("UUID", uuid);
|
||||
compound.setInteger("PlayerCompanionId", companionID);
|
||||
compound.setBoolean("isGUIOpen",isGUIOpen);
|
||||
|
||||
if(hasCompanion()){
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
if(activeCompanion.writeToNBTOptional(nbt))
|
||||
compound.setTag("PlayerCompanion", nbt);
|
||||
}
|
||||
return compound;
|
||||
}
|
||||
if(hasCompanion()){
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
if(activeCompanion.writeToNBTOptional(nbt))
|
||||
compound.setTag("PlayerCompanion", nbt);
|
||||
}
|
||||
return compound;
|
||||
}
|
||||
|
||||
public NBTTagCompound getSyncNBT(){
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
@@ -156,6 +156,46 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
|
||||
return compound;
|
||||
}
|
||||
|
||||
public void setSyncNBT(NBTTagCompound data){
|
||||
dialogData.loadNBTData(data);
|
||||
questData.loadNBTData(data);
|
||||
factionData.loadNBTData(data);
|
||||
}
|
||||
|
||||
public NBTTagCompound getSyncNBTFull() {
|
||||
if(player != null){
|
||||
playername = player.getCommandSenderName();
|
||||
uuid = player.getPersistentID().toString();
|
||||
}
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
dialogData.saveNBTData(compound);
|
||||
bankData.saveNBTData(compound);
|
||||
questData.saveNBTData(compound);
|
||||
transportData.saveNBTData(compound);
|
||||
factionData.saveNBTData(compound);
|
||||
mailData.saveNBTData(compound);
|
||||
compound.setString("PlayerName", playername);
|
||||
compound.setString("UUID", uuid);
|
||||
return compound;
|
||||
}
|
||||
|
||||
public void setSyncNBTFull(NBTTagCompound data){
|
||||
dialogData.loadNBTData(data);
|
||||
bankData.loadNBTData(data);
|
||||
questData.loadNBTData(data);
|
||||
transportData.loadNBTData(data);
|
||||
factionData.loadNBTData(data);
|
||||
mailData.loadNBTData(data);
|
||||
if(player != null){
|
||||
playername = player.getCommandSenderName();
|
||||
uuid = player.getPersistentID().toString();
|
||||
}
|
||||
else{
|
||||
playername = data.getString("PlayerName");
|
||||
uuid = data.getString("UUID");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(Entity entity, World world) {
|
||||
|
||||
|
||||
Reference in new issue
Block a user