Merge remote-tracking branch 'refs/remotes/origin/packet' into animation-events-2

# Conflicts:
#	src/api
#	src/main/java/noppes/npcs/CommonProxy.java
#	src/main/java/noppes/npcs/ServerEventsHandler.java
#	src/main/java/noppes/npcs/client/PacketHandlerClient.java
#	src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
#	src/main/java/noppes/npcs/controllers/data/AnimationData.java
This commit is contained in:
luisc committed 2025-02-11 16:53:36 -06:00
commit 00af353e65
602 files changed
+29702 -6562

No files matched your search

@@ -1,10 +1,11 @@
package noppes.npcs.client.gui.script;
import kamkeel.npcs.network.packets.request.script.PlayerScriptPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.NBTTags;
import noppes.npcs.client.Client;
import noppes.npcs.constants.EnumPacketServer;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.data.PlayerDataScript;
@@ -79,7 +80,7 @@ public class GuiScriptPlayers extends GuiScriptInterface {
hookList.add("frameExit");
this.handler = this.script;
Client.sendData(EnumPacketServer.ScriptPlayerGet);
PlayerScriptPacket.Get();
}
public void setGuiData(NBTTagCompound compound) {
@@ -106,12 +107,12 @@ public class GuiScriptPlayers extends GuiScriptInterface {
List<ScriptContainer> containers = this.script.getScripts();
for (int i = 0; i < containers.size(); i++) {
ScriptContainer container = containers.get(i);
Client.sendData(EnumPacketServer.ScriptPlayerSave, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
PlayerScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
}
NBTTagCompound scriptData = new NBTTagCompound();
scriptData.setString("ScriptLanguage", this.script.getLanguage());
scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
Client.sendData(EnumPacketServer.ScriptPlayerSave, -1, containers.size(), scriptData);
PlayerScriptPacket.Save(-1, containers.size(), scriptData);
}
}