Add tamable entity's owner check in effect behavior.

更新Readme

Readme.md

@@ -4,8 +4,6 @@
 
 An extension mod of TLM(Touhou Little Maid). Add some useful tasks to your Maid.
 
-> Currently, it's logging only.
-
 # Features
 
 ## Logging
@@ -17,6 +15,12 @@ up the maid's ability to cut down trees and destroy leaves!
 
 The maid will search for a specified structure or the player's respawn point based on the item in her hand. If the maid is on the same vehicle as the player (currently only brooms are supported), the player can press a designated button (V by default) to give the maid control or partial control of the carrier.
 
+## Revive
+
+Requires "Player Revive" mod.
+
+The Maid will revive nearby fallen players. If there is an undead totem in the Maid's bauble, the Maid will use one (The maid consumes a totem to skip your revive countdown, instead of just consuming the totem to not die like that in vanilla).
+
 # More
 
 + The Mod is currently in early development. Everything may change in the future.

Readme_zh.md

@@ -4,8 +4,6 @@ For English version, visit [English Version](Readme.md)
 
 一个车万女仆的拓展模组，添加了一些实用的女仆任务。
 
-> 然而，目前只有砍树
-
 # Features
 
 ## Logging
@@ -16,6 +14,12 @@ For English version, visit [English Version](Readme.md)
 
 女仆会根据手上的物品寻找指定的结构或者玩家出生点。如果女仆和玩家在同一载具上（目前只支持扫帚），玩家可以按下指定按键（默认为V）来让女仆控制或部分控制载具。
 
+## Revive
+
+需要`玩家救援`模组
+
+女仆会救援附近倒地的玩家。如果女仆饰品中有不死图腾，则女仆会使用一个。（女仆会消耗一个图腾来跳过你的复活倒计时，而不是像原版一样直接消耗图腾来不死）
+
 # More
 
 + 模组处于早期开发阶段，一切功能在未来都有可能变化。

build.gradle

@@ -166,8 +166,12 @@ dependencies {
 
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
     compileOnly fg.deobf("curse.maven:touhou-little-maid-355044:6440955")
+    compileOnly fg.deobf("curse.maven:playerrevive-266890:6048921")
+    compileOnly fg.deobf("curse.maven:creativecore-257814:6383884")
     runtimeOnly fg.deobf("curse.maven:touhou-little-maid-355044:6440955")
     runtimeOnly fg.deobf("curse.maven:maid-storage-manager-1210244:6455832")
+    runtimeOnly fg.deobf("curse.maven:playerrevive-266890:6048921")
+    runtimeOnly fg.deobf("curse.maven:creativecore-257814:6383884")
     compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
     implementation(jarJar("io.github.llamalad7:mixinextras-forge:0.4.1")) {
         jarJar.ranged(it, "[0.4.1,)")

gradle.properties

@@ -38,7 +38,7 @@ mod_name=maid useful task
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=1.2.0
+mod_version=1.3.3_a_1
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/studio/fantasyit/maid_useful_task/Config.java

@@ -0,0 +1,54 @@
+package studio.fantasyit.maid_useful_task;
+
+import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.config.ModConfigEvent;
+
+import java.util.List;
+
+// An example config class. This is not required, but it's a good idea to have one to keep your config organized.
+// Demonstrates how to use Forge's config APIs
+@Mod.EventBusSubscriber(modid = MaidUsefulTask.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
+public class Config {
+    private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
+
+    private static final ForgeConfigSpec.BooleanValue ENABLE_LOGGING = BUILDER
+            .define("functions.logging", true);
+    private static final ForgeConfigSpec.BooleanValue ENABLE_REVIVE = BUILDER
+            .define("functions.revive", true);
+    private static final ForgeConfigSpec.BooleanValue ENABLE_LOCATE = BUILDER
+            .define("functions.locate", true);
+
+    private static final ForgeConfigSpec.BooleanValue ENABLE_REVIVE_AGGRO = BUILDER
+            .define("revive.aggro", false);
+    private static final ForgeConfigSpec.BooleanValue ENABLE_REVIVE_TOTEM = BUILDER
+            .define("revive.totem", true);
+
+    private static final ForgeConfigSpec.BooleanValue ENABLE_VEHICLE_CONTROL_FULL = BUILDER
+            .define("vehicle_control.full", true);
+    private static final ForgeConfigSpec.BooleanValue ENABLE_VEHICLE_CONTROL_ROTATE = BUILDER
+            .define("vehicle_control.rotate", true);
+
+    static final ForgeConfigSpec SPEC = BUILDER.build();
+
+    public static boolean enableLoggingTask = false;
+    public static boolean enableReviveTask = false;
+    public static boolean enableLocateTask = false;
+
+    public static boolean enableReviveAggro = false;
+    public static boolean enableReviveTotem = false;
+
+    public static boolean enableVehicleControlFull = false;
+    public static boolean enableVehicleControlRotate = false;
+    @SubscribeEvent
+    static void onLoad(final ModConfigEvent event) {
+        enableLoggingTask = ENABLE_LOGGING.get();
+        enableReviveTask = ENABLE_REVIVE.get();
+        enableLocateTask = ENABLE_LOCATE.get();
+        enableReviveAggro = ENABLE_REVIVE_AGGRO.get();
+        enableReviveTotem = ENABLE_REVIVE_TOTEM.get();
+        enableVehicleControlFull = ENABLE_VEHICLE_CONTROL_FULL.get();
+        enableVehicleControlRotate = ENABLE_VEHICLE_CONTROL_ROTATE.get();
+    }
+}

src/main/java/studio/fantasyit/maid_useful_task/MaidUsefulTask.java

@@ -42,6 +42,7 @@ public class MaidUsefulTask {
     @SuppressWarnings("removal")
     public MaidUsefulTask() {
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC);
         MemoryModuleRegistry.register(modEventBus);
         GuiRegistry.init(modEventBus);
         MaidVehicleManager.register();

src/main/java/studio/fantasyit/maid_useful_task/UsefulTaskExtension.java

@@ -7,10 +7,13 @@ import com.github.tartaricacid.touhoulittlemaid.entity.ai.brain.ExtraMaidBrainMa
 import com.github.tartaricacid.touhoulittlemaid.entity.data.TaskDataRegister;
 import com.github.tartaricacid.touhoulittlemaid.entity.task.TaskManager;
 import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import studio.fantasyit.maid_useful_task.compat.PlayerRevive;
 import studio.fantasyit.maid_useful_task.data.MaidConfigKeys;
 import studio.fantasyit.maid_useful_task.data.MaidLoggingConfig;
+import studio.fantasyit.maid_useful_task.data.MaidReviveConfig;
 import studio.fantasyit.maid_useful_task.registry.MemoryModuleRegistry;
 import studio.fantasyit.maid_useful_task.task.MaidLocateTask;
+import studio.fantasyit.maid_useful_task.task.MaidRevivePlayerTask;
 import studio.fantasyit.maid_useful_task.task.MaidTreeTask;
 
 import java.util.List;
@@ -20,8 +23,13 @@ public class UsefulTaskExtension implements ILittleMaid {
     @Override
     public void addMaidTask(TaskManager manager) {
         ILittleMaid.super.addMaidTask(manager);
-        manager.add(new MaidTreeTask());
-        manager.add(new MaidLocateTask());
+        if (Config.enableLoggingTask)
+            manager.add(new MaidTreeTask());
+        if (Config.enableLocateTask)
+            manager.add(new MaidLocateTask());
+        if (Config.enableReviveTask)
+            if (PlayerRevive.isEnable())
+                manager.add(new MaidRevivePlayerTask());
     }
 
     @Override
@@ -48,5 +56,8 @@ public class UsefulTaskExtension implements ILittleMaid {
         MaidConfigKeys.addKey(MaidLoggingConfig.LOCATION,
                 MaidLoggingConfig.KEY = register.register(new MaidLoggingConfig()),
                 MaidLoggingConfig.Data::getDefault);
+        MaidConfigKeys.addKey(MaidReviveConfig.LOCATION,
+                MaidReviveConfig.KEY = register.register(new MaidReviveConfig()),
+                MaidReviveConfig.Data::getDefault);
     }
 }

src/main/java/studio/fantasyit/maid_useful_task/behavior/PlayerReviveBehavior.java

@@ -0,0 +1,187 @@
+package studio.fantasyit.maid_useful_task.behavior;
+
+import com.github.tartaricacid.touhoulittlemaid.entity.ai.brain.sensor.MaidNearestLivingEntitySensor;
+import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.stats.Stats;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
+import net.minecraft.world.entity.ai.goal.target.TargetGoal;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities;
+import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.entity.EntityTypeTest;
+import net.minecraft.world.phys.AABB;
+import studio.fantasyit.maid_useful_task.Config;
+import studio.fantasyit.maid_useful_task.data.MaidReviveConfig;
+import studio.fantasyit.maid_useful_task.util.InvUtil;
+import studio.fantasyit.maid_useful_task.util.WrappedMaidFakePlayer;
+import team.creative.playerrevive.PlayerRevive;
+import team.creative.playerrevive.api.IBleeding;
+import team.creative.playerrevive.server.PlayerReviveServer;
+
+import java.util.*;
+
+public class PlayerReviveBehavior extends Behavior<EntityMaid> {
+    protected static class TryAttackMaidGoal extends TargetGoal {
+        private final EntityMaid maid;
+
+        public TryAttackMaidGoal(Mob p_26140_, EntityMaid maid) {
+            super(p_26140_, true);
+            this.maid = maid;
+        }
+
+        @Override
+        public boolean canUse() {
+            return mob.canAttack(maid);
+        }
+
+        @Override
+        public void start() {
+            mob.setTarget(maid);
+            super.start();
+        }
+
+        public boolean isMaid(EntityMaid maid) {
+            return maid.getUUID().equals(this.maid.getUUID());
+        }
+    }
+
+    public PlayerReviveBehavior() {
+        super(Map.of(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT), 600);
+    }
+
+    @Override
+    protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid maid) {
+        Optional<NearestVisibleLivingEntities> memory = maid.getBrain().getMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES);
+        return memory.map(list -> list
+                .find(entity -> entity instanceof Player)
+                .map(ep -> PlayerReviveServer.getBleeding((ServerPlayer) ep))
+                .anyMatch(IBleeding::isBleeding)
+        ).orElse(false);
+    }
+
+    ServerPlayer targetPlayer;
+    IBleeding bleeding;
+    boolean startedRevive;
+    Set<UUID> aggroEntities;
+
+    @Override
+    protected void start(ServerLevel level, EntityMaid maid, long p_22542_) {
+        super.start(level, maid, p_22542_);
+        aggroEntities = new HashSet<>();
+        startedRevive = false;
+        boolean ownerOnly = maid.getOrCreateData(MaidReviveConfig.KEY, MaidReviveConfig.Data.getDefault()).ownerOnly();
+        LivingEntity owner = maid.getOwner();
+        Optional<NearestVisibleLivingEntities> memory = maid.getBrain().getMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES);
+        targetPlayer = memory.flatMap(list -> list
+                .find(entity -> entity instanceof Player)
+                .map(ep -> (ServerPlayer) ep)
+                .filter(sp -> (owner != null && sp.is(owner)) || !ownerOnly)
+                .filter(ep -> PlayerReviveServer.getBleeding(ep).isBleeding())
+                .findFirst()
+        ).orElse(null);
+        if (targetPlayer != null) {
+            bleeding = PlayerReviveServer.getBleeding(targetPlayer);
+            BehaviorUtils.setWalkAndLookTargetMemories(maid, targetPlayer, 0.5f, 2);
+        }
+        useTotemOfUndying(level, maid);
+    }
+
+    private void useTotemOfUndying(ServerLevel level, EntityMaid maid) {
+        if (!Config.enableReviveTotem) return;
+        ItemStack itemstack = InvUtil.tryExtractOneMatches(maid.getMaidBauble(), (stack) -> stack.is(Items.TOTEM_OF_UNDYING));
+        if (!itemstack.isEmpty()) {
+            targetPlayer.awardStat(Stats.ITEM_USED.get(Items.TOTEM_OF_UNDYING), 1);
+            CriteriaTriggers.USED_TOTEM.trigger(targetPlayer, itemstack);
+
+            targetPlayer.setHealth(1.0F);
+            targetPlayer.removeAllEffects();
+            targetPlayer.addEffect(new MobEffectInstance(MobEffects.REGENERATION, 900, 1));
+            targetPlayer.addEffect(new MobEffectInstance(MobEffects.ABSORPTION, 100, 1));
+            targetPlayer.addEffect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, 800, 0));
+            level.broadcastEntityEvent(targetPlayer, (byte) 35);
+
+            PlayerReviveServer.revive(targetPlayer);
+        }
+    }
+
+    private void checkCanReviveAndStartRevive(ServerLevel level, EntityMaid maid) {
+        if (PlayerRevive.CONFIG.revive.needReviveItem) {
+            if (PlayerRevive.CONFIG.revive.consumeReviveItem && !bleeding.isItemConsumed()) {
+                ItemStack extractedForConsume = InvUtil.tryExtractOneMatches(maid.getAvailableInv(true), PlayerRevive.CONFIG.revive.reviveItem::is);
+                if (!PlayerRevive.CONFIG.revive.reviveItem.is(extractedForConsume)) {
+                    targetPlayer = null;
+                    return;
+                }
+
+                bleeding.setItemConsumed();
+            }
+        }
+
+        PlayerReviveServer.removePlayerAsHelper(WrappedMaidFakePlayer.get(maid));
+        bleeding.revivingPlayers().add(WrappedMaidFakePlayer.get(maid));
+        aggroEntitiesAround(level, maid);
+    }
+
+    @Override
+    protected boolean canStillUse(ServerLevel p_22545_, EntityMaid maid, long p_22547_) {
+        if (targetPlayer == null) return false;
+        if (targetPlayer.distanceTo(maid) > PlayerRevive.CONFIG.revive.maxDistance) return false;
+        return bleeding.isBleeding();
+    }
+
+    protected void aggroEntitiesAround(ServerLevel level, EntityMaid maid) {
+        if (!Config.enableReviveAggro) return;
+        List<Monster> entities = level.getEntities(EntityTypeTest.forClass(Monster.class),
+                AABB.ofSize(maid.position(), 16, 16, 16),
+                entity -> true
+        );
+        for (Monster entity : entities) {
+            if (!aggroEntities.contains(entity.getUUID())) {
+                entity.targetSelector.addGoal(10, new TryAttackMaidGoal(entity, maid));
+                aggroEntities.add(entity.getUUID());
+            }
+        }
+    }
+
+    @Override
+    protected void tick(ServerLevel level, EntityMaid maid, long p_22553_) {
+        super.tick(level, maid, p_22553_);
+        if (p_22553_ % 20 == 0)
+            BehaviorUtils.setWalkAndLookTargetMemories(maid, targetPlayer, 0.5f, 2);
+        if (!startedRevive) {
+            if (maid.distanceTo(targetPlayer) < PlayerRevive.CONFIG.revive.maxDistance) {
+                checkCanReviveAndStartRevive(level, maid);
+                startedRevive = true;
+            }
+        } else {
+            if (p_22553_ % 20 == 0)
+                aggroEntitiesAround(level, maid);
+        }
+    }
+
+    @Override
+    protected void stop(ServerLevel p_22548_, EntityMaid maid, long p_22550_) {
+        PlayerReviveServer.removePlayerAsHelper(WrappedMaidFakePlayer.get(maid));
+        if (!bleeding.isBleeding())
+            targetPlayer.addEffect(new MobEffectInstance(MobEffects.REGENERATION, 200));
+        for (UUID uuid : aggroEntities) {
+            Entity entity = p_22548_.getEntity(uuid);
+            if (entity instanceof Monster monster && entity.isAlive())
+                monster.targetSelector.removeAllGoals(g -> g instanceof TryAttackMaidGoal tg && tg.isMaid(maid));
+        }
+    }
+}

src/main/java/studio/fantasyit/maid_useful_task/behavior/SupportEffectBehavior.java

@@ -0,0 +1,114 @@
+package studio.fantasyit.maid_useful_task.behavior;
+
+import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.stats.Stats;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.TamableAnimal;
+import net.minecraft.world.entity.ai.behavior.Behavior;
+import net.minecraft.world.entity.ai.behavior.BehaviorUtils;
+import net.minecraft.world.entity.ai.goal.target.TargetGoal;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.memory.MemoryStatus;
+import net.minecraft.world.entity.ai.memory.NearestVisibleLivingEntities;
+import net.minecraft.world.entity.monster.Monster;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import net.minecraft.world.level.entity.EntityTypeTest;
+import net.minecraft.world.phys.AABB;
+import studio.fantasyit.maid_useful_task.Config;
+import studio.fantasyit.maid_useful_task.data.MaidReviveConfig;
+import studio.fantasyit.maid_useful_task.util.InvUtil;
+import studio.fantasyit.maid_useful_task.util.WrappedMaidFakePlayer;
+import team.creative.playerrevive.PlayerRevive;
+import team.creative.playerrevive.api.IBleeding;
+import team.creative.playerrevive.server.PlayerReviveServer;
+
+import java.util.*;
+
+public class SupportEffectBehavior extends Behavior<EntityMaid> {
+    public SupportEffectBehavior() {
+        super(Map.of(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES, MemoryStatus.VALUE_PRESENT));
+    }
+
+    @Override
+    protected boolean checkExtraStartConditions(ServerLevel p_22538_, EntityMaid maid) {
+        if (maid.getExperience() <= 0) return false;
+        LivingEntity player = maid.getOwner();
+        if (player == null) return false;
+        Optional<NearestVisibleLivingEntities> memory = maid.getBrain().getMemory(MemoryModuleType.NEAREST_VISIBLE_LIVING_ENTITIES);
+        return memory.map(list -> list
+                .find(entity -> entity instanceof Monster)
+                .map(monster -> (Monster) monster)
+                .map(Mob::getTarget)
+                .anyMatch(target -> {
+                    if (target == null)
+                        return false;
+                    if (target.equals(player)) {
+                        return true;
+                    }
+                    if (target instanceof TamableAnimal tamed) {
+                        if (tamed.getOwner() != null && tamed.getOwner().equals(player))
+                            return true;
+                    }
+                    return false;
+                })
+        ).orElse(false);
+    }
+
+    @Override
+    protected void start(ServerLevel level, EntityMaid maid, long p_22542_) {
+        super.start(level, maid, p_22542_);
+    }
+
+    @Override
+    protected boolean canStillUse(ServerLevel p_22545_, EntityMaid maid, long p_22547_) {
+        return this.checkExtraStartConditions(p_22545_, maid);
+    }
+
+    @Override
+    protected void tick(ServerLevel level, EntityMaid maid, long p_22553_) {
+        super.tick(level, maid, p_22553_);
+        if (p_22553_ % 20 == 0) {
+            //1  experience per second.
+            maid.setExperience(maid.getExperience() - 1);
+            reApplyEffects(level, maid);
+        }
+    }
+
+    private void reApplyEffects(ServerLevel level, EntityMaid maid) {
+        LivingEntity player = maid.getOwner();
+        if (player == null) return;
+        List<Entity> entities = level.getEntities(maid, AABB.ofSize(maid.position(), 16, 16, 16));
+        for (Entity entity : entities) {
+            if (entity instanceof Monster monster && entity.isAlive()) {
+                monster.addEffect(new MobEffectInstance(MobEffects.WEAKNESS, 30, 0, false, false));
+            } else if (entity instanceof TamableAnimal animal && animal.isAlive()) {
+                if (animal.getOwner() != null && animal.getOwner().equals(player)) {
+                    animal.addEffect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 30, 0, false, false));
+                    animal.addEffect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, 30, 1, false, false));
+                }
+            } else if (entity.is(player)) {
+                player.addEffect(new MobEffectInstance(MobEffects.DAMAGE_RESISTANCE, 30, 0, false, false));
+                player.addEffect(new MobEffectInstance(MobEffects.DAMAGE_BOOST, 30, 1, false, false));
+            }
+        }
+    }
+
+
+    @Override
+    protected void stop(ServerLevel p_22548_, EntityMaid maid, long p_22550_) {
+    }
+
+    @Override
+    protected boolean timedOut(long p_22537_) {
+        return false;
+    }
+}

src/main/java/studio/fantasyit/maid_useful_task/compat/PlayerRevive.java

@@ -0,0 +1,9 @@
+package studio.fantasyit.maid_useful_task.compat;
+
+import net.minecraftforge.fml.ModList;
+
+public class PlayerRevive {
+    public static boolean isEnable(){
+        return ModList.get().isLoaded("playerrevive");
+    }
+}

src/main/java/studio/fantasyit/maid_useful_task/data/MaidReviveConfig.java

@@ -0,0 +1,58 @@
+package studio.fantasyit.maid_useful_task.data;
+
+import com.github.tartaricacid.touhoulittlemaid.api.entity.data.TaskDataKey;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceLocation;
+import studio.fantasyit.maid_useful_task.MaidUsefulTask;
+
+public class MaidReviveConfig implements TaskDataKey<MaidReviveConfig.Data> {
+    public static final class Data implements IConfigSetter {
+        private boolean ownerOnly;
+
+        public Data(boolean ownerOnly) {
+            this.ownerOnly = ownerOnly;
+        }
+
+        public static Data getDefault() {
+            return new Data(false);
+        }
+
+        public boolean ownerOnly() {
+            return ownerOnly;
+        }
+
+        public void ownerOnly(boolean ownerOnly) {
+            this.ownerOnly = ownerOnly;
+        }
+
+        @Override
+        public void setConfigValue(String name, String value) {
+            switch (name) {
+                case "ownerOnly":
+                    ownerOnly = Boolean.parseBoolean(value);
+                    break;
+            }
+        }
+    }
+
+    public static TaskDataKey<Data> KEY = null;
+    public static final ResourceLocation LOCATION = new ResourceLocation(MaidUsefulTask.MODID, "revive");
+
+    @Override
+    public ResourceLocation getKey() {
+        return LOCATION;
+    }
+
+    @Override
+    public CompoundTag writeSaveData(Data data) {
+        CompoundTag tag = new CompoundTag();
+        tag.putBoolean("ownerOnly", data.ownerOnly);
+        return tag;
+    }
+
+    @Override
+    public Data readSaveData(CompoundTag compound) {
+        boolean plant = compound.getBoolean("ownerOnly");
+        return new Data(plant);
+    }
+}

src/main/java/studio/fantasyit/maid_useful_task/menu/MaidReviveConfigGui.java

@@ -0,0 +1,53 @@
+package studio.fantasyit.maid_useful_task.menu;
+
+import com.github.tartaricacid.touhoulittlemaid.client.gui.entity.maid.task.MaidTaskConfigGui;
+import com.github.tartaricacid.touhoulittlemaid.client.gui.widget.button.MaidConfigButton;
+import com.github.tartaricacid.touhoulittlemaid.inventory.container.task.TaskConfigContainer;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import studio.fantasyit.maid_useful_task.data.MaidLoggingConfig;
+import studio.fantasyit.maid_useful_task.data.MaidReviveConfig;
+import studio.fantasyit.maid_useful_task.network.MaidConfigurePacket;
+import studio.fantasyit.maid_useful_task.registry.GuiRegistry;
+import studio.fantasyit.maid_useful_task.util.TranslateUtil;
+
+public class MaidReviveConfigGui extends MaidTaskConfigGui<MaidReviveConfigGui.Container> {
+    private MaidReviveConfig.Data currentData;
+
+    public MaidReviveConfigGui(Container screenContainer, Inventory inv, Component titleIn) {
+        super(screenContainer, inv, titleIn);
+    }
+
+    public static class Container extends TaskConfigContainer {
+        public Container(int id, Inventory inventory, int entityId) {
+            super(GuiRegistry.MAID_REVIVE_CONFIG_GUI.get(), id, inventory, entityId);
+        }
+    }
+
+    @Override
+    protected void initAdditionData() {
+        this.currentData = this.maid.getOrCreateData(MaidReviveConfig.KEY, MaidReviveConfig.Data.getDefault());
+    }
+
+    @Override
+    protected void initAdditionWidgets() {
+        super.initAdditionWidgets();
+
+        int startLeft = leftPos + 87;
+        int startTop = topPos + 36;
+        this.addRenderableWidget(new MaidConfigButton(startLeft, startTop + 0,
+                Component.translatable("gui.maid_useful_task.revive.ownerOnly"),
+                TranslateUtil.getBooleanTranslate(this.currentData.ownerOnly()),
+                button -> {
+                    this.currentData.ownerOnly(false);
+                    button.setValue(TranslateUtil.getBooleanTranslate(false));
+                    MaidConfigurePacket.send(this.maid, MaidReviveConfig.LOCATION, "ownerOnly", "false");
+                },
+                button -> {
+                    this.currentData.ownerOnly(true);
+                    button.setValue(TranslateUtil.getBooleanTranslate(true));
+                    MaidConfigurePacket.send(this.maid, MaidReviveConfig.LOCATION, "ownerOnly", "true");
+                }
+        ));
+    }
+}

src/main/java/studio/fantasyit/maid_useful_task/mixin/VehicleBroomMixin.java

@@ -69,7 +69,7 @@ abstract public class VehicleBroomMixin extends AbstractEntityFromItem implement
         this.maid_useful_tasks$vc_type = MaidVehicleControlType.NONE;
     }
 
-    @Inject(method = "tickRidden", at = @At(value = "INVOKE", target = "Lcom/github/tartaricacid/touhoulittlemaid/entity/item/AbstractEntityFromItem;tickRidden(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/phys/Vec3;)V"))
+    @Inject(method = "tickRidden", at = @At(value = "TAIL"))
     public void maid_useful_tasks$tickRidden(CallbackInfo ci) {
         if (maid_useful_tasks$vc_type == MaidVehicleControlType.NONE) {
             return;

src/main/java/studio/fantasyit/maid_useful_task/network/MaidAllowHandleVehicle.java

@@ -7,6 +7,7 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraftforge.network.NetworkEvent;
 import org.jetbrains.annotations.Nullable;
+import studio.fantasyit.maid_useful_task.Config;
 import studio.fantasyit.maid_useful_task.util.MemoryUtil;
 import studio.fantasyit.maid_useful_task.vehicle.MaidVehicleControlType;
 
@@ -34,6 +35,10 @@ public class MaidAllowHandleVehicle {
         if (entity instanceof EntityMaid maid) {
             MaidVehicleControlType[] values = MaidVehicleControlType.values();
             MaidVehicleControlType allowMode = values[(MemoryUtil.getAllowHandleVehicle(maid).ordinal() + 1) % values.length];
+            while ((allowMode == MaidVehicleControlType.FULL && !Config.enableVehicleControlFull)
+                    || (allowMode == MaidVehicleControlType.ROT_ONLY && !Config.enableVehicleControlRotate)) {
+                allowMode = values[(allowMode.ordinal() + 1) % values.length];
+            }
             MemoryUtil.setAllowHandleVehicle(maid, allowMode);
             Component component = switch (allowMode) {
                 case NONE -> Component.translatable("maid_useful_task.allow_handle_vehicle.none");

src/main/java/studio/fantasyit/maid_useful_task/registry/ClientGuiRegistry.java

@@ -7,6 +7,7 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import studio.fantasyit.maid_useful_task.MaidUsefulTask;
 import studio.fantasyit.maid_useful_task.menu.MaidLoggingConfigGui;
+import studio.fantasyit.maid_useful_task.menu.MaidReviveConfigGui;
 
 @Mod.EventBusSubscriber(modid = MaidUsefulTask.MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public class ClientGuiRegistry {
@@ -15,5 +16,8 @@ public class ClientGuiRegistry {
         event.enqueueWork(() -> {
             MenuScreens.register(GuiRegistry.MAID_LOGGING_CONFIG_GUI.get(), MaidLoggingConfigGui::new);
         });
+        event.enqueueWork(() -> {
+            MenuScreens.register(GuiRegistry.MAID_REVIVE_CONFIG_GUI.get(), MaidReviveConfigGui::new);
+        });
     }
 }

src/main/java/studio/fantasyit/maid_useful_task/registry/GuiRegistry.java

@@ -8,11 +8,14 @@ import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 import studio.fantasyit.maid_useful_task.MaidUsefulTask;
 import studio.fantasyit.maid_useful_task.menu.MaidLoggingConfigGui;
+import studio.fantasyit.maid_useful_task.menu.MaidReviveConfigGui;
 
 public class GuiRegistry {
     public static final DeferredRegister<MenuType<?>> MENU_TYPES = DeferredRegister.create(ForgeRegistries.MENU_TYPES, MaidUsefulTask.MODID);
     public static final RegistryObject<MenuType<MaidLoggingConfigGui.Container>> MAID_LOGGING_CONFIG_GUI = MENU_TYPES.register("maid_logging_config_gui",
             () -> IForgeMenuType.create((windowId, inv, data) -> new MaidLoggingConfigGui.Container(windowId, inv, data.readInt())));
+    public static final RegistryObject<MenuType<MaidReviveConfigGui.Container>> MAID_REVIVE_CONFIG_GUI = MENU_TYPES.register("maid_revive_config_gui",
+            () -> IForgeMenuType.create((windowId, inv, data) -> new MaidReviveConfigGui.Container(windowId, inv, data.readInt())));
 
     public static void init(IEventBus modEventBus) {
         MENU_TYPES.register(modEventBus);

src/main/java/studio/fantasyit/maid_useful_task/task/MaidLocateTask.java

@@ -4,6 +4,8 @@ import com.github.tartaricacid.touhoulittlemaid.api.task.IMaidTask;
 import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.core.BlockPos;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvent;
@@ -12,7 +14,11 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.behavior.BehaviorControl;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.MapItem;
+import net.minecraft.world.level.saveddata.maps.MapDecoration;
+import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
 import org.jetbrains.annotations.Nullable;
+import studio.fantasyit.maid_useful_task.Config;
 import studio.fantasyit.maid_useful_task.MaidUsefulTask;
 import studio.fantasyit.maid_useful_task.behavior.common.FindTargetMoveBehavior;
 import studio.fantasyit.maid_useful_task.behavior.common.FindTargetWaitBehavior;
@@ -53,6 +59,11 @@ public class MaidLocateTask implements IMaidTask, IMaidFindTargetTask {
         return false;
     }
 
+    @Override
+    public boolean isEnable(EntityMaid maid) {
+        return Config.enableLocateTask;
+    }
+
     @Override
     public @Nullable BlockPos findTarget(ServerLevel level, EntityMaid maid) {
         BlockPos target = null;
@@ -79,6 +90,35 @@ public class MaidLocateTask implements IMaidTask, IMaidFindTargetTask {
                     target = owner.getSleepingPos().orElse(maid.level().getSharedSpawnPos());
                 }
             }
+        } else if (maid.getMainHandItem().is(Items.FILLED_MAP)) {
+            target = MemoryUtil.getCommonBlockCache(maid);
+            if (target == null) {
+                MapItemSavedData savedData = MapItem.getSavedData(itemStack, maid.level());
+                if (savedData != null) {
+                    BlockPos.MutableBlockPos tmpTarget = new BlockPos.MutableBlockPos(savedData.centerX, level.getSeaLevel(), savedData.centerZ);
+
+                    CompoundTag tag = itemStack.getOrCreateTag();
+                    savedData.getBanners()
+                            .stream()
+                            .findFirst()
+                            .ifPresent(t -> {
+                                tmpTarget.set(t.getPos().immutable());
+                            });
+                    tag.getList("Decorations", Tag.TAG_COMPOUND)
+                            .stream()
+                            .filter(t -> ((CompoundTag) t).getByte("type") == 26)
+                            .findFirst()
+                            .ifPresent(t -> {
+                                CompoundTag decoration = (CompoundTag) t;
+                                tmpTarget.setX(decoration.getInt("x"));
+                                tmpTarget.setZ(decoration.getInt("z"));
+                            });
+
+
+                    target = tmpTarget.immutable();
+                    MemoryUtil.setCommonBlockCache(maid, target);
+                }
+            }
         } else {
             MemoryUtil.clearCommonBlockCache(maid);
         }

src/main/java/studio/fantasyit/maid_useful_task/task/MaidMineTask.java

@@ -0,0 +1,17 @@
+package studio.fantasyit.maid_useful_task.task;
+
+import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
+import net.minecraft.core.BlockPos;
+
+public class MaidMineTask implements IMaidBlockDestroyTask {
+    @Override
+    public boolean shouldDestroyBlock(EntityMaid maid, BlockPos pos) {
+        return false;
+    }
+
+    @Override
+    public boolean mayDestroy(EntityMaid maid, BlockPos pos) {
+        return false;
+    }
+
+}

src/main/java/studio/fantasyit/maid_useful_task/task/MaidRevivePlayerTask.java

@@ -0,0 +1,85 @@
+package studio.fantasyit.maid_useful_task.task;
+
+import com.github.tartaricacid.touhoulittlemaid.api.task.IMaidTask;
+import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
+import com.mojang.datafixers.util.Pair;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvent;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.entity.ai.behavior.BehaviorControl;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
+import org.jetbrains.annotations.Nullable;
+import studio.fantasyit.maid_useful_task.Config;
+import studio.fantasyit.maid_useful_task.MaidUsefulTask;
+import studio.fantasyit.maid_useful_task.behavior.PlayerReviveBehavior;
+import studio.fantasyit.maid_useful_task.behavior.SupportEffectBehavior;
+import studio.fantasyit.maid_useful_task.compat.PlayerRevive;
+import studio.fantasyit.maid_useful_task.menu.MaidLoggingConfigGui;
+import studio.fantasyit.maid_useful_task.menu.MaidReviveConfigGui;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MaidRevivePlayerTask implements IMaidTask {
+    public static final ResourceLocation UID = new ResourceLocation(MaidUsefulTask.MODID, "revive_player");
+
+    @Override
+    public ResourceLocation getUid() {
+        return UID;
+    }
+
+    @Override
+    public ItemStack getIcon() {
+        return Items.ENCHANTED_GOLDEN_APPLE.getDefaultInstance();
+    }
+
+    @Nullable
+    @Override
+    public SoundEvent getAmbientSound(EntityMaid entityMaid) {
+        return null;
+    }
+
+    @Override
+    public boolean isEnable(EntityMaid maid) {
+        return PlayerRevive.isEnable() && Config.enableReviveTask;
+    }
+
+    @Override
+    public boolean enableLookAndRandomWalk(EntityMaid maid) {
+        return false;
+    }
+
+    @Override
+    public boolean enablePanic(EntityMaid maid) {
+        return false;
+    }
+
+    @Override
+    public List<Pair<Integer, BehaviorControl<? super EntityMaid>>> createBrainTasks(EntityMaid entityMaid) {
+        ArrayList<Pair<Integer, BehaviorControl<? super EntityMaid>>> ret = new ArrayList<>();
+        ret.add(Pair.of(1, new PlayerReviveBehavior()));
+        ret.add(Pair.of(1, new SupportEffectBehavior()));
+        return ret;
+    }
+
+    @Override
+    public MenuProvider getTaskConfigGuiProvider(EntityMaid maid) {
+        return new MenuProvider() {
+            @Override
+            public Component getDisplayName() {
+                return Component.literal("");
+            }
+
+            @Override
+            public AbstractContainerMenu createMenu(int index, Inventory playerInventory, Player player) {
+                return new MaidReviveConfigGui.Container(index, playerInventory, maid.getId());
+            }
+        };
+    }
+
+}

src/main/java/studio/fantasyit/maid_useful_task/task/MaidTreeTask.java

@@ -23,6 +23,7 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import studio.fantasyit.maid_useful_task.Config;
 import studio.fantasyit.maid_useful_task.MaidUsefulTask;
 import studio.fantasyit.maid_useful_task.behavior.common.*;
 import studio.fantasyit.maid_useful_task.data.MaidLoggingConfig;
@@ -60,6 +61,11 @@ public class MaidTreeTask implements IMaidTask, IMaidBlockPlaceTask, IMaidBlockD
         return null;
     }
 
+    @Override
+    public boolean isEnable(EntityMaid maid) {
+        return Config.enableLoggingTask;
+    }
+
     @Override
     public MenuProvider getTaskConfigGuiProvider(EntityMaid maid) {
         return new MenuProvider() {
@@ -174,15 +180,16 @@ public class MaidTreeTask implements IMaidTask, IMaidBlockPlaceTask, IMaidBlockD
 
 
     protected boolean isValidNatureTree(EntityMaid maid, BlockPos startPos) {
-        return isValidNatureTree(maid, startPos, new HashSet<>());
+        return isValidNatureTree(maid, startPos, new HashSet<>(), 0);
     }
 
-    protected boolean isValidNatureTree(EntityMaid maid, BlockPos startPos, Set<BlockPos> visited) {
+    protected boolean isValidNatureTree(EntityMaid maid, BlockPos startPos, Set<BlockPos> visited, int depth) {
         BlockValidationMemory validationMemory = MemoryUtil.getBlockValidationMemory(maid);
         if (validationMemory.hasRecord(startPos))
             return validationMemory.isValid(startPos, false);
         if (visited.contains(startPos))
             return false;
+        if (depth > 100) return false;
         visited.add(startPos);
         boolean valid = false;
         final int[] dv = {0, 1, -1};
@@ -191,10 +198,10 @@ public class MaidTreeTask implements IMaidTask, IMaidBlockPlaceTask, IMaidBlockD
                 for (int dy : dv) {
                     BlockPos offset = startPos.offset(dx, dy, dz);
                     BlockState blockState = maid.level().getBlockState(offset);
-                    if (blockState.is(BlockTags.LEAVES) && !blockState.getValue(LeavesBlock.PERSISTENT)) {
+                    if (blockState.is(BlockTags.LEAVES) && blockState.hasProperty(LeavesBlock.PERSISTENT) && !blockState.getValue(LeavesBlock.PERSISTENT)) {
                         valid = true;
                     }
-                    if (blockState.is(BlockTags.LOGS) && isValidNatureTree(maid, offset, visited)) {
+                    if (blockState.is(BlockTags.LOGS) && isValidNatureTree(maid, offset, visited, depth + 1)) {
                         valid = true;
                     }
                 }
@@ -265,4 +272,18 @@ public class MaidTreeTask implements IMaidTask, IMaidBlockPlaceTask, IMaidBlockD
         }
         return false;
     }
+
+    /**
+     * 此处判断当home模式未开启时，不允许上搭。
+     * @param maid
+     * @param center
+     * @param maxUp
+     * @return
+     */
+    @Override
+    public oshi.util.tuples.Pair<BlockPos, BlockPos> findTargetPosBlockUp(EntityMaid maid, BlockPos center, int maxUp) {
+        if (maid.isHomeModeEnable())
+            return IMaidBlockUpTask.super.findTargetPosBlockUp(maid, center, maxUp);
+        return null;
+    }
 }

src/main/java/studio/fantasyit/maid_useful_task/util/InvUtil.java

@@ -0,0 +1,31 @@
+package studio.fantasyit.maid_useful_task.util;
+
+import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
+import net.minecraft.world.entity.item.ItemEntity;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.wrapper.CombinedInvWrapper;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+
+public class InvUtil {
+    public static ItemStack tryExtractOneMatches(IItemHandler inv, Predicate<ItemStack> predicate) {
+        int count = 0;
+        for (int i = 0; i < inv.getSlots(); i++) {
+            ItemStack stackInSlot = inv.getStackInSlot(i);
+            if(stackInSlot.isEmpty()) continue;
+            if (predicate.test(stackInSlot)) {
+                ItemStack get = inv.extractItem(i, 1, false);
+                if (!get.isEmpty()) {
+                    return get;
+                }
+            }
+        }
+        return ItemStack.EMPTY;
+    }
+}

src/main/java/studio/fantasyit/maid_useful_task/util/WrappedMaidFakePlayer.java

@@ -210,6 +210,24 @@ public class WrappedMaidFakePlayer extends FakePlayer {
         return maid.position();
     }
 
+    @Override
+    public float distanceTo(Entity p_20271_) {
+        if (maid == null) return super.distanceTo(p_20271_);
+        return maid.distanceTo(p_20271_);
+    }
+
+    @Override
+    public double distanceToSqr(double p_20276_, double p_20277_, double p_20278_) {
+        if (maid == null) return super.distanceToSqr(p_20276_, p_20277_, p_20278_);
+        return maid.distanceToSqr(p_20276_, p_20277_, p_20278_);
+    }
+
+    @Override
+    public double distanceToSqr(Vec3 p_20239_) {
+        if (maid == null) return super.distanceToSqr(p_20239_);
+        return maid.distanceToSqr(p_20239_);
+    }
+
     @Override
     public void teleportTo(double p_8969_, double p_8970_, double p_8971_) {
         if (maid == null) return;

src/main/resources/META-INF/mods.toml

@@ -70,4 +70,11 @@ description='''${mod_description}'''
    versionRange="[1.2.2,)"
    ordering="AFTER"
    side="BOTH"
+[[dependencies."${mod_id}"]]
+   modId="playerrevive"
+   mandatory=false
+   versionRange="[2.0.16,)"
+   ordering="AFTER"
+   side="BOTH"
+
 

src/main/resources/assets/maid_useful_task/lang/en_us.json

@@ -1,8 +1,10 @@
 {
   "task.maid_useful_task.maid_tree": "Logging",
-  "task.maid_useful_task.maid_tree.description": "The maid will cut down the logs around her and plant saplings.",
+  "task.maid_useful_task.maid_tree.desc": "The maid will cut down the logs around her and plant saplings.",
   "task.maid_useful_task.locate": "Locate",
-  "task.maid_useful_task.locate.description": "The maid can locate the some structure or your home with specific items.",
+  "task.maid_useful_task.locate.desc": "The maid can locate the some structure or your home with specific items.",
+  "task.maid_useful_task.revive_player": "Revive Player",
+  "task.maid_useful_task.revive_player.desc": "The maid will revive nearby bleeding player.",
   "key.maid_useful_tasks.switch_vehicle_control": "Switch Vehicle Control Mode",
   "maid_useful_task.allow_handle_vehicle.none": "Not allowing maid control vehicle",
   "maid_useful_task.allow_handle_vehicle.rot_only": "Allow maid control rotation only",
@@ -10,5 +12,6 @@
   "key.maid_useful_tasks.categories.main": "Maid Useful Tasks",
   "gui.maid_useful_task.logging.plant": "Plant Saplings",
   "gui.maid_useful_task.no": "No",
-  "gui.maid_useful_task.yes": "Yes"
+  "gui.maid_useful_task.yes": "Yes",
+  "gui.maid_useful_task.revive.ownerOnly": "Only revive owner"
 }

src/main/resources/assets/maid_useful_task/lang/zh_cn.json

@@ -1,11 +1,17 @@
 {
+  "gui.maid_useful_task.logging.plant": "种植树苗",
+  "gui.maid_useful_task.no": "否",
+  "gui.maid_useful_task.revive.ownerOnly": "只救援主人",
+  "gui.maid_useful_task.yes": "是",
   "key.maid_useful_tasks.categories.main": "女仆实用任务",
   "key.maid_useful_tasks.switch_vehicle_control": "切换载具控制模式",
   "maid_useful_task.allow_handle_vehicle.full": "允许女仆控制载具",
   "maid_useful_task.allow_handle_vehicle.none": "不允许女仆控制载具",
   "maid_useful_task.allow_handle_vehicle.rot_only": "只允许女仆控制旋转",
   "task.maid_useful_task.locate": "定位",
-  "task.maid_useful_task.locate.description": "女仆会根据手持物品定位指定的结构或你的出生点",
+  "task.maid_useful_task.locate.desc": "女仆会根据手持物品定位指定的结构或你的出生点",
   "task.maid_useful_task.maid_tree": "伐木",
-  "task.maid_useful_task.maid_tree.description": "女仆会砍伐身边的原木并种下树苗"
+  "task.maid_useful_task.maid_tree.desc": "女仆会砍伐身边的原木并种下树苗",
+  "task.maid_useful_task.revive_player": "救援玩家",
+  "task.maid_useful_task.revive_player.desc": "女仆会救援附近倒地的玩家"
 }