From 436d3397155b2cefcf5175d7fb788494c756fe3f Mon Sep 17 00:00:00 2001 From: tartaric_acid Date: Wed, 23 Oct 2024 01:42:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=83=A8=E5=88=86=E6=88=90?= =?UTF-8?q?=E5=B0=B1=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advancement/challenge/kill_100.json | 2 +- .../advancement/maid_base/switch_task.json | 2 +- .../advancement/ChallengeAdvancement.java | 2 +- .../advancement/MaidBaseAdvancement.java | 2 +- .../entity/passive/EntityMaid.java | 3 +++ .../touhoulittlemaid/init/InitItems.java | 1 + .../assets/touhou_little_maid/lang/en_us.json | 2 +- .../assets/touhou_little_maid/lang/zh_cn.json | 2 +- .../models/item/kill_100.json | 6 ++++++ .../textures/item/kill_100.png | Bin 0 -> 287 bytes .../textures/item/kill_slime_300.png | Bin 287 -> 2901 bytes 11 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/touhou_little_maid/models/item/kill_100.json create mode 100644 src/main/resources/assets/touhou_little_maid/textures/item/kill_100.png diff --git a/src/generated/resources/data/touhou_little_maid/advancement/challenge/kill_100.json b/src/generated/resources/data/touhou_little_maid/advancement/challenge/kill_100.json index 811d6d1fe..69d79e289 100644 --- a/src/generated/resources/data/touhou_little_maid/advancement/challenge/kill_100.json +++ b/src/generated/resources/data/touhou_little_maid/advancement/challenge/kill_100.json @@ -16,7 +16,7 @@ "frame": "goal", "icon": { "count": 1, - "id": "minecraft:diamond_sword" + "id": "touhou_little_maid:kill_100" }, "title": { "translate": "advancements.touhou_little_maid.challenge.kill_100.title" diff --git a/src/generated/resources/data/touhou_little_maid/advancement/maid_base/switch_task.json b/src/generated/resources/data/touhou_little_maid/advancement/maid_base/switch_task.json index d09aacc43..cffb917ec 100644 --- a/src/generated/resources/data/touhou_little_maid/advancement/maid_base/switch_task.json +++ b/src/generated/resources/data/touhou_little_maid/advancement/maid_base/switch_task.json @@ -14,7 +14,7 @@ }, "icon": { "count": 1, - "id": "touhou_little_maid:hakurei_gohei" + "id": "minecraft:feather" }, "title": { "translate": "advancements.touhou_little_maid.maid_base.switch_task.title" diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/advancement/ChallengeAdvancement.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/advancement/ChallengeAdvancement.java index d33657bed..86d5acbcc 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/advancement/ChallengeAdvancement.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/advancement/ChallengeAdvancement.java @@ -52,7 +52,7 @@ private static void generateProtect(AdvancementHolder root, Consumer saver, ExistingFileHelper existingFileHelper) { - AdvancementHolder kill = makeGoal(Items.DIAMOND_SWORD, "kill_100").parent(root) + AdvancementHolder kill = makeGoal(InitItems.KILL_100.get(), "kill_100").parent(root) .addCriterion("maid_event", MaidEventTrigger.create(TriggerType.KILL_100)) .rewards(AdvancementRewards.Builder.experience(50)) .save(saver, id("challenge/kill_100"), existingFileHelper); diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/advancement/MaidBaseAdvancement.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/advancement/MaidBaseAdvancement.java index 538344a21..cdcf3fac3 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/advancement/MaidBaseAdvancement.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/datagen/advancement/MaidBaseAdvancement.java @@ -25,7 +25,7 @@ public class MaidBaseAdvancement { public static void generate(Consumer saver, ExistingFileHelper existingFileHelper) { - AdvancementHolder root = make(InitItems.HAKUREI_GOHEI.get(), "switch_task") + AdvancementHolder root = make(Items.FEATHER, "switch_task") .addCriterion("maid_event", MaidEventTrigger.create(TriggerType.SWITCH_TASK)) .save(saver, id("maid_base/switch_task"), existingFileHelper); diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java index 25e216dd1..1576756c9 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/entity/passive/EntityMaid.java @@ -900,6 +900,9 @@ public void thunderHit(ServerLevel world, LightningBolt lightning) { setStruckByLightning(true); if (this.getOwner() instanceof ServerPlayer serverPlayer) { InitTrigger.MAID_EVENT.get().trigger(serverPlayer, TriggerType.LIGHTNING_BOLT); + if (this.getMaxHealth() >= 100) { + InitTrigger.MAID_EVENT.get().trigger(serverPlayer, TriggerType.MAID_100_HEALTHY); + } } } } diff --git a/src/main/java/com/github/tartaricacid/touhoulittlemaid/init/InitItems.java b/src/main/java/com/github/tartaricacid/touhoulittlemaid/init/InitItems.java index 3fd3cd364..b2f4c4fb9 100644 --- a/src/main/java/com/github/tartaricacid/touhoulittlemaid/init/InitItems.java +++ b/src/main/java/com/github/tartaricacid/touhoulittlemaid/init/InitItems.java @@ -80,6 +80,7 @@ public final class InitItems { public static DeferredItem CHANGE_CHAIR_MODEL = ITEMS.register("change_chair_model", ItemAdvancementIcon::new); public static DeferredItem CHANGE_MAID_MODEL = ITEMS.register("change_maid_model", ItemAdvancementIcon::new); public static DeferredItem MAID_100_HEALTHY = ITEMS.register("maid_100_healthy", ItemAdvancementIcon::new); + public static DeferredItem KILL_100 = ITEMS.register("kill_100", ItemAdvancementIcon::new); public static DeferredItem KILL_SLIME_300 = ITEMS.register("kill_slime_300", ItemAdvancementIcon::new); public static DeferredItem ALL_NETHERITE_EQUIPMENT = ITEMS.register("all_netherite_equipment", ItemAdvancementIcon::new); public static DeferredItem KILL_WITHER = ITEMS.register("kill_wither", ItemAdvancementIcon::new); diff --git a/src/main/resources/assets/touhou_little_maid/lang/en_us.json b/src/main/resources/assets/touhou_little_maid/lang/en_us.json index 26b78973f..ce05572f2 100644 --- a/src/main/resources/assets/touhou_little_maid/lang/en_us.json +++ b/src/main/resources/assets/touhou_little_maid/lang/en_us.json @@ -33,7 +33,7 @@ "advancements.touhou_little_maid.challenge.kill_dragon.title": "Dra-gone with a Bang", "advancements.touhou_little_maid.challenge.kill_slime_300.description": "Maid Kills 300 slimes, either regular or magma cube", "advancements.touhou_little_maid.challenge.kill_slime_300.title": "Ooey-Gooey Goodness", - "advancements.touhou_little_maid.challenge.lightning_bolt.description": "Summon a lightning bolt from an altar", + "advancements.touhou_little_maid.challenge.lightning_bolt.description": "Summon a lightning bolt from an altar，and let the lightning strike the maid", "advancements.touhou_little_maid.challenge.lightning_bolt.title": "Tojiko is Mad!", "advancements.touhou_little_maid.challenge.maid_100_healthy.description": "The maid's HP reaches 100", "advancements.touhou_little_maid.challenge.maid_100_healthy.title": "100% Healthy", diff --git a/src/main/resources/assets/touhou_little_maid/lang/zh_cn.json b/src/main/resources/assets/touhou_little_maid/lang/zh_cn.json index ffcc21965..b6ca6ca46 100644 --- a/src/main/resources/assets/touhou_little_maid/lang/zh_cn.json +++ b/src/main/resources/assets/touhou_little_maid/lang/zh_cn.json @@ -33,7 +33,7 @@ "advancements.touhou_little_maid.challenge.kill_dragon.title": "屠龙勇士", "advancements.touhou_little_maid.challenge.kill_slime_300.description": "女仆杀死 300 只史莱姆", "advancements.touhou_little_maid.challenge.kill_slime_300.title": "杀了三百只史莱姆，不知不觉就满级了", - "advancements.touhou_little_maid.challenge.lightning_bolt.description": "从祭坛中合成出闪电", + "advancements.touhou_little_maid.challenge.lightning_bolt.description": "从祭坛中合成出闪电，并用闪电击中女仆", "advancements.touhou_little_maid.challenge.lightning_bolt.title": "何方道友在此渡劫？", "advancements.touhou_little_maid.challenge.maid_100_healthy.description": "女仆血量达到一百点", "advancements.touhou_little_maid.challenge.maid_100_healthy.title": "百分百健康", diff --git a/src/main/resources/assets/touhou_little_maid/models/item/kill_100.json b/src/main/resources/assets/touhou_little_maid/models/item/kill_100.json new file mode 100644 index 000000000..fd4abbbf8 --- /dev/null +++ b/src/main/resources/assets/touhou_little_maid/models/item/kill_100.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "touhou_little_maid:item/kill_100" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/touhou_little_maid/textures/item/kill_100.png b/src/main/resources/assets/touhou_little_maid/textures/item/kill_100.png new file mode 100644 index 0000000000000000000000000000000000000000..799b299f4aa23d363bff476de206bfe828ebd87c GIT binary patch literal 287 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 l2*3