mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-19 14:19:13 +00:00
Merge branch 'janino-scripts' into syntax-highlighter-unified
# Conflicts: # src/main/java/noppes/npcs/blocks/tiles/TileScripted.java # src/main/java/noppes/npcs/client/gui/GuiScript.java # src/main/java/noppes/npcs/client/gui/script/GuiJaninoScript.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java # src/main/java/noppes/npcs/controllers/data/DataScript.java # src/main/java/noppes/npcs/controllers/data/EffectScript.java # src/main/java/noppes/npcs/controllers/data/ForgeDataScript.java # src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java # src/main/java/noppes/npcs/controllers/data/IScriptHandler.java # src/main/java/noppes/npcs/controllers/data/IScriptUnit.java # src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java # src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java # src/main/java/noppes/npcs/controllers/data/RecipeScript.java # src/main/java/noppes/npcs/janino/JaninoScript.java # src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java
This commit is contained in:
commit
0a33f7dd12
36 files changed
+557
-196
No files matched your search
@@ -70,6 +70,7 @@ public class ScriptContainer implements IScriptUnit {
|
||||
}
|
||||
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound compound) {
|
||||
compound.setString(IScriptUnit.NBT_TYPE_KEY, IScriptUnit.TYPE_ECMASCRIPT);
|
||||
if (this.script.length() < 65535) {
|
||||
compound.setString("Script", this.script);
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user