mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 14:35:12 +00:00
Fixed forge, player, & npc scripts not being able to be deleted or added.
This commit is contained in:
1 parent
de6375c4cb
commit
0db96f9040
10 files changed
+35
-3
No files matched your search
@@ -226,6 +226,12 @@ public class PacketHandlerServer{
|
||||
private void saveScripts(IScriptHandler data, ByteBuf buffer, EntityPlayerMP player) throws Exception {
|
||||
int tab = buffer.readInt();
|
||||
if (tab >= 0) {
|
||||
int totalScripts = buffer.readInt();
|
||||
if (data.getScripts().size() > totalScripts) {
|
||||
data.setScripts(data.getScripts().subList(0,totalScripts));
|
||||
} else while (data.getScripts().size() < totalScripts) {
|
||||
data.getScripts().add(new ScriptContainer(data));
|
||||
}
|
||||
NBTTagCompound tabCompound = Server.readNBT(buffer);
|
||||
data.getScripts().get(tab).readFromNBT(tabCompound);
|
||||
} else {
|
||||
@@ -249,6 +255,8 @@ public class PacketHandlerServer{
|
||||
this.getScripts(data,buffer,player);
|
||||
} else if(type == EnumPacketServer.ScriptPlayerSave) {
|
||||
this.saveScripts(data,buffer,player);
|
||||
ScriptController.Instance.lastLoaded = System.currentTimeMillis();
|
||||
ScriptController.Instance.playerScripts.lastInited = System.currentTimeMillis();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -258,6 +266,8 @@ public class PacketHandlerServer{
|
||||
this.getScripts(data,buffer,player);
|
||||
} else if (type == EnumPacketServer.ScriptForgeSave) {
|
||||
this.saveScripts(data,buffer,player);
|
||||
ScriptController.Instance.lastLoaded = System.currentTimeMillis();
|
||||
ScriptController.Instance.forgeScripts.lastInited = System.currentTimeMillis();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -267,6 +277,8 @@ public class PacketHandlerServer{
|
||||
this.getScripts(data,buffer,player);
|
||||
} else if(type == EnumPacketServer.ScriptNPCSave) {
|
||||
this.saveScripts(data,buffer,player);
|
||||
ScriptController.Instance.lastLoaded = System.currentTimeMillis();
|
||||
ScriptController.Instance.npcScripts.lastInited = System.currentTimeMillis();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ public class GuiScriptAllNPCs extends GuiScriptInterface {
|
||||
List<ScriptContainer> containers = this.script.getScripts();
|
||||
for (int i = 0; i < containers.size(); i++) {
|
||||
ScriptContainer container = containers.get(i);
|
||||
Client.sendData(EnumPacketServer.ScriptNPCSave, i, container.writeToNBT(new NBTTagCompound()));
|
||||
Client.sendData(EnumPacketServer.ScriptNPCSave, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
NBTTagCompound scriptData = new NBTTagCompound();
|
||||
scriptData.setString("ScriptLanguage", this.script.getLanguage());
|
||||
|
||||
@@ -47,7 +47,7 @@ public class GuiScriptForge extends GuiScriptInterface {
|
||||
List<ScriptContainer> containers = this.script.getScripts();
|
||||
for (int i = 0; i < containers.size(); i++) {
|
||||
ScriptContainer container = containers.get(i);
|
||||
Client.sendData(EnumPacketServer.ScriptForgeSave, i, container.writeToNBT(new NBTTagCompound()));
|
||||
Client.sendData(EnumPacketServer.ScriptForgeSave, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
NBTTagCompound scriptData = new NBTTagCompound();
|
||||
scriptData.setString("ScriptLanguage", this.script.getLanguage());
|
||||
|
||||
@@ -49,7 +49,7 @@ 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, container.writeToNBT(new NBTTagCompound()));
|
||||
Client.sendData(EnumPacketServer.ScriptPlayerSave, i, containers.size(), container.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
NBTTagCompound scriptData = new NBTTagCompound();
|
||||
scriptData.setString("ScriptLanguage", this.script.getLanguage());
|
||||
|
||||
@@ -229,6 +229,10 @@ public class DataScript implements IScriptHandler {
|
||||
this.scriptLanguage = lang;
|
||||
}
|
||||
|
||||
public void setScripts(List<ScriptContainer> list) {
|
||||
this.scripts = list;
|
||||
}
|
||||
|
||||
public List<ScriptContainer> getScripts() {
|
||||
return this.scripts;
|
||||
}
|
||||
|
||||
@@ -113,6 +113,10 @@ public class ForgeDataScript implements IScriptHandler {
|
||||
this.scriptLanguage = lang;
|
||||
}
|
||||
|
||||
public void setScripts(List<ScriptContainer> list) {
|
||||
this.scripts = list;
|
||||
}
|
||||
|
||||
public List<ScriptContainer> getScripts() {
|
||||
return this.scripts;
|
||||
}
|
||||
|
||||
@@ -25,6 +25,8 @@ public interface IScriptHandler {
|
||||
|
||||
void setLanguage(String var1);
|
||||
|
||||
void setScripts(List<ScriptContainer> list);
|
||||
|
||||
List<ScriptContainer> getScripts();
|
||||
|
||||
String noticeString();
|
||||
|
||||
@@ -101,6 +101,9 @@ public class NPCDataScript implements IScriptHandler {
|
||||
public void setLanguage(String lang) {
|
||||
this.scriptLanguage = lang;
|
||||
}
|
||||
public void setScripts(List<ScriptContainer> list) {
|
||||
this.scripts = list;
|
||||
}
|
||||
public List<ScriptContainer> getScripts() {
|
||||
return this.scripts;
|
||||
}
|
||||
|
||||
@@ -131,6 +131,9 @@ public class PlayerDataScript implements IScriptHandler {
|
||||
public void setLanguage(String lang) {
|
||||
this.scriptLanguage = lang;
|
||||
}
|
||||
public void setScripts(List<ScriptContainer> list) {
|
||||
this.scripts = list;
|
||||
}
|
||||
public List<ScriptContainer> getScripts() {
|
||||
return this.scripts;
|
||||
}
|
||||
|
||||
@@ -143,6 +143,10 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IS
|
||||
this.scriptLanguage = lang;
|
||||
}
|
||||
|
||||
public void setScripts(List<ScriptContainer> list) {
|
||||
this.scripts = list;
|
||||
}
|
||||
|
||||
public List<ScriptContainer> getScripts() {
|
||||
return this.scripts;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user