upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-13 20:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "Java" language option and editor tab language button being available for ScriptHandlers with no janino handling

Browse Source
This commit is contained in:
bigguy345 committed 2026-03-11 16:25:15 +02:00
1 parent 9207cc3f43
commit 59ba554315
1 file changed
+25 -9
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java
+25 -9
View File
@@ -568,19 +568,35 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
*/
protected List<String> getLanguageOptions() {
List<String> options = new ArrayList<>();
// Start with languages known from the server
if (this.languages != null && !this.languages.isEmpty())
options.addAll(this.languages.keySet());
if ((options.isEmpty() || !options.contains("Java")) && this.handler != null && this.handler.supportsJanino()) {
List<String> scripts = new ArrayList<>();
if (ScriptController.Instance != null && ScriptController.Instance.scripts != null) {
scripts.addAll(ScriptController.Instance.scripts.keySet());
if (this.handler != null) {
if (this.handler.supportsJanino()) {
// Handler supports Java — ensure it's in the list
if (!options.contains("Java")) {
List<String> scripts = new ArrayList<>();
if (ScriptController.Instance != null && ScriptController.Instance.scripts != null) {
scripts.addAll(ScriptController.Instance.scripts.keySet());
}
if (this.languages == null)
this.languages = new HashMap();
if (!this.languages.containsKey("Java"))
this.languages.put("Java", scripts);
options.add("Java");
}
} else {
// Handler does not support Java — remove it
options.remove("Java");
}
// Ensure at least the handler's default language is present
String defaultLang = this.handler.getLanguage();
if (defaultLang != null && !defaultLang.isEmpty() && !options.contains(defaultLang)) {
options.add(0, defaultLang);
}
if (this.languages == null)
this.languages = new HashMap();
if (!this.languages.containsKey("Java"))
this.languages.put("Java", scripts);
options.add("Java");
}
return options;