redscript-mc 1.2.28 → 1.2.30

package/editors/vscode/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "redscript-vscode",
-  "version": "1.0.35",
+  "version": "1.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "redscript-vscode",
-      "version": "1.0.35",
+      "version": "1.2.0",
       "license": "MIT",
       "dependencies": {
         "redscript": "file:../../"
@@ -23,7 +23,7 @@
     },
     "../..": {
       "name": "redscript-mc",
-      "version": "1.2.27",
+      "version": "1.2.29",
       "license": "MIT",
       "bin": {
         "redscript": "dist/cli.js",

package/editors/vscode/package.json

@@ -2,7 +2,7 @@
   "name": "redscript-vscode",
   "displayName": "RedScript for Minecraft",
   "description": "Syntax highlighting, error diagnostics, and language support for RedScript — a compiler targeting Minecraft Java Edition",
-  "version": "1.0.35",
+  "version": "1.2.0",
   "publisher": "bkmashiro",
   "icon": "icon.png",
   "license": "MIT",

package/editors/vscode/src/hover.ts

@@ -1009,6 +1009,24 @@ export function registerHoverProvider(context: vscode.ExtensionContext): void {
       provideHover(document, position) {
         const line = document.lineAt(position.line).text
 
+        // ── #rs — special compiler token ────────────────────────
+        const rsRange = document.getWordRangeAtPosition(position, /#rs\b/)
+        if (rsRange) {
+          const md = new vscode.MarkdownString('', true)
+          md.isTrusted = true
+          md.appendCodeblock('#rs', 'redscript')
+          md.appendMarkdown('**RS Internal Scoreboard Objective** *(compiler token)*\n\n')
+          md.appendMarkdown('Resolves to the current datapack\'s internal scoreboard objective at compile time.\n\n')
+          md.appendMarkdown('Default: `__<namespace>` (e.g. `__mygame` for namespace `mygame`).\n\n')
+          md.appendMarkdown('Use `#rs` in `scoreboard_get` / `scoreboard_set` when you need to read or write\n')
+          md.appendMarkdown('the compiler\'s own variable slots — such as in stdlib implementations.\n\n')
+          md.appendMarkdown('> ⚠️ Unlike other `#name` tokens, `#rs` does **not** compile to the literal string `rs`.\n')
+          md.appendMarkdown('> It tracks the `--scoreboard` flag or the `__<namespace>` default.\n\n')
+          md.appendMarkdown('**Example:**\n')
+          md.appendCodeblock('scoreboard_set("timer_ticks", #rs, 0);\n// compiles to: scoreboard players set timer_ticks __mygame 0', 'redscript')
+          return new vscode.Hover(md, rsRange)
+        }
+
         // ── #mc_name hover ──────────────────────────────────────
         const mcRange = document.getWordRangeAtPosition(position, /#[a-zA-Z_][a-zA-Z0-9_]*/)
         if (mcRange) {

package/editors/vscode/syntaxes/redscript.tmLanguage.json

@@ -307,9 +307,18 @@
     },
 
     "mc-name": {
-      "comment": "#objective, #tag, #team — unquoted MC identifier literal",
-      "name": "variable.other.mc-name.redscript",
-      "match": "#[a-zA-Z_][a-zA-Z0-9_]*"
+      "comment": "#objective, #tag, #team — unquoted MC identifier literal. #rs is the special RS-internal scoreboard objective token.",
+      "patterns": [
+        {
+          "comment": "#rs — special compiler token: resolves to the current datapack's internal scoreboard objective (__<namespace>)",
+          "name": "support.constant.rs-objective.redscript",
+          "match": "#rs\\b"
+        },
+        {
+          "name": "variable.other.mc-name.redscript",
+          "match": "#[a-zA-Z_][a-zA-Z0-9_]*"
+        }
+      ]
     },
 
     "operators": {

package/examples/readme-demo.mcrs

@@ -1,92 +1,70 @@
-// readme-demo.mcrs — RedScript v1.2.27 README visual showcase
-// What 55 lines of RedScript can do on a vanilla Minecraft server.
+// readme-demo.mcrs — real-time 2D sine wave
+// Uses sin_fixed() to compute y = sin(x + t) at runtime.
+// _draw(px, py) is a macro function: float params are stored as double×0.01
+// so an integer value N → coordinate N/100 blocks (e.g. 975 → 9.75 blocks).
+// No lookup tables. No precomputed positions. Pure runtime computation.
 //
-// Compile:  node dist/cli.js compile examples/readme-demo.mcrs -o <datapack> --namespace rsdemo
-// In-game:  /function rsdemo:start   (then record your gif)
-//           /function rsdemo:stop
+// Compile:
+//   node dist/cli.js compile examples/readme-demo.mcrs \
+//       -o <out> --namespace rsdemo
+// In-game:
+//   /function rsdemo:start   (face forward, stand ~10 blocks back)
+//   /function rsdemo:stop
 
 import "../src/stdlib/math.mcrs"
 
-let t:     int = 0;     // 0..359 degrees, 4° per tick = full cycle every 1.5 s
-let frame: int = 0;
+let phase: int  = 0;
+let t:     int  = 0;
 let on:    bool = false;
 
-@load fn _init() {
-    t = 0;
-    frame = 0;
+// Macro function: place one particle at (^px/100, ^py/100, ^5).
+// RedScript stores float params as `double 0.01` in rs:macro_args,
+// so integer values become sub-block coordinates at call time.
+fn _draw(px: float, py: float) {
+    particle("minecraft:end_rod", ^px, ^py, ^5, 0.02, 0.02, 0.02, 0.0, 10);
 }
 
+@load fn _init() { phase = 0; t = 0; }
+
 @tick fn _wave_tick() {
     if (!on) { return; }
 
-    t = (t + 4) % 360;
-    frame = frame + 1;
-
-    let s:   int = sin_fixed(t);        // -1000 .. 1000
-    let c:   int = cos_fixed(t);        // -1000 .. 1000
-    let mag: int = abs(s);              // 0 .. 1000
+    // Advance: 4 new points this tick, phase scrolls at 1°/tick
+    t     = (t + 4) % 40;
+    phase = (phase + 1) % 360;
 
-    // ── Particle rings: spread values scale with sin(t) ─────────────────
-    // Inner ring — always visible, small tight shimmer
     foreach (p in @a) at @s {
-        particle("minecraft:end_rod", ~0, ~1, ~0, 0.25, 0.08, 0.25, 0.02, 6);
-    }
+        // Draw 4 consecutive points (loop-unrolled)
+        // px: index 0..39 → -975..975 (÷100 = -9.75..9.75 blocks)
+        // py: sin_fixed → -1000..1000 → ÷4 → -250..250 (÷100 = -2.5..2.5 blocks)
 
-    // Mid ring — appears when sin > 0 (upper half of cycle)
-    if (s > 0) {
-        foreach (p in @a) at @s {
-            particle("minecraft:end_rod", ~0, ~1, ~0, 0.9, 0.25, 0.9, 0.02, 12);
-        }
-    }
+        let i0: int = t;
+        let s0: int = sin_fixed((i0 * 9 + phase) % 360);
+        _draw(i0 * 50 - 975, s0 / 4);
 
-    // Outer ring + soul fire — sin > 600
-    if (s > 600) {
-        foreach (p in @a) at @s {
-            particle("minecraft:end_rod", ~0, ~1, ~0, 1.8, 0.4, 1.8, 0.02, 18);
-            particle("minecraft:soul_fire_flame", ~0, ~2, ~0, 0.9, 0.3, 0.9, 0.03, 8);
-        }
-    }
+        let i1: int = (t + 1) % 40;
+        let s1: int = sin_fixed((i1 * 9 + phase) % 360);
+        _draw(i1 * 50 - 975, s1 / 4);
 
-    // Peak flash — fires ~4 ticks per cycle
-    if (s > 940) {
-        foreach (p in @a) at @s {
-            particle("minecraft:flash", ~0, ~3, ~0, 0.4, 0.3, 0.4, 0.1, 3);
-        }
-    }
+        let i2: int = (t + 2) % 40;
+        let s2: int = sin_fixed((i2 * 9 + phase) % 360);
+        _draw(i2 * 50 - 975, s2 / 4);
 
-    // Negative trough — ground portal swirl
-    if (s < -700) {
-        foreach (p in @a) at @s {
-            particle("minecraft:portal", ~0, ~0.5, ~0, 1.2, 0.4, 1.2, 0.05, 12);
-        }
-    }
-
-    // ── Actionbar: live math rotating every 3 s ──────────────────────────
-    let seg: int = (frame / 45) % 4;
-    if (seg == 0) {
-        actionbar(@a, f"§3⚡ §bsin({t}°) = §e{s}‰   cos({t}°) = §e{c}‰");
-    }
-    if (seg == 1) {
-        actionbar(@a, f"§3⚡ §bsmoothstep(|sin|) = §e{smoothstep(0, 1000, mag)}‰   isqrt({frame}) = §e{isqrt(frame)}");
-    }
-    if (seg == 2) {
-        actionbar(@a, f"§3⚡ §bgcd(360, {t + 1}) = §e{gcd(360, t + 1)}   log2({mag + 1}) = §e{log2_int(mag + 1)}");
-    }
-    if (seg == 3) {
-        actionbar(@a, f"§3⚡ §bpow(2, {(frame / 30) % 10 + 1}) = §e{pow_int(2, (frame / 30) % 10 + 1)}   clamp(sin) = §e{clamp(s, -500, 500)}");
+        let i3: int = (t + 3) % 40;
+        let s3: int = sin_fixed((i3 * 9 + phase) % 360);
+        _draw(i3 * 50 - 975, s3 / 4);
     }
 }
 
 fn start() {
-    on = true;
-    t = 0;
-    frame = 0;
-    title(@a, f"§e✦ §bRedScript§e ✦", f"§7trig-driven particle rings");
-    say("§a▶ readme-demo started  — /function rsdemo:stop to end");
+    on    = true;
+    phase = 0;
+    t     = 0;
+    title(@a, "§e y = sin(x + t)", "§7sin_fixed · macro · real-time");
+    say("§a▶ sine wave — face forward, stand back ~10 blocks");
 }
 
 fn stop() {
     on = false;
-    actionbar(@a, f"§7[ demo stopped ]");
-    say("§c■ readme-demo stopped");
+    say("§c■ stopped");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redscript-mc",
-  "version": "1.2.28",
+  "version": "1.2.30",
   "description": "A high-level programming language that compiles to Minecraft datapacks",
   "main": "dist/index.js",
   "bin": {

package/src/__tests__/cli.test.ts

@@ -55,7 +55,7 @@ describe('CLI API', () => {
       const result = compile(source, { namespace: 'mygame', filePath: mainPath })
       const tickTimer = result.files.find(file => file.path.endsWith('/tick_timer.mcfunction'))
 
-      expect(tickTimer?.content).toContain('scoreboard players set #rs mygame.timer_ticks 1')
+      expect(tickTimer?.content).toContain('scoreboard players set #rs __mygame.timer_ticks 1')
     })
 
     it('adds a call-site hash for stdlib internal scoreboard objectives', () => {
@@ -113,8 +113,8 @@ describe('CLI API', () => {
 
       expect(result.typeErrors).toEqual([])
       const newFn = result.files.find(file => file.path.endsWith('/Timer_new.mcfunction'))
-      expect(newFn?.content).toContain('scoreboard players set timer_ticks timernew 0')
-      expect(newFn?.content).toContain('scoreboard players set timer_active timernew 0')
+      expect(newFn?.content).toContain('scoreboard players set timer_ticks __timernew 0')
+      expect(newFn?.content).toContain('scoreboard players set timer_active __timernew 0')
     })
 
     it('Timer.start/pause/reset', () => {
@@ -142,9 +142,9 @@ describe('CLI API', () => {
       const pauseFn = result.files.find(file => file.path.endsWith('/Timer_pause.mcfunction'))
       const resetFn = result.files.find(file => file.path.endsWith('/Timer_reset.mcfunction'))
 
-      expect(startFn?.content).toContain('scoreboard players set timer_active timerstate 1')
-      expect(pauseFn?.content).toContain('scoreboard players set timer_active timerstate 0')
-      expect(resetFn?.content).toContain('scoreboard players set timer_ticks timerstate 0')
+      expect(startFn?.content).toContain('scoreboard players set timer_active __timerstate 1')
+      expect(pauseFn?.content).toContain('scoreboard players set timer_active __timerstate 0')
+      expect(resetFn?.content).toContain('scoreboard players set timer_ticks __timerstate 0')
     })
 
     it('Timer.done returns bool', () => {
@@ -171,9 +171,9 @@ describe('CLI API', () => {
       expect(result.typeErrors).toEqual([])
       const doneFn = result.files.find(file => file.path.endsWith('/Timer_done.mcfunction'))
       const mainFn = result.files.find(file => file.path.endsWith('/main.mcfunction'))
-      expect(doneFn?.content).toContain('scoreboard players get timer_ticks timerdone')
+      expect(doneFn?.content).toContain('scoreboard players get timer_ticks __timerdone')
       expect(doneFn?.content).toContain('return run scoreboard players get')
-      expect(mainFn?.content).toContain('execute if score $main_finished timerdone matches 1..')
+      expect(mainFn?.content).toContain('execute if score $main_finished __timerdone matches 1..')
     })
 
     it('Timer.tick increments', () => {
@@ -201,10 +201,10 @@ describe('CLI API', () => {
         .map(file => file.content)
         .join('\n')
 
-      expect(tickOutput).toContain('scoreboard players get timer_active timertick')
-      expect(tickOutput).toContain('scoreboard players get timer_ticks timertick')
-      expect(tickOutput).toContain(' += $const_1 timertick')
-      expect(tickOutput).toContain('execute store result score timer_ticks timertick run scoreboard players get $_')
+      expect(tickOutput).toContain('scoreboard players get timer_active __timertick')
+      expect(tickOutput).toContain('scoreboard players get timer_ticks __timertick')
+      expect(tickOutput).toContain(' += $const_1 __timertick')
+      expect(tickOutput).toContain('execute store result score timer_ticks __timertick run scoreboard players get $_')
     })
   })
 

package/src/__tests__/optimizer-advanced.test.ts

@@ -28,7 +28,7 @@ fn turret_tick() {
     const parent = getFileContent(result.files, 'data/test/function/turret_tick.mcfunction')
     const loopBody = getFileContent(result.files, 'data/test/function/turret_tick/foreach_0.mcfunction')
 
-    const hoistedRead = 'execute store result score $_0 test run scoreboard players get config test.turret_range'
+    const hoistedRead = 'execute store result score $_0 __test run scoreboard players get config test.turret_range'
     const executeCall = 'execute as @e[tag=turret] run function test:turret_tick/foreach_0'
 
     expect(parent).toContain(hoistedRead)
@@ -54,7 +54,7 @@ fn read_twice() {
     const readMatches = fn.match(/scoreboard players get @s test\.coins/g) ?? []
 
     expect(readMatches).toHaveLength(1)
-    expect(fn).toContain('scoreboard players operation $_1 test = $_0 test')
+    expect(fn).toContain('scoreboard players operation $_1 __test = $_0 __test')
   })
 
   test('reuses duplicate arithmetic sequences', () => {
@@ -71,10 +71,10 @@ fn math() {
 
     const result = compile(source, { namespace: 'test' })
     const fn = getFileContent(result.files, 'data/test/function/math.mcfunction')
-    const addMatches = fn.match(/\+= \$const_2 test/g) ?? []
+    const addMatches = fn.match(/\+= \$const_2 __test/g) ?? []
 
     expect(addMatches).toHaveLength(1)
-    expect(fn).toContain('scoreboard players operation $_1 test = $_0 test')
+    expect(fn).toContain('scoreboard players operation $_1 __test = $_0 __test')
   })
 })
 

package/src/compile.ts

@@ -28,8 +28,9 @@ export interface CompileOptions {
   dce?: boolean
   mangle?: boolean
   /** Scoreboard objective used for all variable slots.
-   *  Defaults to 'rs'. Set to a unique value (e.g. 'mypack_rs') when loading
-   *  multiple RedScript datapacks simultaneously to avoid variable collisions. */
+   *  Defaults to '__<namespace>' (e.g. '__mathshow') — the double-underscore
+   *  prefix signals compiler-internal and avoids occupying the user's namespace.
+   *  Each datapack gets a unique objective automatically; no manual setup needed. */
   scoreboardObjective?: string
   /** Additional source files that should be treated as *library* code.
    *  Functions in these files are DCE-eligible: they are only compiled into
@@ -269,7 +270,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     // 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
+    const scoreboardObj = options.scoreboardObjective ?? `__${namespace}`
     setScoreboardObjective(scoreboardObj)
 
     // Lowering

package/src/index.ts

@@ -36,9 +36,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. */
+  /** Scoreboard objective used for all variable slots.
+   *  Defaults to '__<namespace>' (e.g. '__mathshow') to avoid collisions when
+   *  multiple RedScript datapacks are loaded simultaneously, without occupying
+   *  the user's own namespace. Override only if you need a specific name. */
   scoreboardObjective?: string
 }
 
@@ -108,7 +109,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
   // 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
+  const scoreboardObj = options.scoreboardObjective ?? `__${namespace}`
   setScoreboardObjective(scoreboardObj)
 
   // Lowering to IR

package/src/lexer/index.ts

@@ -313,9 +313,17 @@ export class Lexer {
       return
     }
 
-    // Local coordinate: ^ or ^5 or ^-3 or ^0.5
+    // Local coordinate: ^ or ^5 or ^-3 or ^0.5 or ^varname (macro variable)
     if (char === '^') {
       let value = '^'
+      // Check for identifier (variable name for macro substitution, e.g. ^px, ^height)
+      if (/[a-zA-Z_]/.test(this.peek())) {
+        while (/[a-zA-Z0-9_]/.test(this.peek())) {
+          value += this.advance()
+        }
+        this.addToken('local_coord', value, startLine, startCol)
+        return
+      }
       // Check for optional sign
       if (this.peek() === '-' || this.peek() === '+') {
         value += this.advance()

package/src/lowering/index.ts

@@ -515,17 +515,33 @@ export class Lowering {
     }
 
     // Set up NBT storage for each macro param
+    // float-typed params are stored as `double 0.01` so that an integer value N
+    // becomes N/100.0 in the command (e.g. scoreboard value 975 → NBT 9.75d → ^9.75)
     for (const macroParam of macroParamNames) {
       const paramIdx = params.findIndex(p => p.name === macroParam)
       if (paramIdx < 0 || paramIdx >= loweredArgs.length) continue
 
       const operand = loweredArgs[paramIdx]
+      const paramType = params[paramIdx]?.type
+      const isFloat = paramType?.kind === 'named' && (paramType as any).name === 'float'
+
       if (operand.kind === 'const') {
-        this.builder.emitRaw(`data modify storage rs:macro_args ${macroParam} set value ${operand.value}`)
+        if (isFloat) {
+          const floatVal = (operand.value / 100).toFixed(6)
+          this.builder.emitRaw(`data modify storage rs:macro_args ${macroParam} set value ${floatVal}d`)
+        } else {
+          this.builder.emitRaw(`data modify storage rs:macro_args ${macroParam} set value ${operand.value}`)
+        }
       } else if (operand.kind === 'var') {
-        this.builder.emitRaw(
-          `execute store result storage rs:macro_args ${macroParam} int 1 run scoreboard players get ${operand.name} ${LOWERING_OBJ}`
-        )
+        if (isFloat) {
+          this.builder.emitRaw(
+            `execute store result storage rs:macro_args ${macroParam} double 0.01 run scoreboard players get ${operand.name} ${LOWERING_OBJ}`
+          )
+        } else {
+          this.builder.emitRaw(
+            `execute store result storage rs:macro_args ${macroParam} int 1 run scoreboard players get ${operand.name} ${LOWERING_OBJ}`
+          )
+        }
       }
     }