feat(c4): add defuser item and improve C4 mechanics

jsconfig.json

@@ -1,14 +1,16 @@
 {
   "$schema": "https://www.schemastore.org/jsconfig.json",
   "compilerOptions": {
-    "lib": ["ES5", "ES2015"],
-    "target": "ES2015",
     "module": "commonjs",
-    "strict": true,
+    "skipDefaultLibCheck": true,
-    "checkJs": true,
+    "moduleResolution": "classic",
+    "composite": true,
+    "isolatedModules": true,
+    "lib": ["ES5", "ES2015"],
+    "incremental": true,
+    "target": "ES2015",
     "skipLibCheck": true,
-    "noImplicitAny": true,
+    "rootDir": ".",
-    "esModuleInterop": true,
+    "allowJs": true
-    "forceConsistentCasingInFileNames": true
   }
 }

src/assets/kubejs/lang/en_us.json

@@ -1,5 +1,6 @@
 {
   "block.kubejs.c4_target": "C4 Target Block",
   "block.kubejs.c4": "C4",
-  "item.kubejs.c4_item": "C4"
+  "item.kubejs.c4_item": "C4",
+  "item.kubejs.c4_defuser": "C4 Defuser"
 }

src/assets/kubejs/lang/zh_cn.json

@@ -1,5 +1,6 @@
 {
   "block.kubejs.c4_target": "C4 Target Block",
   "block.kubejs.c4": "C4",
-  "item.kubejs.c4_item": "C4"
+  "item.kubejs.c4_item": "C4",
+  "item.kubejs.c4_defuser": "C4 Defuser"
 }

src/server_scripts/C4.js

@@ -1 +1,45 @@
-BlockEvents.broken((event) => {});
+/**
+ * C4 Server Scripts
+ * Handles C4 block break event to cancel explosion
+ */
+
+BlockEvents.broken((event) => {
+    const { block, server } = event;
+
+    // Check if the broken block is a C4
+    if (block.id !== "kubejs:c4") {
+        return;
+    }
+
+    // Get the toExplosionC4Map from global
+    /** @type {{[key:string]: boolean | null}} */
+    const toExplosionC4Map = /** @type {any} */ (global["toExplosionC4Map"]);
+
+    if (toExplosionC4Map === undefined || toExplosionC4Map === null) {
+        console.warn("C4 Server: toExplosionC4Map is not available");
+        return;
+    }
+
+    // Get the block position string
+    const blockPosString = block.pos.toShortString();
+
+    // Check if this C4 is in the explosion map
+    if (toExplosionC4Map[blockPosString] === true) {
+        // Set to null to cancel the explosion
+        // The explosion timer checks for === null to skip explosion
+        toExplosionC4Map[blockPosString] = null;
+
+        // Notify players that C4 has been defused
+        if (server !== null) {
+            server.players.forEach((player) => {
+                player.tell(
+                    /** @type {any} */ (
+                        Component.literal("§aC4已被拆除，爆炸已取消！")
+                    ),
+                );
+            });
+        } else {
+            console.warn("C4 Server: Server is null");
+        }
+    }
+});

src/startup_scripts/C4.js

@@ -6,7 +6,7 @@ const $ServerStartedEvent = Java.loadClass(
     "net.minecraftforge.event.server.ServerStartedEvent",
 );
 
-const C4_EXPLOSION_TIME = 7 * 20; // 7 seconds in ticks
+const C4_EXPLOSION_TIME = 10 * 20; // 7 seconds in ticks
 const C4_EXPLOSION_POWER = 128; // Explosion power (TNT is 4)
 const C4_USE_TIME = 5 * 20; // 5 seconds in ticks
 
@@ -158,13 +158,13 @@ StartupEvents.registry("block", (event) => {
         .soundType(SoundType.WOOD) // Set a material (affects the sounds and some properties)
         .unbreakable()
         .textureAll("minecraft:block/target_top");
-});
 
-StartupEvents.registry("block", (event) => {
     event
         .create("c4") // Create a new block
         .soundType(SoundType.GRASS) // Set a material (affects the sounds and some properties)
         .hardness(1) // Set hardness (affects mining time)
+        .requiresTool(true)
+        .tagBlock("minecraft:mineable/axe") //can be mined faster with an axe
         .resistance(1) // Set resistance (to explosions, etc)
         .noItem() // Player cannot hold or place the item
         .noDrops()
@@ -229,6 +229,8 @@ StartupEvents.registry("item", (event) => {
             if (!entity.isPlayer() || entity.uuid === undefined) return;
             delete lastPlayerInfoMap[entity.uuid.toString()];
         });
+
+    event.create("c4_defuser", "axe").attackDamageBaseline(0).maxDamage(0);
 });
 
 // ==================== Client Side Logic ====================
@@ -258,15 +260,7 @@ ClientEvents.init(() => {
 });
 
 // Send data to the server when the key is pressed
-ForgeEvents.onEvent(
+ForgeEvents.onEvent($TickEvent$PlayerTickEvent, (event) => {
-    // @ts-ignore
-    $TickEvent$PlayerTickEvent,
-    /**
-     *
-     * @param {Internal.TickEvent$PlayerTickEvent} event
-     * @returns
-     */
-    (event) => {
     if (operationKeyMapping === undefined) {
         console.warn("Not in client platform");
         return event;
@@ -285,8 +279,7 @@ ForgeEvents.onEvent(
             console.warn("EventBus is not available");
         }
     }
-    },
+});
-);
 
 // ==================== Server Side Logic ====================
 
@@ -383,12 +376,15 @@ function handleC4Activated(event) {
     let remainingSeconds = explosionTime / 20;
     server.scheduleRepeatingInTicks(20, (scheduledEvent) => {
         // Assert C4 exsiting
-        if (toExplosionC4Map[newBlockPosString] === null) return;
+        if (toExplosionC4Map[newBlockPosString] === null) {
+            scheduledEvent.clear();
+            return;
+        }
 
         remainingSeconds -= 1;
         if (remainingSeconds <= 0) {
             scheduledEvent.clear();
-            return scheduledEvent;
+            return;
         }
 
         server.players.forEach((p) => {
@@ -416,15 +412,7 @@ function handleC4Activated(event) {
     });
 }
 
-ForgeEvents.onEvent(
+ForgeEvents.onEvent($ServerStartedEvent, (event) => {
-    //@ts-ignore
-    $ServerStartedEvent,
-    /**
-     *
-     * @param {Internal.ServerStartedEvent} event
-     * @returns
-     */
-    (event) => {
     /**
      * WARNING: Must Do!!!
      * Because Kubejs scheduler is not stable
@@ -446,5 +434,4 @@ ForgeEvents.onEvent(
     eventBus.register("C4Activated", handleC4Activated);
     eventBus.register("C4UseStarted", handleC4UseStarted);
     console.log("C4 Handler: Registered C4Activated event handler");
-    },
+});
-);