Skip to content

Commit 9e6085e

Browse files
committed
🚑️ revert Scripts.runConsole
1 parent f722f56 commit 9e6085e

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: way-zer <[email protected]>
3+
Date: Fri, 7 Feb 2025 15:38:00 +0800
4+
Subject: [PATCH] fixup! Inject convenience variables into console invocations
5+
6+
---
7+
core/src/mindustry/mod/Scripts.java | 2 +-
8+
core/src/mindustry/ui/fragments/ConsoleFragment.java | 2 +-
9+
2 files changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/core/src/mindustry/mod/Scripts.java b/core/src/mindustry/mod/Scripts.java
12+
index 97527093d2d4c1ecee86b6a3fc4955b49f235535..64eab0d4fe1cb9f3f1718b6f2f358009417b31af 100644
13+
--- a/core/src/mindustry/mod/Scripts.java
14+
+++ b/core/src/mindustry/mod/Scripts.java
15+
@@ -55,7 +55,7 @@ public class Scripts implements Disposable{
16+
17+
public String runConsole(String text){
18+
try{
19+
- Object o = context.evaluateString(scope, injectConsoleVariables() + text, "console.js", 1);
20+
+ Object o = context.evaluateString(scope, text, "console.js", 1);
21+
if(o instanceof NativeJavaObject n) o = n.unwrap();
22+
if(o == null) o = "null";
23+
24+
diff --git a/core/src/mindustry/ui/fragments/ConsoleFragment.java b/core/src/mindustry/ui/fragments/ConsoleFragment.java
25+
index 013255ce5aa828d538814fa25dc64c6a56bf9136..469919ac8dcfc19e181a8f2993fcc65e3e4128b0 100644
26+
--- a/core/src/mindustry/ui/fragments/ConsoleFragment.java
27+
+++ b/core/src/mindustry/ui/fragments/ConsoleFragment.java
28+
@@ -176,7 +176,7 @@ public class ConsoleFragment extends Table{
29+
history.insert(1, message);
30+
31+
addMessage("[lightgray]> " + message.replace("[", "[["));
32+
- addMessage(mods.getScripts().runConsole(message).replace("[", "[["));
33+
+ addMessage(mods.getScripts().runConsole(mods.getScripts().injectConsoleVariables() + message).replace("[", "[["));
34+
}
35+
36+
public void toggle(){

src/mindustryX/features/ui/toolTable/HudSettingsTable.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected void rebuild(){
7878
if(i % settings.getInt("arcQuickMsgKey", 8) == 0) t.row();
7979
int finalI = i;
8080
t.button(settings.getString(getArcQuickMsgShortName(i)), Styles.flatBordert, () -> {
81-
if(settings.getBool(getArcQuickMsgJs(finalI))) mods.getScripts().runConsole(settings.getString(getArcQuickMsgName(finalI)));
81+
if(settings.getBool(getArcQuickMsgJs(finalI))) mods.getScripts().runConsole(mods.getScripts().injectConsoleVariables() + settings.getString(getArcQuickMsgName(finalI)));
8282
else Call.sendChatMessage(settings.getString(getArcQuickMsgName(finalI)));
8383
});
8484
}

0 commit comments

Comments
 (0)