redscript-mc 1.2.21 → 1.2.25

package/src/examples/parkour_race.mcrs

@@ -1,8 +1,8 @@
 // ============================================
-// Parkour Race - 跑酷竞速
+// Parkour Race - Parkour Race
 // ============================================
-// 场景：玩家从起点跑到终点，记录最快时间
-// 设有多个检查点，掉落会传送回最近检查点
+// Scenario: Players race from start to finish, recording the fastest time
+// Multiple checkpoints set; falling respawns the player at the nearest checkpoint
 // Scenario: Race from start to finish with checkpoints
 // ============================================
 
@@ -11,28 +11,28 @@ import "../stdlib/world.mcrs"
 import "../stdlib/bossbar.mcrs"
 import "../stdlib/particles.mcrs"
 
-// ===== 配置 =====
+// ===== Configuration =====
 const START_X: int = 0;
 const START_Y: int = 64;
 const START_Z: int = 0;
-const FALL_Y: int = 50;  // 低于此高度视为掉落
+const FALL_Y: int = 50;  // Below this height is considered a fall
 
 const CHECKPOINT_COUNT: int = 5;
 
-// ===== 游戏状态 =====
-// 记分板:
-// - pk_time: 当前用时 (ticks)
-// - pk_best: 最佳记录
-// - pk_checkpoint: 当前检查点
-// - pk_running: 是否在比赛中
+// ===== Game State =====
+// Scoreboards:
+// - pk_time: Current elapsed time (ticks)
+// - pk_best: Best record
+// - pk_checkpoint: Current checkpoint
+// - pk_running: Whether in a race
 
-// 检查点坐标 (简化为直线跑酷)
-// CP0: 0,64,0 (起点)
+// Checkpoint coordinates (simplified to linear parkour)
+// CP0: 0,64,0 (start)
 // CP1: 0,64,50
 // CP2: 0,70,100
 // CP3: 0,75,150
 // CP4: 0,80,200
-// CP5: 0,64,250 (终点)
+// CP5: 0,64,250 (finish)
 
 @load
 fn init() {
@@ -41,21 +41,21 @@ fn init() {
     scoreboard_add_objective("pk_checkpoint", "dummy");
     scoreboard_add_objective("pk_running", "dummy");
     
-    // 显示最佳时间
+    // Display best time
     scoreboard_display("sidebar", "pk_best");
     
     set_day();
     weather_clear();
     
-    announce("§b[跑酷] §f已加载！踩压力板开始");
+    announce("§b[Parkour] §fLoaded! Step on pressure plate to start");
 }
 
-// ===== 开始比赛 =====
+// ===== Start Race =====
 fn start_race(player: selector) {
-    // 检查是否已在比赛中
+    // Check if already in a race
     let running: int = scoreboard_get(player, "pk_running");
     if (running == 1) {
-        tell(player, "§c你已经在比赛中了！");
+        tell(player, "§cYou are already in a race!");
         return;
     }
     
@@ -63,53 +63,53 @@ fn start_race(player: selector) {
     scoreboard_set(player, "pk_time", 0);
     scoreboard_set(player, "pk_checkpoint", 0);
     
-    // 传送到起点
+    // Teleport to start
     tp(player, START_X, START_Y, START_Z);
     
-    // 清除效果，给速度
+    // Clear effects, give speed
     effect_clear(player);
     
-    title(player, "§b开始！");
-    subtitle(player, "§7跑向终点！");
+    title(player, "§bGo!");
+    subtitle(player, "§7Race to the finish!");
     
-    // 创建计时 bossbar
-    tell(player, "§b[跑酷] §a比赛开始！到达终点完成比赛");
+    // Create timer bossbar
+    tell(player, "§b[Parkour] §aRace started! Reach the finish to complete");
     
     sparkles(player);
 }
 
-// ===== 每 tick =====
+// ===== Every Tick =====
 @tick  
 fn race_tick() {
-    // 对每个比赛中的玩家
+    // For each player in a race
     foreach (p in @a) {
         let running: int = scoreboard_get(p, "pk_running");
         if (running == 1) {
-            // 增加时间
+            // Increment time
             scoreboard_add(p, "pk_time", 1);
             
-            // 显示当前时间
+            // Display current time
             let time: int = scoreboard_get(p, "pk_time");
             let seconds: int = time / 20;
             let ms: int = (time % 20) * 5;
-            actionbar(p, "§e⏱ " + seconds + "." + ms + " 秒");
+            actionbar(p, "§e⏱ " + seconds + "." + ms + "s");
             
-            // 检查掉落
+            // Check fall
             check_fall(p);
             
-            // 检查检查点
+            // Check checkpoints
             check_checkpoints(p);
         }
     }
 }
 
 fn check_fall(player: selector) {
-    // 如果玩家低于 FALL_Y，传送回检查点
-    // 使用 execute positioned 检查
+    // If player is below FALL_Y, teleport back to checkpoint
+    // Using execute positioned to check
     execute if entity player[y=..50] run {
         let cp: int = scoreboard_get(player, "pk_checkpoint");
         respawn_at_checkpoint(player, cp);
-        tell(player, "§c掉落！返回检查点 " + cp);
+        tell(player, "§cFell! Returning to checkpoint " + cp);
         angry(player);
     }
 }
@@ -117,35 +117,35 @@ fn check_fall(player: selector) {
 fn check_checkpoints(player: selector) {
     let current_cp: int = scoreboard_get(player, "pk_checkpoint");
     
-    // 检查点 1 (0, 64, 50)
+    // Checkpoint 1 (0, 64, 50)
     if (current_cp == 0) {
         execute if entity player[x=-2..2, y=62..68, z=48..52] run {
             reach_checkpoint(player, 1);
         }
     }
     
-    // 检查点 2 (0, 70, 100)
+    // Checkpoint 2 (0, 70, 100)
     if (current_cp == 1) {
         execute if entity player[x=-2..2, y=68..74, z=98..102] run {
             reach_checkpoint(player, 2);
         }
     }
     
-    // 检查点 3 (0, 75, 150)
+    // Checkpoint 3 (0, 75, 150)
     if (current_cp == 2) {
         execute if entity player[x=-2..2, y=73..79, z=148..152] run {
             reach_checkpoint(player, 3);
         }
     }
     
-    // 检查点 4 (0, 80, 200)
+    // Checkpoint 4 (0, 80, 200)
     if (current_cp == 3) {
         execute if entity player[x=-2..2, y=78..84, z=198..202] run {
             reach_checkpoint(player, 4);
         }
     }
     
-    // 终点 (0, 64, 250)
+    // Finish (0, 64, 250)
     if (current_cp == 4) {
         execute if entity player[x=-2..2, y=62..68, z=248..252] run {
             finish_race(player);
@@ -157,7 +157,7 @@ fn reach_checkpoint(player: selector, cp: int) {
     scoreboard_set(player, "pk_checkpoint", cp);
     
     title(player, "");
-    subtitle(player, "§a检查点 " + cp + " / " + CHECKPOINT_COUNT);
+    subtitle(player, "§aCheckpoint " + cp + " / " + CHECKPOINT_COUNT);
     
     happy(player);
     playsound("minecraft:entity.experience_orb.pickup", "player", player);
@@ -189,45 +189,45 @@ fn finish_race(player: selector) {
     let seconds: int = time / 20;
     let ms: int = (time % 20) * 5;
     
-    // 检查是否是新纪录
+    // Check if it's a new record
     if (best == 0) {
-        // 第一次完成
+        // First completion
         scoreboard_set(player, "pk_best", time);
-        title(player, "§6完成！");
-        subtitle(player, "§e" + seconds + "." + ms + " 秒 §7(首次记录)");
-        announce("§b[跑酷] §f玩家完成比赛！用时 §e" + seconds + "." + ms + " 秒");
+        title(player, "§6Finished!");
+        subtitle(player, "§e" + seconds + "." + ms + "s §7(first record)");
+        announce("§b[Parkour] §fA player finished! Time: §e" + seconds + "." + ms + "s");
     } else {
         if (time < best) {
-            // 新纪录！
+            // New record!
             scoreboard_set(player, "pk_best", time);
-            title(player, "§6新纪录！");
-            subtitle(player, "§e" + seconds + "." + ms + " 秒");
-            announce("§b[跑酷] §6新纪录！§f用时 §e" + seconds + "." + ms + " 秒");
+            title(player, "§6New Record!");
+            subtitle(player, "§e" + seconds + "." + ms + "s");
+            announce("§b[Parkour] §6New Record! §fTime: §e" + seconds + "." + ms + "s");
             totem_effect(player);
         } else {
-            title(player, "§a完成！");
-            subtitle(player, "§e" + seconds + "." + ms + " 秒");
+            title(player, "§aFinished!");
+            subtitle(player, "§e" + seconds + "." + ms + "s");
         }
     }
     
-    // 特效
+    // Effects
     sparkles(player);
     playsound("minecraft:ui.toast.challenge_complete", "player", player);
 }
 
-// ===== 放弃比赛 =====
+// ===== Quit Race =====
 fn quit_race(player: selector) {
     let running: int = scoreboard_get(player, "pk_running");
     if (running == 1) {
         scoreboard_set(player, "pk_running", 0);
-        tell(player, "§c已放弃比赛");
+        tell(player, "§cRace abandoned");
         tp(player, START_X, START_Y, START_Z);
     }
 }
 
-// ===== 查看排行榜 =====
+// ===== View Leaderboard =====
 fn show_leaderboard() {
-    announce("§b===== 跑酷排行榜 =====");
-    // 显示前 5 名 (需要记分板排序)
+    announce("§b===== Parkour Leaderboard =====");
+    // Display top 5 (requires scoreboard sorting)
     scoreboard_display("sidebar", "pk_best");
 }

package/src/index.ts

@@ -35,6 +35,7 @@ export interface CompileOptions {
   typeCheck?: boolean
   filePath?: string
   dce?: boolean
+  mangle?: boolean
 }
 
 export interface CompileResult {
@@ -45,6 +46,7 @@ export interface CompileResult {
   typeErrors?: DiagnosticError[]
   warnings?: Warning[]
   stats?: OptimizationStats
+  sourceMap?: Record<string, string>
 }
 
 /**
@@ -59,6 +61,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
   const shouldOptimize = options.optimize ?? true
   const shouldTypeCheck = options.typeCheck ?? true
   const shouldRunDce = options.dce ?? shouldOptimize
+  const mangle = options.mangle ?? false
   const filePath = options.filePath
   const preprocessed = preprocessSourceWithMetadata(source, { filePath })
   const preprocessedSource = preprocessed.source
@@ -83,7 +86,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
   const ir = lowering.lower(ast)
 
   let optimizedIR: IRModule = ir
-  let generated = generateDatapackWithStats(ir, { optimizeCommands: shouldOptimize })
+  let generated = generateDatapackWithStats(ir, { optimizeCommands: shouldOptimize, mangle })
   let optimizationStats: OptimizationStats | undefined
 
   if (shouldOptimize) {
@@ -105,10 +108,10 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     const copyPropagatedIR: IRModule = { ...ir, functions: copyPropagatedFunctions }
     optimizedIR = { ...ir, functions: deadCodeEliminatedFunctions }
 
-    const baselineGenerated = generateDatapackWithStats(ir, { optimizeCommands: false })
-    const beforeDceGenerated = generateDatapackWithStats(copyPropagatedIR, { optimizeCommands: false })
-    const afterDceGenerated = generateDatapackWithStats(optimizedIR, { optimizeCommands: false })
-    generated = generateDatapackWithStats(optimizedIR, { optimizeCommands: true })
+    const baselineGenerated = generateDatapackWithStats(ir, { optimizeCommands: false, mangle })
+    const beforeDceGenerated = generateDatapackWithStats(copyPropagatedIR, { optimizeCommands: false, mangle })
+    const afterDceGenerated = generateDatapackWithStats(optimizedIR, { optimizeCommands: false, mangle })
+    generated = generateDatapackWithStats(optimizedIR, { optimizeCommands: true, mangle })
 
     stats.deadCodeRemoved =
       countMcfunctionCommands(beforeDceGenerated.files) - countMcfunctionCommands(afterDceGenerated.files)
@@ -124,7 +127,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     optimizationStats = stats
   } else {
     optimizedIR = ir
-    generated = generateDatapackWithStats(ir, { optimizeCommands: false })
+    generated = generateDatapackWithStats(ir, { optimizeCommands: false, mangle })
   }
 
   return {
@@ -135,6 +138,7 @@ export function compile(source: string, options: CompileOptions = {}): CompileRe
     typeErrors,
     warnings: [...dceResult.warnings, ...lowering.warnings],
     stats: optimizationStats,
+    sourceMap: generated.sourceMap,
   }
 }
 

package/src/lowering/index.ts

@@ -17,6 +17,7 @@ import type {
 import type { GlobalVar } from '../ir/types'
 import * as path from 'path'
 import { EVENT_TYPES, getEventParamSpecs, isEventTypeName } from '../events/types'
+import { getBaseSelectorType, areCompatibleTypes, getConcreteSubtypes } from '../types/entity-hierarchy'
 
 // ---------------------------------------------------------------------------
 // Macro-aware builtins (MC 1.20.2+)
@@ -134,11 +135,21 @@ const ENTITY_TO_MC_TYPE: Partial<Record<EntityTypeName, string>> = {
   Creeper: 'minecraft:creeper',
   Spider: 'minecraft:spider',
   Enderman: 'minecraft:enderman',
+  Blaze: 'minecraft:blaze',
+  Witch: 'minecraft:witch',
+  Slime: 'minecraft:slime',
+  ZombieVillager: 'minecraft:zombie_villager',
+  Husk: 'minecraft:husk',
+  Drowned: 'minecraft:drowned',
+  Stray: 'minecraft:stray',
+  WitherSkeleton: 'minecraft:wither_skeleton',
+  CaveSpider: 'minecraft:cave_spider',
   Pig: 'minecraft:pig',
   Cow: 'minecraft:cow',
   Sheep: 'minecraft:sheep',
   Chicken: 'minecraft:chicken',
   Villager: 'minecraft:villager',
+  WanderingTrader: 'minecraft:wandering_trader',
   ArmorStand: 'minecraft:armor_stand',
   Item: 'minecraft:item',
   Arrow: 'minecraft:arrow',
@@ -211,6 +222,15 @@ export class Lowering {
   private intervalCounter: number = 0
   readonly warnings: Warning[] = []
 
+  // Entity type context stack for W_IMPOSSIBLE_AS warnings
+  private entityContextStack: string[] = []
+
+  private currentEntityContext(): string {
+    return this.entityContextStack.length > 0
+      ? this.entityContextStack[this.entityContextStack.length - 1]
+      : 'Entity'
+  }
+
   // Builder state for current function
   private builder!: LoweringBuilder
   private varMap: Map<string, string> = new Map()
@@ -1056,17 +1076,31 @@ export class Lowering {
     }
 
     const mcType = ENTITY_TO_MC_TYPE[cond.entityType]
+    const thenFnName = `${this.currentFn}/then_${this.foreachCounter++}`
+
     if (!mcType) {
-      throw new DiagnosticError(
-        'LoweringError',
-        `Cannot lower entity type check for '${cond.entityType}'`,
-        cond.span ?? stmt.span ?? { line: 0, col: 0 }
-      )
+      // Abstract type — check all concrete subtypes
+      const subtypes = getConcreteSubtypes(cond.entityType)
+      if (subtypes.length === 0) {
+        throw new DiagnosticError(
+          'LoweringError',
+          `Cannot lower entity type check for '${cond.entityType}'`,
+          cond.span ?? stmt.span ?? { line: 0, col: 0 }
+        )
+      }
+      // Use a temp scoreboard variable to OR multiple type checks
+      this.builder.emitRaw(`scoreboard players set __is_result rs:temp 0`)
+      for (const subtype of subtypes) {
+        if (subtype.mcId) {
+          this.builder.emitRaw(`execute if entity ${this.appendTypeFilter(selector, subtype.mcId)} run scoreboard players set __is_result rs:temp 1`)
+        }
+      }
+      this.builder.emitRaw(`execute if score __is_result rs:temp matches 1 run function ${this.namespace}:${thenFnName}`)
+    } else {
+      // Concrete type — single check
+      this.builder.emitRaw(`execute if entity ${this.appendTypeFilter(selector, mcType)} run function ${this.namespace}:${thenFnName}`)
     }
 
-    const thenFnName = `${this.currentFn}/then_${this.foreachCounter++}`
-    this.builder.emitRaw(`execute if entity ${this.appendTypeFilter(selector, mcType)} run function ${this.namespace}:${thenFnName}`)
-
     const savedBuilder = this.builder
     const savedVarMap = new Map(this.varMap)
     const savedBlockPosVars = new Map(this.blockPosVars)
@@ -1243,12 +1277,22 @@ export class Lowering {
     // In foreach body, the binding maps to @s
     this.varMap.set(stmt.binding, '@s')
 
+    // Track entity context for type narrowing
+    const selectorEntityType = getBaseSelectorType(selector)
+    if (selectorEntityType) {
+      this.entityContextStack.push(selectorEntityType)
+    }
+
     this.builder.startBlock('entry')
     this.lowerBlock(stmt.body)
     if (!this.builder.isBlockSealed()) {
       this.builder.emitReturn()
     }
 
+    if (selectorEntityType) {
+      this.entityContextStack.pop()
+    }
+
     const subFn = this.builder.build(subFnName, [], false)
     this.functions.push(subFn)
 
@@ -1397,6 +1441,18 @@ export class Lowering {
     const selector = this.selectorToString(stmt.selector)
     const subFnName = `${this.currentFn}/as_${this.foreachCounter++}`
 
+    // Check for impossible type assertions (W_IMPOSSIBLE_AS)
+    const innerType = getBaseSelectorType(selector)
+    const outerType = this.currentEntityContext()
+    if (innerType && outerType !== 'Entity' && innerType !== 'Entity' && !areCompatibleTypes(outerType, innerType)) {
+      this.warnings.push({
+        message: `Impossible type assertion: @s is ${outerType} but as-block targets ${innerType}`,
+        code: 'W_IMPOSSIBLE_AS',
+        line: stmt.span?.line,
+        col: stmt.span?.col,
+      })
+    }
+
     this.builder.emitRaw(`execute as ${selector} run function ${this.namespace}:${subFnName}`)
 
     // Create sub-function
@@ -1408,12 +1464,21 @@ export class Lowering {
     this.varMap = new Map(savedVarMap)
     this.blockPosVars = new Map(savedBlockPosVars)
 
+    // Track entity context inside as-block
+    if (innerType) {
+      this.entityContextStack.push(innerType)
+    }
+
     this.builder.startBlock('entry')
     this.lowerBlock(stmt.body)
     if (!this.builder.isBlockSealed()) {
       this.builder.emitReturn()
     }
 
+    if (innerType) {
+      this.entityContextStack.pop()
+    }
+
     const subFn = this.builder.build(subFnName, [], false)
     this.functions.push(subFn)
 

package/src/parser/index.ts

@@ -41,11 +41,21 @@ const ENTITY_TYPE_NAMES = new Set<EntityTypeName>([
   'Creeper',
   'Spider',
   'Enderman',
+  'Blaze',
+  'Witch',
+  'Slime',
+  'ZombieVillager',
+  'Husk',
+  'Drowned',
+  'Stray',
+  'WitherSkeleton',
+  'CaveSpider',
   'Pig',
   'Cow',
   'Sheep',
   'Chicken',
   'Villager',
+  'WanderingTrader',
   'ArmorStand',
   'Item',
   'Arrow',
@@ -446,7 +456,16 @@ export class Parser {
       type = { kind: 'named', name: token.kind }
     } else if (token.kind === 'ident') {
       this.advance()
-      type = { kind: 'struct', name: token.value }
+      if (token.value === 'selector' && this.check('<')) {
+        this.advance() // consume <
+        const entityType = this.expect('ident').value
+        this.expect('>')
+        type = { kind: 'selector', entityType }
+      } else if (token.value === 'selector') {
+        type = { kind: 'selector' }
+      } else {
+        type = { kind: 'struct', name: token.value }
+      }
     } else {
       this.error(`Expected type, got '${token.kind}'`)
     }

package/src/typechecker/index.ts

@@ -31,11 +31,21 @@ const ENTITY_HIERARCHY: Record<EntityTypeName, EntityTypeName | null> = {
   'Creeper': 'HostileMob',
   'Spider': 'HostileMob',
   'Enderman': 'HostileMob',
+  'Blaze': 'HostileMob',
+  'Witch': 'HostileMob',
+  'Slime': 'HostileMob',
+  'ZombieVillager': 'HostileMob',
+  'Husk': 'HostileMob',
+  'Drowned': 'HostileMob',
+  'Stray': 'HostileMob',
+  'WitherSkeleton': 'HostileMob',
+  'CaveSpider': 'HostileMob',
   'Pig': 'PassiveMob',
   'Cow': 'PassiveMob',
   'Sheep': 'PassiveMob',
   'Chicken': 'PassiveMob',
   'Villager': 'PassiveMob',
+  'WanderingTrader': 'PassiveMob',
   'ArmorStand': 'entity',
   'Item': 'entity',
   'Arrow': 'entity',
@@ -53,6 +63,24 @@ const MC_TYPE_TO_ENTITY: Record<string, EntityTypeName> = {
   'minecraft:spider': 'Spider',
   'enderman': 'Enderman',
   'minecraft:enderman': 'Enderman',
+  'blaze': 'Blaze',
+  'minecraft:blaze': 'Blaze',
+  'witch': 'Witch',
+  'minecraft:witch': 'Witch',
+  'slime': 'Slime',
+  'minecraft:slime': 'Slime',
+  'zombie_villager': 'ZombieVillager',
+  'minecraft:zombie_villager': 'ZombieVillager',
+  'husk': 'Husk',
+  'minecraft:husk': 'Husk',
+  'drowned': 'Drowned',
+  'minecraft:drowned': 'Drowned',
+  'stray': 'Stray',
+  'minecraft:stray': 'Stray',
+  'wither_skeleton': 'WitherSkeleton',
+  'minecraft:wither_skeleton': 'WitherSkeleton',
+  'cave_spider': 'CaveSpider',
+  'minecraft:cave_spider': 'CaveSpider',
   'pig': 'Pig',
   'minecraft:pig': 'Pig',
   'cow': 'Cow',
@@ -63,6 +91,8 @@ const MC_TYPE_TO_ENTITY: Record<string, EntityTypeName> = {
   'minecraft:chicken': 'Chicken',
   'villager': 'Villager',
   'minecraft:villager': 'Villager',
+  'wandering_trader': 'WanderingTrader',
+  'minecraft:wandering_trader': 'WanderingTrader',
   'armor_stand': 'ArmorStand',
   'minecraft:armor_stand': 'ArmorStand',
   'item': 'Item',