Upmerge master-1.21-lts into master-26-lts

.gitignore

@@ -34,3 +34,7 @@ config
 
 # Ignore Minecraft runtime logs
 /logs
+
+# ClientDevBridge session state (golden images are intentionally kept)
+.clientdevbridge/*
+!.clientdevbridge/golden/

build.gradle

@@ -115,6 +115,10 @@ test {
 repositories {
     mavenCentral()
 	mavenLocal()
+    maven {
+        name "JEI"
+        url "https://maven.blamejared.com"
+    }
     maven {
         name "Cyclops Repo"
         url "https://maven.pkg.github.com/CyclopsMC/packages"
@@ -156,6 +160,9 @@ dependencies {
         }
     }
 
+    // Optional, only used to hide JEI in focus mode
+    compileOnly "mezz.jei:jei-${project.minecraft_version}-neoforge-api:${project.jei_version}"
+
     modLib "com.google.re2j:re2j:1.1"
     modLib ("io.netty:netty-codec-http:4.1.77.Final") {
         transitive = false

gradle.properties

@@ -35,3 +35,4 @@ graal_version=25.2.4
 cyclopscore_version=1.30.1-1051
 integrateddynamics_version=1.32.11-1809
 commoncapabilities_version=2.11.4-344
+jei_version=29.5.0.28

src/main/java/org/cyclops/integratedscripting/GeneralConfig.java

@@ -21,6 +21,8 @@ public class GeneralConfig extends DummyConfigCommon<IModBase> {
     public static int terminalScriptingBaseConsumption = 1;
     @ConfigurablePropertyCommon(category = "general", comment = "The minimum number of ticks inbetween sending a script change packet from client to server.", minimalValue = 0, configLocation = ModConfigLocation.SERVER)
     public static int terminalScriptingClientSyncTickInterval = 20;
+    @ConfigurablePropertyCommon(category = "general", comment = "The number of spaces that tab inserts in the scripting terminal editor.", minimalValue = 1, maximalValue = 16, configLocation = ModConfigLocation.CLIENT)
+    public static int terminalScriptingIndentSize = 2;
 
     @ConfigurablePropertyCommon(category = "general", comment = "If new processes can be created from guest languages. Only enable this on private servers and if you know what you are doing.", configLocation = ModConfigLocation.SERVER)
     public static boolean graalAllowCreateProcess = false;

src/main/java/org/cyclops/integratedscripting/IntegratedScripting.java

@@ -34,6 +34,7 @@
 import org.cyclops.integratedscripting.command.CommandTestScript;
 import org.cyclops.integratedscripting.component.DataComponentDiskIdConfig;
 import org.cyclops.integratedscripting.core.client.model.ScriptingVariableModelProviders;
+import org.cyclops.integratedscripting.core.evaluate.ScriptEvaluationStatuses;
 import org.cyclops.integratedscripting.core.evaluate.ScriptVariableFacadeHandler;
 import org.cyclops.integratedscripting.core.packageddependencies.PackagedDependenciesLoader;
 import org.cyclops.integratedscripting.core.language.LanguageHandlerRegistry;
@@ -43,7 +44,9 @@
 import org.cyclops.integratedscripting.evaluate.translation.ValueTranslatorRegistry;
 import org.cyclops.integratedscripting.evaluate.translation.ValueTranslators;
 import org.cyclops.integratedscripting.gametest.GameTestsAdvancements;
+import org.cyclops.integratedscripting.gametest.GameTestsScriptingDrive;
 import org.cyclops.integratedscripting.gametest.GameTestsScripts;
+import org.cyclops.integratedscripting.gametest.GameTestsTerminalScripting;
 import org.cyclops.integratedscripting.inventory.container.ContainerScriptingDriveConfig;
 import org.cyclops.integratedscripting.inventory.container.ContainerTerminalScriptingConfig;
 import org.cyclops.integratedscripting.item.ItemScriptingDiskConfig;
@@ -127,6 +130,7 @@ protected void onServerStopping(ServerStoppingEvent event) {
         }
         this.scriptingData = null;
         EvaluationExceptionResolutionHelpers.reset();
+        ScriptEvaluationStatuses.reset();
     }
 
     @SubscribeEvent
@@ -187,7 +191,9 @@ protected ICommonProxy constructCommonProxy() {
     public Class<?>[] getGameTestClasses() {
         return new Class<?>[]{
                 GameTestsAdvancements.class,
-                GameTestsScripts.class
+                GameTestsScripts.class,
+                GameTestsScriptingDrive.class,
+                GameTestsTerminalScripting.class
         };
     }
 

src/main/java/org/cyclops/integratedscripting/api/language/ILanguageHandler.java

@@ -1,12 +1,18 @@
 package org.cyclops.integratedscripting.api.language;
 
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
 import org.apache.commons.lang3.tuple.Pair;
 import org.cyclops.cyclopscore.client.gui.image.IImage;
 import org.cyclops.integrateddynamics.api.evaluate.EvaluationException;
 import org.cyclops.integratedscripting.api.network.IScriptFactory;
 
+import javax.annotation.Nullable;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 /**
  * Logic for handling a specific programming language.
@@ -22,8 +28,73 @@ public interface ILanguageHandler {
 
     public List<Pair<Style, String>> markupLine(String line);
 
+    /**
+     * Mark up a full script, which allows constructs such as block comments to span multiple lines.
+     * @param script The script contents.
+     * @return Styled segments that together form the full script.
+     */
+    public default List<Pair<Style, String>> markupScript(String script) {
+        List<Pair<Style, String>> segments = new ArrayList<>();
+        String[] lines = script.split("\n", -1);
+        for (int i = 0; i < lines.length; i++) {
+            if (i > 0) {
+                segments.add(Pair.of(Style.EMPTY, "\n"));
+            }
+            segments.addAll(markupLine(lines[i]));
+        }
+        return segments;
+    }
+
     public IScriptFactory getScriptFactory() throws EvaluationException;
 
+    /**
+     * @return Words of the language that can not be the name of a script member, such as keywords.
+     */
+    public default Set<String> getReservedWords() {
+        return Collections.emptySet();
+    }
+
+    /**
+     * @param script The script contents.
+     * @return The names of the members declared at the top level of the script,
+     *         or null if they can not be determined.
+     */
+    @Nullable
+    public default Set<String> getTopLevelMembers(String script) {
+        return null;
+    }
+
+    /**
+     * @param script The script contents.
+     * @param cursor The cursor position.
+     * @return Completion candidates at the cursor, or null if there are none.
+     */
+    @Nullable
+    public default ScriptCompletions getCompletions(String script, int cursor) {
+        return null;
+    }
+
+    /**
+     * @param script The script contents.
+     * @param cursor The cursor position.
+     * @return The signature of the function call the cursor is in, or null if unknown.
+     */
+    @Nullable
+    public default Component getSignatureHint(String script, int cursor) {
+        return null;
+    }
+
+    /**
+     * Check a script for syntax errors, without executing it.
+     * @param path The script path.
+     * @param script The script contents.
+     * @return The first syntax error, or null if there is none or if checking is not supported.
+     */
+    @Nullable
+    public default ScriptSyntaxError checkSyntax(Path path, String script) {
+        return null;
+    }
+
     public void onServerStarted();
 
 }

src/main/java/org/cyclops/integratedscripting/api/language/ScriptCompletions.java

@@ -0,0 +1,22 @@
+package org.cyclops.integratedscripting.api.language;
+
+import net.minecraft.network.chat.Component;
+
+import java.util.List;
+
+/**
+ * Completion candidates at a position in a script.
+ * @param start The position from which the text before the cursor is replaced when accepting a candidate.
+ * @param items The candidates.
+ * @author rubensworks
+ */
+public record ScriptCompletions(int start, List<Item> items) {
+
+    /**
+     * @param name The text to insert.
+     * @param detail A short description, such as a signature.
+     */
+    public record Item(String name, Component detail) {
+    }
+
+}

src/main/java/org/cyclops/integratedscripting/api/language/ScriptSyntaxError.java

@@ -0,0 +1,11 @@
+package org.cyclops.integratedscripting.api.language;
+
+/**
+ * A syntax error in a script.
+ * @param message The error message.
+ * @param line The 1-based line of the error.
+ * @param column The 1-based column of the error.
+ * @author rubensworks
+ */
+public record ScriptSyntaxError(String message, int line, int column) {
+}

src/main/java/org/cyclops/integratedscripting/blockentity/BlockEntityScriptingDrive.java

@@ -103,9 +103,11 @@ public void setExposedDiskId(int exposedDiskId) {
             this.onDirty();
             ScriptingNetworkHelpers.getScriptingNetwork(getNetwork())
                     .ifPresent(scriptingNetwork -> {
-                        if (exposedDiskId == -1) {
+                        // Also remove the old disk when it is directly replaced by another one
+                        if (oldExposedDiskId >= 0) {
                             scriptingNetwork.removeDisk(oldExposedDiskId);
-                        } else {
+                        }
+                        if (exposedDiskId >= 0) {
                             scriptingNetwork.addDisk(exposedDiskId);
                         }
                     });

src/main/java/org/cyclops/integratedscripting/client/gui/component/button/ButtonIcon.java

@@ -0,0 +1,27 @@
+package org.cyclops.integratedscripting.client.gui.component.button;
+
+import net.minecraft.client.gui.GuiGraphicsExtractor;
+import net.minecraft.network.chat.Component;
+import org.cyclops.cyclopscore.client.gui.component.button.ButtonExtended;
+import org.cyclops.cyclopscore.client.gui.image.IImage;
+
+/**
+ * A button with a centered icon, which is dimmed when the button is inactive.
+ * @author rubensworks
+ */
+public class ButtonIcon extends ButtonExtended {
+
+    private final IImage image;
+
+    public ButtonIcon(int x, int y, int width, int height, Component narrationMessage, OnPress onPress, IImage image) {
+        super(x, y, width, height, narrationMessage, onPress, true);
+        this.image = image;
+    }
+
+    @Override
+    protected void drawButtonInner(GuiGraphicsExtractor guiGraphics, int mouseX, int mouseY) {
+        float color = this.active ? 1F : 0.4F;
+        this.image.drawWithColor(guiGraphics, this.getX() + (this.width - this.image.getWidth()) / 2,
+                this.getY() + (this.height - this.image.getHeight()) / 2, color, color, color, 1F);
+    }
+}

src/main/java/org/cyclops/integratedscripting/client/gui/component/input/EditorKeys.java

@@ -0,0 +1,28 @@
+package org.cyclops.integratedscripting.client.gui.component.input;
+
+import org.lwjgl.glfw.GLFW;
+
+/**
+ * Platform conventions for moving the cursor in text editors.
+ * @author rubensworks
+ */
+public final class EditorKeys {
+
+    private EditorKeys() {
+    }
+
+    /**
+     * @return If the cursor should move or delete by word: Option on macOS, Ctrl elsewhere.
+     */
+    public static boolean isWordModifier(int modifiers, boolean osx) {
+        return (modifiers & (osx ? GLFW.GLFW_MOD_ALT : GLFW.GLFW_MOD_CONTROL)) != 0;
+    }
+
+    /**
+     * @return If arrow keys should jump to the line or document start or end, which is Cmd on macOS.
+     */
+    public static boolean isLineModifier(int modifiers, boolean osx) {
+        return osx && (modifiers & GLFW.GLFW_MOD_SUPER) != 0;
+    }
+
+}