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:
bigguy345 committed 2026-01-14 00:28:11 +02:00
commit 0a33f7dd12
36 files changed
+557 -196

No files matched your search

@@ -559,6 +559,15 @@ public class GuiScriptTextArea extends GuiNpcTextField {
public boolean fullscreen() {
return GuiScriptInterface.isFullscreen;
}
public void setLanguage(String language) {
if (this.container != null) {
// this.container.setLanguage(language);
if (this.enableCodeHighlighting) {
this.container.formatCodeText();
}
}
}
// ==================== RENDERING ====================
public void drawTextBox(int xMouse, int yMouse) {
if (!visible)
@@ -2651,6 +2660,28 @@ public class GuiScriptTextArea extends GuiNpcTextField {
return this.container != null ? this.container.getScriptContext() : ScriptContext.GLOBAL;
}
/**
* Set the script context (NPC, PLAYER, BLOCK, ITEM, etc.).
* This determines which hooks and event types are available for autocomplete.
*
* @param context The script context
*/
public void setScriptContext(ScriptContext context) {
if (this.container != null) {
// this.container.setScriptContext(context);
}
}
/**
* Get the current script context.
*
* @return The script context (NPC, PLAYER, BLOCK, ITEM, etc.)
*/
public ScriptContext getScriptContext() {
// return this.container != null ? this.container.getScriptContext() : ScriptContext.GLOBAL;
return ScriptContext.GLOBAL;
}
public void setListener(ITextChangeListener listener) {
this.listener = listener;
}