Scripted PIDS Preset

.github/workflows/build.yml

@@ -23,10 +23,11 @@ jobs:
       - name: Make Gradle wrapper executable
         run: chmod +x ./gradlew
       - name: Setup Forge files
-        run: ./gradlew forge:setupFiles -Pminecraft_version="${{ matrix.minecraft }}"
+        run: ./gradlew setupFiles -Pminecraft_version="${{ matrix.minecraft }}"
       - name: Build with Gradle
         run: |
           NOW=$(date '+%Y-%m-%d-%H.%M')
+          ./gradlew :rhino:setupRhino
           ./gradlew build -Pminecraft_version="${{ matrix.minecraft }}" -Partifact_date=".artifact_$NOW"
       - name: Upload Artifacts to GitHub
         uses: actions/upload-artifact@v4

.github/workflows/release.yml

@@ -36,9 +36,11 @@ jobs:
       - name: Make Gradle wrapper executable
         run: chmod +x ./gradlew
       - name: Setup Forge files
-        run: ./gradlew forge:setupFiles -Pminecraft_version="${{ matrix.minecraft }}"
+        run: ./gradlew setupFiles -Pminecraft_version="${{ matrix.minecraft }}"
       - name: Build with Gradle
-        run: ./gradlew build -Pminecraft_version="${{ matrix.minecraft }}"
+        run: |
+          ./gradlew :rhino:setupRhino
+          ./gradlew build -Pminecraft_version="${{ matrix.minecraft }}"
       - name: Create release
         uses: softprops/action-gh-release@v2
         with:

.gitignore

@@ -34,10 +34,12 @@ fabric/run/
 
 # forge
 forge/src/main/java/**/mod
+forge/src/main/java/**/mtrscripting
 forge/src/main/java/net/londonunderground/mod
 forge/src/main/resources/assets
 forge/src/main/resources/data
 forge/run
+rhino/src/main/java
 #forge/src/main/resources/META-INF
 
 # java

build.gradle

@@ -1,5 +1,6 @@
 plugins {
 	id "io.github.pacifistmc.forgix" version "1.+"
+	id 'com.gradleup.shadow' version '8.3.4' apply false
 }
 
 forgix {
@@ -18,25 +19,36 @@ forgix {
 	}
 }
 
-subprojects {
+configure(subprojects.findAll {it.name != 'rhino'}) {
 	apply plugin: "java"
+	apply plugin: 'com.gradleup.shadow'
 
 	group project.maven_group
 	version "${rootProject.properties.mod_version}+${rootProject.properties.minecraft_version}"
 
+	configurations {
+		shadowImplementation
+		implementation.extendsFrom shadowImplementation
+	}
+
 	base {
 		archivesName = "${rootProject.archives_base_name}-${project.properties.loader_name}"
 	}
 
 	dependencies {
 		implementation 'com.google.code.findbugs:jsr305:+'
+		shadowImplementation project(":rhino")
 	}
 
 	repositories {
 		flatDir { dirs "../libs" }
 		maven { url "https://jitpack.io" }
 	}
 
+	shadowJar {
+		configurations = [project.configurations.shadowImplementation]
+	}
+
 	def mc_ver = rootProject.properties.minecraft_version
 	def mc_major = mc_ver.split("\\.")[0]
 	def mc_main = mc_ver.split("\\.")[1]
@@ -103,6 +115,40 @@ subprojects {
 		}
 	}
 
+	compileJava.dependsOn(":rhino:checkRhino")
 	build.finalizedBy(mergeJars)
 	assemble.finalizedBy(mergeJars)
+}
+
+tasks.register("setupFiles") {
+	var sourceModloader = "fabric"
+
+	doLast {
+		for(var targetModloader : ["forge"]) {
+			delete fileTree("${targetModloader}/src/main/java/com/lx862/jcm/mod")
+			delete fileTree("${targetModloader}/src/main/java/com/lx862/mtrscripting")
+			delete fileTree("${targetModloader}/src/main/resources/assets")
+			delete fileTree("${targetModloader}/src/main/resources/data")
+
+			copy {
+				from "${sourceModloader}/src/main/java/com/lx862/jcm/mod"
+				into "${targetModloader}/src/main/java/com/lx862/jcm/mod"
+			}
+
+			copy {
+				from "${sourceModloader}/src/main/java/com/lx862/mtrscripting"
+				into "${targetModloader}/src/main/java/com/lx862/mtrscripting"
+			}
+
+			copy {
+				from "${sourceModloader}/src/main/resources/assets"
+				into "${targetModloader}/src/main/resources/assets"
+			}
+
+			copy {
+				from "${sourceModloader}/src/main/resources/data"
+				into "${targetModloader}/src/main/resources/data"
+			}
+		}
+	}
 }

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.7-SNAPSHOT'
+    id 'fabric-loom' version '1.8-SNAPSHOT'
 }
 
 loom {
@@ -51,4 +51,10 @@ jar {
     from("LICENSE") {
         rename { "${it}_${base.archivesName.get()}"}
     }
+}
+
+remapJar {
+    dependsOn(shadowJar)
+    mustRunAfter(shadowJar)
+    inputFile = file(shadowJar.archivePath)
 }

fabric/gradle.properties

@@ -1,6 +1,6 @@
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-fabric_loader_version=0.16.2
+fabric_loader_version=0.16.7
 loader_name=fabric
 
 yarn_mappings_1.20.4=1.20.4+build.3

fabric/src/main/java/com/lx862/jcm/mod/JCMClient.java

@@ -3,11 +3,13 @@
 import com.lx862.jcm.mod.config.ClientConfig;
 import com.lx862.jcm.mod.registry.JCMRegistryClient;
 import com.lx862.jcm.mod.render.gui.screen.ClientConfigScreen;
+import com.lx862.mtrscripting.scripting.ScriptManager;
 import org.mtr.mapping.holder.Screen;
 import org.mtr.mapping.holder.ScreenAbstractMapping;
 
 public class JCMClient {
-    private static ClientConfig config = new ClientConfig();
+    public static final ScriptManager scriptManager = new ScriptManager();
+    private static final ClientConfig config = new ClientConfig();
 
     public static void initializeClient() {
         config.read();

fabric/src/main/java/com/lx862/jcm/mod/data/pids/PIDSManager.java

@@ -1,11 +1,20 @@
 package com.lx862.jcm.mod.data.pids;
 
 import com.google.gson.JsonObject;
-import com.lx862.jcm.mod.data.pids.preset.CustomComponentPIDSPreset;
+import com.lx862.jcm.mod.Constants;
+import com.lx862.mtrscripting.api.ScriptingAPI;
 import com.lx862.jcm.mod.data.pids.preset.JsonPIDSPreset;
 import com.lx862.jcm.mod.data.pids.preset.PIDSPresetBase;
+import com.lx862.jcm.mod.data.pids.preset.ScriptPIDSPreset;
+import com.lx862.jcm.mod.data.pids.scripting.TextWrapper;
+import com.lx862.jcm.mod.data.pids.scripting.TextureWrapper;
+import com.lx862.jcm.mod.data.pids.scripting.util.MTRUtil;
+import com.lx862.jcm.mod.data.pids.scripting.util.TextUtil;
 import com.lx862.jcm.mod.util.JCMLogger;
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import org.mtr.mod.Keys;
+import org.mtr.mod.client.MinecraftClientData;
+import vendor.com.lx862.jcm.org.mozilla.javascript.NativeJavaClass;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -22,8 +31,8 @@ public static void loadJson(JsonObject customResourceJson) {
                 presetId = jsonObject.get("id").getAsString();
                 PIDSPresetBase preset;
 
-                if(jsonObject.has("file")) {
-                    preset = CustomComponentPIDSPreset.parse(jsonObject);
+                if(jsonObject.has("scripts")) {
+                    preset = ScriptPIDSPreset.parse(jsonObject);
                 } else {
                     preset = JsonPIDSPreset.parse(e.getAsJsonObject());
                 }
@@ -40,6 +49,28 @@ public static void loadJson(JsonObject customResourceJson) {
         });
     }
 
+    public static void registerScripting() {
+        String mtrModVersion = null;
+        try {
+            mtrModVersion = (String) Keys.class.getField("MOD_VERSION").get(null);
+        } catch (ReflectiveOperationException ignored) {
+        }
+        ScriptingAPI.registerAddonVersion("mtr", mtrModVersion);
+        ScriptingAPI.registerAddonVersion("jcm", Constants.MOD_VERSION);
+
+        ScriptingAPI.onParseScript((contextName, context, scriptable) -> {
+            // On behalf of MTR
+            scriptable.put("MTRUtil", scriptable, new NativeJavaClass(scriptable, MTRUtil.class));
+            scriptable.put("MTRClientData", scriptable, new NativeJavaClass(scriptable, MinecraftClientData.class));
+            scriptable.put("TextUtil", scriptable, new NativeJavaClass(scriptable, TextUtil.class));
+
+            if(contextName.equals("PIDS")) {
+                scriptable.put("Text", scriptable, new NativeJavaClass(scriptable, TextWrapper.class));
+                scriptable.put("Texture", scriptable, new NativeJavaClass(scriptable, TextureWrapper.class));
+            }
+        });
+    }
+
     public static PIDSPresetBase getPreset(String id, PIDSPresetBase defaultPreset) {
         return presetList.getOrDefault(id, defaultPreset);
     }