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 000000000..799b299f4 Binary files /dev/null and b/src/main/resources/assets/touhou_little_maid/textures/item/kill_100.png differ diff --git a/src/main/resources/assets/touhou_little_maid/textures/item/kill_slime_300.png b/src/main/resources/assets/touhou_little_maid/textures/item/kill_slime_300.png index 799b299f4..eaacca05e 100644 Binary files a/src/main/resources/assets/touhou_little_maid/textures/item/kill_slime_300.png and b/src/main/resources/assets/touhou_little_maid/textures/item/kill_slime_300.png differ