SyncController

This commit is contained in:
Kam committed 2025-01-30 09:26:10 -05:00
1 parent ee8527f261
commit fb496ce1e2
12 files changed
+24 -53

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 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;
}
@@ -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");
}
@@ -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");
}
}
@@ -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;
}
}
@@ -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);
}
@@ -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;
}
@@ -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){
@@ -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);
@@ -11,8 +11,6 @@ public enum EnumPacketClient {
GUI_REDSTONE,
GUI_WAYPOINT,
GUI_DATA,
GUI_ERROR,
GUI_CLOSE,
VILLAGER_LIST,
CLONE,
TELEPORTER,
@@ -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 {
@@ -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);
@@ -757,7 +757,7 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
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) {