From ccf9b6d9bce7922db4dad532c83bf048720d305e Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Sat, 26 Jul 2025 16:04:58 +0200 Subject: [PATCH] skin loader --- .../CustomSkinLoader/CustomSkinLoader.json | 15 ++ .../humanoid_slim/humanoid_slim_poses.json | 149 ------------------ .../config/watut-item-arm-adjustments.json | 94 ----------- web/pack/index.toml | 12 +- web/pack/pack.toml | 2 +- 5 files changed, 20 insertions(+), 252 deletions(-) create mode 100644 web/pack/CustomSkinLoader/CustomSkinLoader.json delete mode 100644 web/pack/config/easy_npc/pose/humanoid_slim/humanoid_slim_poses.json delete mode 100644 web/pack/config/watut-item-arm-adjustments.json diff --git a/web/pack/CustomSkinLoader/CustomSkinLoader.json b/web/pack/CustomSkinLoader/CustomSkinLoader.json new file mode 100644 index 0000000..e9a8081 --- /dev/null +++ b/web/pack/CustomSkinLoader/CustomSkinLoader.json @@ -0,0 +1,15 @@ + +{ + "enable": true, + "loadlist": [ + { + "name": "Piel de patata", + "root": "https://auth.oier.ovh/api/skin-api/skins/", + "type": "CustomSkinAPI" + }, + { + "name": "Mojang", + "type": "MojangAPI" + } + ] +} \ No newline at end of file diff --git a/web/pack/config/easy_npc/pose/humanoid_slim/humanoid_slim_poses.json b/web/pack/config/easy_npc/pose/humanoid_slim/humanoid_slim_poses.json deleted file mode 100644 index 80deb7f..0000000 --- a/web/pack/config/easy_npc/pose/humanoid_slim/humanoid_slim_poses.json +++ /dev/null @@ -1,149 +0,0 @@ -{ - "format_version": "1.8.0", - "animations": { - "Crouching": { - "loop": "hold_on_last_frame", - "bones": { - "Head": { - "rotation": [-7.5, 0, 0], - "position": [0, -4.2, 0] - }, - "Body": { - "rotation": [20, 0, 0], - "position": [0, -3.2, 0] - }, - "RightArm": { - "rotation": [40, 0, 0], - "position": [0, -3.2, 1] - }, - "LeftArm": { - "rotation": [40, 0, 0], - "position": [0, -3.2, 1] - }, - "RightLeg": { - "rotation": [-25, 0, 0], - "position": [0, 0, 4] - }, - "LeftLeg": { - "rotation": [-10, 0, 0], - "position": [0, 0, 3] - } - } - }, - "Standing": { - "loop": "hold_on_last_frame", - "bones": { - "Head": { - "rotation": [0, 0, 0], - "position": [0, 0, 0] - }, - "Body": { - "rotation": [0, 0, 0], - "position": [0, 0, 0] - }, - "RightArm": { - "rotation": [0, 0, 0], - "position": [0, 0, 0] - }, - "LeftArm": { - "rotation": [0, 0, 0], - "position": [0, 0, 0] - }, - "RightLeg": { - "rotation": [0, 0, 0], - "position": [0, 0, 0] - }, - "LeftLeg": { - "rotation": [0, 0, 0], - "position": [0, 0, 0] - } - } - }, - "Sitting": { - "loop": "hold_on_last_frame", - "bones": { - "Head": { - "rotation": [0, 0, -2.5], - "position": [0, -10.5, 0] - }, - "Body": { - "position": [0, -10.5, 0] - }, - "RightArm": { - "rotation": [-35, 0, 0], - "position": [0, -10.5, 0] - }, - "LeftArm": { - "rotation": [-35, 0, 0], - "position": [0, -10.5, 0] - }, - "RightLeg": { - "rotation": [-90, 15, 0], - "position": [0, -10, 0] - }, - "LeftLeg": { - "rotation": [-90, -10.5, 0], - "position": [0, -10, 0] - } - } - }, - "Chilling": { - "loop": "hold_on_last_frame", - "bones": { - "Head": { - "rotation": [-2.5, 0, 2.5], - "position": [0, -12.5, 2] - }, - "Body": { - "rotation": [-20, 0, 0], - "position": [0, -12.25, 3] - }, - "RightArm": { - "rotation": [17.5, 0, 0], - "position": [0, -12.5, 2] - }, - "LeftArm": { - "rotation": [20, 0, 0], - "position": [0, -12.5, 2] - }, - "RightLeg": { - "rotation": [-90, 15, -5], - "position": [0, -10, 0] - }, - "LeftLeg": { - "rotation": [-90, -10.5, 5], - "position": [0, -10, 0.75] - } - } - }, - "Rest": { - "loop": "hold_on_last_frame", - "bones": { - "Head": { - "rotation": [5, 0, 5], - "position": [0, -12, 0] - }, - "Body": { - "rotation": [0, 0, 2.5], - "position": [0, -12, 0] - }, - "RightArm": { - "rotation": [-75, -30, 0], - "position": [-1, -11, 0] - }, - "LeftArm": { - "rotation": [-52.5, -5, 0], - "position": [0, -12, 0] - }, - "RightLeg": { - "rotation": [-32.5, -20, 0], - "position": [-3, -2, -2] - }, - "LeftLeg": { - "rotation": [-90, 40, 0], - "position": [6.75, -10, 0] - } - } - } - } -} \ No newline at end of file diff --git a/web/pack/config/watut-item-arm-adjustments.json b/web/pack/config/watut-item-arm-adjustments.json deleted file mode 100644 index f75a1e4..0000000 --- a/web/pack/config/watut-item-arm-adjustments.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "comment1": "These client side filters and adjustments affect all watut animations in the same way", - "comment2": "filters support @ for mod id, and * at the start or end of the match for partial matches", - "comment3": "in adjustments section, you can specify 'DISABLED' to outright disable any animation on that hand and axis, or use degrees to adjust by a certain amount", - "comment4": "matchingHandX and matchingHandY are probably all you need, for watuts animations, X is the main up/down, and Y is left/right, Z is available but usually not needed", - "comment5": "matchingHand is for adjusting the hand that actually has the item, otherHand is for adjusting the other hand if matchingHand matched something", - "comment6": "using otherHand along with matchingHand is useful for disabling or adjusting movement when using items that change both hands, like gun mods or 2 handed weapons", - "comment7": "you can make a rule only active if a specfic mod is installed by using 'only_if_mod_installed' with a mod id, see its use below for an example", - "comment8": "matching priority order is first to last, so in this file, highest to lowest, higher overrides lower if both match", - "comment9": "use '/watut reloadJSON' (forge builds only) to reload this config in game to see your changes instantly", - "held_item_arm_adjustments": [ - { - "comment1": "example1", - "filters": [ - "themodid:someitem" - ], - "adjustment": { - "matchingHandX": "-90", - "matchingHandY": "DISABLED", - "matchingHandZ": "DISABLED" - } - }, - { - "comment1": "example2", - "filters": [ - "themodid:ingot_*" - ], - "adjustment": { - "matchingHandX": "45" - } - }, - { - "comment1": "example3", - "filters": [ - "*_wacky_tornado_item_*" - ], - "adjustment": { - "matchingHandX": "DISABLED", - "matchingHandY": "DISABLED", - "matchingHandZ": "DISABLED", - "otherHandX": "DISABLED", - "otherHandY": "DISABLED", - "otherHandZ": "DISABLED" - } - }, - { - "filters": [ - "artifacts:umbrella" - ], - "adjustment": { - "matchingHandX": "DISABLED", - "matchingHandY": "DISABLED", - "matchingHandZ": "DISABLED" - } - }, - { - "filters": [ - "tacz:modern_kinetic_gun" - ], - "adjustment": { - "matchingHandX": "DISABLED", - "matchingHandY": "DISABLED", - "matchingHandZ": "DISABLED", - "otherHandX": "-90", - "otherHandY": "60" - } - }, - { - "only_if_mod_installed": "notenoughanimations", - "filters": [ - "minecraft:compass", "minecraft:recovery_compass", "minecraft:torch", "minecraft:soul_torch" - ], - "adjustment": { - "matchingHandX": "DISABLED", - "matchingHandY": "DISABLED", - "matchingHandZ": "DISABLED" - } - }, - { - "only_if_mod_installed": "notenoughanimations", - "filters": [ - "minecraft:filled_map" - ], - "adjustment": { - "matchingHandX": "DISABLED", - "matchingHandY": "DISABLED", - "matchingHandZ": "DISABLED", - "otherHandX": "DISABLED", - "otherHandY": "DISABLED", - "otherHandZ": "DISABLED" - } - } - ] -} \ No newline at end of file diff --git a/web/pack/index.toml b/web/pack/index.toml index 68a9e13..4a7a3fc 100644 --- a/web/pack/index.toml +++ b/web/pack/index.toml @@ -1,5 +1,9 @@ hash-format = "sha256" +[[files]] +file = "CustomSkinLoader/CustomSkinLoader.json" +hash = "88f66d36d098c5a7178072dbe98ada48f3781b53a1745bc82beb271d6fcde4ff" + [[files]] file = "config/CoroUtil/General.toml" hash = "6003299fd97cb6b383ca3df88a2a676c565585799b1e14bb2987617ee189c7c2" @@ -944,10 +948,6 @@ hash = "be81c20c752e33060eef2c8e8fe841cbf76863751fc48e1b0f3158eec4cb7c0c" file = "config/dungeon_crawl.toml" hash = "65a689e684fc2278cd69f31fdc89f8361d00c94c9d38bc848944372c61694dcd" -[[files]] -file = "config/easy_npc/pose/humanoid_slim/humanoid_slim_poses.json" -hash = "392203e8c3a9c652b7e1262c2506e2c604ec979ba5fd60b0f5dcb12a758adc30" - [[files]] file = "config/easy_npc/preset/humanoid/2635a0fe-18a4-4988-bcce-ad30c41b6bf6.npc.nbt" hash = "75e8c0741183a47f194f7a31cb85ff3a43423087343dd0419872acd32d007b51" @@ -1992,10 +1992,6 @@ hash = "165132e384817574b2d00b396665fd6d78c951a8058e60321a73dabfc8004da7" file = "config/watut-common.toml" hash = "39dc75fe44500a3bf156f6e824ef57fe2ca25d11af0bcc08efd0eb0e0c2203a9" -[[files]] -file = "config/watut-item-arm-adjustments.json" -hash = "543e09f71cda1d97d238ac4150e43e50868cf781027c88d68fc714f261d88982" - [[files]] file = "config/watut-server.toml" hash = "b9eaceec932b2f8b235f75d2371fb896e67ad0ac42b99b806349162188c6f5d9" diff --git a/web/pack/pack.toml b/web/pack/pack.toml index 5eb9b9c..98e6682 100644 --- a/web/pack/pack.toml +++ b/web/pack/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "bde52f241ca46a8388ff6dbd05fc4e3c2594dd9b3af664abd97e48febfac2b3d" +hash = "60276c148bdffccaa84d4b8c0585e8747a86218cf5f4e5c8c1ff106459b211f2" [versions] minecraft = "1.21.1"