SyncController Fixes

This commit is contained in:
Kam committed 2025-01-30 09:26:04 -05:00
1 parent 5d308b1f56
commit ee8527f261
6 files changed
+17 -19

No files matched your search

+2 -2
View File
@@ -5,7 +5,7 @@ import foxz.commandhelper.annotations.Command;
import foxz.commandhelper.annotations.SubCommand;
import foxz.commandhelper.permissions.OpOnly;
import foxz.commandhelper.permissions.ParamCheck;
import kamkeel.npcs.controllers.SyncMaster;
import kamkeel.npcs.controllers.SyncController;
import kamkeel.npcs.network.PacketUtil;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.controllers.QuestController;
@@ -169,7 +169,7 @@ public class CmdQuest extends ChMcLogger{
)
public boolean reload(String args[]){
new QuestController().load();
SyncMaster.syncAllQuests();
SyncController.syncAllQuests();
return true;
}
}
@@ -10,9 +10,7 @@ import kamkeel.npcs.network.enums.EnumSyncType;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import noppes.npcs.Server;
import noppes.npcs.client.ClientCacheHandler;
import noppes.npcs.constants.EnumPacketClient;
import noppes.npcs.controllers.DialogController;
import noppes.npcs.controllers.FactionController;
import noppes.npcs.controllers.QuestController;
@@ -21,7 +19,7 @@ import noppes.npcs.controllers.data.*;
import java.util.HashMap;
public class SyncMaster {
public class SyncController {
public static void syncPlayer(EntityPlayerMP player){
// 1) Factions
@@ -290,17 +290,17 @@ public class NoppesUtilPlayer {
if(npc.roleInterface != null)
npc.roleInterface.interact(player);
else
Server.sendData(player, EnumPacketClient.GUI_CLOSE);
PacketUtil.closeGUI(player, -1 , new NBTTagCompound());
}
else if(option.optionType == EnumOptionType.DialogOption){
NoppesUtilServer.openDialog(player, npc, option.getDialog(), optionId+1);
}
else if(option.optionType == EnumOptionType.CommandBlock){
Server.sendData(player, EnumPacketClient.GUI_CLOSE);
PacketUtil.closeGUI(player, -1 , new NBTTagCompound());
NoppesUtilServer.runCommand(player, npc.getCommandSenderName(), option.command);
}
else
Server.sendData(player, EnumPacketClient.GUI_CLOSE);
PacketUtil.closeGUI(player, -1 , new NBTTagCompound());
}
public static void updateQuestLogData(ByteBuf buffer, EntityPlayerMP player) throws IOException {
@@ -5,7 +5,7 @@ import cpw.mods.fml.common.gameevent.PlayerEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import kamkeel.npcs.controllers.ProfileController;
import kamkeel.npcs.controllers.SyncMaster;
import kamkeel.npcs.controllers.SyncController;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.WorldServer;
@@ -52,7 +52,7 @@ public class ServerTickHandler {
playerData.onLogin();
}
SyncMaster.syncPlayer(player);
SyncController.syncPlayer(player);
ProfileController.login(player);
}
@@ -1,6 +1,6 @@
package noppes.npcs.controllers;
import kamkeel.npcs.controllers.SyncMaster;
import kamkeel.npcs.controllers.SyncController;
import kamkeel.npcs.network.enums.EnumSyncType;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
@@ -229,7 +229,7 @@ public class DialogController implements IDialogHandler {
dir.mkdirs();
}
categories.put(category.id, category);
SyncMaster.syncUpdate(EnumSyncType.DIALOG_CATEGORY, -1, SyncMaster.updateDialogCat(category));
SyncController.syncUpdate(EnumSyncType.DIALOG_CATEGORY, -1, SyncController.updateDialogCat(category));
}
public void removeCategory(int category){
@@ -242,7 +242,7 @@ public class DialogController implements IDialogHandler {
for(int dia : cat.dialogs.keySet())
dialogs.remove(dia);
categories.remove(category);
SyncMaster.syncRemove(EnumSyncType.DIALOG_CATEGORY, category);
SyncController.syncRemove(EnumSyncType.DIALOG_CATEGORY, category);
}
private boolean containsCategoryName(String name) {
@@ -290,7 +290,7 @@ public class DialogController implements IDialogHandler {
if(file2.exists())
file2.delete();
file.renameTo(file2);
SyncMaster.syncUpdate(EnumSyncType.DIALOG, category.id, dialog.writeToNBT(new NBTTagCompound()));
SyncController.syncUpdate(EnumSyncType.DIALOG, category.id, dialog.writeToNBT(new NBTTagCompound()));
} catch (Exception e) {
LogWriter.except(e);
}
@@ -304,7 +304,7 @@ public class DialogController implements IDialogHandler {
return;
category.dialogs.remove(dialog.id);
dialogs.remove(dialog.id);
SyncMaster.syncRemove(EnumSyncType.DIALOG, dialog.id);
SyncController.syncRemove(EnumSyncType.DIALOG, dialog.id);
}
private File getDir(){
@@ -1,6 +1,6 @@
package noppes.npcs.controllers;
import kamkeel.npcs.controllers.SyncMaster;
import kamkeel.npcs.controllers.SyncController;
import kamkeel.npcs.network.enums.EnumSyncType;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
@@ -145,7 +145,7 @@ public class QuestController implements IQuestHandler {
for(int dia : cat.quests.keySet())
quests.remove(dia);
categories.remove(category);
SyncMaster.syncRemove(EnumSyncType.QUEST_CATEGORY, category);
SyncController.syncRemove(EnumSyncType.QUEST_CATEGORY, category);
}
public void saveCategory(QuestCategory category){
@@ -176,7 +176,7 @@ public class QuestController implements IQuestHandler {
dir.mkdirs();
}
categories.put(category.id, category);
SyncMaster.syncUpdate(EnumSyncType.QUEST_CATEGORY, -1, SyncMaster.updateQuestCat(category));
SyncController.syncUpdate(EnumSyncType.QUEST_CATEGORY, -1, SyncController.updateQuestCat(category));
}
private boolean containsCategoryName(String name) {
name = name.toLowerCase();
@@ -224,7 +224,7 @@ public class QuestController implements IQuestHandler {
if(file2.exists())
file2.delete();
file.renameTo(file2);
SyncMaster.syncUpdate(EnumSyncType.QUEST, category.id, quest.writeToNBT(new NBTTagCompound()));
SyncController.syncUpdate(EnumSyncType.QUEST, category.id, quest.writeToNBT(new NBTTagCompound()));
} catch (Exception e) {
e.printStackTrace();
}