From 681c975be1a593bf0c295663dca662a349fc91b7 Mon Sep 17 00:00:00 2001 From: fengyun Date: Wed, 7 Aug 2024 23:49:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=96=B9=E5=BC=8F=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- init.json | 2 +- sakura_dress_BP/items/aisi.json | 6 +- sakura_dress_BP/items/bailu.json | 6 +- sakura_dress_BP/items/banruo.json | 4 + sakura_dress_BP/items/bingfeng.json | 6 +- sakura_dress_BP/items/bohui.json | 4 + sakura_dress_BP/items/cike.json | 4 + sakura_dress_BP/items/fashi.json | 4 + sakura_dress_BP/items/feier.json | 6 +- sakura_dress_BP/items/fuguang.json | 6 +- sakura_dress_BP/items/gaoda.json | 6 +- sakura_dress_BP/items/gewen.json | 8 +- sakura_dress_BP/items/guimian.json | 6 +- sakura_dress_BP/items/haijun.json | 4 + sakura_dress_BP/items/hanyan.json | 4 + sakura_dress_BP/items/heian.json | 6 +- sakura_dress_BP/items/heilong.json | 6 +- sakura_dress_BP/items/hongjing.json | 4 + sakura_dress_BP/items/huangfeng.json | 4 + sakura_dress_BP/items/huigu.json | 4 + sakura_dress_BP/items/huizhang.json | 4 + sakura_dress_BP/items/huohu.json | 4 + sakura_dress_BP/items/huoxiao.json | 4 + sakura_dress_BP/items/hutao.json | 6 +- sakura_dress_BP/items/jiuwei.json | 6 +- sakura_dress_BP/items/jixie.json | 4 + sakura_dress_BP/items/kali.json | 4 + sakura_dress_BP/items/kelin.json | 4 + sakura_dress_BP/items/kui.json | 4 + sakura_dress_BP/items/kulou.json | 4 + sakura_dress_BP/items/lansu.json | 4 + sakura_dress_BP/items/leilong.json | 4 + sakura_dress_BP/items/lengjing.json | 6 +- sakura_dress_BP/items/lihuo.json | 4 + sakura_dress_BP/items/lingdong.json | 6 +- sakura_dress_BP/items/linguang.json | 4 + sakura_dress_BP/items/luren.json | 6 +- sakura_dress_BP/items/maoxian.json | 4 + sakura_dress_BP/items/moran.json | 6 +- sakura_dress_BP/items/mushi.json | 6 +- sakura_dress_BP/items/nafei.json | 4 + sakura_dress_BP/items/naiya.json | 6 +- sakura_dress_BP/items/naxida.json | 4 + sakura_dress_BP/items/no_fashion.json | 21 --- sakura_dress_BP/items/qingbing.json | 4 + sakura_dress_BP/items/qinglian.json | 6 +- sakura_dress_BP/items/qishu.json | 6 +- sakura_dress_BP/items/qiushui.json | 6 +- sakura_dress_BP/items/qugui.json | 4 + sakura_dress_BP/items/shendao.json | 6 +- sakura_dress_BP/items/sheshou.json | 6 +- sakura_dress_BP/items/shuibing.json | 6 +- sakura_dress_BP/items/shuishen.json | 8 +- sakura_dress_BP/items/wangling.json | 6 +- sakura_dress_BP/items/weiwei.json | 4 + sakura_dress_BP/items/wudou.json | 4 + sakura_dress_BP/items/xiaochou.json | 4 + sakura_dress_BP/items/xinggui.json | 6 +- sakura_dress_BP/items/xingkong.json | 6 +- sakura_dress_BP/items/xixue.json | 4 + sakura_dress_BP/items/xueyuan.json | 4 + sakura_dress_BP/items/xuezu.json | 8 +- sakura_dress_BP/items/xukong.json | 4 + sakura_dress_BP/items/yiji.json | 4 + sakura_dress_BP/items/yinghua.json | 4 + sakura_dress_BP/items/yinyue.json | 6 +- sakura_dress_BP/items/youlong.json | 6 +- sakura_dress_BP/items/zhandou.json | 4 + sakura_dress_BP/items/zhanshi.json | 4 + sakura_dress_BP/items/ziluo.json | 6 +- sakura_dress_BP/manifest.json | 6 +- .../entity/player/player.entity.json | 144 +++++++++--------- sakura_dress_RP/manifest.json | 6 +- 73 files changed, 386 insertions(+), 135 deletions(-) delete mode 100644 sakura_dress_BP/items/no_fashion.json diff --git a/init.json b/init.json index 90847d2..db27b1b 100644 --- a/init.json +++ b/init.json @@ -1,5 +1,5 @@ { "name": "SakuraDress", "description": "樱落绘境基岩版萌芽时装", - "version": "1.1.1" + "version": "1.1.3" } diff --git a/sakura_dress_BP/items/aisi.json b/sakura_dress_BP/items/aisi.json index 4263892..6319e0d 100644 --- a/sakura_dress_BP/items/aisi.json +++ b/sakura_dress_BP/items/aisi.json @@ -9,11 +9,15 @@ "minecraft:max_stack_size": 1, "tag:aisi": {}, "tag:fashion": {}, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:icon": { "texture": "dress2" }, "minecraft:display_name": { - "value":"aisi" + "value": "aisi" } }, "events": {} diff --git a/sakura_dress_BP/items/bailu.json b/sakura_dress_BP/items/bailu.json index 91e5905..8d8ea5c 100644 --- a/sakura_dress_BP/items/bailu.json +++ b/sakura_dress_BP/items/bailu.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:bailu": {}, - "tag:bailuon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"白露" } diff --git a/sakura_dress_BP/items/banruo.json b/sakura_dress_BP/items/banruo.json index ef2828c..0e518f7 100644 --- a/sakura_dress_BP/items/banruo.json +++ b/sakura_dress_BP/items/banruo.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"般若武士" } diff --git a/sakura_dress_BP/items/bingfeng.json b/sakura_dress_BP/items/bingfeng.json index 69dd1f9..4239fd5 100644 --- a/sakura_dress_BP/items/bingfeng.json +++ b/sakura_dress_BP/items/bingfeng.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:bingfeng": {}, - "tag:bingfengon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"冰封女王" } diff --git a/sakura_dress_BP/items/bohui.json b/sakura_dress_BP/items/bohui.json index ca0e367..3f87a9d 100644 --- a/sakura_dress_BP/items/bohui.json +++ b/sakura_dress_BP/items/bohui.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"卜绘咕" } diff --git a/sakura_dress_BP/items/cike.json b/sakura_dress_BP/items/cike.json index f3bbfe0..1c4d4b5 100644 --- a/sakura_dress_BP/items/cike.json +++ b/sakura_dress_BP/items/cike.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"黑风刺客" } diff --git a/sakura_dress_BP/items/fashi.json b/sakura_dress_BP/items/fashi.json index 4700cde..b1a617a 100644 --- a/sakura_dress_BP/items/fashi.json +++ b/sakura_dress_BP/items/fashi.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"紫晶法师" } diff --git a/sakura_dress_BP/items/feier.json b/sakura_dress_BP/items/feier.json index d012fea..0f96b93 100644 --- a/sakura_dress_BP/items/feier.json +++ b/sakura_dress_BP/items/feier.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:feier": {}, - "tag:feieron": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"菲尔" } diff --git a/sakura_dress_BP/items/fuguang.json b/sakura_dress_BP/items/fuguang.json index 0ac2931..318ef13 100644 --- a/sakura_dress_BP/items/fuguang.json +++ b/sakura_dress_BP/items/fuguang.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:fuguang": {}, - "tag:fuguangon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"光明骑士" } diff --git a/sakura_dress_BP/items/gaoda.json b/sakura_dress_BP/items/gaoda.json index 6ed2822..ea41c0a 100644 --- a/sakura_dress_BP/items/gaoda.json +++ b/sakura_dress_BP/items/gaoda.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:gaoda": {}, - "tag:gaodaon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"高达" } diff --git a/sakura_dress_BP/items/gewen.json b/sakura_dress_BP/items/gewen.json index 38d6c95..3602d63 100644 --- a/sakura_dress_BP/items/gewen.json +++ b/sakura_dress_BP/items/gewen.json @@ -8,12 +8,16 @@ "components": { "minecraft:max_stack_size": 1, "tag:gewen": {}, - "tag:gewenon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { - "value":"格温" + "value": "格温" } }, "events": {} diff --git a/sakura_dress_BP/items/guimian.json b/sakura_dress_BP/items/guimian.json index bcf20f3..e5422b2 100644 --- a/sakura_dress_BP/items/guimian.json +++ b/sakura_dress_BP/items/guimian.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:guimian": {}, - "tag:guimianon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"guimian" } diff --git a/sakura_dress_BP/items/haijun.json b/sakura_dress_BP/items/haijun.json index 5fa0077..7ecb040 100644 --- a/sakura_dress_BP/items/haijun.json +++ b/sakura_dress_BP/items/haijun.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"haijun" } diff --git a/sakura_dress_BP/items/hanyan.json b/sakura_dress_BP/items/hanyan.json index d81f230..72b7e95 100644 --- a/sakura_dress_BP/items/hanyan.json +++ b/sakura_dress_BP/items/hanyan.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress1" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"hanyan" } diff --git a/sakura_dress_BP/items/heian.json b/sakura_dress_BP/items/heian.json index b3bf122..68d7614 100644 --- a/sakura_dress_BP/items/heian.json +++ b/sakura_dress_BP/items/heian.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:heian": {}, - "tag:heianon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"heian" } diff --git a/sakura_dress_BP/items/heilong.json b/sakura_dress_BP/items/heilong.json index b78d059..b5c330f 100644 --- a/sakura_dress_BP/items/heilong.json +++ b/sakura_dress_BP/items/heilong.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:heilong": {}, - "tag:heilongon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"heilong" } diff --git a/sakura_dress_BP/items/hongjing.json b/sakura_dress_BP/items/hongjing.json index 0cacc59..5d83407 100644 --- a/sakura_dress_BP/items/hongjing.json +++ b/sakura_dress_BP/items/hongjing.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"hongjing" } diff --git a/sakura_dress_BP/items/huangfeng.json b/sakura_dress_BP/items/huangfeng.json index c1883b5..187be22 100644 --- a/sakura_dress_BP/items/huangfeng.json +++ b/sakura_dress_BP/items/huangfeng.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"huangfeng" } diff --git a/sakura_dress_BP/items/huigu.json b/sakura_dress_BP/items/huigu.json index 543f459..a6a25e0 100644 --- a/sakura_dress_BP/items/huigu.json +++ b/sakura_dress_BP/items/huigu.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"huigu" } diff --git a/sakura_dress_BP/items/huizhang.json b/sakura_dress_BP/items/huizhang.json index f8c32f6..9ffd86f 100644 --- a/sakura_dress_BP/items/huizhang.json +++ b/sakura_dress_BP/items/huizhang.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress1" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"huizhang" } diff --git a/sakura_dress_BP/items/huohu.json b/sakura_dress_BP/items/huohu.json index 907fd6b..9d990ab 100644 --- a/sakura_dress_BP/items/huohu.json +++ b/sakura_dress_BP/items/huohu.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress1" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"huohu" } diff --git a/sakura_dress_BP/items/huoxiao.json b/sakura_dress_BP/items/huoxiao.json index ad2c6c9..112c5f2 100644 --- a/sakura_dress_BP/items/huoxiao.json +++ b/sakura_dress_BP/items/huoxiao.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"huoxiao" } diff --git a/sakura_dress_BP/items/hutao.json b/sakura_dress_BP/items/hutao.json index c8cab40..566cf51 100644 --- a/sakura_dress_BP/items/hutao.json +++ b/sakura_dress_BP/items/hutao.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:hutao": {}, - "tag:hutaoon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"hutao" } diff --git a/sakura_dress_BP/items/jiuwei.json b/sakura_dress_BP/items/jiuwei.json index f553722..7a2a220 100644 --- a/sakura_dress_BP/items/jiuwei.json +++ b/sakura_dress_BP/items/jiuwei.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:jiuwei": {}, - "tag:jiuweion": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"jiuwei" } diff --git a/sakura_dress_BP/items/jixie.json b/sakura_dress_BP/items/jixie.json index 471a32e..826bf7f 100644 --- a/sakura_dress_BP/items/jixie.json +++ b/sakura_dress_BP/items/jixie.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"jixie" } diff --git a/sakura_dress_BP/items/kali.json b/sakura_dress_BP/items/kali.json index 8d80ee7..c6c2a35 100644 --- a/sakura_dress_BP/items/kali.json +++ b/sakura_dress_BP/items/kali.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"kali" } diff --git a/sakura_dress_BP/items/kelin.json b/sakura_dress_BP/items/kelin.json index 88ddba3..a42ebef 100644 --- a/sakura_dress_BP/items/kelin.json +++ b/sakura_dress_BP/items/kelin.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"kelin" } diff --git a/sakura_dress_BP/items/kui.json b/sakura_dress_BP/items/kui.json index b7b5dd9..85d2576 100644 --- a/sakura_dress_BP/items/kui.json +++ b/sakura_dress_BP/items/kui.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"kui" } diff --git a/sakura_dress_BP/items/kulou.json b/sakura_dress_BP/items/kulou.json index 5d2e30e..6aed22e 100644 --- a/sakura_dress_BP/items/kulou.json +++ b/sakura_dress_BP/items/kulou.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"kulou" } diff --git a/sakura_dress_BP/items/lansu.json b/sakura_dress_BP/items/lansu.json index 4db97cc..8f5eff3 100644 --- a/sakura_dress_BP/items/lansu.json +++ b/sakura_dress_BP/items/lansu.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"lansu" } diff --git a/sakura_dress_BP/items/leilong.json b/sakura_dress_BP/items/leilong.json index a536c1d..538ee95 100644 --- a/sakura_dress_BP/items/leilong.json +++ b/sakura_dress_BP/items/leilong.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"leilong" } diff --git a/sakura_dress_BP/items/lengjing.json b/sakura_dress_BP/items/lengjing.json index b5c649e..a42b068 100644 --- a/sakura_dress_BP/items/lengjing.json +++ b/sakura_dress_BP/items/lengjing.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:lengjing": {}, - "tag:lengjingon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"lengjing" } diff --git a/sakura_dress_BP/items/lihuo.json b/sakura_dress_BP/items/lihuo.json index d6e64e9..80634da 100644 --- a/sakura_dress_BP/items/lihuo.json +++ b/sakura_dress_BP/items/lihuo.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"lihuo" } diff --git a/sakura_dress_BP/items/lingdong.json b/sakura_dress_BP/items/lingdong.json index ca2bbd9..00d1e4c 100644 --- a/sakura_dress_BP/items/lingdong.json +++ b/sakura_dress_BP/items/lingdong.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:lingdong": {}, - "tag:lingdongon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"lingdong" } diff --git a/sakura_dress_BP/items/linguang.json b/sakura_dress_BP/items/linguang.json index 095230d..173c796 100644 --- a/sakura_dress_BP/items/linguang.json +++ b/sakura_dress_BP/items/linguang.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"linguang" } diff --git a/sakura_dress_BP/items/luren.json b/sakura_dress_BP/items/luren.json index a5853b1..fa13b89 100644 --- a/sakura_dress_BP/items/luren.json +++ b/sakura_dress_BP/items/luren.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:luren": {}, - "tag:lurenon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"luren" } diff --git a/sakura_dress_BP/items/maoxian.json b/sakura_dress_BP/items/maoxian.json index eb60052..a11c74b 100644 --- a/sakura_dress_BP/items/maoxian.json +++ b/sakura_dress_BP/items/maoxian.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"maoxian" } diff --git a/sakura_dress_BP/items/moran.json b/sakura_dress_BP/items/moran.json index 25a9e50..7c8d179 100644 --- a/sakura_dress_BP/items/moran.json +++ b/sakura_dress_BP/items/moran.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:moran": {}, - "tag:moranon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"moran" } diff --git a/sakura_dress_BP/items/mushi.json b/sakura_dress_BP/items/mushi.json index 72a92e8..79a25c7 100644 --- a/sakura_dress_BP/items/mushi.json +++ b/sakura_dress_BP/items/mushi.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:mushi": {}, - "tag:mushion": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"mushi" } diff --git a/sakura_dress_BP/items/nafei.json b/sakura_dress_BP/items/nafei.json index 583d41a..0358be7 100644 --- a/sakura_dress_BP/items/nafei.json +++ b/sakura_dress_BP/items/nafei.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"nafei" } diff --git a/sakura_dress_BP/items/naiya.json b/sakura_dress_BP/items/naiya.json index 25875ae..a8df0f8 100644 --- a/sakura_dress_BP/items/naiya.json +++ b/sakura_dress_BP/items/naiya.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:naiya": {}, - "tag:naiyaon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"naiya" } diff --git a/sakura_dress_BP/items/naxida.json b/sakura_dress_BP/items/naxida.json index a037483..4f2cc8b 100644 --- a/sakura_dress_BP/items/naxida.json +++ b/sakura_dress_BP/items/naxida.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"naxida" } diff --git a/sakura_dress_BP/items/no_fashion.json b/sakura_dress_BP/items/no_fashion.json deleted file mode 100644 index 25c4abd..0000000 --- a/sakura_dress_BP/items/no_fashion.json +++ /dev/null @@ -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": {} - } -} \ No newline at end of file diff --git a/sakura_dress_BP/items/qingbing.json b/sakura_dress_BP/items/qingbing.json index 05901ce..2e91751 100644 --- a/sakura_dress_BP/items/qingbing.json +++ b/sakura_dress_BP/items/qingbing.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress1" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"qingbing" } diff --git a/sakura_dress_BP/items/qinglian.json b/sakura_dress_BP/items/qinglian.json index 2e01c2e..731365b 100644 --- a/sakura_dress_BP/items/qinglian.json +++ b/sakura_dress_BP/items/qinglian.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:qinglian": {}, - "tag:qinglianon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"qinglian" } diff --git a/sakura_dress_BP/items/qishu.json b/sakura_dress_BP/items/qishu.json index 3161436..173f2f6 100644 --- a/sakura_dress_BP/items/qishu.json +++ b/sakura_dress_BP/items/qishu.json @@ -12,8 +12,12 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { - "value":"qishu" + "value": "qishu" } }, "events": {} diff --git a/sakura_dress_BP/items/qiushui.json b/sakura_dress_BP/items/qiushui.json index 667bbef..ed1b4e9 100644 --- a/sakura_dress_BP/items/qiushui.json +++ b/sakura_dress_BP/items/qiushui.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:qiushui": {}, - "tag:qiushuion": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"qiushui" } diff --git a/sakura_dress_BP/items/qugui.json b/sakura_dress_BP/items/qugui.json index 120666f..d824ec7 100644 --- a/sakura_dress_BP/items/qugui.json +++ b/sakura_dress_BP/items/qugui.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"qugui" } diff --git a/sakura_dress_BP/items/shendao.json b/sakura_dress_BP/items/shendao.json index 6ca69c4..89888e7 100644 --- a/sakura_dress_BP/items/shendao.json +++ b/sakura_dress_BP/items/shendao.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:shendao": {}, - "tag:shendaoon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"shendao" } diff --git a/sakura_dress_BP/items/sheshou.json b/sakura_dress_BP/items/sheshou.json index ba032d7..6a7f68d 100644 --- a/sakura_dress_BP/items/sheshou.json +++ b/sakura_dress_BP/items/sheshou.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:sheshou": {}, - "tag:sheshouon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"sheshou" } diff --git a/sakura_dress_BP/items/shuibing.json b/sakura_dress_BP/items/shuibing.json index aed168d..14e079c 100644 --- a/sakura_dress_BP/items/shuibing.json +++ b/sakura_dress_BP/items/shuibing.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:shuibing": {}, - "tag:shuibingon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"shuibing" } diff --git a/sakura_dress_BP/items/shuishen.json b/sakura_dress_BP/items/shuishen.json index fb36823..1ab3db6 100644 --- a/sakura_dress_BP/items/shuishen.json +++ b/sakura_dress_BP/items/shuishen.json @@ -8,12 +8,16 @@ "components": { "minecraft:max_stack_size": 1, "tag:shuishen": {}, - "tag:shuishenon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { - "value":"shuishen" + "value": "shuishen" } }, "events": {} diff --git a/sakura_dress_BP/items/wangling.json b/sakura_dress_BP/items/wangling.json index 08f316b..d7246a9 100644 --- a/sakura_dress_BP/items/wangling.json +++ b/sakura_dress_BP/items/wangling.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:wangling": {}, - "tag:wanglingon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"wangling" } diff --git a/sakura_dress_BP/items/weiwei.json b/sakura_dress_BP/items/weiwei.json index a1e0030..4a12a40 100644 --- a/sakura_dress_BP/items/weiwei.json +++ b/sakura_dress_BP/items/weiwei.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"weiwei" } diff --git a/sakura_dress_BP/items/wudou.json b/sakura_dress_BP/items/wudou.json index 6fb5229..e653d0b 100644 --- a/sakura_dress_BP/items/wudou.json +++ b/sakura_dress_BP/items/wudou.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"wudou" } diff --git a/sakura_dress_BP/items/xiaochou.json b/sakura_dress_BP/items/xiaochou.json index e26ba01..ce05c22 100644 --- a/sakura_dress_BP/items/xiaochou.json +++ b/sakura_dress_BP/items/xiaochou.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"xiaochou" } diff --git a/sakura_dress_BP/items/xinggui.json b/sakura_dress_BP/items/xinggui.json index 58ee0e8..5bb97dd 100644 --- a/sakura_dress_BP/items/xinggui.json +++ b/sakura_dress_BP/items/xinggui.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:xinggui": {}, - "tag:xingguion": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"xinggui" } diff --git a/sakura_dress_BP/items/xingkong.json b/sakura_dress_BP/items/xingkong.json index 5f85c9d..ffa8a99 100644 --- a/sakura_dress_BP/items/xingkong.json +++ b/sakura_dress_BP/items/xingkong.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:xingkong": {}, - "tag:xingkongon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"xingkong" } diff --git a/sakura_dress_BP/items/xixue.json b/sakura_dress_BP/items/xixue.json index 88d8190..4d737d0 100644 --- a/sakura_dress_BP/items/xixue.json +++ b/sakura_dress_BP/items/xixue.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"xixue" } diff --git a/sakura_dress_BP/items/xueyuan.json b/sakura_dress_BP/items/xueyuan.json index ec5e1cb..e179372 100644 --- a/sakura_dress_BP/items/xueyuan.json +++ b/sakura_dress_BP/items/xueyuan.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"xueyuan" } diff --git a/sakura_dress_BP/items/xuezu.json b/sakura_dress_BP/items/xuezu.json index 33e2547..e1c33e9 100644 --- a/sakura_dress_BP/items/xuezu.json +++ b/sakura_dress_BP/items/xuezu.json @@ -7,11 +7,15 @@ }, "components": { "minecraft:max_stack_size": 1, - "tag:xinggui": {}, - "tag:xingguion": {}, + "tag:xuezu": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"xuezu" } diff --git a/sakura_dress_BP/items/xukong.json b/sakura_dress_BP/items/xukong.json index 2628698..57e06a8 100644 --- a/sakura_dress_BP/items/xukong.json +++ b/sakura_dress_BP/items/xukong.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"xukong" } diff --git a/sakura_dress_BP/items/yiji.json b/sakura_dress_BP/items/yiji.json index e5c8a22..3f5954c 100644 --- a/sakura_dress_BP/items/yiji.json +++ b/sakura_dress_BP/items/yiji.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"yiji" } diff --git a/sakura_dress_BP/items/yinghua.json b/sakura_dress_BP/items/yinghua.json index 04ca590..ffbe306 100644 --- a/sakura_dress_BP/items/yinghua.json +++ b/sakura_dress_BP/items/yinghua.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"yinghua" } diff --git a/sakura_dress_BP/items/yinyue.json b/sakura_dress_BP/items/yinyue.json index df0dbf0..7692a2b 100644 --- a/sakura_dress_BP/items/yinyue.json +++ b/sakura_dress_BP/items/yinyue.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:yinyue": {}, - "tag:yinyueon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"yinyue" } diff --git a/sakura_dress_BP/items/youlong.json b/sakura_dress_BP/items/youlong.json index c34e49b..ba07a3d 100644 --- a/sakura_dress_BP/items/youlong.json +++ b/sakura_dress_BP/items/youlong.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:youlong": {}, - "tag:youlongon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"youlong" } diff --git a/sakura_dress_BP/items/zhandou.json b/sakura_dress_BP/items/zhandou.json index ad900ca..f61c2d0 100644 --- a/sakura_dress_BP/items/zhandou.json +++ b/sakura_dress_BP/items/zhandou.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress2" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"zhandou" } diff --git a/sakura_dress_BP/items/zhanshi.json b/sakura_dress_BP/items/zhanshi.json index ddee412..7a79888 100644 --- a/sakura_dress_BP/items/zhanshi.json +++ b/sakura_dress_BP/items/zhanshi.json @@ -12,6 +12,10 @@ "minecraft:icon": { "texture": "dress1" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"zhanshi" } diff --git a/sakura_dress_BP/items/ziluo.json b/sakura_dress_BP/items/ziluo.json index df52f65..3248562 100644 --- a/sakura_dress_BP/items/ziluo.json +++ b/sakura_dress_BP/items/ziluo.json @@ -8,10 +8,14 @@ "components": { "minecraft:max_stack_size": 1, "tag:ziluo": {}, - "tag:ziluoon": {}, + "tag:fashion": {}, "minecraft:icon": { "texture": "dress3" }, + "minecraft:wearable": { + "dispensable": true, + "slot": "slot.armor.head" + }, "minecraft:display_name": { "value":"ziluo" } diff --git a/sakura_dress_BP/manifest.json b/sakura_dress_BP/manifest.json index e014cce..6d0df42 100644 --- a/sakura_dress_BP/manifest.json +++ b/sakura_dress_BP/manifest.json @@ -1,13 +1,13 @@ { "format_version": 2, "header": { - "name": "SakuraDress 1.1.0", + "name": "SakuraDress 1.1.2", "description": "樱落绘境基岩版萌芽时装", "uuid": "898cbd07-3990-4787-a7d0-85c555cb9889", "version": [ 1, 1, - 0 + 2 ], "min_engine_version": [ 1, @@ -23,7 +23,7 @@ "version": [ 1, 1, - 0 + 2 ] } ] diff --git a/sakura_dress_RP/entity/player/player.entity.json b/sakura_dress_RP/entity/player/player.entity.json index 60d426a..3160ee7 100644 --- a/sakura_dress_RP/entity/player/player.entity.json +++ b/sakura_dress_RP/entity/player/player.entity.json @@ -175,75 +175,75 @@ "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.nofashion= query.is_item_name_any('slot.inventory', 0, 'minecraft:air');", - "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');", - "variable.hongjing = query.is_item_name_any('slot.inventory', 0, 'sakuradress:hongjing');", - "variable.qingbing = query.is_item_name_any('slot.inventory', 0, 'sakuradress:qingbing');", - "variable.linguang = query.is_item_name_any('slot.inventory', 0, 'sakuradress:linguang');", - "variable.aisi = query.is_item_name_any('slot.inventory', 0, 'sakuradress:aisi');", - "variable.bohui = query.is_item_name_any('slot.inventory', 0, 'sakuradress:bohui');", - "variable.haijun = query.is_item_name_any('slot.inventory', 0, 'sakuradress:haijun');", - "variable.hanyan = query.is_item_name_any('slot.inventory', 0, 'sakuradress:hanyan');", - "variable.huigu = query.is_item_name_any('slot.inventory', 0, 'sakuradress:huigu');", - "variable.huizhang = query.is_item_name_any('slot.inventory', 0, 'sakuradress:huizhang');", - "variable.huohu = query.is_item_name_any('slot.inventory', 0, 'sakuradress:huohu');", - "variable.huoxiao = query.is_item_name_any('slot.inventory', 0, 'sakuradress:huoxiao');", - "variable.jixie = query.is_item_name_any('slot.inventory', 0, 'sakuradress:jixie');", - "variable.kelin = query.is_item_name_any('slot.inventory', 0, 'sakuradress:kelin');", - "variable.kui = query.is_item_name_any('slot.inventory', 0, 'sakuradress:kui');", - "variable.leilong = query.is_item_name_any('slot.inventory', 0, 'sakuradress:leilong');", - "variable.maoxian = query.is_item_name_any('slot.inventory', 0, 'sakuradress:maoxian');", - "variable.nafei = query.is_item_name_any('slot.inventory', 0, 'sakuradress:nafei');", - "variable.qugui = query.is_item_name_any('slot.inventory', 0, 'sakuradress:qugui');", - "variable.weiwei = query.is_item_name_any('slot.inventory', 0, 'sakuradress:weiwei');", - "variable.wudou = query.is_item_name_any('slot.inventory', 0, 'sakuradress:wudou');", - "variable.xixue = query.is_item_name_any('slot.inventory', 0, 'sakuradress:xixue');", - "variable.xukong = query.is_item_name_any('slot.inventory', 0, 'sakuradress:xukong');", - "variable.yiji = query.is_item_name_any('slot.inventory', 0, 'sakuradress:yiji');", - "variable.zhandou = query.is_item_name_any('slot.inventory', 0, 'sakuradress:zhandou');", - "variable.zhanshi = query.is_item_name_any('slot.inventory', 0, 'sakuradress:zhanshi');", - "variable.lansu = query.is_item_name_any('slot.inventory', 0, 'sakuradress:lansu');", - "variable.xiaochou = query.is_item_name_any('slot.inventory', 0, 'sakuradress:xiaochou');", - "variable.qishu = query.is_item_name_any('slot.inventory', 0, 'sakuradress:qishu');", - "variable.banruo = query.is_item_name_any('slot.inventory', 0, 'sakuradress:banruo');", - "variable.cike = query.is_item_name_any('slot.inventory', 0, 'sakuradress:cike');", - "variable.yinghua = query.is_item_name_any('slot.inventory', 0, 'sakuradress:yinghua');", - "variable.lihuo = query.is_item_name_any('slot.inventory', 0, 'sakuradress:lihuo');", - "variable.kulou = query.is_item_name_any('slot.inventory', 0, 'sakuradress:kulou');", - "variable.fashi = query.is_item_name_any('slot.inventory', 0, 'sakuradress:fashi');", - "variable.fuguang = query.is_item_name_any('slot.inventory', 0, 'sakuradress:fuguang');", - "variable.heian = query.is_item_name_any('slot.inventory', 0, 'sakuradress:heian');", - "variable.heilong = query.is_item_name_any('slot.inventory', 0, 'sakuradress:heilong');", - "variable.gaoda = query.is_item_name_any('slot.inventory', 0, 'sakuradress:gaoda');", - "variable.jiuwei = query.is_item_name_any('slot.inventory', 0, 'sakuradress:jiuwei');", - "variable.lengjing = query.is_item_name_any('slot.inventory', 0, 'sakuradress:lengjing');", - "variable.lingdong = query.is_item_name_any('slot.inventory', 0, 'sakuradress:lingdong');", - "variable.luren = query.is_item_name_any('slot.inventory', 0, 'sakuradress:luren');", - "variable.moran = query.is_item_name_any('slot.inventory', 0, 'sakuradress:moran');", - "variable.mushi = query.is_item_name_any('slot.inventory', 0, 'sakuradress:mushi');", - "variable.naiya = query.is_item_name_any('slot.inventory', 0, 'sakuradress:naiya');", - "variable.qinglian = query.is_item_name_any('slot.inventory', 0, 'sakuradress:qinglian');", - "variable.qiushui = query.is_item_name_any('slot.inventory', 0, 'sakuradress:qiushui');", - "variable.sheshou = query.is_item_name_any('slot.inventory', 0, 'sakuradress:sheshou');", - "variable.shendao = query.is_item_name_any('slot.inventory', 0, 'sakuradress:shendao');", - "variable.guimian = query.is_item_name_any('slot.inventory', 0, 'sakuradress:guimian');", - "variable.wangling = query.is_item_name_any('slot.inventory', 0, 'sakuradress:wangling');", - "variable.xuezu = query.is_item_name_any('slot.inventory', 0, 'sakuradress:xuezu');", - "variable.xinggui = query.is_item_name_any('slot.inventory', 0, 'sakuradress:xinggui');", - "variable.xingkong = query.is_item_name_any('slot.inventory', 0, 'sakuradress:xingkong');", - "variable.youlong = query.is_item_name_any('slot.inventory', 0, 'sakuradress:youlong');", - "variable.ziluo = query.is_item_name_any('slot.inventory', 0, 'sakuradress:ziluo');", - "variable.bailu = query.is_item_name_any('slot.inventory', 0, 'sakuradress:bailu');", - "variable.yinyue = query.is_item_name_any('slot.inventory', 0, 'sakuradress:yinyue');", - "variable.bingfeng = query.is_item_name_any('slot.inventory', 0, 'sakuradress:bingfeng');", - "variable.feier = query.is_item_name_any('slot.inventory', 0, 'sakuradress:feier');", - "variable.shuishen = query.is_item_name_any('slot.inventory', 0, 'sakuradress:shuishen');", - "variable.gewen = query.is_item_name_any('slot.inventory', 0, 'sakuradress:gewen');", - "variable.hutao = query.is_item_name_any('slot.inventory', 0, 'sakuradress:hutao');", - "variable.shuibing = query.is_item_name_any('slot.inventory', 0, 'sakuradress:shuibing');", - "variable.naxida = query.is_item_name_any('slot.inventory', 0, 'sakuradress:naxida');" + "variable.fashion= query.equipped_item_any_tag('slot.armor.head', 'fashion');", + "variable.kali = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:kali');", + "variable.xueyuan = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:xueyuan');", + "variable.huangfeng = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:huangfeng');", + "variable.hongjing = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:hongjing');", + "variable.qingbing = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:qingbing');", + "variable.linguang = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:linguang');", + "variable.aisi = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:aisi');", + "variable.bohui = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:bohui');", + "variable.haijun = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:haijun');", + "variable.hanyan = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:hanyan');", + "variable.huigu = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:huigu');", + "variable.huizhang = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:huizhang');", + "variable.huohu = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:huohu');", + "variable.huoxiao = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:huoxiao');", + "variable.jixie = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:jixie');", + "variable.kelin = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:kelin');", + "variable.kui = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:kui');", + "variable.leilong = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:leilong');", + "variable.maoxian = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:maoxian');", + "variable.nafei = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:nafei');", + "variable.qugui = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:qugui');", + "variable.weiwei = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:weiwei');", + "variable.wudou = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:wudou');", + "variable.xixue = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:xixue');", + "variable.xukong = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:xukong');", + "variable.yiji = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:yiji');", + "variable.zhandou = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:zhandou');", + "variable.zhanshi = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:zhanshi');", + "variable.lansu = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:lansu');", + "variable.xiaochou = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:xiaochou');", + "variable.qishu = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:qishu');", + "variable.banruo = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:banruo');", + "variable.cike = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:cike');", + "variable.yinghua = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:yinghua');", + "variable.lihuo = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:lihuo');", + "variable.kulou = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:kulou');", + "variable.fashi = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:fashi');", + "variable.fuguang = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:fuguang');", + "variable.heian = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:heian');", + "variable.heilong = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:heilong');", + "variable.gaoda = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:gaoda');", + "variable.jiuwei = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:jiuwei');", + "variable.lengjing = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:lengjing');", + "variable.lingdong = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:lingdong');", + "variable.luren = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:luren');", + "variable.moran = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:moran');", + "variable.mushi = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:mushi');", + "variable.naiya = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:naiya');", + "variable.qinglian = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:qinglian');", + "variable.qiushui = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:qiushui');", + "variable.sheshou = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:sheshou');", + "variable.shendao = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:shendao');", + "variable.guimian = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:guimian');", + "variable.wangling = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:wangling');", + "variable.xuezu = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:xuezu');", + "variable.xinggui = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:xinggui');", + "variable.xingkong = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:xingkong');", + "variable.youlong = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:youlong');", + "variable.ziluo = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:ziluo');", + "variable.bailu = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:bailu');", + "variable.yinyue = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:yinyue');", + "variable.bingfeng = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:bingfeng');", + "variable.feier = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:feier');", + "variable.shuishen = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:shuishen');", + "variable.gewen = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:gewen');", + "variable.hutao = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:hutao');", + "variable.shuibing = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:shuibing');", + "variable.naxida = query.is_item_name_any('slot.armor.head', 0, 'sakuradress:naxida');" ], "animate": [ "root" @@ -313,13 +313,13 @@ }, "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" diff --git a/sakura_dress_RP/manifest.json b/sakura_dress_RP/manifest.json index 8388ea3..ed1da9f 100644 --- a/sakura_dress_RP/manifest.json +++ b/sakura_dress_RP/manifest.json @@ -1,13 +1,13 @@ { "format_version": 2, "header": { - "name": "SakuraDress 1.1.0", + "name": "SakuraDress 1.1.2", "description": "樱落绘境基岩版萌芽时装", "uuid": "34a44803-a08e-431c-a074-613550dde7b8", "version": [ 1, 1, - 0 + 2 ], "min_engine_version": [ 1, @@ -23,7 +23,7 @@ "version": [ 1, 1, - 0 + 2 ] } ]