npm - redscript-mc - Versions diffs - 1.2.26 → 1.2.28 - Mend

@@ -66,11 +66,16 @@ function compile(source, options = {}) {
         const checker = new typechecker_1.TypeChecker(preprocessedSource, filePath);
         typeErrors = checker.check(ast);
     }
+    // Configure scoreboard objective for this compilation.
+    // Default: use the datapack namespace so each datapack gets its own objective
+    // automatically, preventing variable collisions when multiple datapacks coexist.
+    const scoreboardObj = options.scoreboardObjective ?? namespace;
+    (0, lowering_1.setScoreboardObjective)(scoreboardObj);
     // Lowering to IR
     const lowering = new lowering_1.Lowering(namespace, preprocessed.ranges);
     const ir = lowering.lower(ast);
     let optimizedIR = ir;
-    let generated = (0, mcfunction_1.generateDatapackWithStats)(ir, { optimizeCommands: shouldOptimize, mangle });
+    let generated = (0, mcfunction_1.generateDatapackWithStats)(ir, { optimizeCommands: shouldOptimize, mangle, scoreboardObjective: scoreboardObj });
     let optimizationStats;
     if (shouldOptimize) {
         const stats = (0, commands_1.createEmptyOptimizationStats)();
@@ -86,10 +91,10 @@ function compile(source, options = {}) {
         }
         const copyPropagatedIR = { ...ir, functions: copyPropagatedFunctions };
         optimizedIR = { ...ir, functions: deadCodeEliminatedFunctions };
-        const baselineGenerated = (0, mcfunction_1.generateDatapackWithStats)(ir, { optimizeCommands: false, mangle });
-        const beforeDceGenerated = (0, mcfunction_1.generateDatapackWithStats)(copyPropagatedIR, { optimizeCommands: false, mangle });
-        const afterDceGenerated = (0, mcfunction_1.generateDatapackWithStats)(optimizedIR, { optimizeCommands: false, mangle });
-        generated = (0, mcfunction_1.generateDatapackWithStats)(optimizedIR, { optimizeCommands: true, mangle });
+        const baselineGenerated = (0, mcfunction_1.generateDatapackWithStats)(ir, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj });
+        const beforeDceGenerated = (0, mcfunction_1.generateDatapackWithStats)(copyPropagatedIR, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj });
+        const afterDceGenerated = (0, mcfunction_1.generateDatapackWithStats)(optimizedIR, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj });
+        generated = (0, mcfunction_1.generateDatapackWithStats)(optimizedIR, { optimizeCommands: true, mangle, scoreboardObjective: scoreboardObj });
         stats.deadCodeRemoved =
             (0, mcfunction_1.countMcfunctionCommands)(beforeDceGenerated.files) - (0, mcfunction_1.countMcfunctionCommands)(afterDceGenerated.files);
         stats.licmHoists = generated.stats.licmHoists;
@@ -105,7 +110,7 @@ function compile(source, options = {}) {
     }
     else {
         optimizedIR = ir;
-        generated = (0, mcfunction_1.generateDatapackWithStats)(ir, { optimizeCommands: false, mangle });
+        generated = (0, mcfunction_1.generateDatapackWithStats)(ir, { optimizeCommands: false, mangle, scoreboardObjective: scoreboardObj });
     }
     return {
         files: [...generated.files, ...generated.advancements],

@@ -0,0 +1,3 @@
+# block: tick_body
+scoreboard players set $__tick_turret_tick rs 0
+execute as @e[type=armor_stand,tag=turret] run function turret:turret_tick/foreach_0

@@ -0,0 +1,5 @@
+# block: entry
+scoreboard players add $__tick_turret_tick rs 1
+execute store success score $__tick_turret_tick_check rs if score $__tick_turret_tick rs matches 20..
+execute if score $__tick_turret_tick_check rs matches 1.. run function turret:turret_tick/tick_body
+execute if score $__tick_turret_tick_check rs matches ..0 run function turret:turret_tick/tick_skip

@@ -0,0 +1,15 @@
+{
+  "$b": "x",
+  "$d": "p0",
+  "$h": "g",
+  "$i": "a",
+  "$j": "b",
+  "$l": "p1",
+  "$m": "c",
+  "$p": "y",
+  "$s": "r",
+  "$a": "const:0",
+  "$c": "internal:p0",
+  "$g": "internal:ret",
+  "$k": "internal:p1"
+}

@@ -0,0 +1,17 @@
+{
+  "$b": "x",
+  "$d": "p0",
+  "$h": "g",
+  "$i": "a",
+  "$j": "b",
+  "$l": "p1",
+  "$m": "c",
+  "$p": "y",
+  "$s": "r",
+  "$t": "k",
+  "$v": "result",
+  "$a": "const:0",
+  "$c": "internal:p0",
+  "$g": "internal:ret",
+  "$k": "internal:p1"
+}

@@ -0,0 +1,15 @@
+{
+  "$b": "a",
+  "$d": "b",
+  "$f": "p0",
+  "$g": "p1",
+  "$h": "c",
+  "$k": "x",
+  "$m": "y",
+  "$o": "tmp",
+  "$q": "i",
+  "$a": "const:0",
+  "$c": "internal:p0",
+  "$e": "internal:p1",
+  "$i": "internal:ret"
+}

@@ -17,6 +17,10 @@ export interface CompileOptions {
     filePath?: string;
     dce?: boolean;
     mangle?: boolean;
+    /** Scoreboard objective used for all variable slots (default: 'rs').
+     *  Set a unique value per datapack to avoid collisions when multiple
+     *  RedScript datapacks are loaded simultaneously. */
+    scoreboardObjective?: string;
 }
 export interface CompileResult {
     files: DatapackFile[];

@@ -0,0 +1,15 @@
+{
+  "$e": "n",
+  "$g": "p0",
+  "$j": "i",
+  "$k": "x",
+  "$p": "next",
+  "$s": "f",
+  "$u": "result",
+  "$a": "const:0",
+  "$b": "const:1",
+  "$c": "const:2",
+  "$d": "const:16",
+  "$f": "internal:p0",
+  "$i": "internal:ret"
+}

@@ -7,6 +7,9 @@
 import type { IRModule } from '../ir/types';
 import type { SourceRange } from '../compile';
 import type { Program } from '../ast/types';
+/** Current scoreboard objective. Set once per compile() call. */
+export declare let LOWERING_OBJ: string;
+export declare function setScoreboardObjective(obj: string): void;
 export interface Warning {
     message: string;
     code: string;

redscript-mc 1.2.26 → 1.2.28