Compare commits

..

No commits in common. "3425c8e0e80a4846cc1f3d6d4acef84fdd02eb20" and "ede40d19cf918c5c60fd7cccc318f5047210b00c" have entirely different histories.

4 changed files with 38 additions and 135 deletions

View File

@ -1,21 +0,0 @@
{
"format_version": "1.16.100",
"minecraft:item": {
"description": {
"identifier": "sakuradress:no_fashion",
"category": "equipment"
},
"components": {
"minecraft:max_stack_size": 1,
"tag:aisi": {},
"tag:fashion": {},
"minecraft:icon": {
"texture": "dress2"
},
"minecraft:display_name": {
"value":"no_fashion"
}
},
"events": {}
}
}

View File

@ -175,7 +175,7 @@
"variable.hand_bob = query.life_time < 0.01 ? 0.0 : variable.hand_bob + ((query.is_on_ground && query.is_alive ? math.clamp(math.sqrt(math.pow(query.position_delta(0), 2.0) + math.pow(query.position_delta(2), 2.0)), 0.0, 0.1) : 0.0) - variable.hand_bob) * 0.02;", "variable.hand_bob = query.life_time < 0.01 ? 0.0 : variable.hand_bob + ((query.is_on_ground && query.is_alive ? math.clamp(math.sqrt(math.pow(query.position_delta(0), 2.0) + math.pow(query.position_delta(2), 2.0)), 0.0, 0.1) : 0.0) - variable.hand_bob) * 0.02;",
"variable.map_angle = math.clamp(1 - variable.player_x_rotation / 45.1, 0.0, 1.0);", "variable.map_angle = math.clamp(1 - variable.player_x_rotation / 45.1, 0.0, 1.0);",
"variable.item_use_normalized = query.main_hand_item_use_duration / query.main_hand_item_max_duration;", "variable.item_use_normalized = query.main_hand_item_use_duration / query.main_hand_item_max_duration;",
"variable.nofashion= query.is_item_name_any('slot.inventory', 0, 'minecraft:air');", "variable.fashion= query.is_item_name_any('slot.inventory', 0, 'sakuradress:kali') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:xueyuan') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:huangfeng') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:hongjing') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:qingbing') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:linguang') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:aisi') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:bohui') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:haijun') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:hanyan') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:huigu') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:huizhang') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:huohu') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:huoxiao') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:jixie') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:kelin') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:kui') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:leilong') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:maoxian') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:nafei') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:qingbing') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:qugui') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:weiwei') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:wudou') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:xixue') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:xukong') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:yiji') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:zhandou') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:zhanshi') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:lansu') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:xiaochou') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:qishu') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:banruo') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:cike') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:yinghua') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:lihuo') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:kulou') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:fashi') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:fuguang') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:heian') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:heilong') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:gaoda') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:jiuwei') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:lengjing') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:lingdong') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:luren') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:moran') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:mushi') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:naiya') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:qinglian') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:qiushui') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:sheshou') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:shendao') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:guimian') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:wangling') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:xuezu') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:xinggui') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:xingkong') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:youlong') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:ziluo') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:bailu') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:yinyue') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:bingfeng') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:feier') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:shuishen') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:gewen') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:hutao') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:shuibing') || query.is_item_name_any('slot.inventory', 0, 'sakuradress:naxida');",
"variable.kali = query.is_item_name_any('slot.inventory', 0, 'sakuradress:kali');", "variable.kali = query.is_item_name_any('slot.inventory', 0, 'sakuradress:kali');",
"variable.xueyuan = query.is_item_name_any('slot.inventory', 0, 'sakuradress:xueyuan');", "variable.xueyuan = query.is_item_name_any('slot.inventory', 0, 'sakuradress:xueyuan');",
"variable.huangfeng = query.is_item_name_any('slot.inventory', 0, 'sakuradress:huangfeng');", "variable.huangfeng = query.is_item_name_any('slot.inventory', 0, 'sakuradress:huangfeng');",
@ -313,13 +313,13 @@
}, },
"render_controllers": [ "render_controllers": [
{ {
"controller.render.player.first_person_true": "variable.is_first_person && variable.nofashion" "controller.render.player.first_person_true": "variable.is_first_person && !variable.fashion"
}, },
{ {
"controller.render.player.third_person_true": "!variable.is_first_person && !variable.map_face_icon && variable.nofashion" "controller.render.player.third_person_true": "!variable.is_first_person && !variable.map_face_icon && !variable.fashion"
}, },
{ {
"controller.render.player.map_true": "variable.map_face_icon && variable.nofashion" "controller.render.player.map_true": "variable.map_face_icon && !variable.fashion"
}, },
{ {
"controller.render.player.first_person": "variable.is_first_person" "controller.render.player.first_person": "variable.is_first_person"
@ -334,7 +334,7 @@
"controller.render.player.first_person_kali": "variable.is_first_person && variable.kali" "controller.render.player.first_person_kali": "variable.is_first_person && variable.kali"
}, },
{ {
"controller.render.player.third_person_kali": "!variable.is_first_person && !variable.map_face_icon && variable.kali" "controller.render.player.third_person_kali": "!variable.is_first_person&&!variable.map_face_icon && variable.kali"
}, },
{ {
"controller.render.player.map_kali": "variable.map_face_icon && variable.kali" "controller.render.player.map_kali": "variable.map_face_icon && variable.kali"

View File

@ -3,111 +3,47 @@
"render_controllers": { "render_controllers": {
"controller.render.player.first_person": { "controller.render.player.first_person": {
"geometry": "Geometry.default", "geometry": "Geometry.default",
"materials": [ "materials": [ { "*": "Material.default" } ],
{ "textures": [ "Texture.invisibility" ],
"*": "Material.default"
}
],
"textures": [
"Texture.invisibility"
],
"part_visibility": [ "part_visibility": [
{ { "*": false },
"*": false { "head": "variable.kali || variable.xueyuan" },
}, { "rightArm": "query.get_equipped_item_name(0, 1) == '' || query.get_equipped_item_name(0, 1) == 'filled_map'" },
{ { "rightSleeve": "query.get_equipped_item_name(0, 1) == '' || query.get_equipped_item_name(0, 1) == 'filled_map'" },
"head": "variable.kali || variable.xueyuan" { "leftArm": "(query.get_equipped_item_name(0, 1) == 'filled_map' && query.get_equipped_item_name('off_hand') != 'shield') || (query.get_equipped_item_name('off_hand') == 'filled_map' && !query.item_is_charged) || (!query.item_is_charged && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0))" },
}, { "leftSleeve": "(query.get_equipped_item_name(0, 1) == 'filled_map' && query.get_equipped_item_name('off_hand') != 'shield') || (query.get_equipped_item_name('off_hand') == 'filled_map' && !query.item_is_charged) || (!query.item_is_charged && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0))" }
{
"rightArm": "query.get_equipped_item_name(0, 1) == '' || query.get_equipped_item_name(0, 1) == 'filled_map'"
},
{
"rightSleeve": "query.get_equipped_item_name(0, 1) == '' || query.get_equipped_item_name(0, 1) == 'filled_map'"
},
{
"leftArm": "(query.get_equipped_item_name(0, 1) == 'filled_map' && query.get_equipped_item_name('off_hand') != 'shield') || (query.get_equipped_item_name('off_hand') == 'filled_map' && !query.item_is_charged) || (!query.item_is_charged && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0))"
},
{
"leftSleeve": "(query.get_equipped_item_name(0, 1) == 'filled_map' && query.get_equipped_item_name('off_hand') != 'shield') || (query.get_equipped_item_name('off_hand') == 'filled_map' && !query.item_is_charged) || (!query.item_is_charged && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0))"
}
] ]
}, },
"controller.render.player.third_person": { "controller.render.player.third_person": {
"geometry": "Geometry.default", "geometry": "Geometry.default",
"materials": [ "materials": [ { "*": "Material.default" } ],
{ "textures": [ "Texture.invisibility" ],
"*": "Material.default"
}
],
"textures": [
"Texture.invisibility"
],
"part_visibility": [ "part_visibility": [
{ { "*": false },
"*": true { "helmet": "variable.helmet_layer_visible" },
}, { "leftLegging": "variable.leg_layer_visible" },
{ { "rightLegging": "variable.leg_layer_visible" },
"helmet": "variable.helmet_layer_visible" { "leftBoot": "variable.boot_layer_visible" },
}, { "rightBoot": "variable.boot_layer_visible" },
{ { "leftSock": "variable.boot_layer_visible && variable.leg_layer_visible" },
"leftLegging": "variable.leg_layer_visible" { "rightSock": "variable.boot_layer_visible && variable.leg_layer_visible" },
}, { "bodyArmor": "variable.chest_layer_visible && !query.has_cape" },
{ { "leftArmArmor": "variable.chest_layer_visible && !query.has_cape" },
"rightLegging": "variable.leg_layer_visible" { "root": "variable.kali || variable.xueyuan" },
}, { "rightArmArmor": "variable.chest_layer_visible && !query.has_cape" },
{ { "belt": "variable.chest_layer_visible && variable.leg_layer_visible" }
"leftBoot": "variable.boot_layer_visible"
},
{
"rightBoot": "variable.boot_layer_visible"
},
{
"leftSock": "variable.boot_layer_visible && variable.leg_layer_visible"
},
{
"rightSock": "variable.boot_layer_visible && variable.leg_layer_visible"
},
{
"bodyArmor": "variable.chest_layer_visible && !query.has_cape"
},
{
"leftArmArmor": "variable.chest_layer_visible && !query.has_cape"
},
{
"root": "variable.kali || variable.xueyuan"
},
{
"rightArmArmor": "variable.chest_layer_visible && !query.has_cape"
},
{
"belt": "variable.chest_layer_visible && variable.leg_layer_visible"
}
] ]
}, },
"controller.render.player.map": { "controller.render.player.map": {
"geometry": "Geometry.default", "geometry": "Geometry.default",
"materials": [ "materials": [ { "*": "Material.default" } ],
{ "textures": [ "Texture.invisibility" ],
"*": "Material.default"
}
],
"textures": [
"Texture.invisibility"
],
"part_visibility": [ "part_visibility": [
{ { "*": false },
"*": false { "head": true },
}, { "hat": true },
{ { "helmet": true }
"head": true
},
{
"hat": true
},
{
"helmet": true
}
] ]
} }
} }
} }

View File

@ -37,21 +37,9 @@
"Texture.default" "Texture.default"
], ],
"part_visibility": [ "part_visibility": [
{ { "*": true },
"*": false { "head" : false},
}, { "hat" : false}
{
"rightArm": "query.get_equipped_item_name(0, 1) == '' || query.get_equipped_item_name(0, 1) == 'filled_map'"
},
{
"rightSleeve": "query.get_equipped_item_name(0, 1) == '' || query.get_equipped_item_name(0, 1) == 'filled_map'"
},
{
"leftArm": "(query.get_equipped_item_name(0, 1) == 'filled_map' && query.get_equipped_item_name('off_hand') != 'shield') || (query.get_equipped_item_name('off_hand') == 'filled_map' && !query.item_is_charged) || (!query.item_is_charged && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0))"
},
{
"leftSleeve": "(query.get_equipped_item_name(0, 1) == 'filled_map' && query.get_equipped_item_name('off_hand') != 'shield') || (query.get_equipped_item_name('off_hand') == 'filled_map' && !query.item_is_charged) || (!query.item_is_charged && (variable.item_use_normalized > 0 && variable.item_use_normalized < 1.0))"
}
] ]
}, },
"controller.render.player.third_person_true": { "controller.render.player.third_person_true": {