From fb496ce1e2f944a907d2ff9f4ec1295f9f67a5a2 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 30 Jan 2025 09:26:10 -0500 Subject: [PATCH] SyncController --- src/main/java/foxz/command/CmdDialog.java | 4 +-- .../kamkeel/npcs/command/DialogCommand.java | 4 +-- .../kamkeel/npcs/command/QuestCommand.java | 4 +-- .../packets/client/large/LargeSyncPacket.java | 8 +++--- .../java/noppes/npcs/NoppesUtilServer.java | 4 +-- .../noppes/npcs/ScriptPlayerEventHandler.java | 4 +-- .../java/noppes/npcs/ServerEventsHandler.java | 8 +++--- .../npcs/client/PacketHandlerClient.java | 25 ------------------- .../npcs/constants/EnumPacketClient.java | 2 -- .../npcs/controllers/FactionController.java | 6 ++--- .../npcs/controllers/RecipeController.java | 6 ++--- .../npcs/scripted/entity/ScriptPlayer.java | 2 +- 12 files changed, 24 insertions(+), 53 deletions(-) diff --git a/src/main/java/foxz/command/CmdDialog.java b/src/main/java/foxz/command/CmdDialog.java index 842611930..3b6a3e857 100644 --- a/src/main/java/foxz/command/CmdDialog.java +++ b/src/main/java/foxz/command/CmdDialog.java @@ -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 net.minecraft.command.CommandBase; import net.minecraft.entity.player.EntityPlayer; import noppes.npcs.NoppesUtilServer; @@ -89,7 +89,7 @@ public class CmdDialog extends ChMcLogger { ) public boolean reload(String args[]){ new DialogController().load(); - SyncMaster.syncAllDialogs(); + SyncController.syncAllDialogs(); return true; } diff --git a/src/main/java/kamkeel/npcs/command/DialogCommand.java b/src/main/java/kamkeel/npcs/command/DialogCommand.java index d89311880..4ad1e7e22 100644 --- a/src/main/java/kamkeel/npcs/command/DialogCommand.java +++ b/src/main/java/kamkeel/npcs/command/DialogCommand.java @@ -1,6 +1,6 @@ package kamkeel.npcs.command; -import kamkeel.npcs.controllers.SyncMaster; +import kamkeel.npcs.controllers.SyncController; import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; @@ -89,7 +89,7 @@ public class DialogCommand extends CommandKamkeelBase { ) public void reload(ICommandSender sender, String args[]){ new DialogController().load(); - SyncMaster.syncAllDialogs(); + SyncController.syncAllDialogs(); sendResult(sender, "Dialogs Reloaded"); } diff --git a/src/main/java/kamkeel/npcs/command/QuestCommand.java b/src/main/java/kamkeel/npcs/command/QuestCommand.java index 4dc1a334e..644b64ddc 100644 --- a/src/main/java/kamkeel/npcs/command/QuestCommand.java +++ b/src/main/java/kamkeel/npcs/command/QuestCommand.java @@ -1,6 +1,6 @@ package kamkeel.npcs.command; -import kamkeel.npcs.controllers.SyncMaster; +import kamkeel.npcs.controllers.SyncController; import kamkeel.npcs.network.PacketUtil; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; @@ -381,7 +381,7 @@ public class QuestCommand extends CommandKamkeelBase { ) public void reload(ICommandSender sender, String args[]){ new QuestController().load(); - SyncMaster.syncAllQuests(); + SyncController.syncAllQuests(); sendResult(sender, "Quests Reloaded"); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/large/LargeSyncPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/large/LargeSyncPacket.java index 2ce8f59e9..e454467f9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/large/LargeSyncPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/large/LargeSyncPacket.java @@ -3,7 +3,7 @@ package kamkeel.npcs.network.packets.client.large; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import kamkeel.npcs.controllers.SyncMaster; +import kamkeel.npcs.controllers.SyncController; import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; @@ -89,13 +89,13 @@ public final class LargeSyncPacket extends LargeAbstractPacket { private void handleSyncPacketClient(EnumSyncType enumSyncType, EnumSyncAction enumSyncAction, int id, NBTTagCompound data) { switch (enumSyncAction) { case RELOAD: - SyncMaster.clientSync(enumSyncType, data); + SyncController.clientSync(enumSyncType, data); break; case UPDATE: - SyncMaster.clientUpdate(enumSyncType, id, data); + SyncController.clientUpdate(enumSyncType, id, data); break; case REMOVE: - SyncMaster.clientSyncRemove(enumSyncType, id); + SyncController.clientSyncRemove(enumSyncType, id); break; } } diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 56f6cbf05..d81bc9abe 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -1,7 +1,7 @@ package noppes.npcs; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.controllers.SyncMaster; +import kamkeel.npcs.controllers.SyncController; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.packets.client.DialogPacket; @@ -574,7 +574,7 @@ public class NoppesUtilServer { playerdata.save(); } if(pl != null) { - SyncMaster.syncPlayer((EntityPlayerMP) pl); + SyncController.syncPlayer((EntityPlayerMP) pl); } sendPlayerData(type, player, name); } diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 2ad69fc27..e9afafd53 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -5,7 +5,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; -import kamkeel.npcs.controllers.SyncMaster; +import kamkeel.npcs.controllers.SyncController; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -63,7 +63,7 @@ public class ScriptPlayerEventHandler { PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); if(playerData.updateClient) { - SyncMaster.syncPlayerData((EntityPlayerMP)player, true); + SyncController.syncPlayerData((EntityPlayerMP)player, true); playerData.updateClient = false; } diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 3c8d18487..3e59a2325 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -3,7 +3,7 @@ package noppes.npcs; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; -import kamkeel.npcs.controllers.SyncMaster; +import kamkeel.npcs.controllers.SyncController; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumSoundOperation; import kamkeel.npcs.network.enums.EnumSyncAction; @@ -21,7 +21,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentTranslation; @@ -43,7 +42,6 @@ import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.*; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; -import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; @@ -202,7 +200,7 @@ public class ServerEventsHandler { EnumSyncType.WORKBENCH_RECIPES, EnumSyncAction.RELOAD, -1, - SyncMaster.workbenchNBT() + SyncController.workbenchNBT() ), (EntityPlayerMP) player); } if(block == CustomItems.carpentyBench && event.action == Action.RIGHT_CLICK_BLOCK && !player.worldObj.isRemote){ @@ -210,7 +208,7 @@ public class ServerEventsHandler { EnumSyncType.CARPENTRY_RECIPES, EnumSyncAction.RELOAD, -1, - SyncMaster.carpentryNBT() + SyncController.carpentryNBT() ), (EntityPlayerMP) player); } if((block == CustomItems.banner || block == CustomItems.wallBanner || block == CustomItems.sign) && event.action == Action.RIGHT_CLICK_BLOCK){ diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java index 15bc2e6ba..fd9be163d 100644 --- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java +++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java @@ -112,31 +112,6 @@ public class PacketHandlerClient extends PacketHandlerServer{ if(gui instanceof IGuiData) ((IGuiData)gui).setGuiData(Server.readNBT(buffer)); } - else if(type == EnumPacketClient.GUI_ERROR){ - GuiScreen gui = Minecraft.getMinecraft().currentScreen; - if(gui == null || !(gui instanceof IGuiError)) - return; - - int i = buffer.readInt(); - NBTTagCompound compound = Server.readNBT(buffer); - - ((IGuiError)gui).setError(i, compound); - } - else if(type == EnumPacketClient.GUI_CLOSE){ - GuiScreen gui = Minecraft.getMinecraft().currentScreen; - if(gui == null) - return; - - if(gui instanceof IGuiClose){ - int i = buffer.readInt(); - NBTTagCompound compound = Server.readNBT(buffer); - ((IGuiClose)gui).setClose(i, compound); - } - - Minecraft mc = Minecraft.getMinecraft(); - mc.displayGuiScreen(null); - mc.setIngameFocus(); - } else if(type == EnumPacketClient.VILLAGER_LIST){ MerchantRecipeList merchantrecipelist = MerchantRecipeList.func_151390_b(new PacketBuffer(buffer)); ServerEventsHandler.Merchant.setRecipes(merchantrecipelist); diff --git a/src/main/java/noppes/npcs/constants/EnumPacketClient.java b/src/main/java/noppes/npcs/constants/EnumPacketClient.java index 4d4032d19..a372477a4 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketClient.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketClient.java @@ -11,8 +11,6 @@ public enum EnumPacketClient { GUI_REDSTONE, GUI_WAYPOINT, GUI_DATA, - GUI_ERROR, - GUI_CLOSE, VILLAGER_LIST, CLONE, TELEPORTER, diff --git a/src/main/java/noppes/npcs/controllers/FactionController.java b/src/main/java/noppes/npcs/controllers/FactionController.java index d9419131c..9ab4b6311 100644 --- a/src/main/java/noppes/npcs/controllers/FactionController.java +++ b/src/main/java/noppes/npcs/controllers/FactionController.java @@ -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; @@ -157,7 +157,7 @@ public class FactionController implements IFactionHandler { NBTTagCompound facCompound = new NBTTagCompound(); faction.writeNBT(facCompound); - SyncMaster.syncUpdate(EnumSyncType.FACTION, -1, facCompound); + SyncController.syncUpdate(EnumSyncType.FACTION, -1, facCompound); saveFactions(); } @@ -192,7 +192,7 @@ public class FactionController implements IFactionHandler { } else { this.saveFactions(); faction.id = -1; - SyncMaster.syncRemove(EnumSyncType.FACTION, id); + SyncController.syncRemove(EnumSyncType.FACTION, id); return faction; } } else { diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index e1b5d84f9..1bdddd556 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -1,6 +1,6 @@ package noppes.npcs.controllers; -import kamkeel.npcs.controllers.SyncMaster; +import kamkeel.npcs.controllers.SyncController; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -206,11 +206,11 @@ public class RecipeController implements IRecipeHandler { return null; RecipeCarpentry globalRecipe = globalRecipes.remove(recipe.id); if(globalRecipe != null) - SyncMaster.syncAllWorkbenchRecipes(); + SyncController.syncAllWorkbenchRecipes(); RecipeCarpentry carpentry = carpentryRecipes.remove(recipe.id); if(carpentry != null) - SyncMaster.syncAllWorkbenchRecipes(); + SyncController.syncAllWorkbenchRecipes(); saveCategories(); reloadGlobalRecipes(globalRecipes); diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 2aee9c6a0..4dc28df83 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -757,7 +757,7 @@ public class ScriptPlayer extends ScriptLivingBase public void closeGui() { ((EntityPlayerMP)this.entity).closeContainer(); - Server.sendData((EntityPlayerMP)this.entity, EnumPacketClient.GUI_CLOSE, -1, new NBTTagCompound()); + PacketUtil.closeGUI(player, -1 , new NBTTagCompound()); } public void showCustomOverlay(ICustomOverlay overlay) {