redscript-mc 1.2.9 → 1.2.11

package/README.md

@@ -20,55 +20,56 @@ Write clean game logic. RedScript handles the scoreboard spaghetti.
 
 ### 🚀 [Try it online — no install needed!](https://redscript-ide.pages.dev)
 
+<img src="./demo.gif" alt="RedScript Demo" width="400" />
+
+*↑ Particles spawning at player position every tick — 100% vanilla, no mods! Just 30 lines of RedScript with full control flow: `if`, `foreach`, `@tick`, f-strings, and more.*
+
 </div>
 
 ---
 
 ### What is RedScript?
 
-You want to make a Minecraft mini-game. You need a countdown timer, kill counter, respawn logic, and a scoreboard display. In vanilla MC, that's 40+ `.mcfunction` files, hundreds of `execute if score` commands, and a weekend of debugging.
+RedScript is a typed scripting language that compiles to vanilla Minecraft datapacks. Write clean code with variables, functions, loops, and events — RedScript handles the scoreboard commands and `.mcfunction` files for you.
 
-With RedScript, it's this:
+**The demo above?** Just 30 lines:
 
 ```rs
-// pvp_game.mcrs
-import "stdlib/player.mcrs"
-
-const GAME_TIME: int = 300;
-
-@tick(rate=20)
-fn every_second() {
-    let time: int = scoreboard_get(#game, #timer);
-
-    if (time <= 0) {
-        end_game();
-        return;
+let counter: int = 0;
+let running: bool = false;
+
+@tick fn demo_tick() {
+    if (!running) { return; }
+    counter = counter + 1;
+    
+    foreach (p in @a) at @s {
+        particle("minecraft:end_rod", ~0, ~1, ~0, 0.5, 0.5, 0.5, 0.1, 5);
+    }
+    
+    if (counter % 20 == 0) {
+        say(f"Running for {counter} ticks");
     }
-
-    scoreboard_set(#game, #timer, time - 1);
-    actionbar(@a, "⏱ ${time}s remaining");
-}
-
-fn start_game() {
-    scoreboard_set(#game, #timer, GAME_TIME);
-    scoreboard_set(#game, #running, 1);
-    title(@a, "Fight!", "Game started");
-    tp(@a, (0, 64, 0));
 }
 
-fn end_game() {
-    scoreboard_set(#game, #running, 0);
-    title(@a, "Game Over!");
-    announce("Thanks for playing!");
+@keep fn start() {
+    running = true;
+    counter = 0;
+    say(f"Demo started!");
 }
 
-@on_death
-fn on_kill() {
-    scoreboard_add(@s, #kills, 1);
+@keep fn stop() {
+    running = false;
+    say(f"Demo stopped at {counter} ticks.");
 }
 ```
 
-One file. Compiles to a ready-to-use datapack in seconds.
+**What you get:**
+- ✅ `let` / `const` variables (no more `scoreboard players set`)
+- ✅ `if` / `else` / `for` / `foreach` control flow
+- ✅ `@tick` / `@load` / `@on(Event)` decorators
+- ✅ `foreach (p in @a) at @s` — iterate entities with execute context
+- ✅ f-strings like `f"Score: {points}"` for dynamic output
+- ✅ One file → ready-to-use datapack
 
 ---
 
@@ -199,7 +200,8 @@ if (hp <= 0) {
 }
 
 for (let i: int = 0; i < 10; i = i + 1) {
-    summon("minecraft:zombie", (i, 64, 0));
+    say(f"Spawning wave {i}");
+    summon("minecraft:zombie", ~0, ~0, ~0);
 }
 
 foreach (player in @a) {

package/README.zh.md

@@ -20,55 +20,56 @@
 
 ### 🚀 [在线试用 — 无需安装！](https://redscript-ide.pages.dev)
 
+<img src="./demo.gif" alt="RedScript Demo" width="400" />
+
+*↑ 每 tick 在玩家位置生成粒子 — 纯原版，无需 MOD！仅 30 行 RedScript，包含完整控制流：`if`、`foreach`、`@tick`、f-strings 等。*
+
 </div>
 
 ---
 
 ### RedScript 是什么？
 
-你想做一个 Minecraft 小游戏——倒计时、击杀计数、复活逻辑、记分板显示。用原版 MC 的话，这意味着 40+ 个 `.mcfunction` 文件、几百条 `execute if score` 命令，还要花一个周末调试。
+RedScript 是一门编译到原版 Minecraft 数据包的脚本语言。用变量、函数、循环、事件写代码，RedScript 帮你生成记分板命令和 `.mcfunction` 文件。
 
-用 RedScript，就是这样：
+**上面的演示？** 只有 30 行：
 
 ```rs
-// pvp_game.mcrs
-import "stdlib/player.mcrs"
-
-const GAME_TIME: int = 300;
-
-@tick(rate=20)
-fn every_second() {
-    let time: int = scoreboard_get(#game, #timer);
-
-    if (time <= 0) {
-        end_game();
-        return;
+let counter: int = 0;
+let running: bool = false;
+
+@tick fn demo_tick() {
+    if (!running) { return; }
+    counter = counter + 1;
+    
+    foreach (p in @a) at @s {
+        particle("minecraft:end_rod", ~0, ~1, ~0, 0.5, 0.5, 0.5, 0.1, 5);
+    }
+    
+    if (counter % 20 == 0) {
+        say(f"已运行 {counter} ticks");
     }
-
-    scoreboard_set(#game, #timer, time - 1);
-    actionbar(@a, "⏱ 剩余 ${time} 秒");
-}
-
-fn start_game() {
-    scoreboard_set(#game, #timer, GAME_TIME);
-    scoreboard_set(#game, #running, 1);
-    title(@a, "开始战斗！", "游戏已开始");
-    tp(@a, (0, 64, 0));
 }
 
-fn end_game() {
-    scoreboard_set(#game, #running, 0);
-    title(@a, "游戏结束！");
-    announce("感谢游玩！");
+@keep fn start() {
+    running = true;
+    counter = 0;
+    say(f"Demo 已启动！");
 }
 
-@on_death
-fn on_kill() {
-    scoreboard_add(@s, #kills, 1);
+@keep fn stop() {
+    running = false;
+    say(f"Demo 已停止，共运行 {counter} ticks。");
 }
 ```
 
-一个文件，几秒钟编译出可以直接用的 datapack。
+**你得到：**
+- ✅ `let` / `const` 变量（告别 `scoreboard players set`）
+- ✅ `if` / `else` / `for` / `foreach` 完整控制流
+- ✅ `@tick` / `@load` / `@on(Event)` 装饰器
+- ✅ `foreach (p in @a) at @s` — 遍历实体并设置执行上下文
+- ✅ f-strings 如 `f"分数: {points}"` 动态输出
+- ✅ 一个文件 → 可直接使用的 datapack
 
 ---
 
@@ -199,7 +200,8 @@ if (hp <= 0) {
 }
 
 for (let i: int = 0; i < 10; i = i + 1) {
-    summon("minecraft:zombie", (i, 64, 0));
+    say(f"生成第 {i} 波");
+    summon("minecraft:zombie", ~0, ~0, ~0);
 }
 
 foreach (player in @a) {

package/dist/__tests__/mc-integration.test.js

@@ -731,4 +731,89 @@ describe('MC Integration - New Features', () => {
         expect(tickResult.ok).toBe(true);
     });
 });
+describe('MC Integration - Extended Coverage', () => {
+    test('struct-test.mcrs: struct instantiation and field access', async () => {
+        if (!serverOnline)
+            return;
+        writeFixtureFile('struct-test.mcrs', 'struct_test');
+        await mc.reload();
+        await mc.command('/function struct_test:__load').catch(() => { });
+        await mc.command('/function struct_test:test_struct');
+        await mc.ticks(5);
+        expect(await mc.scoreboard('#struct_x', 'rs')).toBe(10);
+        expect(await mc.scoreboard('#struct_y', 'rs')).toBe(64);
+        expect(await mc.scoreboard('#struct_z', 'rs')).toBe(-5);
+        expect(await mc.scoreboard('#struct_x2', 'rs')).toBe(15); // 10+5
+        expect(await mc.scoreboard('#struct_z2', 'rs')).toBe(-10); // -5*2
+        expect(await mc.scoreboard('#struct_alive', 'rs')).toBe(1);
+        expect(await mc.scoreboard('#struct_score', 'rs')).toBe(100);
+    });
+    test('enum-test.mcrs: enum values and match', async () => {
+        if (!serverOnline)
+            return;
+        writeFixtureFile('enum-test.mcrs', 'enum_test');
+        await mc.reload();
+        await mc.command('/function enum_test:__load').catch(() => { });
+        await mc.command('/function enum_test:test_enum');
+        await mc.ticks(5);
+        expect(await mc.scoreboard('#enum_phase', 'rs')).toBe(2); // Playing=2
+        expect(await mc.scoreboard('#enum_match', 'rs')).toBe(2); // matched Playing
+        expect(await mc.scoreboard('#enum_rank', 'rs')).toBe(10); // Diamond=10
+        expect(await mc.scoreboard('#enum_high', 'rs')).toBe(1); // Diamond > Gold
+    });
+    test('array-test.mcrs: array operations', async () => {
+        if (!serverOnline)
+            return;
+        writeFixtureFile('array-test.mcrs', 'array_test');
+        await mc.reload();
+        await mc.command('/function array_test:__load').catch(() => { });
+        await mc.command('/function array_test:test_array');
+        await mc.ticks(5);
+        expect(await mc.scoreboard('#arr_0', 'rs')).toBe(10);
+        expect(await mc.scoreboard('#arr_2', 'rs')).toBe(30);
+        expect(await mc.scoreboard('#arr_4', 'rs')).toBe(50);
+        expect(await mc.scoreboard('#arr_len', 'rs')).toBe(5);
+        expect(await mc.scoreboard('#arr_sum', 'rs')).toBe(150); // 10+20+30+40+50
+        expect(await mc.scoreboard('#arr_push', 'rs')).toBe(4); // [1,2,3,4].len
+        expect(await mc.scoreboard('#arr_pop', 'rs')).toBe(4); // popped value
+    });
+    test('break-continue-test.mcrs: break and continue statements', async () => {
+        if (!serverOnline)
+            return;
+        writeFixtureFile('break-continue-test.mcrs', 'break_continue_test');
+        await mc.reload();
+        await mc.command('/function break_continue_test:__load').catch(() => { });
+        await mc.command('/function break_continue_test:test_break_continue');
+        await mc.ticks(10);
+        expect(await mc.scoreboard('#break_at', 'rs')).toBe(5);
+        expect(await mc.scoreboard('#sum_evens', 'rs')).toBe(20); // 0+2+4+6+8
+        expect(await mc.scoreboard('#while_break', 'rs')).toBe(7);
+        expect(await mc.scoreboard('#nested_break', 'rs')).toBe(3); // outer completes 3 times
+    });
+    test('match-range-test.mcrs: match with range patterns', async () => {
+        if (!serverOnline)
+            return;
+        writeFixtureFile('match-range-test.mcrs', 'match_range_test');
+        await mc.reload();
+        await mc.command('/function match_range_test:__load').catch(() => { });
+        await mc.command('/function match_range_test:test_match_range');
+        await mc.ticks(5);
+        expect(await mc.scoreboard('#grade', 'rs')).toBe(4); // score=85 → B
+        expect(await mc.scoreboard('#boundary_59', 'rs')).toBe(1); // 59 matches 0..59
+        expect(await mc.scoreboard('#boundary_60', 'rs')).toBe(2); // 60 matches 60..100
+        expect(await mc.scoreboard('#neg_range', 'rs')).toBe(1); // -5 matches ..0
+    });
+    test('foreach-at-test.mcrs: foreach with at @s context', async () => {
+        if (!serverOnline)
+            return;
+        writeFixtureFile('foreach-at-test.mcrs', 'foreach_at_test');
+        await mc.reload();
+        await mc.fullReset({ clearArea: false, killEntities: true, resetScoreboards: false });
+        await mc.command('/function foreach_at_test:setup').catch(() => { });
+        await mc.command('/function foreach_at_test:test_foreach_at');
+        await mc.ticks(10);
+        expect(await mc.scoreboard('#foreach_count', 'rs')).toBe(3);
+        expect(await mc.scoreboard('#foreach_at_count', 'rs')).toBe(3);
+    });
+});
 //# sourceMappingURL=mc-integration.test.js.map

package/dist/ast/types.d.ts

@@ -247,6 +247,45 @@ export type ExecuteSubcommand = {
 } | {
     kind: 'at';
     selector: EntitySelector;
+} | {
+    kind: 'positioned';
+    x: string;
+    y: string;
+    z: string;
+} | {
+    kind: 'positioned_as';
+    selector: EntitySelector;
+} | {
+    kind: 'rotated';
+    yaw: string;
+    pitch: string;
+} | {
+    kind: 'rotated_as';
+    selector: EntitySelector;
+} | {
+    kind: 'facing';
+    x: string;
+    y: string;
+    z: string;
+} | {
+    kind: 'facing_entity';
+    selector: EntitySelector;
+    anchor: 'eyes' | 'feet';
+} | {
+    kind: 'anchored';
+    anchor: 'eyes' | 'feet';
+} | {
+    kind: 'align';
+    axes: string;
+} | {
+    kind: 'in';
+    dimension: string;
+} | {
+    kind: 'on';
+    relation: string;
+} | {
+    kind: 'summon';
+    entity: string;
 } | {
     kind: 'if_entity';
     selector?: EntitySelector;
@@ -258,8 +297,45 @@ export type ExecuteSubcommand = {
     varName?: string;
     filters?: SelectorFilter;
 } | {
-    kind: 'in';
-    dimension: string;
+    kind: 'if_block';
+    pos: [string, string, string];
+    block: string;
+} | {
+    kind: 'unless_block';
+    pos: [string, string, string];
+    block: string;
+} | {
+    kind: 'if_score';
+    target: string;
+    targetObj: string;
+    op: string;
+    source: string;
+    sourceObj: string;
+} | {
+    kind: 'unless_score';
+    target: string;
+    targetObj: string;
+    op: string;
+    source: string;
+    sourceObj: string;
+} | {
+    kind: 'if_score_range';
+    target: string;
+    targetObj: string;
+    range: string;
+} | {
+    kind: 'unless_score_range';
+    target: string;
+    targetObj: string;
+    range: string;
+} | {
+    kind: 'store_result';
+    target: string;
+    targetObj: string;
+} | {
+    kind: 'store_success';
+    target: string;
+    targetObj: string;
 };
 export type Stmt = {
     kind: 'let';
@@ -275,6 +351,12 @@ export type Stmt = {
     kind: 'return';
     value?: Expr;
     span?: Span;
+} | {
+    kind: 'break';
+    span?: Span;
+} | {
+    kind: 'continue';
+    span?: Span;
 } | {
     kind: 'if';
     cond: Expr;

package/dist/index.d.ts

@@ -3,7 +3,7 @@
  *
  * Main entry point for programmatic usage.
  */
-export declare const version = "1.2.9";
+export declare const version = "1.2.11";
 import type { Warning } from './lowering';
 import { DatapackFile } from './codegen/mcfunction';
 import type { IRModule } from './ir/types';

package/dist/index.js

@@ -9,7 +9,7 @@ exports.MCCommandValidator = exports.generateDatapack = exports.optimize = expor
 exports.compile = compile;
 exports.check = check;
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-exports.version = '1.2.9';
+exports.version = '1.2.11';
 const lexer_1 = require("./lexer");
 const parser_1 = require("./parser");
 const typechecker_1 = require("./typechecker");

package/dist/lexer/index.d.ts

@@ -5,7 +5,7 @@
  * Handles special cases like entity selectors vs decorators,
  * range literals, and raw commands.
  */
-export type TokenKind = 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match' | 'return' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace' | 'execute' | 'run' | 'unless' | 'int' | 'bool' | 'float' | 'string' | 'void' | 'BlockPos' | 'true' | 'false' | 'selector' | 'decorator' | 'int_lit' | 'float_lit' | 'byte_lit' | 'short_lit' | 'long_lit' | 'double_lit' | 'string_lit' | 'f_string' | 'range_lit' | 'rel_coord' | 'local_coord' | '+' | '-' | '*' | '/' | '%' | '~' | '^' | '==' | '!=' | '<' | '<=' | '>' | '>=' | '&&' | '||' | '!' | '=' | '+=' | '-=' | '*=' | '/=' | '%=' | '{' | '}' | '(' | ')' | '[' | ']' | ',' | ';' | ':' | '::' | '->' | '=>' | '.' | 'ident' | 'mc_name' | 'raw_cmd' | 'eof';
+export type TokenKind = 'fn' | 'let' | 'const' | 'if' | 'else' | 'while' | 'for' | 'foreach' | 'match' | 'return' | 'break' | 'continue' | 'as' | 'at' | 'in' | 'is' | 'struct' | 'impl' | 'enum' | 'trigger' | 'namespace' | 'execute' | 'run' | 'unless' | 'int' | 'bool' | 'float' | 'string' | 'void' | 'BlockPos' | 'true' | 'false' | 'selector' | 'decorator' | 'int_lit' | 'float_lit' | 'byte_lit' | 'short_lit' | 'long_lit' | 'double_lit' | 'string_lit' | 'f_string' | 'range_lit' | 'rel_coord' | 'local_coord' | '+' | '-' | '*' | '/' | '%' | '~' | '^' | '==' | '!=' | '<' | '<=' | '>' | '>=' | '&&' | '||' | '!' | '=' | '+=' | '-=' | '*=' | '/=' | '%=' | '{' | '}' | '(' | ')' | '[' | ']' | ',' | ';' | ':' | '::' | '->' | '=>' | '.' | 'ident' | 'mc_name' | 'raw_cmd' | 'eof';
 export interface Token {
     kind: TokenKind;
     value: string;

package/dist/lexer/index.js

@@ -23,6 +23,8 @@ const KEYWORDS = {
     foreach: 'foreach',
     match: 'match',
     return: 'return',
+    break: 'break',
+    continue: 'continue',
     as: 'as',
     at: 'at',
     in: 'in',

package/dist/lowering/index.d.ts

@@ -45,6 +45,7 @@ export declare class Lowering {
     private varTypes;
     private floatVars;
     private worldObjCounter;
+    private loopStack;
     constructor(namespace: string, sourceRanges?: SourceRange[]);
     lower(program: Program): IRModule;
     private lowerFn;
@@ -54,6 +55,8 @@ export declare class Lowering {
     private lowerStmt;
     private lowerLetStmt;
     private lowerReturnStmt;
+    private lowerBreakStmt;
+    private lowerContinueStmt;
     private lowerIfStmt;
     private lowerIsCheckIfStmt;
     private lowerWhileStmt;