From 91f1881f94affca7ef2f101967fe0082fd45ed56 Mon Sep 17 00:00:00 2001 From: fengyun Date: Wed, 7 Aug 2024 18:49:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E7=89=88=E6=A8=A1=E5=9E=8B=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E4=BA=BA=E7=A7=B0=E6=89=8B=E9=83=A8=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=B0=9D=E8=AF=95=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=97=A0=E6=97=B6=E8=A3=85=E6=A3=80=E6=B5=8B=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=87=8F=E5=B0=91=E6=88=96=E6=B6=88=E9=99=A4=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E4=B8=8E=E8=80=97=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- init.json | 2 +- sakura_dress_BP/items/no_fashion.json | 21 +++ sakura_dress_BP/manifest.json | 6 +- .../entity/player/player.entity.json | 10 +- sakura_dress_RP/manifest.json | 6 +- .../fengyun/player.render_controllers.json | 124 +++++++++++++----- .../render_controllers/player/true.json | 18 ++- 7 files changed, 142 insertions(+), 45 deletions(-) create mode 100644 sakura_dress_BP/items/no_fashion.json diff --git a/init.json b/init.json index bea9c9a..4728abd 100644 --- a/init.json +++ b/init.json @@ -1,5 +1,5 @@ { "name": "SakuraDress", "description": "樱落绘境基岩版萌芽时装", - "version": "1.0.17" + "version": "1.0.19" } diff --git a/sakura_dress_BP/items/no_fashion.json b/sakura_dress_BP/items/no_fashion.json new file mode 100644 index 0000000..25c4abd --- /dev/null +++ b/sakura_dress_BP/items/no_fashion.json @@ -0,0 +1,21 @@ +{ + "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": {} + } +} \ No newline at end of file diff --git a/sakura_dress_BP/manifest.json b/sakura_dress_BP/manifest.json index 8c8f3cb..a639e8c 100644 --- a/sakura_dress_BP/manifest.json +++ b/sakura_dress_BP/manifest.json @@ -1,13 +1,13 @@ { "format_version": 2, "header": { - "name": "SakuraDress 1.0.16", + "name": "SakuraDress 1.0.18", "description": "樱落绘境基岩版萌芽时装", "uuid": "898cbd07-3990-4787-a7d0-85c555cb9889", "version": [ 1, 0, - 16 + 18 ], "min_engine_version": [ 1, @@ -23,7 +23,7 @@ "version": [ 1, 0, - 16 + 18 ] } ] diff --git a/sakura_dress_RP/entity/player/player.entity.json b/sakura_dress_RP/entity/player/player.entity.json index 36934ac..5e2dc4d 100644 --- a/sakura_dress_RP/entity/player/player.entity.json +++ b/sakura_dress_RP/entity/player/player.entity.json @@ -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.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.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.nofashion= query.is_item_name_any('slot.inventory', 0, 'sakuradress:no_fashion');", "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.huangfeng = query.is_item_name_any('slot.inventory', 0, 'sakuradress:huangfeng');", @@ -313,13 +313,13 @@ }, "render_controllers": [ { - "controller.render.player.first_person_true": "variable.is_first_person && !variable.fashion" + "controller.render.player.first_person_true": "variable.is_first_person && variable.nofashion" }, { - "controller.render.player.third_person_true": "!variable.is_first_person && !variable.map_face_icon && !variable.fashion" + "controller.render.player.third_person_true": "!variable.is_first_person && !variable.map_face_icon && variable.nofashion" }, { - "controller.render.player.map_true": "variable.map_face_icon && !variable.fashion" + "controller.render.player.map_true": "variable.map_face_icon && variable.nofashion" }, { "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.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" diff --git a/sakura_dress_RP/manifest.json b/sakura_dress_RP/manifest.json index 9a9d979..fb102d2 100644 --- a/sakura_dress_RP/manifest.json +++ b/sakura_dress_RP/manifest.json @@ -1,13 +1,13 @@ { "format_version": 2, "header": { - "name": "SakuraDress 1.0.16", + "name": "SakuraDress 1.0.18", "description": "樱落绘境基岩版萌芽时装", "uuid": "34a44803-a08e-431c-a074-613550dde7b8", "version": [ 1, 0, - 16 + 18 ], "min_engine_version": [ 1, @@ -23,7 +23,7 @@ "version": [ 1, 0, - 16 + 18 ] } ] diff --git a/sakura_dress_RP/render_controllers/fengyun/player.render_controllers.json b/sakura_dress_RP/render_controllers/fengyun/player.render_controllers.json index 50f64ca..5478e6b 100644 --- a/sakura_dress_RP/render_controllers/fengyun/player.render_controllers.json +++ b/sakura_dress_RP/render_controllers/fengyun/player.render_controllers.json @@ -3,47 +3,111 @@ "render_controllers": { "controller.render.player.first_person": { "geometry": "Geometry.default", - "materials": [ { "*": "Material.default" } ], - "textures": [ "Texture.invisibility" ], + "materials": [ + { + "*": "Material.default" + } + ], + "textures": [ + "Texture.invisibility" + ], "part_visibility": [ - { "*": 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'" }, - { "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))" } + { + "*": 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'" + }, + { + "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": { "geometry": "Geometry.default", - "materials": [ { "*": "Material.default" } ], - "textures": [ "Texture.invisibility" ], + "materials": [ + { + "*": "Material.default" + } + ], + "textures": [ + "Texture.invisibility" + ], "part_visibility": [ - { "*": false }, - { "helmet": "variable.helmet_layer_visible" }, - { "leftLegging": "variable.leg_layer_visible" }, - { "rightLegging": "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" } + { + "*": true + }, + { + "helmet": "variable.helmet_layer_visible" + }, + { + "leftLegging": "variable.leg_layer_visible" + }, + { + "rightLegging": "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": { "geometry": "Geometry.default", - "materials": [ { "*": "Material.default" } ], - "textures": [ "Texture.invisibility" ], + "materials": [ + { + "*": "Material.default" + } + ], + "textures": [ + "Texture.invisibility" + ], "part_visibility": [ - { "*": false }, - { "head": true }, - { "hat": true }, - { "helmet": true } + { + "*": false + }, + { + "head": true + }, + { + "hat": true + }, + { + "helmet": true + } ] } } -} +} \ No newline at end of file diff --git a/sakura_dress_RP/render_controllers/player/true.json b/sakura_dress_RP/render_controllers/player/true.json index 1321177..a45be06 100644 --- a/sakura_dress_RP/render_controllers/player/true.json +++ b/sakura_dress_RP/render_controllers/player/true.json @@ -37,9 +37,21 @@ "Texture.default" ], "part_visibility": [ - { "*": true }, - { "head" : false}, - { "hat" : false} + { + "*": 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": {