simplified-mojang-jsons 0.0.20 → 0.0.22

package/dist/builders/behaviors/entities/EntityTemplateBuilder.d.ts

@@ -63,20 +63,28 @@ export declare class FinalEntityBuilderTemplate extends BehaviorEntityBuilder {
      */
     private byID;
     /**
-     * Metodo auxiliar que agrega componentes a una lista de mapas objectivo garantizando que no existan previamente.
-     * @param {BPEntityComponentsMap} target Mapa destino donde se insertaran los nuevos componentes.
+     * Metodo auxiliar que agrega componentes a un mapa objectivo. Si el componente ya existe en el mapa, fusiona sus datos con los del nuevo en vez de reemplazarlo.
+     * @param {BPEntityComponentsMap} target Mapa destiono a considerar.
      * @param {(readonly BPEntityComponent[] | undefined)} list Lista de componentes a incorporar.
      * @param {string} where Contexto u origen de la ejecucion para mensajes de error.
-     * @param {string} replaceWith Sugerencia del metodo o alternativa recomendada cuando ya existe la clave.
      * @returns {void}
      *
-     * @throws {Error} Marcara error si, algun componente de la lista colisiona con una clave existente en el parametro target.
-     * @throws {Error} Marcara error si, la lista contiene componente duplicados entre si.
+     * @throws {Error} Marcara error si, la lista contiene componentes duplicados entre si.
      *
-     * @author HaJuegos - 01-10-2026
+     * @author HaJuegos - 12-11-2026
+     * @private
+     */
+    private addMerge;
+    /**
+     * Metodo auxiliar que fusiona dos componentes con el mismo ID en uno solo. Los objectos se mezclan de forma recursiva.
+     * @param {BPEntityComponent} a Componente existente en la plantilla base.
+     * @param {BPEntityComponent} b Componente nuevo con los datos adiccionales a fusionar.
+     * @returns {BPEntityComponent} Devuelve un componente con el mismo ID cuyo build contiene los datos fusionados.
+     * @returns {void}
+     * @author HaJuegos - 12-11-2026
      * @private
      */
-    private addUnique;
+    private mergeComp;
     /**
      * Metodo auxiliar que examina de manera recursiva la estructura de eventos a verificar de los grupos de componentes existan y que no tengan duplicados.
      * @param {LooseEvents} events Estructura o mapa de eventos a analizar.

package/dist/builders/behaviors/entities/EntityTemplateBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityTemplateBuilder.d.ts","sourceRoot":"","sources":["../../../../src/builders/behaviors/entities/EntityTemplateBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,iBAAiB,EAAqD,iBAAiB,EAAE,sBAAsB,EAAE,UAAU,EAAe,cAAc,EAAE,QAAQ,EAAE,MAAM,oDAAoD,CAAC;AAC3R,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD;;;;;GAKG;AACH,qBAAa,0BAA2B,SAAQ,qBAAqB;IACjE;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IAEzD;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwD;IAEjF;;;;;;OAMG;IACH,YAAa,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAmI/C;IAED;;;;;OAKG;IACI,UAAU,IAAI,MAAM,CAE1B;IAED;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,QAAQ;IAwBhB;;;;;;;;OAQG;IACH,OAAO,CAAC,IAAI;IAcZ;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,SAAS;IAUjB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,cAAc;IAoCtB;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO;IAaf;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK;CAmDhB;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC1B,KAAK,CAAC,KAAK,SAAS,SAAS,iBAAiB,EAAE,EAChD,KAAK,CAAC,EAAE,SAAS,sBAAsB,EACvC,EAAE,SAAS,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAC9C,GAAG,EAAE,qBAAqB,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,IAEnC,KAAK,CAAC,EAAE,SAAS,SAAS,iBAAiB,EAAE,GAAG,EAAE,EAClD,KAAK,CAAC,EAAE,SAAS,sBAAsB,GAAG,EAAE,SACxC,0BAA0B,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAAQ,0BAA0B,CAG9F"}
+{"version":3,"file":"EntityTemplateBuilder.d.ts","sourceRoot":"","sources":["../../../../src/builders/behaviors/entities/EntityTemplateBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,iBAAiB,EAAqD,iBAAiB,EAAE,sBAAsB,EAAE,UAAU,EAAe,cAAc,EAAE,QAAQ,EAAE,MAAM,oDAAoD,CAAC;AAC3R,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD;;;;;GAKG;AACH,qBAAa,0BAA2B,SAAQ,qBAAqB;IACjE;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IAEzD;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwD;IAEjF;;;;;;OAMG;IACH,YAAa,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAsI/C;IAED;;;;;OAKG;IACI,UAAU,IAAI,MAAM,CAE1B;IAED;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,QAAQ;IAwBhB;;;;;;;;OAQG;IACH,OAAO,CAAC,IAAI;IAcZ;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,QAAQ;IAMhB;;;;;;;;OAQG;IACH,OAAO,CAAC,SAAS;IAuBjB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,cAAc;IAoCtB;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO;IAaf;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK;CAmDhB;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC1B,KAAK,CAAC,KAAK,SAAS,SAAS,iBAAiB,EAAE,EAChD,KAAK,CAAC,EAAE,SAAS,sBAAsB,EACvC,EAAE,SAAS,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,EAC9C,GAAG,EAAE,qBAAqB,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,IAEnC,KAAK,CAAC,EAAE,SAAS,SAAS,iBAAiB,EAAE,GAAG,EAAE,EAClD,KAAK,CAAC,EAAE,SAAS,sBAAsB,GAAG,EAAE,SACxC,0BAA0B,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAAQ,0BAA0B,CAG9F"}

package/dist/index.js

@@ -13485,7 +13485,7 @@ var FinalEntityBuilderTemplate = class extends BehaviorEntityBuilder {
         delete comps[id];
       }
     }
-    this.addUnique(comps, over.add?.components, `${where} add.components`, "components");
+    this.addMerge(comps, over.add?.components, `${where} add.components`);
     const compsGroups = {};
     if (!over.clearAllData) {
       for (const id of Object.keys(over.componentsGroups ?? {})) {
@@ -13524,7 +13524,7 @@ var FinalEntityBuilderTemplate = class extends BehaviorEntityBuilder {
     }
     for (const [id, list] of Object.entries(over.add?.componentsGroups ?? {})) {
       compsGroups[id] ?? (compsGroups[id] = {});
-      this.addUnique(compsGroups[id], list, `${where} add.componentsGroups."${id}"`, `componentsGroups."${id}"`);
+      this.addMerge(compsGroups[id], list, `${where} add.componentsGroups."${id}"`);
     }
     const baseEvents = over.clearAllData ? {} : this.patchMap(def.events, over.events, `${where} events`, BPEntityDefaultEventsNames);
     const events = { ...baseEvents };
@@ -13543,9 +13543,11 @@ var FinalEntityBuilderTemplate = class extends BehaviorEntityBuilder {
     }
     for (const [name, event] of Object.entries(over.add?.events ?? {})) {
       if (!over.clearAllData && name in events) {
-        throw new Error(`${where} add.events: el evento "${name}" ya existe en la plantilla base. Usa events para reemplazarlo de la plantilla base.`);
+        const seq = (e) => Object.keys(e).length == 1 && Array.isArray(e.sequence) ? e.sequence : [e];
+        events[name] = { sequence: [...seq(events[name]), ...seq(event)] };
+      } else {
+        events[name] = event;
       }
-      events[name] = event;
     }
     this.validateEvents(events, Object.keys(compsGroups), where, !def.id.startsWith("minecraft:"));
     this.setDefaultComponents(Object.values(comps));
@@ -13614,27 +13616,50 @@ var FinalEntityBuilderTemplate = class extends BehaviorEntityBuilder {
     return out;
   }
   /**
-   * Metodo auxiliar que agrega componentes a una lista de mapas objectivo garantizando que no existan previamente.
-   * @param {BPEntityComponentsMap} target Mapa destino donde se insertaran los nuevos componentes.
-   * @param {(readonly BPEntityComponent[] | undefined)} list Lista de componentes a incorporar. 
+   * Metodo auxiliar que agrega componentes a un mapa objectivo. Si el componente ya existe en el mapa, fusiona sus datos con los del nuevo en vez de reemplazarlo.
+   * @param {BPEntityComponentsMap} target Mapa destiono a considerar. 
+   * @param {(readonly BPEntityComponent[] | undefined)} list Lista de componentes a incorporar.
    * @param {string} where Contexto u origen de la ejecucion para mensajes de error.
-   * @param {string} replaceWith Sugerencia del metodo o alternativa recomendada cuando ya existe la clave.
    * @returns {void}
    * 
-   * @throws {Error} Marcara error si, algun componente de la lista colisiona con una clave existente en el parametro target.
-   * @throws {Error} Marcara error si, la lista contiene componente duplicados entre si.
+   * @throws {Error} Marcara error si, la lista contiene componentes duplicados entre si.
    * 
-   * @author HaJuegos - 01-10-2026
+   * @author HaJuegos - 12-11-2026 
    * @private
    */
-  addUnique(target, list, where, replaceWith) {
+  addMerge(target, list, where) {
     for (const [id, comp] of Object.entries(this.byID(list, where))) {
-      if (id in target) {
-        throw new Error(`${where}: "${id}" ya existe. Usa ${replaceWith} para reemplazarlo.`);
-      }
-      target[id] = comp;
+      target[id] = id in target ? this.mergeComp(target[id], comp) : comp;
     }
   }
+  /**
+   * Metodo auxiliar que fusiona dos componentes con el mismo ID en uno solo. Los objectos se mezclan de forma recursiva.
+   * @param {BPEntityComponent} a Componente existente en la plantilla base.
+   * @param {BPEntityComponent} b Componente nuevo con los datos adiccionales a fusionar.
+   * @returns {BPEntityComponent} Devuelve un componente con el mismo ID cuyo build contiene los datos fusionados.
+   * @returns {void}
+   * @author HaJuegos - 12-11-2026 
+   * @private
+   */
+  mergeComp(a, b) {
+    const id = a.idComp;
+    const merge = (x, y) => {
+      if (Array.isArray(x) && Array.isArray(y)) {
+        return [...x, ...y];
+      }
+      ;
+      if (x && y && typeof x == "object" && typeof y == "object" && !Array.isArray(x) && !Array.isArray(y)) {
+        const out = { ...x };
+        for (const k of Object.keys(y)) {
+          out[k] = k in x ? merge(x[k], y[k]) : y[k];
+        }
+        ;
+        return out;
+      }
+      return y;
+    };
+    return { idComp: id, build: () => ({ [id]: merge(a.build()[id], b.build()[id]) }) };
+  }
   /**
    * Metodo auxiliar que examina de manera recursiva la estructura de eventos a verificar de los grupos de componentes existan y que no tengan duplicados.
    * @param {LooseEvents} events Estructura o mapa de eventos a analizar.
@@ -219619,34 +219644,90 @@ var PlayerEntity = createRPEntityClient({
     },
     scripts: {
       scale: "0.9375",
+      variables: {
+        "variable.fpMeleeSpearUseAttachableRotationZ": "public",
+        "variable.tpMeleeSpearUseAttachableRotationZ": "public",
+        "variable.fpMeleeSpearAttackAttachableRotationZ": "public",
+        "variable.tpMeleeSpearAttackAttachablePositionZ": "public",
+        "variable.attackTime": "public",
+        "variable.itemUseNormalized": "public"
+      },
       initialize: [
         `${MoLang.variable("is_holding_right")} = 0.0;`,
         `${MoLang.variable("is_blinking")} = 0.0;`,
         `${MoLang.variable("last_blink_time")} = 0.0;`,
-        `${MoLang.variable("hand_bob")} = 0.0;`
+        `${MoLang.variable("hand_bob")} = 0.0;`,
+        `${MoLang.variable("melee_spear_java_to_bedrock_scale")} = 40.0;`
       ],
       preAnimation: [
         `${MoLang.variable("helmet_layer_visible")} = !${MoLang.hasHeadGear()};`,
         `${MoLang.variable("leg_layer_visible")} = 1.0;`,
         `${MoLang.variable("boot_layer_visible")} = 1.0;`,
         `${MoLang.variable("chest_layer_visible")} = 1.0;`,
-        "variable.attack_body_rot_y = Math.sin(360*Math.sqrt(variable.attack_time)) * 5.0;",
-        `${MoLang.variable("tcos0")} = (${MoLang.cos(`${MoLang.modifiedDistanceMoved()} * 38.17`)} * ${MoLang.modifiedMoveSpeed()} / ${MoLang.variable("gliding_speed_value")}) * 57.3;`,
-        `${MoLang.variable("first_person_rotation_factor")} = ${MoLang.sin(`(1 - ${MoLang.variable("attack_time")}) * 180.0`)};`,
+        `${MoLang.variable("attack_body_rot_y")} = Math.sin(360 * Math.sqrt(${MoLang.variable("attack_time")})) * 10.0;`,
+        `${MoLang.variable("tcos0")} = ${MoLang.cos(`${MoLang.modifiedDistanceMoved()} * 38.17`)} * ${MoLang.modifiedMoveSpeed()} / ${MoLang.variable("gliding_speed_value")} * 57.3;`,
+        `${MoLang.variable("first_person_item_rotation_factor")} = ${MoLang.sin(`(1 - ${MoLang.variable("attack_time")}) * 180.0`)};`,
         `${MoLang.variable("hand_bob")} = ${MoLang.lifeTime()} < 0.01 ? 0.0 : ${MoLang.variable("hand_bob")} + ((${MoLang.isOnGround()} && ${MoLang.isAlive()} ? ${MoLang.max(0, MoLang.min(MoLang.sqrt(`${MoLang.pow(MoLang.positionDelta(0), 2)} + ${MoLang.pow(MoLang.positionDelta(2), 2)}`), 0.1))} : 0.0) - ${MoLang.variable("hand_bob")}) * 0.02;`,
         `${MoLang.variable("map_angle")} = ${MoLang.max(0, MoLang.min(`1 - ${MoLang.variable("player_x_rotation")} / 45.1`, 1))};`,
+        `${MoLang.variable("item_use_duration")} = ${MoLang.mainHandItemUseDuration()} > 0.0 ? (${MoLang.mainHandItemMaxDuration()} - (${MoLang.mainHandItemUseDuration()} - ${MoLang.frameAlpha()} + 1.0)) : 0.0;`,
         `${MoLang.variable("item_use_normalized")} = ${MoLang.mainHandItemUseDuration()} / ${MoLang.mainHandItemMaxDuration()};`,
-        `${MoLang.variable("riding_y_offset")} = ${MoLang.isRidingAnyEntityOfType("minecraft:minecart", "minecraft:boat", "minecraft:chest_boat", "minecraft:strider")} ? -3.0 : 0.0;`
+        `${MoLang.variable("riding_y_offset")} = ${MoLang.isRidingAnyEntityOfType("minecraft:minecart", "minecraft:boat", "minecraft:chest_boat", "minecraft:strider")} ? -3.0 : 0.0;`,
+        `${MoLang.variable("melee_spear_equipped")} = ${MoLang.equippedItemAnyTag("slot.weapon.mainhand", "minecraft:is_spear")};`,
+        `${MoLang.variable("tp_melee_spear_base_arm_rotation_x")} = (${MoLang.isSwimming()} || ${MoLang.isGliding()}) ? (-115.0 - ${MoLang.targetXRotation()}) : (${MoLang.isCrawling()} ? -115.0 : -30.0);`,
+        [
+          `(${MoLang.variable("melee_spear_equipped")}) ? {`,
+          `${MoLang.temp("melee_spear_use_finish_raise_tick")} = ${MoLang.kineticWeaponDelay()};`,
+          `t.melee_spear_use_finish_sway_tick = t.melee_spear_use_finish_raise_tick + ${MoLang.kineticWeaponDismountDuration()};`,
+          "t.melee_spear_use_start_sway_tick = t.melee_spear_use_finish_sway_tick - 20.0;",
+          `t.melee_spear_use_finish_lower_tick = t.melee_spear_use_finish_raise_tick + ${MoLang.kineticWeaponKnockbackDuration()};`,
+          "t.melee_spear_use_start_lower_tick = t.melee_spear_use_finish_lower_tick - 40.0;",
+          `t.melee_spear_use_finish_raise_back_tick = t.melee_spear_use_finish_raise_tick + ${MoLang.kineticWeaponDamageDuration()};`,
+          "t.melee_spear_use_start_raise_back_tick = t.melee_spear_use_finish_raise_back_tick - 5.0;",
+          "t.melee_spear_use_raise_progress = math.clamp(math.inverse_lerp(0.0, t.melee_spear_use_finish_raise_tick, v.item_use_duration), 0.0, 1.0);",
+          "t.melee_spear_use_raise_progress_start = math.clamp(math.inverse_lerp(0.0, 0.5, t.melee_spear_use_raise_progress), 0.0, 1.0);",
+          "t.melee_spear_use_raise_progress_middle = math.clamp(math.inverse_lerp(0.5, 0.8, t.melee_spear_use_raise_progress), 0.0, 1.0);",
+          "t.melee_spear_use_raise_progress_end = math.clamp(math.inverse_lerp(0.8, 1.0, t.melee_spear_use_raise_progress), 0.0, 1.0);",
+          "t.melee_spear_use_sway_progress = math.clamp(math.inverse_lerp(t.melee_spear_use_start_sway_tick, t.melee_spear_use_finish_sway_tick, v.item_use_duration), 0.0, 1.0);",
+          "t.melee_spear_use_lower_progress = math.ease_in_out_elastic(0.0, 1.0, math.clamp(math.inverse_lerp(t.melee_spear_use_start_lower_tick, t.melee_spear_use_finish_lower_tick, v.item_use_duration - 20.0), 0.0, 1.0));",
+          "t.melee_spear_use_raise_back_progress = math.clamp(math.inverse_lerp(t.melee_spear_use_start_raise_back_tick, t.melee_spear_use_finish_raise_back_tick, v.item_use_duration), 0.0, 1.0);",
+          "t.melee_spear_use_sway_intensity = math.ease_out_circ(0.0, 2.0, t.melee_spear_use_sway_progress) + math.ease_in_circ(0.0, -2.0, t.melee_spear_use_raise_back_progress);",
+          "t.melee_spear_use_sway_scale_slow = math.sin(v.item_use_duration * 19.0) * t.melee_spear_use_sway_intensity;",
+          "t.melee_spear_use_sway_scale_fast = math.sin(v.item_use_duration * 30.0) * t.melee_spear_use_sway_intensity;",
+          "v.fp_melee_spear_use_item_position_x = (t.melee_spear_use_raise_progress_start * 0.05 + t.melee_spear_use_raise_progress_end * -0.05 + t.melee_spear_use_sway_scale_slow * 0.005) * v.melee_spear_java_to_bedrock_scale;",
+          "v.fp_melee_spear_use_item_position_y = (t.melee_spear_use_raise_progress_start * -0.075 + t.melee_spear_use_raise_progress_middle * 0.075 + t.melee_spear_use_sway_scale_fast * 0.01) * v.melee_spear_java_to_bedrock_scale;",
+          "v.fp_melee_spear_use_item_position_z = (t.melee_spear_use_raise_progress_start * 0.05 + t.melee_spear_use_raise_progress_end * -0.05 + t.melee_spear_use_sway_scale_slow * 0.005) * v.melee_spear_java_to_bedrock_scale;",
+          "v.fp_melee_spear_use_item_rotation_y = t.melee_spear_use_raise_progress * 20.0 + t.melee_spear_use_lower_progress * 20.0 + t.melee_spear_use_sway_scale_slow * 0.5 + t.melee_spear_use_raise_back_progress * -40.0;",
+          "v.fp_melee_spear_use_item_rotation_z = math.ease_in_out_back(0.0, -60.0, t.melee_spear_use_raise_progress) + t.melee_spear_use_lower_progress * -25.0 + t.melee_spear_use_raise_back_progress * 85.0 + t.melee_spear_use_sway_scale_fast * 0.5;",
+          "v.fp_melee_spear_use_attachable_rotation_z = math.clamp(math.inverse_lerp(0.5, 0.55, t.melee_spear_use_raise_progress), 0.0, 1.0) * -50.0 + t.melee_spear_use_sway_progress * 90.0 + t.melee_spear_use_raise_back_progress * -40.0;",
+          "v.tp_melee_spear_use_arm_rotation_x = t.melee_spear_use_raise_progress_start * -40.0 + t.melee_spear_use_raise_progress_middle * 30.0 + t.melee_spear_use_raise_progress_end * -20.0 + t.melee_spear_use_lower_progress * 20.0 + t.melee_spear_use_raise_back_progress * 10.0;",
+          "v.tp_melee_spear_use_arm_rotation_x = v.tp_melee_spear_use_arm_rotation_x + t.melee_spear_use_sway_scale_slow * 0.6;",
+          "v.tp_melee_spear_use_arm_rotation_y = t.melee_spear_use_sway_scale_fast * 1.0;",
+          "v.tp_melee_spear_use_arm_rotation_z = t.melee_spear_use_sway_scale_slow * 0.5;",
+          "v.tp_melee_spear_use_item_rotation_x = t.melee_spear_use_raise_progress * 60.0 + t.melee_spear_use_raise_back_progress * -60.0;",
+          "v.tp_melee_spear_use_attachable_rotation_z = t.melee_spear_use_raise_progress * 90.0 + t.melee_spear_use_sway_progress * -90.0;",
+          `t.melee_spear_attack_duration_ratio = 1.0 / ${MoLang.baseSwingDuration()};`,
+          "t.melee_spear_attack_raise_end = 0.05 * t.melee_spear_attack_duration_ratio;",
+          "t.melee_spear_attack_thrust_end = 0.2 * t.melee_spear_attack_duration_ratio;",
+          "t.melee_spear_attack_recover_start = 1.0 - (0.6 * t.melee_spear_attack_duration_ratio);",
+          "t.melee_spear_attack_raise_progress = math.clamp(math.inverse_lerp(0.0, t.melee_spear_attack_raise_end, v.attack_time), 0.0, 1.0);",
+          "t.melee_spear_attack_thrust_progress = math.clamp(math.inverse_lerp(t.melee_spear_attack_raise_end, t.melee_spear_attack_thrust_end, v.attack_time), 0.0, 1.0);",
+          "t.melee_spear_attack_recover_progress = math.clamp(math.inverse_lerp(t.melee_spear_attack_recover_start, 1.0, v.attack_time), 0.0, 1.0);",
+          "t.melee_spear_attack_raise_scale = math.ease_in_out_sine(0.0, 1.0, t.melee_spear_attack_raise_progress);",
+          "t.melee_spear_attack_thrust_scale = math.ease_in_quad(0.0, 1.0, t.melee_spear_attack_thrust_progress);",
+          "t.melee_spear_attack_recover_scale = math.ease_in_out_expo(0.0, 1.0, t.melee_spear_attack_recover_progress);",
+          "v.fp_melee_spear_attack_item_position_x = (t.melee_spear_attack_raise_scale * 0.1 + t.melee_spear_attack_thrust_scale * -0.1) * v.melee_spear_java_to_bedrock_scale;",
+          "v.fp_melee_spear_attack_item_position_y = (t.melee_spear_attack_raise_scale * -0.075 + t.melee_spear_attack_recover_scale * 0.075) * v.melee_spear_java_to_bedrock_scale;",
+          "v.fp_melee_spear_attack_item_position_z = (t.melee_spear_attack_raise_scale * 0.65 + t.melee_spear_attack_thrust_scale * -0.65) * v.melee_spear_java_to_bedrock_scale;",
+          "v.fp_melee_spear_attack_item_rotation_y = t.melee_spear_attack_raise_scale * 20.0 + t.melee_spear_attack_recover_scale * -20.0;",
+          "v.fp_melee_spear_attack_item_rotation_z = t.melee_spear_attack_raise_scale * -60.0 + t.melee_spear_attack_recover_scale * 60.0;",
+          "v.fp_melee_spear_attack_attachable_rotation_z = t.melee_spear_attack_raise_scale * 40.0 + t.melee_spear_attack_recover_scale * -40.0;",
+          "v.tp_melee_spear_attack_arm_rotation_x = t.melee_spear_attack_raise_scale * 90.0 + t.melee_spear_attack_thrust_scale * -120.0 + t.melee_spear_attack_recover_scale * 30.0;",
+          "v.tp_melee_spear_attack_item_rotation_x = t.melee_spear_attack_thrust_scale * 60.0 + t.melee_spear_attack_recover_scale * -60.0;",
+          "v.tp_melee_spear_attack_attachable_position_z = (t.melee_spear_attack_thrust_scale * -0.15 + t.melee_spear_attack_recover_scale * 0.15) * v.melee_spear_java_to_bedrock_scale;",
+          "};"
+        ].join(" ")
       ],
       animate: ["root"],
-      variables: {
-        "variable.fpMeleeSpearUseAttachableRotationZ": "public",
-        "variable.tpMeleeSpearUseAttachableRotationZ": "public",
-        "variable.fpMeleeSpearAttackAttachableRotationZ": "public",
-        "variable.tpMeleeSpearAttackAttachablePositionZ": "public",
-        "variable.attackTime": "public",
-        "variable.itemUseNormalized": "public"
-      },
       shouldUpdateEffectsOffscreen: "1.0"
     },
     animations: {
@@ -219664,11 +219745,18 @@ var PlayerEntity = createRPEntityClient({
       "move.arms": "animation.player.move.arms",
       "move.legs": "animation.player.move.legs",
       swimming: "animation.player.swim",
+      "swimming.no_right_arm": "animation.player.swim.no_right_arm",
       "swimming.legs": "animation.player.swim.legs",
+      crawling: "animation.player.crawl",
+      "crawling.no_right_arm": "animation.player.crawl.no_right_arm",
+      "crawling.legs": "animation.player.crawl.legs",
+      "riding.root": "animation.player.riding.root",
       "riding.arms": "animation.player.riding.arms",
       "riding.legs": "animation.player.riding.legs",
       holding: "animation.player.holding",
+      holding_heavy_core: "animation.player.holding_heavy_core",
       brandish_spear: "animation.humanoid.brandish_spear",
+      holding_spyglass: "animation.humanoid.holding_spyglass",
       charging: "animation.humanoid.charging",
       "attack.positions": "animation.player.attack.positions",
       "attack.rotations": "animation.player.attack.rotations",
@@ -219682,9 +219770,9 @@ var PlayerEntity = createRPEntityClient({
       first_person_base_pose: "animation.player.first_person.base_pose",
       first_person_empty_hand: "animation.player.first_person.empty_hand",
       first_person_swap_item: "animation.player.first_person.swap_item",
+      first_person_shield_block: "animation.player.first_person.shield_block",
       first_person_attack_controller: "controller.animation.player.first_person_attack",
       first_person_attack_rotation: "animation.player.first_person.attack_rotation",
-      first_person_attack_rotation_item: "animation.player.first_person.attack_rotation_item",
       first_person_vr_attack_rotation: "animation.player.first_person.vr_attack_rotation",
       first_person_walk: "animation.player.first_person.walk",
       first_person_map_controller: "controller.animation.player.first_person_map",
@@ -219697,23 +219785,7 @@ var PlayerEntity = createRPEntityClient({
       first_person_breathing_bob: "animation.player.first_person.breathing_bob",
       third_person_crossbow_equipped: "animation.player.crossbow_equipped",
       third_person_bow_equipped: "animation.player.bow_equipped",
-      crossbow_hold: "animation.player.crossbow_hold",
-      crossbow_controller: "controller.animation.player.crossbow",
-      shield_block_main_hand: "animation.player.shield_block_main_hand",
-      shield_block_off_hand: "animation.player.shield_block_off_hand",
-      blink: "controller.animation.persona.blink",
       fishing_rod: "animation.humanoid.fishing_rod",
-      holding_spyglass: "animation.humanoid.holding_spyglass",
-      first_person_shield_block: "animation.player.first_person.shield_block",
-      tooting_goat_horn: "animation.humanoid.tooting_goat_horn",
-      holding_brush: "animation.humanoid.holding_brush",
-      brushing: "animation.humanoid.brushing",
-      crawling: "animation.player.crawl",
-      "crawling.legs": "animation.player.crawl.legs",
-      "swimming.no_right_arm": "animation.player.swim.no_right_arm",
-      "crawling.no_right_arm": "animation.player.crawl.no_right_arm",
-      "riding.root": "animation.player.riding.root",
-      holding_heavy_core: "animation.player.holding_heavy_core",
       first_person_melee_spear_use: "animation.player.first_person.melee_spear_use",
       first_person_melee_spear_hold: "animation.player.first_person.melee_spear_hold",
       first_person_melee_spear_attack: "animation.player.first_person.melee_spear_attack",
@@ -219721,7 +219793,15 @@ var PlayerEntity = createRPEntityClient({
       third_person_melee_spear_use: "animation.humanoid.melee_spear_use",
       third_person_melee_spear_hold: "animation.humanoid.melee_spear_hold",
       third_person_melee_spear_attack: "animation.player.melee_spear_attack",
-      third_person_melee_spear_controller: "controller.animation.player.melee_spear"
+      third_person_melee_spear_controller: "controller.animation.player.melee_spear",
+      crossbow_hold: "animation.player.crossbow_hold",
+      crossbow_controller: "controller.animation.player.crossbow",
+      shield_block_main_hand: "animation.player.shield_block_main_hand",
+      shield_block_off_hand: "animation.player.shield_block_off_hand",
+      blink: "controller.animation.persona.blink",
+      tooting_goat_horn: "animation.humanoid.tooting_goat_horn",
+      holding_brush: "animation.humanoid.holding_brush",
+      brushing: "animation.humanoid.brushing"
     },
     renderControllers: [
       {