@orusteam/solariscore 2.5.4 → 2.5.6

package/dist/block/components/EggBlockComponent.d.ts

@@ -1,6 +1,11 @@
-import { BlockComponentRandomTickEvent, BlockCustomComponent, CustomComponentParameters } from "@minecraft/server";
+import { BlockComponentEntityFallOnEvent, BlockComponentPlayerBreakEvent, BlockComponentPlayerInteractEvent, BlockComponentPlayerPlaceBeforeEvent, BlockComponentRandomTickEvent, BlockComponentStepOnEvent, BlockCustomComponent, CustomComponentParameters } from "@minecraft/server";
 export declare class EggBlockComponent implements BlockCustomComponent {
     constructor();
+    beforeOnPlayerPlace({ block, player }: BlockComponentPlayerPlaceBeforeEvent, { params }: CustomComponentParameters): void;
+    onEntityFallOn({ block, entity }: BlockComponentEntityFallOnEvent, { params }: CustomComponentParameters): void;
+    onPlayerBreak({ block, brokenBlockPermutation, player }: BlockComponentPlayerBreakEvent): void;
+    onPlayerInteract({ block, dimension, player }: BlockComponentPlayerInteractEvent, { params }: CustomComponentParameters): void;
     onRandomTick({ block, dimension }: BlockComponentRandomTickEvent, { params }: CustomComponentParameters): void;
+    onStepOn({ block, entity }: BlockComponentStepOnEvent, { params }: CustomComponentParameters): void;
 }
 //# sourceMappingURL=EggBlockComponent.d.ts.map

package/dist/block/components/EggBlockComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EggBlockComponent.d.ts","sourceRoot":"","sources":["../../../src/block/components/EggBlockComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,yBAAyB,EAAS,MAAM,mBAAmB,CAAC;AAoB1H,qBAAa,iBAAkB,YAAW,oBAAoB;;IAK1D,YAAY,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,6BAA6B,EAAE,EAAE,MAAM,EAAE,EAAE,yBAAyB;CAmB1G"}
+{"version":3,"file":"EggBlockComponent.d.ts","sourceRoot":"","sources":["../../../src/block/components/EggBlockComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,+BAA+B,EAAE,8BAA8B,EAAE,iCAAiC,EAAE,oCAAoC,EAAE,6BAA6B,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,yBAAyB,EAAqD,MAAM,mBAAmB,CAAC;AA+DlV,qBAAa,iBAAkB,YAAW,oBAAoB;;IAU1D,mBAAmB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,oCAAoC,EAAE,EAAE,MAAM,EAAE,EAAE,yBAAyB;IAWlH,cAAc,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,+BAA+B,EAAE,EAAE,MAAM,EAAE,EAAE,yBAAyB;IASxG,aAAa,CAAC,EAAE,KAAK,EAAE,sBAAsB,EAAE,MAAM,EAAE,EAAE,8BAA8B;IAoBvF,gBAAgB,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,iCAAiC,EAAE,EAAE,MAAM,EAAE,EAAE,yBAAyB;IAsBvH,YAAY,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,6BAA6B,EAAE,EAAE,MAAM,EAAE,EAAE,yBAAyB;IAyBvG,QAAQ,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,yBAAyB,EAAE,EAAE,MAAM,EAAE,EAAE,yBAAyB;CAQ/F"}

package/dist/index.js

@@ -571,6 +571,15 @@ var ChunkUtil = class _ChunkUtil {
 
 // src/utils/ColorUtil.ts
 var ColorUtil = class {
+  static colorToRgb(color) {
+    if (typeof color === "string") {
+      return this.hexToRgb(color);
+    }
+    if (Array.isArray(color)) {
+      return this.tupleToRgb(color);
+    }
+    return color;
+  }
   static hexToRgb(hex) {
     var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
     return {
@@ -579,6 +588,16 @@ var ColorUtil = class {
       blue: result ? parseInt(result[3], 16) / 255 : 0
     };
   }
+  static rgbToTuple(rgb) {
+    return [rgb.red, rgb.green, rgb.blue];
+  }
+  static tupleToRgb(tuple) {
+    return {
+      red: tuple[0],
+      green: tuple[1],
+      blue: tuple[2]
+    };
+  }
 };
 
 // src/utils/DateUtil.ts
@@ -4253,31 +4272,125 @@ var DoorBlockComponent = class {
 };
 
 // src/block/components/EggBlockComponent.ts
-import { world as world2 } from "@minecraft/server";
-function canCrack() {
-  const timeOfDay = world2.getTimeOfDay();
-  if (timeOfDay >= 21600 && timeOfDay <= 22550) return true;
+import { EquipmentSlot as EquipmentSlot3, GameMode as GameMode3, system as system4, world as world2 } from "@minecraft/server";
+var FALL_BREAK_CHANCE = 1 / 3;
+var STEP_BREAK_CHANCE = 1 / 100;
+function canCrack(block, eggBlockParams) {
+  const { hatch_only_at_night, nest_block } = eggBlockParams;
+  if (nest_block && block.below()?.typeId !== nest_block) {
+    return false;
+  }
+  if (hatch_only_at_night) {
+    const timeOfDay = world2.getTimeOfDay();
+    if (timeOfDay >= 21600 && timeOfDay <= 22550) {
+      return true;
+    }
+  }
   return Math.random() < 2e-3;
 }
+function tryBreakEgg(block, eggBlockParams) {
+  if (eggBlockParams.sensitive) {
+    const { permutation } = block;
+    const location = block.center();
+    const eggCount = Number(permutation.getState("orusteam:egg_count"));
+    if (eggCount <= 0) {
+      block.dimension.runCommand(`setblock ${location.x} ${location.y} ${location.z} air [] destroy`);
+      return;
+    }
+    const newPermutation = permutation.withState("orusteam:egg_count", eggCount - 1);
+    block.setPermutation(newPermutation);
+    block.dimension.playSound(eggBlockParams.break_sound ?? "dig.stone", location);
+  }
+}
 var EggBlockComponent = class {
   constructor() {
+    this.beforeOnPlayerPlace = this.beforeOnPlayerPlace.bind(this);
+    this.onEntityFallOn = this.onEntityFallOn.bind(this);
+    this.onPlayerBreak = this.onPlayerBreak.bind(this);
+    this.onPlayerInteract = this.onPlayerInteract.bind(this);
     this.onRandomTick = this.onRandomTick.bind(this);
+    this.onStepOn = this.onStepOn.bind(this);
+  }
+  beforeOnPlayerPlace({ block, player }, { params }) {
+    if (player) {
+      const { nest_block } = params;
+      const bellowBlock = block.below();
+      if (bellowBlock?.typeId === nest_block) {
+        const location = block.center();
+        system4.run(() => block.dimension.spawnParticle("minecraft:crop_growth_emitter", location));
+      }
+    }
+  }
+  onEntityFallOn({ block, entity }, { params }) {
+    if (entity) {
+      const eggBlockParams = params;
+      if (!eggBlockParams.ignored_entities?.includes(entity?.typeId) && Math.random() < FALL_BREAK_CHANCE) {
+        tryBreakEgg(block, eggBlockParams);
+      }
+    }
+  }
+  onPlayerBreak({ block, brokenBlockPermutation, player }) {
+    if (player && player.getGameMode() === GameMode3.Survival) {
+      const location = block.center();
+      const eggCount = Number(brokenBlockPermutation.getState("orusteam:egg_count"));
+      const mainHand = EntityUtil.getEquippedItem(player, EquipmentSlot3.Mainhand);
+      const items = [];
+      for (let i = 0; i < eggCount; i++) {
+        const itemStack = world2.getLootTableManager().generateLootFromBlockPermutation(brokenBlockPermutation, mainHand);
+        if (itemStack) {
+          items.push(...itemStack);
+        }
+      }
+      for (const itemStack of items) {
+        block.dimension.spawnItem(itemStack, location);
+      }
+    }
+  }
+  onPlayerInteract({ block, dimension, player }, { params }) {
+    if (player) {
+      const mainHand = EntityUtil.getEquippedItem(player, EquipmentSlot3.Mainhand);
+      if (mainHand?.typeId === block.typeId) {
+        const { add_egg_sound, max_eggs_per_block } = params;
+        const { permutation } = block;
+        let eggCount = Number(permutation.getState("orusteam:egg_count"));
+        if (++eggCount >= (max_eggs_per_block ?? 1)) {
+          return;
+        }
+        const newPermutation = permutation.withState("orusteam:egg_count", eggCount);
+        const location = block.center();
+        block.setPermutation(newPermutation);
+        dimension.playSound(add_egg_sound ?? "dig.stone", location);
+        ItemUtil.decrementStack(player);
+      }
+    }
   }
   onRandomTick({ block, dimension }, { params }) {
-    const { crack_sound, drop_sound, entity_id } = params;
-    if (canCrack()) {
+    const eggBlockParams = params;
+    const { crack_sound, drop_sound, entity_id } = eggBlockParams;
+    if (canCrack(block, eggBlockParams)) {
       const { permutation } = block;
       const location = block.center();
-      const stage = String(permutation.getState("cracked_state"));
-      if (stage === "max_cracked") {
-        dimension.spawnEntity(entity_id, location);
-        dimension.playSound(drop_sound ?? "block.turtle_egg.drop", location);
+      const crackedState = String(permutation.getState("orusteam:cracked_state"));
+      if (crackedState === "max_cracked") {
+        const eggCount = Number(permutation.getState("orusteam:egg_count"));
+        dimension.playSound(drop_sound ?? "", location);
         dimension.runCommand(`setblock ${location.x} ${location.y} ${location.z} air [] destroy`);
+        for (let i = 0; i <= eggCount; i++) {
+          dimension.spawnEntity(entity_id, location);
+        }
         return;
       }
-      const newPermutation = permutation.withState("cracked_state", stage === "no_cracks" ? "cracked" : "max_cracked");
+      const newPermutation = permutation.withState("orusteam:cracked_state", crackedState === "no_cracks" ? "cracked" : "max_cracked");
       block.setPermutation(newPermutation);
-      dimension.playSound(crack_sound ?? "block.turtle_egg.crack", location);
+      dimension.playSound(crack_sound ?? "", location);
+    }
+  }
+  onStepOn({ block, entity }, { params }) {
+    if (entity) {
+      const eggBlockParams = params;
+      if (!eggBlockParams.ignored_entities?.includes(entity?.typeId) && Math.random() < STEP_BREAK_CHANCE) {
+        tryBreakEgg(block, eggBlockParams);
+      }
     }
   }
 };
@@ -4367,7 +4480,7 @@ var ParticleEmitterBlockComponent = class {
 };
 
 // src/block/components/SaplingBlockComponent.ts
-import { EquipmentSlot as EquipmentSlot3, GameMode as GameMode3 } from "@minecraft/server";
+import { EquipmentSlot as EquipmentSlot4, GameMode as GameMode4 } from "@minecraft/server";
 function tryPlaceFeature(blockSapling, params) {
   const { feature } = params;
   const featurePlaced = blockSapling.dimension.placeFeature(feature, blockSapling.location);
@@ -4382,13 +4495,13 @@ var SaplingBlockComponent = class {
   }
   onPlayerInteract({ block, player }, { params }) {
     if (player) {
-      const mainhand = EntityUtil.getEquippedItem(player, EquipmentSlot3.Mainhand);
+      const mainhand = EntityUtil.getEquippedItem(player, EquipmentSlot4.Mainhand);
       if (!mainhand || mainhand.typeId !== "minecraft:bone_meal") return;
       const { permutation } = block;
       const ageBit = Number(permutation.getState("dbe:age_bit"));
       applyGrowthEffects(block);
       ItemUtil.decrementStack(player);
-      if (player.getGameMode() === GameMode3.Creative) {
+      if (player.getGameMode() === GameMode4.Creative) {
         tryPlaceFeature(block, params);
         return;
       }
@@ -4429,7 +4542,7 @@ var DurabilitySensorItemComponent = class {
 };
 
 // src/misc/DynamicDatabase.ts
-import { Entity as Entity3, system as system4, World as World2 } from "@minecraft/server";
+import { Entity as Entity3, system as system5, World as World2 } from "@minecraft/server";
 var DynamicDatabase = class _DynamicDatabase {
   constructor(provider, dataId) {
     this.provider = provider;
@@ -4509,7 +4622,7 @@ var DynamicDatabase = class _DynamicDatabase {
   saveOnNextTick() {
     if (!this.isSaving) {
       this.isSaving = true;
-      system4.runTimeout(() => {
+      system5.runTimeout(() => {
         this.save();
         this.isSaving = false;
       }, 2);

package/dist/utils/ColorUtil.d.ts

@@ -1,5 +1,11 @@
 import { RGB } from "@minecraft/server";
-export declare class ColorUtil {
+type RGBTuple = [r: number, g: number, b: number];
+type Color = RGB | RGBTuple | string;
+declare class ColorUtil {
+    static colorToRgb(color: Color): RGB;
     static hexToRgb(hex: string): RGB;
+    static rgbToTuple(rgb: RGB): RGBTuple;
+    static tupleToRgb(tuple: RGBTuple): RGB;
 }
+export { Color, ColorUtil, RGBTuple };
 //# sourceMappingURL=ColorUtil.d.ts.map

package/dist/utils/ColorUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ColorUtil.d.ts","sourceRoot":"","sources":["../../src/utils/ColorUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAIxC,qBAAa,SAAS;IAClB,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;CAQpC"}
+{"version":3,"file":"ColorUtil.d.ts","sourceRoot":"","sources":["../../src/utils/ColorUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAIxC,KAAK,QAAQ,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AAClD,KAAK,KAAK,GAAG,GAAG,GAAG,QAAQ,GAAG,MAAM,CAAC;AAIrC,cAAM,SAAS;IACX,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,GAAG;IAYpC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG;IASjC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ;IAIrC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,GAAG,GAAG;CAO1C;AAID,OAAO,EACH,KAAK,EACL,SAAS,EACT,QAAQ,EACX,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orusteam/solariscore",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",